| Message ID | 1340627195-11544-3-git-send-email-mihai.caraman@freescale.com |
|---|---|
| State | New, archived |
| Headers | show |
On 25.06.2012, at 14:26, Mihai Caraman wrote: > Add EPCR support in booke mtspr/mfspr emulation. EPCR register is defined > only for 64-bit and HV categories, so it shoud be available only on 64-bit > virtual processors. Undefine the support for 32-bit builds. > Define a reusable setter function for vcpu's EPCR. > > Signed-off-by: Mihai Caraman <mihai.caraman@freescale.com> > --- > arch/powerpc/kvm/booke.c | 12 +++++++++++- > arch/powerpc/kvm/booke.h | 6 ++++++ > arch/powerpc/kvm/booke_emulate.c | 13 ++++++++++++- > 3 files changed, 29 insertions(+), 2 deletions(-) > > diff --git a/arch/powerpc/kvm/booke.c b/arch/powerpc/kvm/booke.c > index 72f13f4..f9fa260 100644 > --- a/arch/powerpc/kvm/booke.c > +++ b/arch/powerpc/kvm/booke.c > @@ -13,7 +13,7 @@ > * Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. > * > * Copyright IBM Corp. 2007 > - * Copyright 2010-2011 Freescale Semiconductor, Inc. > + * Copyright 2010-2012 Freescale Semiconductor, Inc. > * > * Authors: Hollis Blanchard <hollisb@us.ibm.com> > * Christian Ehrhardt <ehrhardt@linux.vnet.ibm.com> > @@ -1243,6 +1243,16 @@ void kvmppc_core_commit_memory_region(struct kvm *kvm, > { > } > > +#ifdef CONFIG_64BIT > +void kvmppc_set_epcr(struct kvm_vcpu *vcpu, u32 new_epcr) > +{ > + vcpu->arch.epcr = new_epcr; > + vcpu->arch.shadow_epcr &= ~SPRN_EPCR_GICM; > + if (vcpu->arch.epcr & SPRN_EPCR_ICM) > + vcpu->arch.shadow_epcr |= SPRN_EPCR_GICM; Why would the setter be #ifdef CONFIG_64BIT? EPCR exists on e500mc too, no? Please only #ifdef the GICM bits out. Alex -- 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
> -----Original Message----- > From: kvm-ppc-owner@vger.kernel.org [mailto:kvm-ppc- > owner@vger.kernel.org] On Behalf Of Alexander Graf > Sent: Wednesday, July 04, 2012 4:22 PM > To: Caraman Mihai Claudiu-B02008 > Cc: kvm-ppc@vger.kernel.org; kvm@vger.kernel.org; linuxppc- > dev@lists.ozlabs.org; qemu-ppc@nongnu.org > Subject: Re: [RFC PATCH 02/17] KVM: PPC64: booke: Add EPCR support in > mtspr/mfspr emulation > > > On 25.06.2012, at 14:26, Mihai Caraman wrote: > > > Add EPCR support in booke mtspr/mfspr emulation. EPCR register is > defined > > only for 64-bit and HV categories, so it shoud be available only on 64- > bit > > virtual processors. Undefine the support for 32-bit builds. > > Define a reusable setter function for vcpu's EPCR. > > > > Signed-off-by: Mihai Caraman <mihai.caraman@freescale.com> > > --- > > arch/powerpc/kvm/booke.c | 12 +++++++++++- > > arch/powerpc/kvm/booke.h | 6 ++++++ > > arch/powerpc/kvm/booke_emulate.c | 13 ++++++++++++- > > 3 files changed, 29 insertions(+), 2 deletions(-) > > > > diff --git a/arch/powerpc/kvm/booke.c b/arch/powerpc/kvm/booke.c > > index 72f13f4..f9fa260 100644 > > --- a/arch/powerpc/kvm/booke.c > > +++ b/arch/powerpc/kvm/booke.c > > @@ -13,7 +13,7 @@ > > * Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, > USA. > > * > > * Copyright IBM Corp. 2007 > > - * Copyright 2010-2011 Freescale Semiconductor, Inc. > > + * Copyright 2010-2012 Freescale Semiconductor, Inc. > > * > > * Authors: Hollis Blanchard <hollisb@us.ibm.com> > > * Christian Ehrhardt <ehrhardt@linux.vnet.ibm.com> > > @@ -1243,6 +1243,16 @@ void kvmppc_core_commit_memory_region(struct kvm > *kvm, > > { > > } > > > > +#ifdef CONFIG_64BIT > > +void kvmppc_set_epcr(struct kvm_vcpu *vcpu, u32 new_epcr) > > +{ > > + vcpu->arch.epcr = new_epcr; > > + vcpu->arch.shadow_epcr &= ~SPRN_EPCR_GICM; > > + if (vcpu->arch.epcr & SPRN_EPCR_ICM) > > + vcpu->arch.shadow_epcr |= SPRN_EPCR_GICM; > > Why would the setter be #ifdef CONFIG_64BIT? EPCR exists on e500mc too, > no? Please only #ifdef the GICM bits out. kvmppc_set_epcr deals with guest EPCR and EPCR does not exist on a virtual e500mc as detailed in patch's comment. All callers are also guarded by #ifdef CONFIG_64BIT, my assumption was that we will not support a virtual core with 64-bit category on a 32-bit host. > > > Alex > > -- > 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 -- 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
On 04.07.2012, at 16:14, Caraman Mihai Claudiu-B02008 wrote: >> -----Original Message----- >> From: kvm-ppc-owner@vger.kernel.org [mailto:kvm-ppc- >> owner@vger.kernel.org] On Behalf Of Alexander Graf >> Sent: Wednesday, July 04, 2012 4:22 PM >> To: Caraman Mihai Claudiu-B02008 >> Cc: kvm-ppc@vger.kernel.org; kvm@vger.kernel.org; linuxppc- >> dev@lists.ozlabs.org; qemu-ppc@nongnu.org >> Subject: Re: [RFC PATCH 02/17] KVM: PPC64: booke: Add EPCR support in >> mtspr/mfspr emulation >> >> >> On 25.06.2012, at 14:26, Mihai Caraman wrote: >> >>> Add EPCR support in booke mtspr/mfspr emulation. EPCR register is >> defined >>> only for 64-bit and HV categories, so it shoud be available only on 64- >> bit >>> virtual processors. Undefine the support for 32-bit builds. >>> Define a reusable setter function for vcpu's EPCR. >>> >>> Signed-off-by: Mihai Caraman <mihai.caraman@freescale.com> >>> --- >>> arch/powerpc/kvm/booke.c | 12 +++++++++++- >>> arch/powerpc/kvm/booke.h | 6 ++++++ >>> arch/powerpc/kvm/booke_emulate.c | 13 ++++++++++++- >>> 3 files changed, 29 insertions(+), 2 deletions(-) >>> >>> diff --git a/arch/powerpc/kvm/booke.c b/arch/powerpc/kvm/booke.c >>> index 72f13f4..f9fa260 100644 >>> --- a/arch/powerpc/kvm/booke.c >>> +++ b/arch/powerpc/kvm/booke.c >>> @@ -13,7 +13,7 @@ >>> * Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, >> USA. >>> * >>> * Copyright IBM Corp. 2007 >>> - * Copyright 2010-2011 Freescale Semiconductor, Inc. >>> + * Copyright 2010-2012 Freescale Semiconductor, Inc. >>> * >>> * Authors: Hollis Blanchard <hollisb@us.ibm.com> >>> * Christian Ehrhardt <ehrhardt@linux.vnet.ibm.com> >>> @@ -1243,6 +1243,16 @@ void kvmppc_core_commit_memory_region(struct kvm >> *kvm, >>> { >>> } >>> >>> +#ifdef CONFIG_64BIT >>> +void kvmppc_set_epcr(struct kvm_vcpu *vcpu, u32 new_epcr) >>> +{ >>> + vcpu->arch.epcr = new_epcr; >>> + vcpu->arch.shadow_epcr &= ~SPRN_EPCR_GICM; >>> + if (vcpu->arch.epcr & SPRN_EPCR_ICM) >>> + vcpu->arch.shadow_epcr |= SPRN_EPCR_GICM; >> >> Why would the setter be #ifdef CONFIG_64BIT? EPCR exists on e500mc too, >> no? Please only #ifdef the GICM bits out. > > kvmppc_set_epcr deals with guest EPCR and EPCR does not exist on a virtual e500mc > as detailed in patch's comment. All callers are also guarded by #ifdef CONFIG_64BIT, > my assumption was that we will not support a virtual core with 64-bit category > on a 32-bit host. My main concern is that every #ifdef potentially breaks things without us knowing. So the less #ifdef's we have, the better off we are. The spec only says that we don't _have_ to implement EPCR for non-hv non-64bit systems. It doesn't forbid to do so, right? Alex -- 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/kvm/booke.c b/arch/powerpc/kvm/booke.c index 72f13f4..f9fa260 100644 --- a/arch/powerpc/kvm/booke.c +++ b/arch/powerpc/kvm/booke.c @@ -13,7 +13,7 @@ * Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * Copyright IBM Corp. 2007 - * Copyright 2010-2011 Freescale Semiconductor, Inc. + * Copyright 2010-2012 Freescale Semiconductor, Inc. * * Authors: Hollis Blanchard <hollisb@us.ibm.com> * Christian Ehrhardt <ehrhardt@linux.vnet.ibm.com> @@ -1243,6 +1243,16 @@ void kvmppc_core_commit_memory_region(struct kvm *kvm, { } +#ifdef CONFIG_64BIT +void kvmppc_set_epcr(struct kvm_vcpu *vcpu, u32 new_epcr) +{ + vcpu->arch.epcr = new_epcr; + vcpu->arch.shadow_epcr &= ~SPRN_EPCR_GICM; + if (vcpu->arch.epcr & SPRN_EPCR_ICM) + vcpu->arch.shadow_epcr |= SPRN_EPCR_GICM; +} +#endif + void kvmppc_set_tcr(struct kvm_vcpu *vcpu, u32 new_tcr) { vcpu->arch.tcr = new_tcr; diff --git a/arch/powerpc/kvm/booke.h b/arch/powerpc/kvm/booke.h index ba61974..e05b48f 100644 --- a/arch/powerpc/kvm/booke.h +++ b/arch/powerpc/kvm/booke.h @@ -69,6 +69,12 @@ extern unsigned long kvmppc_booke_handlers; void kvmppc_set_msr(struct kvm_vcpu *vcpu, u32 new_msr); void kvmppc_mmu_msr_notify(struct kvm_vcpu *vcpu, u32 old_msr); +#ifdef CONFIG_64BIT +void kvmppc_set_epcr(struct kvm_vcpu *vcpu, u32 new_epcr); +#else +static inline void kvmppc_set_epcr(struct kvm_vcpu *vcpu, u32 new_epcr) {} +#endif + void kvmppc_set_tcr(struct kvm_vcpu *vcpu, u32 new_tcr); void kvmppc_set_tsr_bits(struct kvm_vcpu *vcpu, u32 tsr_bits); void kvmppc_clr_tsr_bits(struct kvm_vcpu *vcpu, u32 tsr_bits); diff --git a/arch/powerpc/kvm/booke_emulate.c b/arch/powerpc/kvm/booke_emulate.c index 6c76397..9cf2b95f 100644 --- a/arch/powerpc/kvm/booke_emulate.c +++ b/arch/powerpc/kvm/booke_emulate.c @@ -13,7 +13,7 @@ * Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * Copyright IBM Corp. 2008 - * Copyright 2011 Freescale Semiconductor, Inc. + * Copyright 2011-2012 Freescale Semiconductor, Inc. * * Authors: Hollis Blanchard <hollisb@us.ibm.com> */ @@ -207,6 +207,12 @@ int kvmppc_booke_emulate_mtspr(struct kvm_vcpu *vcpu, int sprn, ulong spr_val) case SPRN_IVOR15: vcpu->arch.ivor[BOOKE_IRQPRIO_DEBUG] = spr_val; break; +#ifdef CONFIG_64BIT + case SPRN_EPCR: + kvmppc_set_epcr(vcpu, spr_val); + mtspr(SPRN_EPCR, vcpu->arch.shadow_epcr); + break; +#endif default: emulated = EMULATE_FAIL; @@ -293,6 +299,11 @@ int kvmppc_booke_emulate_mfspr(struct kvm_vcpu *vcpu, int sprn, ulong *spr_val) case SPRN_IVOR15: *spr_val = vcpu->arch.ivor[BOOKE_IRQPRIO_DEBUG]; break; +#ifdef CONFIG_64BIT + case SPRN_EPCR: + *spr_val = vcpu->arch.epcr; + break; +#endif default: emulated = EMULATE_FAIL;
Add EPCR support in booke mtspr/mfspr emulation. EPCR register is defined only for 64-bit and HV categories, so it shoud be available only on 64-bit virtual processors. Undefine the support for 32-bit builds. Define a reusable setter function for vcpu's EPCR. Signed-off-by: Mihai Caraman <mihai.caraman@freescale.com> --- arch/powerpc/kvm/booke.c | 12 +++++++++++- arch/powerpc/kvm/booke.h | 6 ++++++ arch/powerpc/kvm/booke_emulate.c | 13 ++++++++++++- 3 files changed, 29 insertions(+), 2 deletions(-)