[PATCH 0 of 3] Fix KVM on PowerPC 440GP

[PATCH 0 of 3] Fix KVM on PowerPC 440GP

[hollis_blanchard]

Hi Avi, these patches make KVM run on 440GP (the only 440-based SoC that wasn't
passing the compatibility check) and fix or enhance a couple very minor issues
in related code. Please apply.

Alex, please ack.

-Hollis

[PATCH 0 of 3] Fix KVM on PowerPC 440GP

[hollis_blanchard]

Hi Avi, these patches make KVM run on 440GP (the only 440-based SoC that wasn't
passing the compatibility check) and fix or enhance a couple very minor issues
in related code. Please apply.

Alex, please ack.

-Hollis

[PATCH 1 of 3] KVM: PPC: initialize IVORs in addition to IVPR

[hollis_blanchard]

Developers can now tell at a glace the exact type of the premature interrupt,
instead of just knowing that there was some premature interrupt.

Signed-off-by: Hollis Blanchard <hollis_blanchard@mentor.com>


---
 arch/powerpc/kvm/booke.c |  8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)


diff --git a/arch/powerpc/kvm/booke.c b/arch/powerpc/kvm/booke.c
--- a/arch/powerpc/kvm/booke.c
+++ b/arch/powerpc/kvm/booke.c
@@ -466,15 +466,19 @@ int kvmppc_handle_exit(struct kvm_run *r
 /* Initial guest state: 16MB mapping 0 -> 0, PC = 0, MSR = 0, R1 = 16MB */
 int kvm_arch_vcpu_setup(struct kvm_vcpu *vcpu)
 {
+	int i;
+
 	vcpu->arch.pc = 0;
 	vcpu->arch.msr = 0;
 	kvmppc_set_gpr(vcpu, 1, (16<<20) - 8); /* -8 for the callee-save LR slot */
 
 	vcpu->arch.shadow_pid = 1;
 
-	/* Eye-catching number so we know if the guest takes an interrupt
-	 * before it's programmed its own IVPR. */
+	/* Eye-catching numbers so we know if the guest takes an interrupt
+	 * before it's programmed its own IVPR/IVORs. */
 	vcpu->arch.ivpr = 0x55550000;
+	for (i = 0; i < BOOKE_IRQPRIO_MAX; i++)
+		vcpu->arch.ivor[i] = 0x7700 | i * 4;
 
 	kvmppc_init_timing_stats(vcpu);
 

[PATCH 1 of 3] KVM: PPC: initialize IVORs in addition to IVPR

[hollis_blanchard]

Developers can now tell at a glace the exact type of the premature interrupt,
instead of just knowing that there was some premature interrupt.

Signed-off-by: Hollis Blanchard <hollis_blanchard@mentor.com>


---
 arch/powerpc/kvm/booke.c |  8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)


diff --git a/arch/powerpc/kvm/booke.c b/arch/powerpc/kvm/booke.c
--- a/arch/powerpc/kvm/booke.c
+++ b/arch/powerpc/kvm/booke.c
@@ -466,15 +466,19 @@ int kvmppc_handle_exit(struct kvm_run *r
 /* Initial guest state: 16MB mapping 0 -> 0, PC = 0, MSR = 0, R1 = 16MB */
 int kvm_arch_vcpu_setup(struct kvm_vcpu *vcpu)
 {
+	int i;
+
 	vcpu->arch.pc = 0;
 	vcpu->arch.msr = 0;
 	kvmppc_set_gpr(vcpu, 1, (16<<20) - 8); /* -8 for the callee-save LR slot */
 
 	vcpu->arch.shadow_pid = 1;
 
-	/* Eye-catching number so we know if the guest takes an interrupt
-	 * before it's programmed its own IVPR. */
+	/* Eye-catching numbers so we know if the guest takes an interrupt
+	 * before it's programmed its own IVPR/IVORs. */
 	vcpu->arch.ivpr = 0x55550000;
+	for (i = 0; i < BOOKE_IRQPRIO_MAX; i++)
+		vcpu->arch.ivor[i] = 0x7700 | i * 4;
 
 	kvmppc_init_timing_stats(vcpu);
 

[PATCH 2 of 3] KVM: PPC: fix compilation of "dump tlbs" debug function

[hollis_blanchard-nmGgyN9QBj3QT0dZR+AlfA]

Missing local variable.

Signed-off-by: Hollis Blanchard <hollis_blanchard-nmGgyN9QBj3QT0dZR+AlfA@public.gmane.org>


---
 arch/powerpc/kvm/44x_tlb.c |  1 +
 1 files changed, 1 insertions(+), 0 deletions(-)


diff --git a/arch/powerpc/kvm/44x_tlb.c b/arch/powerpc/kvm/44x_tlb.c
--- a/arch/powerpc/kvm/44x_tlb.c
+++ b/arch/powerpc/kvm/44x_tlb.c
@@ -47,6 +47,7 @@
 #ifdef DEBUG
 void kvmppc_dump_tlbs(struct kvm_vcpu *vcpu)
 {
+	struct kvmppc_vcpu_44x *vcpu_44x = to_44x(vcpu);
 	struct kvmppc_44x_tlbe *tlbe;
 	int i;
 

[PATCH 2 of 3] KVM: PPC: fix compilation of "dump tlbs" debug function

[hollis_blanchard]

Missing local variable.

Signed-off-by: Hollis Blanchard <hollis_blanchard@mentor.com>


---
 arch/powerpc/kvm/44x_tlb.c |  1 +
 1 files changed, 1 insertions(+), 0 deletions(-)


diff --git a/arch/powerpc/kvm/44x_tlb.c b/arch/powerpc/kvm/44x_tlb.c
--- a/arch/powerpc/kvm/44x_tlb.c
+++ b/arch/powerpc/kvm/44x_tlb.c
@@ -47,6 +47,7 @@
 #ifdef DEBUG
 void kvmppc_dump_tlbs(struct kvm_vcpu *vcpu)
 {
+	struct kvmppc_vcpu_44x *vcpu_44x = to_44x(vcpu);
 	struct kvmppc_44x_tlbe *tlbe;
 	int i;
 

[PATCH 3 of 3] KVM: PPC: allow ppc440gp to pass the compatibility check

[hollis_blanchard-nmGgyN9QBj3QT0dZR+AlfA]

Match only the first part of cur_cpu_spec->platform.

440GP (the first 440 processor) is identified by the string "ppc440gp", while
all later 440 processors use simply "ppc440".

Signed-off-by: Hollis Blanchard <hollis_blanchard-nmGgyN9QBj3QT0dZR+AlfA@public.gmane.org>


---
 arch/powerpc/kvm/44x.c |  3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)


diff --git a/arch/powerpc/kvm/44x.c b/arch/powerpc/kvm/44x.c
--- a/arch/powerpc/kvm/44x.c
+++ b/arch/powerpc/kvm/44x.c
@@ -43,7 +43,7 @@ int kvmppc_core_check_processor_compat(v
 {
 	int r;
 
-	if (strcmp(cur_cpu_spec->platform, "ppc440") == 0)
+	if (strncmp(cur_cpu_spec->platform, "ppc440", 6) == 0)
 		r = 0;
 	else
 		r = -ENOTSUPP;
@@ -72,6 +72,7 @@ int kvmppc_core_vcpu_setup(struct kvm_vc
 	/* Since the guest can directly access the timebase, it must know the
 	 * real timebase frequency. Accordingly, it must see the state of
 	 * CCR1[TCS]. */
+	/* XXX CCR1 doesn't exist on all 440 SoCs. */
 	vcpu->arch.ccr1 = mfspr(SPRN_CCR1);
 
 	for (i = 0; i < ARRAY_SIZE(vcpu_44x->shadow_refs); i++)

[PATCH 3 of 3] KVM: PPC: allow ppc440gp to pass the compatibility

[hollis_blanchard]

Match only the first part of cur_cpu_spec->platform.

440GP (the first 440 processor) is identified by the string "ppc440gp", while
all later 440 processors use simply "ppc440".

Signed-off-by: Hollis Blanchard <hollis_blanchard@mentor.com>


---
 arch/powerpc/kvm/44x.c |  3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)


diff --git a/arch/powerpc/kvm/44x.c b/arch/powerpc/kvm/44x.c
--- a/arch/powerpc/kvm/44x.c
+++ b/arch/powerpc/kvm/44x.c
@@ -43,7 +43,7 @@ int kvmppc_core_check_processor_compat(v
 {
 	int r;
 
-	if (strcmp(cur_cpu_spec->platform, "ppc440") = 0)
+	if (strncmp(cur_cpu_spec->platform, "ppc440", 6) = 0)
 		r = 0;
 	else
 		r = -ENOTSUPP;
@@ -72,6 +72,7 @@ int kvmppc_core_vcpu_setup(struct kvm_vc
 	/* Since the guest can directly access the timebase, it must know the
 	 * real timebase frequency. Accordingly, it must see the state of
 	 * CCR1[TCS]. */
+	/* XXX CCR1 doesn't exist on all 440 SoCs. */
 	vcpu->arch.ccr1 = mfspr(SPRN_CCR1);
 
 	for (i = 0; i < ARRAY_SIZE(vcpu_44x->shadow_refs); i++)

Re: [PATCH 0 of 3] Fix KVM on PowerPC 440GP

[Alexander Graf]

On 07.08.2010, at 19:33, hollis_blanchard@mentor.com wrote:

> Hi Avi, these patches make KVM run on 440GP (the only 440-based SoC that wasn't
> passing the compatibility check) and fix or enhance a couple very minor issues
> in related code. Please apply.
> 
> Alex, please ack.

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


Alex

Re: [PATCH 0 of 3] Fix KVM on PowerPC 440GP

[Alexander Graf]

On 07.08.2010, at 19:33, hollis_blanchard@mentor.com wrote:

> Hi Avi, these patches make KVM run on 440GP (the only 440-based SoC that wasn't
> passing the compatibility check) and fix or enhance a couple very minor issues
> in related code. Please apply.
> 
> Alex, please ack.

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


Alex

Re: [PATCH 0 of 3] Fix KVM on PowerPC 440GP

[Avi Kivity]

  On 08/07/2010 08:33 PM, hollis_blanchard-nmGgyN9QBj3QT0dZR+AlfA@public.gmane.org wrote:
> Hi Avi, these patches make KVM run on 440GP (the only 440-based SoC that wasn't
> passing the compatibility check) and fix or enhance a couple very minor issues
> in related code. Please apply.

Patches don't apply (at least the first), please rebase.

-- 
error compiling committee.c: too many arguments to function

Re: [PATCH 0 of 3] Fix KVM on PowerPC 440GP

[Avi Kivity]

  On 08/07/2010 08:33 PM, hollis_blanchard@mentor.com wrote:
> Hi Avi, these patches make KVM run on 440GP (the only 440-based SoC that wasn't
> passing the compatibility check) and fix or enhance a couple very minor issues
> in related code. Please apply.

Patches don't apply (at least the first), please rebase.

-- 
error compiling committee.c: too many arguments to function

Re: [PATCH 0 of 3] Fix KVM on PowerPC 440GP

[Alexander Graf]

On 17.08.2010, at 11:27, Avi Kivity wrote:

> On 08/07/2010 08:33 PM, hollis_blanchard-nmGgyN9QBj3QT0dZR+AlfA@public.gmane.org wrote:
>> Hi Avi, these patches make KVM run on 440GP (the only 440-based SoC that wasn't
>> passing the compatibility check) and fix or enhance a couple very minor issues
>> in related code. Please apply.
> 
> Patches don't apply (at least the first), please rebase.

I have a queue lying around locally anyways that I want to push today, so I'll just add them to it.

Alex

Re: [PATCH 0 of 3] Fix KVM on PowerPC 440GP

[Alexander Graf]

On 17.08.2010, at 11:27, Avi Kivity wrote:

> On 08/07/2010 08:33 PM, hollis_blanchard@mentor.com wrote:
>> Hi Avi, these patches make KVM run on 440GP (the only 440-based SoC that wasn't
>> passing the compatibility check) and fix or enhance a couple very minor issues
>> in related code. Please apply.
> 
> Patches don't apply (at least the first), please rebase.

I have a queue lying around locally anyways that I want to push today, so I'll just add them to it.

Alex