[PATCH 2/4] KVM: PPC: booke: Wrap __kvmppc_vcpu_run()

[Alexander Graf]

On 29.03.2011, at 11:36, Liu Yu-B13201 wrote:

> 
> 
>> -----Original Message-----
>> From: 
>> linuxppc-dev-bounces+b13201=freescale.com at lists.ozlabs.org 
>> [mailto:linuxppc-dev-bounces+b13201=freescale.com at lists.ozlabs
>> .org] On Behalf Of Alexander Graf
>> Sent: Tuesday, March 29, 2011 5:32 PM
>> To: Wood Scott-B07421
>> Cc: linuxppc-dev at lists.ozlabs.org
>> Subject: Re: [PATCH 2/4] KVM: PPC: booke: Wrap __kvmppc_vcpu_run()
>> 
>> 
>> On 28.03.2011, at 21:25, Scott Wood wrote:
>> 
>>> From: yu liu <yu.liu at freescale.com>
>>> 
>>> We need to save/restore SPE environment on e500 core.
>>> Wrap __kvmppc_vcpu_run() so that we can put the SPE code in
>>> e500.c.
>>> 
>>> Signed-off-by: Liu Yu <yu.liu at freescale.com>
>>> Signed-off-by: Scott Wood <scottwood at freescale.com>
>>> ---
>>> arch/powerpc/include/asm/kvm_ppc.h  |    1 +
>>> arch/powerpc/kvm/44x.c              |    5 +++++
>>> arch/powerpc/kvm/book3s.c           |    1 -
>>> arch/powerpc/kvm/booke_interrupts.S |    2 +-
>>> arch/powerpc/kvm/e500.c             |    5 +++++
>>> 5 files changed, 12 insertions(+), 2 deletions(-)
>>> 
>>> diff --git a/arch/powerpc/include/asm/kvm_ppc.h 
>> b/arch/powerpc/include/asm/kvm_ppc.h
>>> index ecb3bc7..4e7a1be 100644
>>> --- a/arch/powerpc/include/asm/kvm_ppc.h
>>> +++ b/arch/powerpc/include/asm/kvm_ppc.h
>>> @@ -42,6 +42,7 @@ enum emulation_result {
>>> 	EMULATE_AGAIN,        /* something went wrong. go again */
>>> };
>>> 
>>> +extern int __kvmppc_vcpu_entry(struct kvm_run *kvm_run, 
>> struct kvm_vcpu *vcpu);
>>> extern int __kvmppc_vcpu_run(struct kvm_run *kvm_run, 
>> struct kvm_vcpu *vcpu);
>>> extern char kvmppc_handlers_start[];
>>> extern unsigned long kvmppc_handler_len;
>>> diff --git a/arch/powerpc/kvm/44x.c b/arch/powerpc/kvm/44x.c
>>> index 74d0e74..3d2e7d2 100644
>>> --- a/arch/powerpc/kvm/44x.c
>>> +++ b/arch/powerpc/kvm/44x.c
>>> @@ -147,6 +147,11 @@ void kvmppc_core_vcpu_free(struct 
>> kvm_vcpu *vcpu)
>>> 	kmem_cache_free(kvm_vcpu_cache, vcpu_44x);
>>> }
>>> 
>>> +int __kvmppc_vcpu_run(struct kvm_run *kvm_run, struct 
>> kvm_vcpu *vcpu)
>>> +{
>>> +	return __kvmppc_vcpu_entry(kvm_run, vcpu);
>> 
>> 440 calls _entry on _run
>> 
>>> +}
>>> +
>>> static int __init kvmppc_44x_init(void)
>>> {
>>> 	int r;
>>> diff --git a/arch/powerpc/kvm/book3s.c b/arch/powerpc/kvm/book3s.c
>>> index c961de4..fb12853 100644
>>> --- a/arch/powerpc/kvm/book3s.c
>>> +++ b/arch/powerpc/kvm/book3s.c
>>> @@ -1379,7 +1379,6 @@ void kvmppc_core_vcpu_free(struct 
>> kvm_vcpu *vcpu)
>>> 	vfree(vcpu_book3s);
>>> }
>>> 
>>> -extern int __kvmppc_vcpu_entry(struct kvm_run *kvm_run, 
>> struct kvm_vcpu *vcpu);
>> 
>> BookS loses its _entry reference?
>> 
>>> int __kvmppc_vcpu_run(struct kvm_run *kvm_run, struct 
>> kvm_vcpu *vcpu)
>>> {
>>> 	int ret;
>>> diff --git a/arch/powerpc/kvm/booke_interrupts.S 
>> b/arch/powerpc/kvm/booke_interrupts.S
>>> index 1cc471f..ab29f5f 100644
>>> --- a/arch/powerpc/kvm/booke_interrupts.S
>>> +++ b/arch/powerpc/kvm/booke_interrupts.S
>>> @@ -293,7 +293,7 @@ heavyweight_exit:
>>> *  r3: kvm_run pointer
>>> *  r4: vcpu pointer
>>> */
>>> -_GLOBAL(__kvmppc_vcpu_run)
>>> +_GLOBAL(__kvmppc_vcpu_entry)
>> 
>> BookE calls _run _entry now
>> 
>>> 	stwu	r1, -HOST_STACK_SIZE(r1)
>>> 	stw	r1, VCPU_HOST_STACK(r4)	/* Save stack pointer 
>> to vcpu. */
>>> 
>>> diff --git a/arch/powerpc/kvm/e500.c b/arch/powerpc/kvm/e500.c
>>> index e3768ee..e762634 100644
>>> --- a/arch/powerpc/kvm/e500.c
>>> +++ b/arch/powerpc/kvm/e500.c
>>> @@ -70,6 +70,11 @@ int kvmppc_core_vcpu_setup(struct kvm_vcpu *vcpu)
>>> 	return 0;
>>> }
>>> 
>>> +int __kvmppc_vcpu_run(struct kvm_run *kvm_run, struct 
>> kvm_vcpu *vcpu)
>>> +{
>>> +	return __kvmppc_vcpu_entry(kvm_run, vcpu);
>>> +}
>> 
>> e500 calls _entry on _run
>> 
>> 
>> So you're basically adding a C wrapper around _entry. That's 
>> fine for me, but what is the BookS change about?
>> 
> 
> Hi Alex,
> 
> The declaration for Book3S is moved to global header.

Ah, I missed the first chunk :). Thanks!


Alex