From: Mihai Caraman <mihai.caraman@freescale.com> To: <kvm-ppc@vger.kernel.org>, <kvm@vger.kernel.org>, <linuxppc-dev@lists.ozlabs.org>, <qemu-ppc@nongnu.org> Cc: Mihai Caraman <mihai.caraman@freescale.com> Subject: [RFC PATCH 05/17] KVM: PPC: booke: Extend MAS2 EPN mask for 64-bit Date: Mon, 25 Jun 2012 15:26:23 +0300 [thread overview] Message-ID: <1340627195-11544-6-git-send-email-mihai.caraman@freescale.com> (raw) In-Reply-To: <1340627195-11544-1-git-send-email-mihai.caraman@freescale.com> Extend MAS2 EPN mask for 64-bit hosts, to retain most significant bits. Change get tlb eaddr to use this mask. Signed-off-by: Mihai Caraman <mihai.caraman@freescale.com> --- arch/powerpc/include/asm/mmu-book3e.h | 2 +- arch/powerpc/kvm/e500.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/powerpc/include/asm/mmu-book3e.h b/arch/powerpc/include/asm/mmu-book3e.h index eeabcdb..99d43e0 100644 --- a/arch/powerpc/include/asm/mmu-book3e.h +++ b/arch/powerpc/include/asm/mmu-book3e.h @@ -59,7 +59,7 @@ #define MAS1_TSIZE_SHIFT 7 #define MAS1_TSIZE(x) (((x) << MAS1_TSIZE_SHIFT) & MAS1_TSIZE_MASK) -#define MAS2_EPN 0xFFFFF000 +#define MAS2_EPN (~0xFFFUL) #define MAS2_X0 0x00000040 #define MAS2_X1 0x00000020 #define MAS2_W 0x00000010 diff --git a/arch/powerpc/kvm/e500.h b/arch/powerpc/kvm/e500.h index aa8b814..3e31098 100644 --- a/arch/powerpc/kvm/e500.h +++ b/arch/powerpc/kvm/e500.h @@ -155,7 +155,7 @@ get_tlb_size(const struct kvm_book3e_206_tlb_entry *tlbe) static inline gva_t get_tlb_eaddr(const struct kvm_book3e_206_tlb_entry *tlbe) { - return tlbe->mas2 & 0xfffff000; + return tlbe->mas2 & MAS2_EPN; } static inline u64 get_tlb_bytes(const struct kvm_book3e_206_tlb_entry *tlbe) -- 1.7.4.1
WARNING: multiple messages have this Message-ID (diff)
From: Mihai Caraman <mihai.caraman@freescale.com> To: kvm-ppc@vger.kernel.org, kvm@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, qemu-ppc@nongnu.org Cc: Mihai Caraman <mihai.caraman@freescale.com> Subject: [RFC PATCH 05/17] KVM: PPC: booke: Extend MAS2 EPN mask for 64-bit Date: Mon, 25 Jun 2012 12:26:23 +0000 [thread overview] Message-ID: <1340627195-11544-6-git-send-email-mihai.caraman@freescale.com> (raw) In-Reply-To: <1340627195-11544-1-git-send-email-mihai.caraman@freescale.com> Extend MAS2 EPN mask for 64-bit hosts, to retain most significant bits. Change get tlb eaddr to use this mask. Signed-off-by: Mihai Caraman <mihai.caraman@freescale.com> --- arch/powerpc/include/asm/mmu-book3e.h | 2 +- arch/powerpc/kvm/e500.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/powerpc/include/asm/mmu-book3e.h b/arch/powerpc/include/asm/mmu-book3e.h index eeabcdb..99d43e0 100644 --- a/arch/powerpc/include/asm/mmu-book3e.h +++ b/arch/powerpc/include/asm/mmu-book3e.h @@ -59,7 +59,7 @@ #define MAS1_TSIZE_SHIFT 7 #define MAS1_TSIZE(x) (((x) << MAS1_TSIZE_SHIFT) & MAS1_TSIZE_MASK) -#define MAS2_EPN 0xFFFFF000 +#define MAS2_EPN (~0xFFFUL) #define MAS2_X0 0x00000040 #define MAS2_X1 0x00000020 #define MAS2_W 0x00000010 diff --git a/arch/powerpc/kvm/e500.h b/arch/powerpc/kvm/e500.h index aa8b814..3e31098 100644 --- a/arch/powerpc/kvm/e500.h +++ b/arch/powerpc/kvm/e500.h @@ -155,7 +155,7 @@ get_tlb_size(const struct kvm_book3e_206_tlb_entry *tlbe) static inline gva_t get_tlb_eaddr(const struct kvm_book3e_206_tlb_entry *tlbe) { - return tlbe->mas2 & 0xfffff000; + return tlbe->mas2 & MAS2_EPN; } static inline u64 get_tlb_bytes(const struct kvm_book3e_206_tlb_entry *tlbe) -- 1.7.4.1
next prev parent reply other threads:[~2012-06-25 12:26 UTC|newest] Thread overview: 203+ messages / expand[flat|nested] mbox.gz Atom feed top 2012-06-25 12:26 [RFC PATCH 00/17] KVM: PPC: 64-bit Book3E support Mihai Caraman 2012-06-25 12:26 ` Mihai Caraman 2012-06-25 12:26 ` [RFC PATCH 01/17] KVM: PPC64: booke: Set interrupt computation mode for 64-bit host Mihai Caraman 2012-06-25 12:26 ` Mihai Caraman 2012-07-04 13:22 ` Alexander Graf 2012-07-04 13:22 ` Alexander Graf 2012-07-04 13:22 ` Alexander Graf 2012-06-25 12:26 ` [RFC PATCH 02/17] KVM: PPC64: booke: Add EPCR support in mtspr/mfspr emulation Mihai Caraman 2012-06-25 12:26 ` Mihai Caraman 2012-07-04 13:21 ` Alexander Graf 2012-07-04 13:21 ` Alexander Graf 2012-07-04 13:21 ` Alexander Graf 2012-07-04 14:14 ` Caraman Mihai Claudiu-B02008 2012-07-04 14:14 ` Caraman Mihai Claudiu-B02008 2012-07-04 14:14 ` Caraman Mihai Claudiu-B02008 2012-07-04 14:53 ` Alexander Graf 2012-07-04 14:53 ` Alexander Graf 2012-07-04 14:53 ` Alexander Graf 2012-06-25 12:26 ` [RFC PATCH 03/17] KVM: PPC64: booke: Add EPCR support in sregs Mihai Caraman 2012-06-25 12:26 ` Mihai Caraman 2012-06-25 12:59 ` Avi Kivity 2012-06-25 12:59 ` Avi Kivity 2012-06-25 12:59 ` Avi Kivity 2012-06-25 13:24 ` Caraman Mihai Claudiu-B02008 2012-06-25 13:24 ` Caraman Mihai Claudiu-B02008 2012-06-25 13:36 ` Avi Kivity 2012-06-25 13:36 ` Avi Kivity 2012-06-25 13:36 ` Avi Kivity 2012-06-26 22:34 ` Scott Wood 2012-06-26 22:34 ` Scott Wood 2012-06-26 22:34 ` Scott Wood 2012-06-27 11:41 ` Caraman Mihai Claudiu-B02008 2012-06-27 11:41 ` Caraman Mihai Claudiu-B02008 2012-06-27 11:41 ` Caraman Mihai Claudiu-B02008 2012-06-27 15:23 ` Scott Wood 2012-06-27 15:23 ` Scott Wood 2012-07-04 13:33 ` [Qemu-ppc] " Alexander Graf 2012-07-04 13:33 ` Alexander Graf 2012-07-04 13:33 ` Alexander Graf 2012-07-05 11:49 ` Caraman Mihai Claudiu-B02008 2012-07-05 11:49 ` Caraman Mihai Claudiu-B02008 2012-07-05 11:49 ` Caraman Mihai Claudiu-B02008 2012-07-05 12:12 ` Alexander Graf 2012-07-05 12:12 ` Alexander Graf 2012-07-05 12:12 ` Alexander Graf 2012-07-05 12:54 ` Caraman Mihai Claudiu-B02008 2012-07-05 12:54 ` Caraman Mihai Claudiu-B02008 2012-07-05 12:54 ` Caraman Mihai Claudiu-B02008 2012-07-11 18:07 ` Alexander Graf 2012-07-11 18:07 ` Alexander Graf 2012-07-11 18:07 ` Alexander Graf 2012-06-25 12:26 ` [RFC PATCH 04/17] KVM: PPC64: booke: Add guest computation mode for irq delivery Mihai Caraman 2012-06-25 12:26 ` Mihai Caraman 2012-07-04 13:40 ` [Qemu-ppc] " Alexander Graf 2012-07-04 13:40 ` Alexander Graf 2012-07-04 13:40 ` Alexander Graf 2012-07-05 9:28 ` Caraman Mihai Claudiu-B02008 2012-07-05 9:28 ` Caraman Mihai Claudiu-B02008 2012-07-05 9:28 ` Caraman Mihai Claudiu-B02008 2012-07-05 23:51 ` Scott Wood 2012-07-05 23:51 ` Scott Wood 2012-07-05 23:51 ` Scott Wood 2012-07-06 7:03 ` Alexander Graf 2012-07-06 7:03 ` Alexander Graf 2012-07-06 7:03 ` Alexander Graf 2012-06-25 12:26 ` Mihai Caraman [this message] 2012-06-25 12:26 ` [RFC PATCH 05/17] KVM: PPC: booke: Extend MAS2 EPN mask for 64-bit Mihai Caraman 2012-07-04 13:49 ` [Qemu-ppc] " Alexander Graf 2012-07-04 13:49 ` Alexander Graf 2012-07-04 13:49 ` Alexander Graf 2012-07-05 11:14 ` Caraman Mihai Claudiu-B02008 2012-07-05 11:14 ` Caraman Mihai Claudiu-B02008 2012-07-05 11:14 ` Caraman Mihai Claudiu-B02008 2012-10-08 10:10 ` Alexander Graf 2012-10-08 10:10 ` Alexander Graf 2012-10-08 10:10 ` Alexander Graf 2012-10-08 13:06 ` Caraman Mihai Claudiu-B02008 2012-10-08 13:06 ` Caraman Mihai Claudiu-B02008 2012-10-08 13:06 ` Caraman Mihai Claudiu-B02008 2012-10-08 13:10 ` Alexander Graf 2012-10-08 13:10 ` Alexander Graf 2012-10-08 13:10 ` Alexander Graf 2012-06-25 12:26 ` [RFC PATCH 06/17] KVM: PPC: e500: Add emulation helper for getting instruction ea Mihai Caraman 2012-06-25 12:26 ` Mihai Caraman 2012-07-04 13:56 ` Alexander Graf 2012-07-04 13:56 ` Alexander Graf 2012-07-04 13:56 ` Alexander Graf 2012-07-05 11:39 ` Caraman Mihai Claudiu-B02008 2012-07-05 11:39 ` Caraman Mihai Claudiu-B02008 2012-07-05 11:39 ` Caraman Mihai Claudiu-B02008 2012-07-11 17:53 ` Alexander Graf 2012-07-11 17:53 ` Alexander Graf 2012-07-11 17:53 ` Alexander Graf 2012-06-25 12:26 ` [RFC PATCH 07/17] KVM: PPC: e500: Mask ea's high 32-bits in 32/64 instr emulation Mihai Caraman 2012-06-25 12:26 ` Mihai Caraman 2012-07-04 14:00 ` [Qemu-ppc] " Alexander Graf 2012-07-04 14:00 ` Alexander Graf 2012-07-04 14:00 ` Alexander Graf 2012-07-04 14:05 ` Alexander Graf 2012-07-04 14:05 ` Alexander Graf 2012-07-04 14:05 ` Alexander Graf 2012-06-25 12:26 ` [RFC PATCH 08/17] KVM: PPC: e500mc: Fix tlbilx emulation for 64-bit guests Mihai Caraman 2012-06-25 12:26 ` Mihai Caraman 2012-07-06 14:54 ` Alexander Graf 2012-07-06 14:54 ` Alexander Graf 2012-07-06 14:54 ` Alexander Graf 2012-06-25 12:26 ` [RFC PATCH 09/17] KVM: PPC64: booke: Hard disable interrupts when entering guest Mihai Caraman 2012-06-25 12:26 ` Mihai Caraman 2012-07-04 14:14 ` [Qemu-ppc] " Alexander Graf 2012-07-04 14:14 ` Alexander Graf 2012-07-04 14:14 ` Alexander Graf 2012-07-04 22:21 ` Benjamin Herrenschmidt 2012-07-04 22:21 ` Benjamin Herrenschmidt 2012-07-06 23:03 ` Caraman Mihai Claudiu-B02008 2012-07-06 23:03 ` Caraman Mihai Claudiu-B02008 2012-07-06 23:03 ` Caraman Mihai Claudiu-B02008 2012-06-25 12:26 ` [RFC PATCH 10/17] PowerPC: booke64: Refactor exception prolog for save/restore regs Mihai Caraman 2012-06-25 12:26 ` Mihai Caraman 2012-06-26 22:12 ` Benjamin Herrenschmidt 2012-06-26 22:12 ` Benjamin Herrenschmidt 2012-06-26 22:12 ` Benjamin Herrenschmidt 2012-06-27 11:49 ` Caraman Mihai Claudiu-B02008 2012-06-27 11:49 ` Caraman Mihai Claudiu-B02008 2012-06-27 11:49 ` Caraman Mihai Claudiu-B02008 2012-06-25 12:26 ` [RFC PATCH 11/17] PowerPC: booke64: Fix machine check handler to use the right prolog Mihai Caraman 2012-06-25 12:26 ` Mihai Caraman 2012-06-26 22:13 ` Benjamin Herrenschmidt 2012-06-26 22:13 ` Benjamin Herrenschmidt 2012-06-26 22:13 ` Benjamin Herrenschmidt 2012-06-25 12:26 ` [RFC PATCH 12/17] PowerPC: booke64: Add DO_KVM kernel hooks Mihai Caraman 2012-06-25 12:26 ` Mihai Caraman 2012-07-04 14:29 ` [Qemu-ppc] " Alexander Graf 2012-07-04 14:29 ` Alexander Graf 2012-07-04 14:29 ` Alexander Graf 2012-07-04 15:27 ` Caraman Mihai Claudiu-B02008 2012-07-04 15:27 ` Caraman Mihai Claudiu-B02008 2012-07-04 15:27 ` Caraman Mihai Claudiu-B02008 2012-07-04 15:45 ` Alexander Graf 2012-07-04 15:45 ` Alexander Graf 2012-07-04 15:45 ` Alexander Graf 2012-07-04 18:15 ` Caraman Mihai Claudiu-B02008 2012-07-04 18:15 ` Caraman Mihai Claudiu-B02008 2012-07-04 18:15 ` Caraman Mihai Claudiu-B02008 2012-07-06 0:19 ` Scott Wood 2012-07-06 0:19 ` Scott Wood 2012-07-06 0:19 ` Scott Wood 2012-07-04 22:25 ` Benjamin Herrenschmidt 2012-07-04 22:25 ` Benjamin Herrenschmidt 2012-07-04 22:25 ` Benjamin Herrenschmidt 2012-07-06 22:33 ` Caraman Mihai Claudiu-B02008 2012-07-06 22:33 ` Caraman Mihai Claudiu-B02008 2012-07-06 22:33 ` Caraman Mihai Claudiu-B02008 2012-07-06 23:11 ` Alexander Graf 2012-07-06 23:11 ` Alexander Graf 2012-07-06 23:11 ` Alexander Graf 2012-07-07 8:39 ` Caraman Mihai Claudiu-B02008 2012-07-07 8:39 ` Caraman Mihai Claudiu-B02008 2012-07-07 8:39 ` Caraman Mihai Claudiu-B02008 2012-07-11 22:25 ` Alexander Graf 2012-07-11 22:25 ` Alexander Graf 2012-07-11 22:25 ` Alexander Graf 2012-07-11 22:28 ` Benjamin Herrenschmidt 2012-07-11 22:28 ` Benjamin Herrenschmidt 2012-07-11 22:28 ` Benjamin Herrenschmidt 2012-07-11 22:35 ` Alexander Graf 2012-07-11 22:35 ` Alexander Graf 2012-07-11 22:43 ` Benjamin Herrenschmidt 2012-07-11 22:43 ` Benjamin Herrenschmidt 2012-07-11 22:43 ` Benjamin Herrenschmidt 2012-07-11 22:51 ` Alexander Graf 2012-07-11 22:51 ` Alexander Graf 2012-07-11 22:51 ` Alexander Graf 2012-06-25 12:26 ` [RFC PATCH 13/17] PowerPC: booke64: Use SPRG0/3 scratch for bolted TLB miss & crit int Mihai Caraman 2012-06-25 12:26 ` Mihai Caraman 2012-06-26 22:16 ` Benjamin Herrenschmidt 2012-06-26 22:16 ` Benjamin Herrenschmidt 2012-06-26 22:16 ` Benjamin Herrenschmidt 2012-07-05 15:51 ` Caraman Mihai Claudiu-B02008 2012-07-05 15:51 ` Caraman Mihai Claudiu-B02008 2012-07-05 15:51 ` Caraman Mihai Claudiu-B02008 2012-06-26 22:24 ` Scott Wood 2012-06-26 22:24 ` Scott Wood 2012-06-26 22:24 ` Scott Wood 2012-06-25 12:26 ` [RFC PATCH 14/17] KVM: PPC32: bookehv: Remove GET_VCPU macro from exception handler Mihai Caraman 2012-06-25 12:26 ` Mihai Caraman 2012-06-25 12:26 ` [RFC PATCH 15/17] KVM: PPC64: bookehv: Add support for interrupt handling Mihai Caraman 2012-06-25 12:26 ` Mihai Caraman 2012-07-04 15:13 ` [Qemu-ppc] " Alexander Graf 2012-07-04 15:13 ` Alexander Graf 2012-07-04 15:13 ` Alexander Graf 2012-07-04 15:37 ` Caraman Mihai Claudiu-B02008 2012-07-04 15:37 ` Caraman Mihai Claudiu-B02008 2012-07-04 15:37 ` Caraman Mihai Claudiu-B02008 2012-07-04 15:46 ` Alexander Graf 2012-07-04 15:46 ` Alexander Graf 2012-07-04 15:46 ` Alexander Graf 2012-07-04 18:21 ` Caraman Mihai Claudiu-B02008 2012-07-04 18:21 ` Caraman Mihai Claudiu-B02008 2012-07-04 18:21 ` Caraman Mihai Claudiu-B02008 2012-06-25 12:26 ` [RFC PATCH 16/17] KVM: PPC: e500: Silence bogus GCC warning in tlb code Mihai Caraman 2012-06-25 12:26 ` Mihai Caraman 2012-06-25 12:26 ` [RFC PATCH 17/17] KVM: PPC: booke: Fix get_tb() compile error on 64-bit Mihai Caraman 2012-06-25 12:26 ` Mihai Caraman
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=1340627195-11544-6-git-send-email-mihai.caraman@freescale.com \ --to=mihai.caraman@freescale.com \ --cc=kvm-ppc@vger.kernel.org \ --cc=kvm@vger.kernel.org \ --cc=linuxppc-dev@lists.ozlabs.org \ --cc=qemu-ppc@nongnu.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: linkBe 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.