From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from e28smtp02.in.ibm.com (e28smtp02.in.ibm.com [125.16.236.2]) (using TLSv1.2 with cipher CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 3r8lGm6BG9zDq7w for ; Wed, 18 May 2016 16:51:28 +1000 (AEST) Received: from localhost by e28smtp02.in.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 18 May 2016 12:21:26 +0530 Received: from d28relay03.in.ibm.com (d28relay03.in.ibm.com [9.184.220.60]) by d28dlp01.in.ibm.com (Postfix) with ESMTP id 74D6CE005B for ; Wed, 18 May 2016 12:24:34 +0530 (IST) Received: from d28av02.in.ibm.com (d28av02.in.ibm.com [9.184.220.64]) by d28relay03.in.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id u4I6pMQR38928638 for ; Wed, 18 May 2016 12:21:22 +0530 Received: from d28av02.in.ibm.com (localhost [127.0.0.1]) by d28av02.in.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id u4I6pKKX006947 for ; Wed, 18 May 2016 12:21:21 +0530 Message-ID: <573C10E5.9000007@linux.vnet.ibm.com> Date: Wed, 18 May 2016 12:21:17 +0530 From: Shreyas B Prabhu MIME-Version: 1.0 To: ego@linux.vnet.ibm.com CC: mpe@ellerman.id.au, linuxppc-dev@lists.ozlabs.org, paulus@ozlabs.org, linux-kernel@vger.kernel.org, mikey@neuling.org Subject: Re: [PATCH v2 4/9] powerpc/powernv: Make power7_powersave_common more generic References: <1462263878-25237-1-git-send-email-shreyas@linux.vnet.ibm.com> <1462263878-25237-5-git-send-email-shreyas@linux.vnet.ibm.com> <20160518063708.GD3939@in.ibm.com> In-Reply-To: <20160518063708.GD3939@in.ibm.com> Content-Type: text/plain; charset=windows-1252 List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , On 05/18/2016 12:07 PM, Gautham R Shenoy wrote: > Hi Shreyas, > > On Tue, May 03, 2016 at 01:54:33PM +0530, Shreyas B. Prabhu wrote: >> power7_powersave_common does common steps needed before entering idle >> state and eventually changes MSR to MSR_IDLE and does rfid to >> power7_enter_nap_mode. >> >> Make it more generic by passing the rfid address as a function parameter. >> Also make function name more generic. > > [..snip..] > >> >> _GLOBAL(power7_winkle) >> - li r3,3 >> + li r3,PNV_THREAD_WINKLE > > This particular change above can go as an independent patch. Okay. > >> >> _GLOBAL(power7_wakeup_tb_loss) >> diff --git a/arch/powerpc/kernel/idle_power_common.S b/arch/powerpc/kernel/idle_power_common.S >> index 05954ae..ff7a541 100644 >> --- a/arch/powerpc/kernel/idle_power_common.S >> +++ b/arch/powerpc/kernel/idle_power_common.S >> @@ -21,8 +21,10 @@ >> * To check IRQ_HAPPENED in r4 >> * 0 - don't check >> * 1 - check >> + * >> + * Address to 'rfid' to in r5 >> */ >> -_GLOBAL(power7_powersave_common) >> +_GLOBAL(power_powersave_common) >> /* Use r3 to pass state nap/sleep/winkle */ >> /* NAP is a state loss, we create a regs frame on the >> * stack, fill it up with the state we care about and >> @@ -79,13 +81,12 @@ _GLOBAL(power7_powersave_common) >> * because as soon as we do that, another thread can switch >> * the MMU context to the guest. >> */ >> - LOAD_REG_IMMEDIATE(r5, MSR_IDLE) >> + LOAD_REG_IMMEDIATE(r7, MSR_IDLE) >> li r6, MSR_RI >> andc r6, r9, r6 >> - LOAD_REG_ADDR(r7, power7_enter_nap_mode) >> mtmsrd r6, 1 /* clear RI before setting SRR0/1 */ >> - mtspr SPRN_SRR0, r7 >> - mtspr SPRN_SRR1, r5 >> + mtspr SPRN_SRR0, r5 >> + mtspr SPRN_SRR1, r7 >> rfid >> /* No return */ > > Any particular reason why you swapped the roles of r5 and r7 ? > With this patch, r5 which is the third parameter to power_powersave_common contains the return address that needs to be written to SRR0. So here I'm keeping r5 unaltered and using r7 for the MSR. Thanks, Shreyas