From patchwork Thu Jun 21 02:04:35 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Neuling X-Patchwork-Id: 166183 X-Patchwork-Delegate: michael@ellerman.id.au Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from ozlabs.org (localhost [IPv6:::1]) by ozlabs.org (Postfix) with ESMTP id C88D4B73DE for ; Thu, 21 Jun 2012 12:17:15 +1000 (EST) Received: by ozlabs.org (Postfix) id 06F02B7008; Thu, 21 Jun 2012 12:04:36 +1000 (EST) Delivered-To: linuxppc-dev@ozlabs.org Received: from localhost.localdomain (localhost [127.0.0.1]) by ozlabs.org (Postfix) with ESMTP id 59290B6F9F; Thu, 21 Jun 2012 12:04:35 +1000 (EST) Received: by localhost.localdomain (Postfix, from userid 1000) id 3FEE3D431D9; Thu, 21 Jun 2012 12:04:35 +1000 (EST) To: Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman From: Michael Neuling Date: Thu, 21 Jun 2012 12:04:35 +1000 Subject: [PATCH 8/18] powerpc: merge VCPU_GPR In-Reply-To: <1340244266.960241.475925824909.qpush@ale> Message-Id: <20120621020435.3FEE3D431D9@localhost.localdomain> Cc: mikey@neuling.org, linuxppc-dev@ozlabs.org, schwab@linux-m68k.org, Anton Blanchard , Olof Johannsson X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.15rc1 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" Merge the defines of VCPU_GPR from different places. Signed-off-by: Michael Neuling --- arch/powerpc/include/asm/ppc_asm.h | 7 +++++++ arch/powerpc/kvm/book3s_hv_rmhandlers.S | 3 --- arch/powerpc/kvm/book3s_interrupts.S | 8 -------- arch/powerpc/kvm/booke_interrupts.S | 2 -- arch/powerpc/kvm/bookehv_interrupts.S | 1 - 5 files changed, 7 insertions(+), 14 deletions(-) Index: powerpc-test/arch/powerpc/include/asm/ppc_asm.h =================================================================== --- powerpc-test.orig/arch/powerpc/include/asm/ppc_asm.h +++ powerpc-test/arch/powerpc/include/asm/ppc_asm.h @@ -178,6 +178,13 @@ END_FW_FTR_SECTION_IFSET(FW_FEATURE_SPLP #define HMT_HIGH or 3,3,3 #define HMT_EXTRA_HIGH or 7,7,7 # power7 only +#ifdef CONFIG_PPC64 +#define ULONG_SIZE 8 +#else +#define ULONG_SIZE 4 +#endif +#define VCPU_GPR(n) (VCPU_GPRS + (n * ULONG_SIZE)) + #ifdef __KERNEL__ #ifdef CONFIG_PPC64 Index: powerpc-test/arch/powerpc/kvm/book3s_hv_rmhandlers.S =================================================================== --- powerpc-test.orig/arch/powerpc/kvm/book3s_hv_rmhandlers.S +++ powerpc-test/arch/powerpc/kvm/book3s_hv_rmhandlers.S @@ -72,9 +72,6 @@ _GLOBAL(kvmppc_hv_entry_trampoline) mtsrr1 r6 RFI -#define ULONG_SIZE 8 -#define VCPU_GPR(n) (VCPU_GPRS + (n * ULONG_SIZE)) - /****************************************************************************** * * * Entry code * Index: powerpc-test/arch/powerpc/kvm/book3s_interrupts.S =================================================================== --- powerpc-test.orig/arch/powerpc/kvm/book3s_interrupts.S +++ powerpc-test/arch/powerpc/kvm/book3s_interrupts.S @@ -25,19 +25,11 @@ #include #if defined(CONFIG_PPC_BOOK3S_64) - -#define ULONG_SIZE 8 #define FUNC(name) GLUE(.,name) - #elif defined(CONFIG_PPC_BOOK3S_32) - -#define ULONG_SIZE 4 #define FUNC(name) name - #endif /* CONFIG_PPC_BOOK3S_XX */ - -#define VCPU_GPR(n) (VCPU_GPRS + (n * ULONG_SIZE)) #define VCPU_LOAD_NVGPRS(vcpu) \ PPC_LL r14, VCPU_GPR(R14)(vcpu); \ PPC_LL r15, VCPU_GPR(R15)(vcpu); \ Index: powerpc-test/arch/powerpc/kvm/booke_interrupts.S =================================================================== --- powerpc-test.orig/arch/powerpc/kvm/booke_interrupts.S +++ powerpc-test/arch/powerpc/kvm/booke_interrupts.S @@ -25,8 +25,6 @@ #include #include -#define VCPU_GPR(n) (VCPU_GPRS + (n * 4)) - /* The host stack layout: */ #define HOST_R1 0 /* Implied by stwu. */ #define HOST_CALLEE_LR 4 Index: powerpc-test/arch/powerpc/kvm/bookehv_interrupts.S =================================================================== --- powerpc-test.orig/arch/powerpc/kvm/bookehv_interrupts.S +++ powerpc-test/arch/powerpc/kvm/bookehv_interrupts.S @@ -37,7 +37,6 @@ #define LONGBYTES (BITS_PER_LONG / 8) -#define VCPU_GPR(n) (VCPU_GPRS + (n * LONGBYTES)) #define VCPU_GUEST_SPRG(n) (VCPU_GUEST_SPRGS + (n * LONGBYTES)) /* The host stack layout: */