target/ppc: Fix VRMA page size for ISA v3.0
PATCH v2 1/1 target/ppc: Fix VRMA page size for ISA v3.0
Until v2.07s, the VRMA page size (L||LP) was encoded in LPCR[VRMASD]. In v3.0 that moved to the partition table PS field.
The powernv machine can now run KVM HPT guests on POWER9/10 CPUs with this fix and the patch to add ASDR.
---
Since v1:
- Added llp variable to avoid calling get_vrma_llp twice [Cedric].
- Added some bit defines for architected fields and values [Cedric].
Patches 1,3 from the previously posted series, let's defer 4-6 decrementer fixes until after 8.1, so this is the last remaining one from the series.
Thanks,
Nick
target/ppc/mmu-hash64.c | 45 +++++++++++++++++++++++++++++++++++------ target/ppc/mmu-hash64.h | 5 +++++ 2 files changed, 44 insertions(+), 6 deletions(-)
target/ppc/mmu-hash64.c +39 -6
@@ -874,12 +874,46 @@ static target_ulong rmls_limit(PowerPCCPU *cpu)return rma_sizes[rmls]; } -static int build_vrma_slbe (PowerPCCPU *cpu,ppc_slb_t *slb) +/* Return the LLP in SLB_VSID format */ +static uint64_t get_vrma_llp (PowerPCCPU *cpu) {CPUPPCState *env = &cpu->env; -target_ulong lpcr = env->spr[SPR_LPCR ]; -uint32_t vrmasd = (lpcr &LPCR_VRMASD ) >>LPCR_VRMASD_SHIFT ; -target_ulong vsid =SLB_VSID_VRMA | ((vrmasd <<4 ) &SLB_VSID_LLP_MASK ); +uint64_t llp; + +if (env->mmu_model ==POWERPC_MMU_3_00 ) { +ppc_v3_pate_t pate; +uint64_t ps, l, lp; + +/* +* ISA v3.0 removes the LPCR[VRMASD] field and puts the VRMA base +* page size (L||LP equivalent) in the PS field in the HPT partition +* table entry. +*/ +if (!ppc64_v3_get_pate (cpu, cpu->env.spr[SPR_LPIDR ], &pate)) { +error_report ("Bad VRMA with no partition table entry" ); +return 0 ; + } + ps =PATE0_GET_PS (pate.dw0); +/* PS has L||LP in 3 consecutive bits, put them into SLB LLP format */ + l = (ps >>2 ) &0x1 ; + lp = ps &0x3 ; + llp = (l <<SLB_VSID_L_SHIFT ) | (lp <<SLB_VSID_LP_SHIFT ); + + }else { +uint64_t lpcr = env->spr[SPR_LPCR ]; +target_ulong vrmasd = (lpcr &LPCR_VRMASD ) >>LPCR_VRMASD_SHIFT ; + +/* VRMASD LLP matches SLB format, just shift and mask it */ + llp = (vrmasd <<SLB_VSID_LP_SHIFT ) &SLB_VSID_LLP_MASK ; + } + +return llp; +} + +static int build_vrma_slbe (PowerPCCPU *cpu,ppc_slb_t *slb) +{ +uint64_t llp =get_vrma_llp (cpu); +target_ulong vsid =SLB_VSID_VRMA | llp;int i;for (i =0 ; i <PPC_PAGE_SIZES_MAX_SZ ; i++) {
@@ -897,8 +931,7 @@ static int build_vrma_slbe(PowerPCCPU *cpu, ppc_slb_t *slb) } } -error_report ("Bad page size encoding in LPCR[VRMASD]; LPCR=0x" - TARGET_FMT_lx, lpcr); +error_report ("Bad VRMA page size encoding 0x" TARGET_FMT_lx, llp);return -1 ; }
target/ppc/mmu-hash64.h +5 -0
@@ -41,8 +41,10 @@ void ppc_hash64_finalize(PowerPCCPU *cpu);#define SLB_VSID_KP 0x0000000000000400ULL#define SLB_VSID_N 0x0000000000000200ULL/* no-execute */ #define SLB_VSID_L 0x0000000000000100ULL +#define SLB_VSID_L_SHIFT PPC_BIT_NR(55)#define SLB_VSID_C 0x0000000000000080ULL/* class */ #define SLB_VSID_LP 0x0000000000000030ULL +#define SLB_VSID_LP_SHIFT PPC_BIT_NR(59)#define SLB_VSID_ATTR 0x0000000000000FFFULL#define SLB_VSID_LLP_MASK (SLB_VSID_L | SLB_VSID_LP)#define SLB_VSID_4K 0x0000000000000000ULL
@@ -58,6 +60,9 @@ void ppc_hash64_finalize(PowerPCCPU *cpu);#define SDR_64_HTABSIZE 0x000000000000001FULL#define PATE0_HTABORG 0x0FFFFFFFFFFC0000ULL +#define PATE0_PS PPC_BITMASK(56, 58) +#define PATE0_GET_PS (dw0) (((dw0) & PATE0_PS) >> PPC_BIT_NR(58)) +#define HPTES_PER_GROUP 8#define HASH_PTE_SIZE_64 16#define HASH_PTEG_SIZE_64 (HASH_PTE_SIZE_64 * HPTES_PER_GROUP)
Signature · 1 line
2.40.1
Quoted 6 lines · Nicholas Piggin
Until v2.07s, the VRMA page size (L||LP) was encoded in LPCR[VRMASD]. In v3.0 that moved to the partition table PS field.
The powernv machine can now run KVM HPT guests on POWER9/10 CPUs with this fix and the patch to add ASDR.
Quoted 6 lines
Fixes 3367c62f522b ("target/ppc: Support for POWER9 native hash")Signed-off-by Nicholas Piggin <[email protected]>---
Since v1:
- Added llp variable to avoid callingget_vrma_llptwice [Cedric].
- Added some bit defines for architected fields and values [Cedric].
Thanks,
C.
Quoted 102 lines
Patches 1,3 from the previously posted series, let's defer 4-6 decrementer fixes until after 8.1, so this is the last remaining one from the series.
Thanks,
Nicktarget/ppc/mmu-hash64.c | 45 +++++++++++++++++++++++++++++++++++------ target/ppc/mmu-hash64.h | 5 +++++ 2 files changed, 44 insertions(+), 6 deletions(-)target/ppc/mmu-hash64.c +39
-6@@ -874,12 +874,46 @@ static target_ulong rmls_limit(PowerPCCPU *cpu)return rma_sizes[rmls]; } -static int build_vrma_slbe (PowerPCCPU *cpu,ppc_slb_t *slb) +/* Return the LLP in SLB_VSID format */ +static uint64_t get_vrma_llp (PowerPCCPU *cpu) {CPUPPCState *env = &cpu->env; -target_ulong lpcr = env->spr[SPR_LPCR ]; -uint32_t vrmasd = (lpcr &LPCR_VRMASD ) >>LPCR_VRMASD_SHIFT ; -target_ulong vsid =SLB_VSID_VRMA | ((vrmasd <<4 ) &SLB_VSID_LLP_MASK ); +uint64_t llp; + +if (env->mmu_model ==POWERPC_MMU_3_00 ) { +ppc_v3_pate_t pate; +uint64_t ps, l, lp; + +/* +* ISA v3.0 removes the LPCR[VRMASD] field and puts the VRMA base +* page size (L||LP equivalent) in the PS field in the HPT partition +* table entry. +*/ +if (!ppc64_v3_get_pate (cpu, cpu->env.spr[SPR_LPIDR ], &pate)) { +error_report ("Bad VRMA with no partition table entry" ); +return 0 ; + } + ps =PATE0_GET_PS (pate.dw0); +/* PS has L||LP in 3 consecutive bits, put them into SLB LLP format */ + l = (ps >>2 ) &0x1 ; + lp = ps &0x3 ; + llp = (l <<SLB_VSID_L_SHIFT ) | (lp <<SLB_VSID_LP_SHIFT ); + + }else { +uint64_t lpcr = env->spr[SPR_LPCR ]; +target_ulong vrmasd = (lpcr &LPCR_VRMASD ) >>LPCR_VRMASD_SHIFT ; + +/* VRMASD LLP matches SLB format, just shift and mask it */ + llp = (vrmasd <<SLB_VSID_LP_SHIFT ) &SLB_VSID_LLP_MASK ; + } + +return llp; +} + +static int build_vrma_slbe (PowerPCCPU *cpu,ppc_slb_t *slb) +{ +uint64_t llp =get_vrma_llp (cpu); +target_ulong vsid =SLB_VSID_VRMA | llp;int i;for (i =0 ; i <PPC_PAGE_SIZES_MAX_SZ ; i++) {@@ -897,8 +931,7 @@ static int build_vrma_slbe(PowerPCCPU *cpu, ppc_slb_t *slb) } } -error_report ("Bad page size encoding in LPCR[VRMASD]; LPCR=0x" - TARGET_FMT_lx, lpcr); +error_report ("Bad VRMA page size encoding 0x" TARGET_FMT_lx, llp);return -1 ; }target/ppc/mmu-hash64.h +5
-0@@ -41,8 +41,10 @@ void ppc_hash64_finalize(PowerPCCPU *cpu);#define SLB_VSID_KP 0x0000000000000400ULL#define SLB_VSID_N 0x0000000000000200ULL/* no-execute */ #define SLB_VSID_L 0x0000000000000100ULL +#define SLB_VSID_L_SHIFT PPC_BIT_NR(55)#define SLB_VSID_C 0x0000000000000080ULL/* class */ #define SLB_VSID_LP 0x0000000000000030ULL +#define SLB_VSID_LP_SHIFT PPC_BIT_NR(59)#define SLB_VSID_ATTR 0x0000000000000FFFULL#define SLB_VSID_LLP_MASK (SLB_VSID_L | SLB_VSID_LP)#define SLB_VSID_4K 0x0000000000000000ULL@@ -58,6 +60,9 @@ void ppc_hash64_finalize(PowerPCCPU *cpu);#define SDR_64_HTABSIZE 0x000000000000001FULL#define PATE0_HTABORG 0x0FFFFFFFFFFC0000ULL +#define PATE0_PS PPC_BITMASK(56, 58) +#define PATE0_GET_PS (dw0) (((dw0) & PATE0_PS) >> PPC_BIT_NR(58)) +#define HPTES_PER_GROUP 8#define HASH_PTE_SIZE_64 16#define HASH_PTEG_SIZE_64 (HASH_PTE_SIZE_64 * HPTES_PER_GROUP)
Daniel Henrique Barboza
AppliedQueued in gitlab.com/danielhb/qemu/tree/ppc-next. Thanks,
Daniel
Quoted 114 lines · Nicholas Piggin
Until v2.07s, the VRMA page size (L||LP) was encoded in LPCR[VRMASD]. In v3.0 that moved to the partition table PS field.
The powernv machine can now run KVM HPT guests on POWER9/10 CPUs with this fix and the patch to add ASDR.
Fixes 3367c62f522b ("target/ppc: Support for POWER9 native hash")Signed-off-by Nicholas Piggin <[email protected]>---
Since v1:
- Added llp variable to avoid callingget_vrma_llptwice [Cedric].
- Added some bit defines for architected fields and values [Cedric].Patches 1,3 from the previously posted series, let's defer 4-6 decrementer fixes until after 8.1, so this is the last remaining one from the series.
Thanks,
Nicktarget/ppc/mmu-hash64.c | 45 +++++++++++++++++++++++++++++++++++------ target/ppc/mmu-hash64.h | 5 +++++ 2 files changed, 44 insertions(+), 6 deletions(-)target/ppc/mmu-hash64.c +39
-6@@ -874,12 +874,46 @@ static target_ulong rmls_limit(PowerPCCPU *cpu)return rma_sizes[rmls]; } -static int build_vrma_slbe (PowerPCCPU *cpu,ppc_slb_t *slb) +/* Return the LLP in SLB_VSID format */ +static uint64_t get_vrma_llp (PowerPCCPU *cpu) {CPUPPCState *env = &cpu->env; -target_ulong lpcr = env->spr[SPR_LPCR ]; -uint32_t vrmasd = (lpcr &LPCR_VRMASD ) >>LPCR_VRMASD_SHIFT ; -target_ulong vsid =SLB_VSID_VRMA | ((vrmasd <<4 ) &SLB_VSID_LLP_MASK ); +uint64_t llp; + +if (env->mmu_model ==POWERPC_MMU_3_00 ) { +ppc_v3_pate_t pate; +uint64_t ps, l, lp; + +/* +* ISA v3.0 removes the LPCR[VRMASD] field and puts the VRMA base +* page size (L||LP equivalent) in the PS field in the HPT partition +* table entry. +*/ +if (!ppc64_v3_get_pate (cpu, cpu->env.spr[SPR_LPIDR ], &pate)) { +error_report ("Bad VRMA with no partition table entry" ); +return 0 ; + } + ps =PATE0_GET_PS (pate.dw0); +/* PS has L||LP in 3 consecutive bits, put them into SLB LLP format */ + l = (ps >>2 ) &0x1 ; + lp = ps &0x3 ; + llp = (l <<SLB_VSID_L_SHIFT ) | (lp <<SLB_VSID_LP_SHIFT ); + + }else { +uint64_t lpcr = env->spr[SPR_LPCR ]; +target_ulong vrmasd = (lpcr &LPCR_VRMASD ) >>LPCR_VRMASD_SHIFT ; + +/* VRMASD LLP matches SLB format, just shift and mask it */ + llp = (vrmasd <<SLB_VSID_LP_SHIFT ) &SLB_VSID_LLP_MASK ; + } + +return llp; +} + +static int build_vrma_slbe (PowerPCCPU *cpu,ppc_slb_t *slb) +{ +uint64_t llp =get_vrma_llp (cpu); +target_ulong vsid =SLB_VSID_VRMA | llp;int i;for (i =0 ; i <PPC_PAGE_SIZES_MAX_SZ ; i++) {@@ -897,8 +931,7 @@ static int build_vrma_slbe(PowerPCCPU *cpu, ppc_slb_t *slb) } } -error_report ("Bad page size encoding in LPCR[VRMASD]; LPCR=0x" - TARGET_FMT_lx, lpcr); +error_report ("Bad VRMA page size encoding 0x" TARGET_FMT_lx, llp);return -1 ; }target/ppc/mmu-hash64.h +5
-0@@ -41,8 +41,10 @@ void ppc_hash64_finalize(PowerPCCPU *cpu);#define SLB_VSID_KP 0x0000000000000400ULL#define SLB_VSID_N 0x0000000000000200ULL/* no-execute */ #define SLB_VSID_L 0x0000000000000100ULL +#define SLB_VSID_L_SHIFT PPC_BIT_NR(55)#define SLB_VSID_C 0x0000000000000080ULL/* class */ #define SLB_VSID_LP 0x0000000000000030ULL +#define SLB_VSID_LP_SHIFT PPC_BIT_NR(59)#define SLB_VSID_ATTR 0x0000000000000FFFULL#define SLB_VSID_LLP_MASK (SLB_VSID_L | SLB_VSID_LP)#define SLB_VSID_4K 0x0000000000000000ULL@@ -58,6 +60,9 @@ void ppc_hash64_finalize(PowerPCCPU *cpu);#define SDR_64_HTABSIZE 0x000000000000001FULL#define PATE0_HTABORG 0x0FFFFFFFFFFC0000ULL +#define PATE0_PS PPC_BITMASK(56, 58) +#define PATE0_GET_PS (dw0) (((dw0) & PATE0_PS) >> PPC_BIT_NR(58)) +#define HPTES_PER_GROUP 8#define HASH_PTE_SIZE_64 16#define HASH_PTEG_SIZE_64 (HASH_PTE_SIZE_64 * HPTES_PER_GROUP)