From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752198AbcERHWx (ORCPT ); Wed, 18 May 2016 03:22:53 -0400 Received: from e23smtp01.au.ibm.com ([202.81.31.143]:56228 "EHLO e23smtp01.au.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750795AbcERHWw (ORCPT ); Wed, 18 May 2016 03:22:52 -0400 X-IBM-Helo: d23dlp03.au.ibm.com X-IBM-MailFrom: shreyas@linux.vnet.ibm.com X-IBM-RcptTo: linux-kernel@vger.kernel.org Message-ID: <573C180B.8050201@linux.vnet.ibm.com> Date: Wed, 18 May 2016 12:51:47 +0530 From: Shreyas B Prabhu User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.1.0 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 1/9] powerpc/powernv: Move CHECK_HMI_INTERRUPT to exception-64s header References: <1462263878-25237-1-git-send-email-shreyas@linux.vnet.ibm.com> <1462263878-25237-2-git-send-email-shreyas@linux.vnet.ibm.com> <20160518043551.GA3939@in.ibm.com> In-Reply-To: <20160518043551.GA3939@in.ibm.com> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 16051807-1618-0000-0000-000045DE74E6 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 05/18/2016 10:05 AM, Gautham R Shenoy wrote: > On Tue, May 03, 2016 at 01:54:30PM +0530, Shreyas B. Prabhu wrote: >> CHECK_HMI_INTERRUPT is used to check for HMI's in reset vector. Move >> the macro to a common location (exception-64s.h) >> This patch does not change any functionality. >> > > I suppose this code movement is to facilitate the invocation of > CHECK_HMI_INTERRUPT in some later patch ? In this case you could > add this to the commit message. > Ok. I'll do that. > Otherwise, > Reviewed-by: Gautham R. Shenoy Thanks for the review. >> --- >> arch/powerpc/include/asm/exception-64s.h | 18 ++++++++++++++++++ >> arch/powerpc/kernel/idle_power7.S | 20 +------------------- >> 2 files changed, 19 insertions(+), 19 deletions(-) >> >> diff --git a/arch/powerpc/include/asm/exception-64s.h b/arch/powerpc/include/asm/exception-64s.h >> index 93ae809..6a625af 100644 >> --- a/arch/powerpc/include/asm/exception-64s.h >> +++ b/arch/powerpc/include/asm/exception-64s.h >> @@ -545,4 +545,22 @@ END_FTR_SECTION_IFSET(CPU_FTR_CAN_NAP) >> #define FINISH_NAP >> #endif >> >> +#define CHECK_HMI_INTERRUPT \ >> + mfspr r0,SPRN_SRR1; \ >> +BEGIN_FTR_SECTION_NESTED(66); \ >> + rlwinm r0,r0,45-31,0xf; /* extract wake reason field (P8) */ \ >> +FTR_SECTION_ELSE_NESTED(66); \ >> + rlwinm r0,r0,45-31,0xe; /* P7 wake reason field is 3 bits */ \ >> +ALT_FTR_SECTION_END_NESTED_IFSET(CPU_FTR_ARCH_207S, 66); \ >> + cmpwi r0,0xa; /* Hypervisor maintenance ? */ \ >> + bne 20f; \ >> + /* Invoke opal call to handle hmi */ \ >> + ld r2,PACATOC(r13); \ >> + ld r1,PACAR1(r13); \ >> + std r3,ORIG_GPR3(r1); /* Save original r3 */ \ >> + li r0,OPAL_HANDLE_HMI; /* Pass opal token argument*/ \ >> + bl opal_call_realmode; \ >> + ld r3,ORIG_GPR3(r1); /* Restore original r3 */ \ >> +20: nop; >> + >> #endif /* _ASM_POWERPC_EXCEPTION_H */ >> diff --git a/arch/powerpc/kernel/idle_power7.S b/arch/powerpc/kernel/idle_power7.S >> index 470ceeb..6b3404b 100644 >> --- a/arch/powerpc/kernel/idle_power7.S >> +++ b/arch/powerpc/kernel/idle_power7.S >> @@ -19,6 +19,7 @@ >> #include >> #include >> #include >> +#include >> #include >> >> #undef DEBUG >> @@ -257,25 +258,6 @@ _GLOBAL(power7_winkle) >> b power7_powersave_common >> /* No return */ >> >> -#define CHECK_HMI_INTERRUPT \ >> - mfspr r0,SPRN_SRR1; \ >> -BEGIN_FTR_SECTION_NESTED(66); \ >> - rlwinm r0,r0,45-31,0xf; /* extract wake reason field (P8) */ \ >> -FTR_SECTION_ELSE_NESTED(66); \ >> - rlwinm r0,r0,45-31,0xe; /* P7 wake reason field is 3 bits */ \ >> -ALT_FTR_SECTION_END_NESTED_IFSET(CPU_FTR_ARCH_207S, 66); \ >> - cmpwi r0,0xa; /* Hypervisor maintenance ? */ \ >> - bne 20f; \ >> - /* Invoke opal call to handle hmi */ \ >> - ld r2,PACATOC(r13); \ >> - ld r1,PACAR1(r13); \ >> - std r3,ORIG_GPR3(r1); /* Save original r3 */ \ >> - li r0,OPAL_HANDLE_HMI; /* Pass opal token argument*/ \ >> - bl opal_call_realmode; \ >> - ld r3,ORIG_GPR3(r1); /* Restore original r3 */ \ >> -20: nop; >> - >> - >> _GLOBAL(power7_wakeup_tb_loss) >> ld r2,PACATOC(r13); >> ld r1,PACAR1(r13) >> -- >> 2.4.11 >>