[PATCH v2 0/3] kvmppc/e500: fix breaks

[PATCH v2 0/3] kvmppc/e500: fix breaks

[Liu Yu]

These patches fix current e500 break.

v2:
patch 2: add comment about PIR
patch 3: move tlbcfg code to init

[PATCH v2 1/3] kvmppc/e500: Add register l1csr0 emulation

[Liu Yu]

Latest kernel start to access l1csr0 to contron L1.
We just tell guest no operation is on going.

Signed-off-by: Liu Yu <yu.liu@freescale.com>
---
 arch/powerpc/include/asm/kvm_e500.h |    1 +
 arch/powerpc/kvm/e500_emulate.c     |    6 ++++++
 2 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/arch/powerpc/include/asm/kvm_e500.h b/arch/powerpc/include/asm/kvm_e500.h
index 9d497ce..569dfd3 100644
--- a/arch/powerpc/include/asm/kvm_e500.h
+++ b/arch/powerpc/include/asm/kvm_e500.h
@@ -52,6 +52,7 @@ struct kvmppc_vcpu_e500 {
 	u32 mas5;
 	u32 mas6;
 	u32 mas7;
+	u32 l1csr0;
 	u32 l1csr1;
 	u32 hid0;
 	u32 hid1;
diff --git a/arch/powerpc/kvm/e500_emulate.c b/arch/powerpc/kvm/e500_emulate.c
index 7644f7a..95f8ec8 100644
--- a/arch/powerpc/kvm/e500_emulate.c
+++ b/arch/powerpc/kvm/e500_emulate.c
@@ -99,6 +99,10 @@ int kvmppc_core_emulate_mtspr(struct kvm_vcpu *vcpu, int sprn, int rs)
 		vcpu_e500->mas6 = spr_val; break;
 	case SPRN_MAS7:
 		vcpu_e500->mas7 = spr_val; break;
+	case SPRN_L1CSR0:
+		vcpu_e500->l1csr0 = spr_val;
+		vcpu_e500->l1csr0 &= ~(L1CSR0_DCFI | L1CSR0_CLFC);
+		break;
 	case SPRN_L1CSR1:
 		vcpu_e500->l1csr1 = spr_val; break;
 	case SPRN_HID0:
@@ -179,6 +183,8 @@ int kvmppc_core_emulate_mfspr(struct kvm_vcpu *vcpu, int sprn, int rt)
 		break;
 	}
 
+	case SPRN_L1CSR0:
+		kvmppc_set_gpr(vcpu, rt, vcpu_e500->l1csr0); break;
 	case SPRN_L1CSR1:
 		kvmppc_set_gpr(vcpu, rt, vcpu_e500->l1csr1); break;
 	case SPRN_HID0:
-- 
1.6.4

[PATCH v2 2/3] kvmppc/e500: Add PVR/PIR init for E500

[Liu Yu]

commit 513579e3a391a3874c478a8493080822069976e8 change the way
we emulate PVR/PIR,
which left PVR/PIR uninitialized on E500, and make guest puzzled.

Signed-off-by: Liu Yu <yu.liu@freescale.com>
---
 arch/powerpc/kvm/e500.c |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/arch/powerpc/kvm/e500.c b/arch/powerpc/kvm/e500.c
index 64949ee..efa1198 100644
--- a/arch/powerpc/kvm/e500.c
+++ b/arch/powerpc/kvm/e500.c
@@ -60,6 +60,12 @@ int kvmppc_core_vcpu_setup(struct kvm_vcpu *vcpu)
 
 	kvmppc_e500_tlb_setup(vcpu_e500);
 
+	/* Registers init */
+	vcpu->arch.pvr = mfspr(SPRN_PVR);
+
+	/* Since booke kvm only support one core, update all vcpus' PIR to 0 */
+	vcpu->vcpu_id = 0;
+
 	return 0;
 }
 
-- 
1.6.4

[PATCH v2 3/3] kvmppc/e500: fix tlbcfg emulation

[Liu Yu]

commit 55fb1027c1cf9797dbdeab48180da530e81b1c39 doesn't update tlbcfg correctly.
Fix it and move this part to init code.

Signed-off-by: Liu Yu <yu.liu@freescale.com>
---
 arch/powerpc/include/asm/kvm_e500.h |    2 ++
 arch/powerpc/kvm/e500_emulate.c     |   20 ++------------------
 arch/powerpc/kvm/e500_tlb.c         |    6 ++++++
 3 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/arch/powerpc/include/asm/kvm_e500.h b/arch/powerpc/include/asm/kvm_e500.h
index 569dfd3..7fea26f 100644
--- a/arch/powerpc/include/asm/kvm_e500.h
+++ b/arch/powerpc/include/asm/kvm_e500.h
@@ -56,6 +56,8 @@ struct kvmppc_vcpu_e500 {
 	u32 l1csr1;
 	u32 hid0;
 	u32 hid1;
+	u32 tlb0cfg;
+	u32 tlb1cfg;
 
 	struct kvm_vcpu vcpu;
 };
diff --git a/arch/powerpc/kvm/e500_emulate.c b/arch/powerpc/kvm/e500_emulate.c
index 95f8ec8..8e3edfb 100644
--- a/arch/powerpc/kvm/e500_emulate.c
+++ b/arch/powerpc/kvm/e500_emulate.c
@@ -164,25 +164,9 @@ int kvmppc_core_emulate_mfspr(struct kvm_vcpu *vcpu, int sprn, int rt)
 		kvmppc_set_gpr(vcpu, rt, vcpu_e500->mas7); break;
 
 	case SPRN_TLB0CFG:
-	{
-		ulong tmp = SPRN_TLB0CFG;
-
-		tmp &= ~0xfffUL;
-		tmp |= vcpu_e500->guest_tlb_size[0];
-		kvmppc_set_gpr(vcpu, rt, tmp);
-		break;
-	}
-
+		kvmppc_set_gpr(vcpu, rt, vcpu_e500->tlb0cfg); break;
 	case SPRN_TLB1CFG:
-	{
-		ulong tmp = SPRN_TLB1CFG;
-
-		tmp &= ~0xfffUL;
-		tmp |= vcpu_e500->guest_tlb_size[1];
-		kvmppc_set_gpr(vcpu, rt, tmp);
-		break;
-	}
-
+		kvmppc_set_gpr(vcpu, rt, vcpu_e500->tlb1cfg); break;
 	case SPRN_L1CSR0:
 		kvmppc_set_gpr(vcpu, rt, vcpu_e500->l1csr0); break;
 	case SPRN_L1CSR1:
diff --git a/arch/powerpc/kvm/e500_tlb.c b/arch/powerpc/kvm/e500_tlb.c
index 99a830b..7db158e 100644
--- a/arch/powerpc/kvm/e500_tlb.c
+++ b/arch/powerpc/kvm/e500_tlb.c
@@ -731,6 +731,12 @@ int kvmppc_e500_tlb_init(struct kvmppc_vcpu_e500 *vcpu_e500)
 	if (vcpu_e500->shadow_pages[1] == NULL)
 		goto err_out_page0;
 
+	/* Init TLB configuration register */
+	vcpu_e500->tlb0cfg = mfspr(SPRN_TLB0CFG) & ~0xfffUL;
+	vcpu_e500->tlb0cfg |= vcpu_e500->guest_tlb_size[0];
+	vcpu_e500->tlb1cfg = mfspr(SPRN_TLB1CFG) & ~0xfffUL;
+	vcpu_e500->tlb1cfg |= vcpu_e500->guest_tlb_size[1];
+
 	return 0;
 
 err_out_page0:
-- 
1.6.4

Re: [PATCH v2 3/3] kvmppc/e500: fix tlbcfg emulation

[Alexander Graf]

On 22.01.2010, at 11:50, Liu Yu wrote:

> commit 55fb1027c1cf9797dbdeab48180da530e81b1c39 doesn't update tlbcfg correctly.
> Fix it and move this part to init code.
> 
> Signed-off-by: Liu Yu <yu.liu-KZfg59tc24xl57MIdRCFDg@public.gmane.org>
> ---
> arch/powerpc/include/asm/kvm_e500.h |    2 ++
> arch/powerpc/kvm/e500_emulate.c     |   20 ++------------------
> arch/powerpc/kvm/e500_tlb.c         |    6 ++++++
> 3 files changed, 10 insertions(+), 18 deletions(-)
> 
> diff --git a/arch/powerpc/include/asm/kvm_e500.h b/arch/powerpc/include/asm/kvm_e500.h
> index 569dfd3..7fea26f 100644
> --- a/arch/powerpc/include/asm/kvm_e500.h
> +++ b/arch/powerpc/include/asm/kvm_e500.h
> @@ -56,6 +56,8 @@ struct kvmppc_vcpu_e500 {
> 	u32 l1csr1;
> 	u32 hid0;
> 	u32 hid1;
> +	u32 tlb0cfg;
> +	u32 tlb1cfg;
> 
> 	struct kvm_vcpu vcpu;
> };
> diff --git a/arch/powerpc/kvm/e500_emulate.c b/arch/powerpc/kvm/e500_emulate.c
> index 95f8ec8..8e3edfb 100644
> --- a/arch/powerpc/kvm/e500_emulate.c
> +++ b/arch/powerpc/kvm/e500_emulate.c
> @@ -164,25 +164,9 @@ int kvmppc_core_emulate_mfspr(struct kvm_vcpu *vcpu, int sprn, int rt)
> 		kvmppc_set_gpr(vcpu, rt, vcpu_e500->mas7); break;
> 
> 	case SPRN_TLB0CFG:
> -	{
> -		ulong tmp = SPRN_TLB0CFG;
> -
> -		tmp &= ~0xfffUL;
> -		tmp |= vcpu_e500->guest_tlb_size[0];
> -		kvmppc_set_gpr(vcpu, rt, tmp);
> -		break;
> -	}
> -
> +		kvmppc_set_gpr(vcpu, rt, vcpu_e500->tlb0cfg); break;

So before the guest couldn't change the guest TLB size and now it can? Is that on purpose? Mind to explain why the old code was there?

The rest looks good.

Alex--
To unsubscribe from this list: send the line "unsubscribe kvm-ppc" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH v2 2/3] kvmppc/e500: Add PVR/PIR init for E500

[Alexander Graf]

On 22.01.2010, at 11:50, Liu Yu wrote:

> commit 513579e3a391a3874c478a8493080822069976e8 change the way
> we emulate PVR/PIR,
> which left PVR/PIR uninitialized on E500, and make guest puzzled.
> 
> Signed-off-by: Liu Yu <yu.liu@freescale.com>

Acked-by: Alexander Graf <agraf@suse.de>

Re: [PATCH v2 1/3] kvmppc/e500: Add register l1csr0 emulation

[Alexander Graf]

On 22.01.2010, at 11:50, Liu Yu wrote:

> Latest kernel start to access l1csr0 to contron L1.

control? :)

> We just tell guest no operation is on going.
> 
> Signed-off-by: Liu Yu <yu.liu@freescale.com>

Acked-by: Alexander Graf <agraf@suse.de>

RE: [PATCH v2 3/3] kvmppc/e500: fix tlbcfg emulation

[Liu Yu-B13201]

 

> -----Original Message-----
> From: Alexander Graf [mailto:agraf-l3A5Bk7waGM@public.gmane.org] 
> Sent: Friday, January 22, 2010 7:05 PM
> To: Liu Yu-B13201
> Cc: kvm-ppc-u79uwXL29TY76Z2rM5mHXA@public.gmane.org; kvm-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
> Subject: Re: [PATCH v2 3/3] kvmppc/e500: fix tlbcfg emulation
> 
> 
> On 22.01.2010, at 11:50, Liu Yu wrote:
> 
> > commit 55fb1027c1cf9797dbdeab48180da530e81b1c39 doesn't 
> update tlbcfg correctly.
> > Fix it and move this part to init code.
> > 
> > Signed-off-by: Liu Yu <yu.liu-KZfg59tc24xl57MIdRCFDg@public.gmane.org>
> > ---
> > arch/powerpc/include/asm/kvm_e500.h |    2 ++
> > arch/powerpc/kvm/e500_emulate.c     |   20 ++------------------
> > arch/powerpc/kvm/e500_tlb.c         |    6 ++++++
> > 3 files changed, 10 insertions(+), 18 deletions(-)
> > 
> > diff --git a/arch/powerpc/include/asm/kvm_e500.h 
> b/arch/powerpc/include/asm/kvm_e500.h
> > index 569dfd3..7fea26f 100644
> > --- a/arch/powerpc/include/asm/kvm_e500.h
> > +++ b/arch/powerpc/include/asm/kvm_e500.h
> > @@ -56,6 +56,8 @@ struct kvmppc_vcpu_e500 {
> > 	u32 l1csr1;
> > 	u32 hid0;
> > 	u32 hid1;
> > +	u32 tlb0cfg;
> > +	u32 tlb1cfg;
> > 
> > 	struct kvm_vcpu vcpu;
> > };
> > diff --git a/arch/powerpc/kvm/e500_emulate.c 
> b/arch/powerpc/kvm/e500_emulate.c
> > index 95f8ec8..8e3edfb 100644
> > --- a/arch/powerpc/kvm/e500_emulate.c
> > +++ b/arch/powerpc/kvm/e500_emulate.c
> > @@ -164,25 +164,9 @@ int kvmppc_core_emulate_mfspr(struct 
> kvm_vcpu *vcpu, int sprn, int rt)
> > 		kvmppc_set_gpr(vcpu, rt, vcpu_e500->mas7); break;
> > 
> > 	case SPRN_TLB0CFG:
> > -	{
> > -		ulong tmp = SPRN_TLB0CFG;
> > -
> > -		tmp &= ~0xfffUL;
> > -		tmp |= vcpu_e500->guest_tlb_size[0];
> > -		kvmppc_set_gpr(vcpu, rt, tmp);
> > -		break;
> > -	}
> > -
> > +		kvmppc_set_gpr(vcpu, rt, vcpu_e500->tlb0cfg); break;
> 
> So before the guest couldn't change the guest TLB size and 
> now it can? Is that on purpose? Mind to explain why the old 
> code was there?
> 

What? The register is readonly.
I was thinking we could change guest TLB size online.
But I don't think guest kernel would like that.

Re: [PATCH v2 3/3] kvmppc/e500: fix tlbcfg emulation

[Alexander Graf]

On 22.01.2010, at 12:12, Liu Yu-B13201 wrote:

> 
> 
>> -----Original Message-----
>> From: Alexander Graf [mailto:agraf-l3A5Bk7waGM@public.gmane.org] 
>> Sent: Friday, January 22, 2010 7:05 PM
>> To: Liu Yu-B13201
>> Cc: kvm-ppc-u79uwXL29TY76Z2rM5mHXA@public.gmane.org; kvm-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
>> Subject: Re: [PATCH v2 3/3] kvmppc/e500: fix tlbcfg emulation
>> 
>> 
>> On 22.01.2010, at 11:50, Liu Yu wrote:
>> 
>>> commit 55fb1027c1cf9797dbdeab48180da530e81b1c39 doesn't 
>> update tlbcfg correctly.
>>> Fix it and move this part to init code.
>>> 
>>> Signed-off-by: Liu Yu <yu.liu-KZfg59tc24xl57MIdRCFDg@public.gmane.org>
>>> ---
>>> arch/powerpc/include/asm/kvm_e500.h |    2 ++
>>> arch/powerpc/kvm/e500_emulate.c     |   20 ++------------------
>>> arch/powerpc/kvm/e500_tlb.c         |    6 ++++++
>>> 3 files changed, 10 insertions(+), 18 deletions(-)
>>> 
>>> diff --git a/arch/powerpc/include/asm/kvm_e500.h 
>> b/arch/powerpc/include/asm/kvm_e500.h
>>> index 569dfd3..7fea26f 100644
>>> --- a/arch/powerpc/include/asm/kvm_e500.h
>>> +++ b/arch/powerpc/include/asm/kvm_e500.h
>>> @@ -56,6 +56,8 @@ struct kvmppc_vcpu_e500 {
>>> 	u32 l1csr1;
>>> 	u32 hid0;
>>> 	u32 hid1;
>>> +	u32 tlb0cfg;
>>> +	u32 tlb1cfg;
>>> 
>>> 	struct kvm_vcpu vcpu;
>>> };
>>> diff --git a/arch/powerpc/kvm/e500_emulate.c 
>> b/arch/powerpc/kvm/e500_emulate.c
>>> index 95f8ec8..8e3edfb 100644
>>> --- a/arch/powerpc/kvm/e500_emulate.c
>>> +++ b/arch/powerpc/kvm/e500_emulate.c
>>> @@ -164,25 +164,9 @@ int kvmppc_core_emulate_mfspr(struct 
>> kvm_vcpu *vcpu, int sprn, int rt)
>>> 		kvmppc_set_gpr(vcpu, rt, vcpu_e500->mas7); break;
>>> 
>>> 	case SPRN_TLB0CFG:
>>> -	{
>>> -		ulong tmp = SPRN_TLB0CFG;
>>> -
>>> -		tmp &= ~0xfffUL;
>>> -		tmp |= vcpu_e500->guest_tlb_size[0];
>>> -		kvmppc_set_gpr(vcpu, rt, tmp);
>>> -		break;
>>> -	}
>>> -
>>> +		kvmppc_set_gpr(vcpu, rt, vcpu_e500->tlb0cfg); break;
>> 
>> So before the guest couldn't change the guest TLB size and 
>> now it can? Is that on purpose? Mind to explain why the old 
>> code was there?
>> 
> 
> What? The register is readonly.
> I was thinking we could change guest TLB size online.
> But I don't think guest kernel would like that.

Oh, I see. Mind to resend this patch with a patch description that explains that? :-)

Alex--
To unsubscribe from this list: send the line "unsubscribe kvm-ppc" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH v2 0/3] kvmppc/e500: fix breaks

[Marcelo Tosatti]

On Fri, Jan 22, 2010 at 06:50:28PM +0800, Liu Yu wrote:
> These patches fix current e500 break.
> 
> v2:
> patch 2: add comment about PIR
> patch 3: move tlbcfg code to init

Applied all (and updated 3/3), thanks.