* [PATCH 1/2] KVM/PPC: Fix PPC KVM e500_tlb.c build error
@ 2009-07-02 2:55 Yang Shi
2009-07-02 2:55 ` [PATCH 2/2] KVM/PPC: Fix kvm_main.c build error for PPC KVM Yang Shi
2009-07-02 3:09 ` [PATCH 1/2] KVM/PPC: Fix PPC KVM e500_tlb.c build error Liu Yu-B13201
0 siblings, 2 replies; 5+ messages in thread
From: Yang Shi @ 2009-07-02 2:55 UTC (permalink / raw)
To: yu.liu, hollisb, avi; +Cc: linuxppc-dev, kvm, kvm-ppc
Since include/asm/mmu-fsl-booke.h was replaced by include/asm/mmu-book3e.h,
fix e500_tlb.h to reflect the change and fix e500_tlb.c to align with the
new page size macro definition in include/asm/mmu-book3e.h.
Signed-off-by: Yang Shi <yang.shi@windriver.com>
---
arch/powerpc/kvm/e500_tlb.c | 8 ++++----
arch/powerpc/kvm/e500_tlb.h | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/arch/powerpc/kvm/e500_tlb.c b/arch/powerpc/kvm/e500_tlb.c
index 0e773fc..616762b 100644
--- a/arch/powerpc/kvm/e500_tlb.c
+++ b/arch/powerpc/kvm/e500_tlb.c
@@ -309,7 +309,7 @@ static inline void kvmppc_e500_shadow_map(struct kvmppc_vcpu_e500 *vcpu_e500,
vcpu_e500->shadow_pages[tlbsel][esel] = new_page;
/* Force TS=1 IPROT=0 TSIZE=4KB for all guest mappings. */
- stlbe->mas1 = MAS1_TSIZE(BOOKE_PAGESZ_4K)
+ stlbe->mas1 = MAS1_TSIZE(BOOK3E_PAGESZ_4K)
| MAS1_TID(get_tlb_tid(gtlbe)) | MAS1_TS | MAS1_VALID;
stlbe->mas2 = (gvaddr & MAS2_EPN)
| e500_shadow_mas2_attrib(gtlbe->mas2,
@@ -545,7 +545,7 @@ int kvmppc_e500_emul_tlbwe(struct kvm_vcpu *vcpu)
case 0:
/* TLB0 */
gtlbe->mas1 &= ~MAS1_TSIZE(~0);
- gtlbe->mas1 |= MAS1_TSIZE(BOOKE_PAGESZ_4K);
+ gtlbe->mas1 |= MAS1_TSIZE(BOOK3E_PAGESZ_4K);
stlbsel = 0;
sesel = kvmppc_e500_stlbe_map(vcpu_e500, 0, esel);
@@ -679,14 +679,14 @@ void kvmppc_e500_tlb_setup(struct kvmppc_vcpu_e500 *vcpu_e500)
/* Insert large initial mapping for guest. */
tlbe = &vcpu_e500->guest_tlb[1][0];
- tlbe->mas1 = MAS1_VALID | MAS1_TSIZE(BOOKE_PAGESZ_256M);
+ tlbe->mas1 = MAS1_VALID | MAS1_TSIZE(BOOK3E_PAGESZ_256M);
tlbe->mas2 = 0;
tlbe->mas3 = E500_TLB_SUPER_PERM_MASK;
tlbe->mas7 = 0;
/* 4K map for serial output. Used by kernel wrapper. */
tlbe = &vcpu_e500->guest_tlb[1][1];
- tlbe->mas1 = MAS1_VALID | MAS1_TSIZE(BOOKE_PAGESZ_4K);
+ tlbe->mas1 = MAS1_VALID | MAS1_TSIZE(BOOK3E_PAGESZ_4K);
tlbe->mas2 = (0xe0004500 & 0xFFFFF000) | MAS2_I | MAS2_G;
tlbe->mas3 = (0xe0004500 & 0xFFFFF000) | E500_TLB_SUPER_PERM_MASK;
tlbe->mas7 = 0;
diff --git a/arch/powerpc/kvm/e500_tlb.h b/arch/powerpc/kvm/e500_tlb.h
index 45b064b..abb1bf8 100644
--- a/arch/powerpc/kvm/e500_tlb.h
+++ b/arch/powerpc/kvm/e500_tlb.h
@@ -16,7 +16,7 @@
#define __KVM_E500_TLB_H__
#include <linux/kvm_host.h>
-#include <asm/mmu-fsl-booke.h>
+#include <asm/mmu-book3e.h>
#include <asm/tlb.h>
#include <asm/kvm_e500.h>
--
1.6.0.4
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 2/2] KVM/PPC: Fix kvm_main.c build error for PPC KVM
2009-07-02 2:55 [PATCH 1/2] KVM/PPC: Fix PPC KVM e500_tlb.c build error Yang Shi
@ 2009-07-02 2:55 ` Yang Shi
2009-07-02 3:09 ` [PATCH 1/2] KVM/PPC: Fix PPC KVM e500_tlb.c build error Liu Yu-B13201
1 sibling, 0 replies; 5+ messages in thread
From: Yang Shi @ 2009-07-02 2:55 UTC (permalink / raw)
To: yu.liu, hollisb, avi; +Cc: linuxppc-dev, kvm, kvm-ppc
With the latest kernel building KVM for PPC, got integer overflow
error in kvm_main.c file. The root cause is that compiler consider
KVM_PAGES_PER_HPAGE as signed long type, however it should be
unsigned long type.
So, change it to unsigned long type in include/asm/kvm_host.h
Signed-off-by: Yang Shi <yang.shi@windriver.com>
---
arch/powerpc/include/asm/kvm_host.h | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/arch/powerpc/include/asm/kvm_host.h b/arch/powerpc/include/asm/kvm_host.h
index dfdf13c..fddc3ed 100644
--- a/arch/powerpc/include/asm/kvm_host.h
+++ b/arch/powerpc/include/asm/kvm_host.h
@@ -34,7 +34,7 @@
#define KVM_COALESCED_MMIO_PAGE_OFFSET 1
/* We don't currently support large pages. */
-#define KVM_PAGES_PER_HPAGE (1<<31)
+#define KVM_PAGES_PER_HPAGE (1UL << 31)
struct kvm;
struct kvm_run;
--
1.6.0.4
^ permalink raw reply related [flat|nested] 5+ messages in thread
* RE: [PATCH 1/2] KVM/PPC: Fix PPC KVM e500_tlb.c build error
2009-07-02 2:55 [PATCH 1/2] KVM/PPC: Fix PPC KVM e500_tlb.c build error Yang Shi
2009-07-02 2:55 ` [PATCH 2/2] KVM/PPC: Fix kvm_main.c build error for PPC KVM Yang Shi
@ 2009-07-02 3:09 ` Liu Yu-B13201
2009-07-02 11:19 ` Avi Kivity
1 sibling, 1 reply; 5+ messages in thread
From: Liu Yu-B13201 @ 2009-07-02 3:09 UTC (permalink / raw)
To: Yang Shi, hollisb, avi; +Cc: linuxppc-dev, kvm, kvm-ppc
This fix is already accepted in kvm.git=20
> -----Original Message-----
> From: Yang Shi [mailto:yang.shi@windriver.com]=20
> Sent: Thursday, July 02, 2009 10:55 AM
> To: Liu Yu-B13201; hollisb@us.ibm.com; avi@redhat.com
> Cc: kvm-ppc@vger.kernel.org; kvm@vger.kernel.org;=20
> linuxppc-dev@ozlabs.org
> Subject: [PATCH 1/2] KVM/PPC: Fix PPC KVM e500_tlb.c build error
>=20
> Since include/asm/mmu-fsl-booke.h was replaced by=20
> include/asm/mmu-book3e.h,
> fix e500_tlb.h to reflect the change and fix e500_tlb.c to=20
> align with the
> new page size macro definition in include/asm/mmu-book3e.h.
>=20
> Signed-off-by: Yang Shi <yang.shi@windriver.com>
> ---
> arch/powerpc/kvm/e500_tlb.c | 8 ++++----
> arch/powerpc/kvm/e500_tlb.h | 2 +-
> 2 files changed, 5 insertions(+), 5 deletions(-)
>=20
> diff --git a/arch/powerpc/kvm/e500_tlb.c b/arch/powerpc/kvm/e500_tlb.c
> index 0e773fc..616762b 100644
> --- a/arch/powerpc/kvm/e500_tlb.c
> +++ b/arch/powerpc/kvm/e500_tlb.c
> @@ -309,7 +309,7 @@ static inline void=20
> kvmppc_e500_shadow_map(struct kvmppc_vcpu_e500 *vcpu_e500,
> vcpu_e500->shadow_pages[tlbsel][esel] =3D new_page;
> =20
> /* Force TS=3D1 IPROT=3D0 TSIZE=3D4KB for all guest mappings. */
> - stlbe->mas1 =3D MAS1_TSIZE(BOOKE_PAGESZ_4K)
> + stlbe->mas1 =3D MAS1_TSIZE(BOOK3E_PAGESZ_4K)
> | MAS1_TID(get_tlb_tid(gtlbe)) | MAS1_TS | MAS1_VALID;
> stlbe->mas2 =3D (gvaddr & MAS2_EPN)
> | e500_shadow_mas2_attrib(gtlbe->mas2,
> @@ -545,7 +545,7 @@ int kvmppc_e500_emul_tlbwe(struct kvm_vcpu *vcpu)
> case 0:
> /* TLB0 */
> gtlbe->mas1 &=3D ~MAS1_TSIZE(~0);
> - gtlbe->mas1 |=3D MAS1_TSIZE(BOOKE_PAGESZ_4K);
> + gtlbe->mas1 |=3D MAS1_TSIZE(BOOK3E_PAGESZ_4K);
> =20
> stlbsel =3D 0;
> sesel =3D=20
> kvmppc_e500_stlbe_map(vcpu_e500, 0, esel);
> @@ -679,14 +679,14 @@ void kvmppc_e500_tlb_setup(struct=20
> kvmppc_vcpu_e500 *vcpu_e500)
> =20
> /* Insert large initial mapping for guest. */
> tlbe =3D &vcpu_e500->guest_tlb[1][0];
> - tlbe->mas1 =3D MAS1_VALID | MAS1_TSIZE(BOOKE_PAGESZ_256M);
> + tlbe->mas1 =3D MAS1_VALID | MAS1_TSIZE(BOOK3E_PAGESZ_256M);
> tlbe->mas2 =3D 0;
> tlbe->mas3 =3D E500_TLB_SUPER_PERM_MASK;
> tlbe->mas7 =3D 0;
> =20
> /* 4K map for serial output. Used by kernel wrapper. */
> tlbe =3D &vcpu_e500->guest_tlb[1][1];
> - tlbe->mas1 =3D MAS1_VALID | MAS1_TSIZE(BOOKE_PAGESZ_4K);
> + tlbe->mas1 =3D MAS1_VALID | MAS1_TSIZE(BOOK3E_PAGESZ_4K);
> tlbe->mas2 =3D (0xe0004500 & 0xFFFFF000) | MAS2_I | MAS2_G;
> tlbe->mas3 =3D (0xe0004500 & 0xFFFFF000) |=20
> E500_TLB_SUPER_PERM_MASK;
> tlbe->mas7 =3D 0;
> diff --git a/arch/powerpc/kvm/e500_tlb.h b/arch/powerpc/kvm/e500_tlb.h
> index 45b064b..abb1bf8 100644
> --- a/arch/powerpc/kvm/e500_tlb.h
> +++ b/arch/powerpc/kvm/e500_tlb.h
> @@ -16,7 +16,7 @@
> #define __KVM_E500_TLB_H__
> =20
> #include <linux/kvm_host.h>
> -#include <asm/mmu-fsl-booke.h>
> +#include <asm/mmu-book3e.h>
> #include <asm/tlb.h>
> #include <asm/kvm_e500.h>
> =20
> --=20
> 1.6.0.4
>=20
>=20
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 1/2] KVM/PPC: Fix PPC KVM e500_tlb.c build error
2009-07-02 3:09 ` [PATCH 1/2] KVM/PPC: Fix PPC KVM e500_tlb.c build error Liu Yu-B13201
@ 2009-07-02 11:19 ` Avi Kivity
2009-07-03 1:35 ` Liu Yu-B13201
0 siblings, 1 reply; 5+ messages in thread
From: Avi Kivity @ 2009-07-02 11:19 UTC (permalink / raw)
To: Liu Yu-B13201; +Cc: linuxppc-dev, Yang Shi, kvm-ppc, hollisb, kvm
On 07/02/2009 06:09 AM, Liu Yu-B13201 wrote:
> This fix is already accepted in kvm.git
>
What about the other? Is it needed?
--
error compiling committee.c: too many arguments to function
^ permalink raw reply [flat|nested] 5+ messages in thread
* RE: [PATCH 1/2] KVM/PPC: Fix PPC KVM e500_tlb.c build error
2009-07-02 11:19 ` Avi Kivity
@ 2009-07-03 1:35 ` Liu Yu-B13201
0 siblings, 0 replies; 5+ messages in thread
From: Liu Yu-B13201 @ 2009-07-03 1:35 UTC (permalink / raw)
To: Avi Kivity; +Cc: linuxppc-dev, Yang Shi, kvm-ppc, hollisb, kvm
=20
> -----Original Message-----
> From: Avi Kivity [mailto:avi@redhat.com]=20
> Sent: Thursday, July 02, 2009 7:20 PM
> To: Liu Yu-B13201
> Cc: Yang Shi; hollisb@us.ibm.com; kvm-ppc@vger.kernel.org;=20
> kvm@vger.kernel.org; linuxppc-dev@ozlabs.org
> Subject: Re: [PATCH 1/2] KVM/PPC: Fix PPC KVM e500_tlb.c build error
>=20
> On 07/02/2009 06:09 AM, Liu Yu-B13201 wrote:
> > This fix is already accepted in kvm.git
> > =20
>=20
> What about the other? Is it needed?
>=20
No, it's already fixed by commit =
b57227e600f4ecc394d6ba3c2aaa558867b5addc.
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2009-07-03 1:35 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-07-02 2:55 [PATCH 1/2] KVM/PPC: Fix PPC KVM e500_tlb.c build error Yang Shi
2009-07-02 2:55 ` [PATCH 2/2] KVM/PPC: Fix kvm_main.c build error for PPC KVM Yang Shi
2009-07-02 3:09 ` [PATCH 1/2] KVM/PPC: Fix PPC KVM e500_tlb.c build error Liu Yu-B13201
2009-07-02 11:19 ` Avi Kivity
2009-07-03 1:35 ` Liu Yu-B13201
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).