From: "Liu Yu-B13201" <Yu.Liu-KZfg59tc24xl57MIdRCFDg@public.gmane.org>
To: "Yang Shi" <yang.shi-CWA4WttNNZF54TAoqtyWWQ@public.gmane.org>,
<hollisb-r/Jw6+rmf7HQT0dZR+AlfA@public.gmane.org>,
<avi-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
Cc: <kvm-ppc-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>,
<kvm-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>,
<linuxppc-dev-mnsaURCQ41sdnm+yROfE0A@public.gmane.org>
Subject: RE: [PATCH 1/2] KVM/PPC: Fix PPC KVM e500_tlb.c build error
Date: Thu, 2 Jul 2009 11:09:09 +0800 [thread overview]
Message-ID: <0A1FE637C2C7E148B9573BB60CC630E531C59D@zch01exm26.fsl.freescale.net> (raw)
In-Reply-To: <47a7508d4561874c1a052cebe1b7f42b19831393.1246502441.git.yang.shi-CWA4WttNNZF54TAoqtyWWQ@public.gmane.org>
This fix is already accepted in kvm.git
> -----Original Message-----
> From: Yang Shi [mailto:yang.shi-CWA4WttNNZF54TAoqtyWWQ@public.gmane.org]
> Sent: Thursday, July 02, 2009 10:55 AM
> To: Liu Yu-B13201; hollisb-r/Jw6+rmf7HQT0dZR+AlfA@public.gmane.org; avi-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org
> Cc: kvm-ppc-u79uwXL29TY76Z2rM5mHXA@public.gmane.org; kvm-u79uwXL29TY76Z2rM5mHXA@public.gmane.org;
> linuxppc-dev-mnsaURCQ41sdnm+yROfE0A@public.gmane.org
> Subject: [PATCH 1/2] KVM/PPC: Fix PPC KVM e500_tlb.c build error
>
> 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-CWA4WttNNZF54TAoqtyWWQ@public.gmane.org>
> ---
> 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
>
>
--
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
WARNING: multiple messages have this Message-ID (diff)
From: "Liu Yu-B13201" <Yu.Liu@freescale.com>
To: "Yang Shi" <yang.shi@windriver.com>, <hollisb@us.ibm.com>,
<avi@redhat.com>
Cc: linuxppc-dev@ozlabs.org, kvm@vger.kernel.org, kvm-ppc@vger.kernel.org
Subject: RE: [PATCH 1/2] KVM/PPC: Fix PPC KVM e500_tlb.c build error
Date: Thu, 2 Jul 2009 11:09:09 +0800 [thread overview]
Message-ID: <0A1FE637C2C7E148B9573BB60CC630E531C59D@zch01exm26.fsl.freescale.net> (raw)
In-Reply-To: <47a7508d4561874c1a052cebe1b7f42b19831393.1246502441.git.yang.shi@windriver.com>
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
next prev parent reply other threads:[~2009-07-02 3:09 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
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 2:55 ` [PATCH 2/2] KVM/PPC: Fix kvm_main.c build error for PPC KVM Yang Shi
[not found] ` <47a7508d4561874c1a052cebe1b7f42b19831393.1246502441.git.yang.shi-CWA4WttNNZF54TAoqtyWWQ@public.gmane.org>
2009-07-02 3:09 ` Liu Yu-B13201 [this message]
2009-07-02 3:09 ` [PATCH 1/2] KVM/PPC: Fix PPC KVM e500_tlb.c build error Liu Yu-B13201
[not found] ` <0A1FE637C2C7E148B9573BB60CC630E531C59D-bKEhWGtIRUJ4Lp7cDGe+DVjVikpgYyvb5NbjCUgZEJk@public.gmane.org>
2009-07-02 11:19 ` Avi Kivity
2009-07-02 11:19 ` Avi Kivity
[not found] ` <4A4C97C4.9090908-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
2009-07-03 1:35 ` Liu Yu-B13201
2009-07-03 1:35 ` Liu Yu-B13201
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=0A1FE637C2C7E148B9573BB60CC630E531C59D@zch01exm26.fsl.freescale.net \
--to=yu.liu-kzfg59tc24xl57midrcfdg@public.gmane.org \
--cc=avi-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org \
--cc=hollisb-r/Jw6+rmf7HQT0dZR+AlfA@public.gmane.org \
--cc=kvm-ppc-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=kvm-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=linuxppc-dev-mnsaURCQ41sdnm+yROfE0A@public.gmane.org \
--cc=yang.shi-CWA4WttNNZF54TAoqtyWWQ@public.gmane.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.