target-ppc: Fix htab_mask calculation
PATCH 1/1 target-ppc: Fix htab_mask calculation
From: "Aneesh Kumar K.V" <[email protected]>
Correctly update the htab_mask using the return value of KVM_PPC_ALLOCATE_HTAB ioctl. Also we don't update sdr1 on GET_SREGS for HV. So don't update htab_mask if sdr1 is found to be zero. Fix the pte index calculation to be same as that found in the kernel
--- hw/ppc/spapr.c | 3 ++- target-ppc/mmu-hash64.c | 2 +- target-ppc/mmu_helper.c | 4 +++- 3 files changed, 6 insertions(+), 3 deletions(-)
hw/ppc/spapr.c +2 -1
@@ -717,7 +717,8 @@ static void spapr_cpu_reset(void *opaque) env->external_htab = (uint8_t *)spapr->htab; env->htab_base =-1 ; - env->htab_mask =HTAB_SIZE (spapr) -1 ; +/* 128 (2**7) bytes in each HPTEG */ + env->htab_mask = (1ULL << ((spapr)->htab_shift -7 )) -1 ; env->spr[SPR_SDR1 ] = (target_ulong )(uintptr_t )spapr->htab | (spapr->htab_shift -18 ); }
target-ppc/mmu-hash64.c +1 -1
@@ -347,7 +347,7 @@ static hwaddr ppc_hash64_pteg_search(CPUPPCState *env, hwaddr hash,unsigned long pte_index;struct ppc_hash64_hpte_token *token; - pte_index = (hash *HPTES_PER_GROUP ) & env->htab_mask; + pte_index = (hash & env->htab_mask) *HPTES_PER_GROUP ; token =ppc_hash64_start_access (ppc_env_get_cpu (env), pte_index);if (!token) {return -1 ;
target-ppc/mmu_helper.c +3 -1
@@ -2025,7 +2025,9 @@ void ppc_store_sdr1(CPUPPCState *env, target_ulong value) " stored in SDR1\n", htabsize); htabsize = 28; } - env->htab_mask = (1ULL << (htabsize +18 )) -1 ; +if (htabsize) { + env->htab_mask = (1ULL << (htabsize +18 )) -1 ; + } env->htab_base = value &SDR_64_HTABORG ; } else#endif /* defined(TARGET_PPC64) */
Signature · 1 line
1.8.1.2
Quoted 47 lines · Aneesh Kumar K.V
From: "Aneesh Kumar K.V" <[email protected]>
Correctly update the
htab_maskusing the return value ofKVM_PPC_ALLOCATE_HTABioctl. Also we don't update sdr1 onGET_SREGSfor HV. So don't updatehtab_maskif sdr1 is found to be zero. Fix the pte index calculation to be same as that found in the kernelSigned-off-by Aneesh Kumar K.V <[email protected]>--- hw/ppc/spapr.c | 3 ++- target-ppc/mmu-hash64.c | 2 +- target-ppc/mmu_helper.c | 4 +++- 3 files changed, 6 insertions(+), 3 deletions(-)hw/ppc/spapr.c +2
-1@@ -717,7 +717,8 @@ static void spapr_cpu_reset(void *opaque) env->external_htab = (uint8_t *)spapr->htab; env->htab_base =-1 ; - env->htab_mask =HTAB_SIZE (spapr) -1 ; +/* 128 (2**7) bytes in each HPTEG */ + env->htab_mask = (1ULL << ((spapr)->htab_shift -7 )) -1 ; env->spr[SPR_SDR1 ] = (target_ulong )(uintptr_t )spapr->htab | (spapr->htab_shift -18 ); }target-ppc/mmu-hash64.c +1
-1@@ -347,7 +347,7 @@ static hwaddr ppc_hash64_pteg_search(CPUPPCState *env, hwaddr hash,unsigned long pte_index;struct ppc_hash64_hpte_token *token; - pte_index = (hash *HPTES_PER_GROUP ) & env->htab_mask; + pte_index = (hash & env->htab_mask) *HPTES_PER_GROUP ; token =ppc_hash64_start_access (ppc_env_get_cpu (env), pte_index);if (!token) {return -1 ;target-ppc/mmu_helper.c +0
-0
target-ppc/mmu_helper.c void ppc_store_sdr1(CPUPPCState *env, target_ulong value) · line 2029
Quoted 6 lines
target-ppc/mmu_helper.c +2
-1@@ -2025,7 +2025,9 @@ void ppc_store_sdr1(CPUPPCState *env, target_ulong value) " stored in SDR1\n", htabsize); htabsize =28 ; } - env->htab_mask = (1ULL << (htabsize +18 )) -1 ; +if (htabsize) { + env->htab_mask = (1ULL << (htabsize +18 )) -1 ;
This should also be ?
env->htab_mask = (1ULL << (htabsize + 18 - 7)) - 1;
target-ppc/mmu_helper.c void ppc_store_sdr1(CPUPPCState *env, target_ulong value) · line 2033
Quoted 4 lines
target-ppc/mmu_helper.c +1
-0+ } env->htab_base = value &SDR_64_HTABORG ; } else#endif /* defined(TARGET_PPC64) */
-aneesh