From patchwork Wed Jul 16 04:21:17 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bharat Bhushan X-Patchwork-Id: 370588 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id E3D3C14011B for ; Wed, 16 Jul 2014 14:21:20 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759017AbaGPEVU (ORCPT ); Wed, 16 Jul 2014 00:21:20 -0400 Received: from mail-by2lp0240.outbound.protection.outlook.com ([207.46.163.240]:20448 "EHLO na01-by2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1755919AbaGPEVT convert rfc822-to-8bit (ORCPT ); Wed, 16 Jul 2014 00:21:19 -0400 Received: from BLUPR03MB566.namprd03.prod.outlook.com (10.141.77.155) by BLUPR03MB501.namprd03.prod.outlook.com (10.141.80.18) with Microsoft SMTP Server (TLS) id 15.0.980.8; Wed, 16 Jul 2014 04:21:17 +0000 Received: from BLUPR03MB566.namprd03.prod.outlook.com ([10.141.77.155]) by BLUPR03MB566.namprd03.prod.outlook.com ([10.141.77.155]) with mapi id 15.00.0985.008; Wed, 16 Jul 2014 04:21:17 +0000 From: "Bharat.Bhushan@freescale.com" To: "mihai.caraman@freescale.com" , "Alexander Graf" CC: "kvm-ppc@vger.kernel.org" Subject: RE: Re: [PATCH 6/6] kvm: ppc: Add SPRN_SPR get helper function Thread-Topic: Re: [PATCH 6/6] kvm: ppc: Add SPRN_SPR get helper function Thread-Index: Ac+gTNpCZQPBI74oTxWnpobrSsU3IAAYBK2A Date: Wed, 16 Jul 2014 04:21:17 +0000 Message-ID: References: In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [192.88.169.1] x-microsoft-antispam: BCL:0;PCL:0;RULEID: x-forefront-prvs: 0274272F87 x-forefront-antispam-report: SFV:NSPM; SFS:(6009001)(377454003)(189002)(13464003)(199002)(51704005)(81342001)(76176999)(86362001)(74662001)(81542001)(101416001)(77982001)(80022001)(19580395003)(83322001)(76576001)(85852003)(46102001)(54356999)(20776003)(83072002)(33646002)(66066001)(85306003)(2656002)(92566001)(107046002)(74502001)(79102001)(99286002)(105586002)(76482001)(87936001)(106356001)(31966008)(74316001)(64706001)(95666004)(50986999)(19580405001)(21056001)(4396001)(99396002)(108616002)(24736002); DIR:OUT; SFP:; SCL:1; SRVR:BLUPR03MB501; H:BLUPR03MB566.namprd03.prod.outlook.com; FPR:; MLV:sfv; PTR:InfoNoRecords; MX:1; LANG:en; MIME-Version: 1.0 X-OriginatorOrg: freescale.com Sender: kvm-ppc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm-ppc@vger.kernel.org > -----Original Message----- > From: Caraman Mihai Claudiu-B02008 > Sent: Tuesday, July 15, 2014 10:20 PM > To: Alexander Graf > Cc: Bhushan Bharat-R65777; kvm-ppc@vger.kernel.org > Subject: Re: [PATCH 6/6] kvm: ppc: Add SPRN_SPR get helper function > > > kvmppc_set_epr() is already defined in asm/kvm_ppc.h, So > > rename and move get_epr helper function to same file. > > > > Signed-off-by: Bharat Bhushan > > --- > > arch/powerpc/include/asm/kvm_ppc.h | 9 +++++++++ > > arch/powerpc/kvm/booke.c | 11 +---------- > > 2 files changed, 10 insertions(+), 10 deletions(-) > > This patch which is already applied on kvm-ppc-queue breaks book3s. > I get these errors with g5_defconfig: > > In file included from arch/powerpc/kernel/asm-offsets.c:57:0: > ./arch/powerpc/include/asm/kvm_ppc.h: In function 'kvmppc_get_epr': > ./arch/powerpc/include/asm/kvm_ppc.h:400:19: error: 'struct kvm_vcpu_arch' has > no member named 'epr' > ./arch/powerpc/include/asm/kvm_ppc.h: In function 'kvmppc_get_sprg0': > ./arch/powerpc/include/asm/kvm_ppc.h:522:1: error: 'SPRN_GSPRG0' undeclared > (first use in this function) > ./arch/powerpc/include/asm/kvm_ppc.h:522:1: note: each undeclared identifier is > reported only once for each function it appears in > ... I am sorry, I forgot to compile for book3s. Should we squash below change to fix these errors. > > -Mike --- To unsubscribe from this list: send the line "unsubscribe kvm-ppc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/arch/powerpc/include/asm/kvm_ppc.h b/arch/powerpc/include/asm/kvm_ppc.h index ad14d26..7ad4730 100644 --- a/arch/powerpc/include/asm/kvm_ppc.h +++ b/arch/powerpc/include/asm/kvm_ppc.h @@ -399,7 +399,7 @@ static inline unsigned long kvmppc_get_epr(struct kvm_vcpu *vcpu) { #ifdef CONFIG_KVM_BOOKE_HV return mfspr(SPRN_GEPR); -#else +#elif defined(CONFIG_BOOKE) return vcpu->arch.epr; #endif } @@ -522,6 +522,7 @@ static inline void kvmppc_set_##reg(struct kvm_vcpu *vcpu, u##size val) \ SHARED_WRAPPER_SET(reg, size, e500hv_spr) \ SHARED_WRAPPER(critical, 64, 0) +#ifdef CONFIG_BOOKE SHARED_WRAPPER(sprg0, 64, SPRN_GSPRG0) SHARED_WRAPPER(sprg1, 64, SPRN_GSPRG1) SHARED_WRAPPER(sprg2, 64, SPRN_GSPRG2) @@ -530,6 +531,16 @@ SHARED_WRAPPER(srr0, 64, SPRN_GSRR0) SHARED_WRAPPER(srr1, 64, SPRN_GSRR1) SHARED_WRAPPER(dar, 64, SPRN_GDEAR) SHARED_WRAPPER(esr, 64, SPRN_GESR) +#else +SHARED_WRAPPER(sprg0, 64, 0) +SHARED_WRAPPER(sprg1, 64, 0) +SHARED_WRAPPER(sprg2, 64, 0) +SHARED_WRAPPER(sprg3, 64, 0) +SHARED_WRAPPER(srr0, 64, 0) +SHARED_WRAPPER(srr1, 64, 0) +SHARED_WRAPPER(dar, 64, 0) +SHARED_WRAPPER(esr, 64, 0) +#endif SHARED_WRAPPER_GET(msr, 64, 0) static inline void kvmppc_set_msr_fast(struct kvm_vcpu *vcpu, u64 val) {