diff options
| -rw-r--r-- | target-ppc/helper.c | 8 | ||||
| -rw-r--r-- | target-ppc/op_helper.c | 9 |
2 files changed, 10 insertions, 7 deletions
diff --git a/target-ppc/helper.c b/target-ppc/helper.c index 672494c593..31a98978dd 100644 --- a/target-ppc/helper.c +++ b/target-ppc/helper.c @@ -1298,13 +1298,7 @@ target_phys_addr_t booke206_tlb_to_page_size(CPUState *env, ppcmas_tlb_t *tlb) int tlbm_size; tlbncfg = env->spr[SPR_BOOKE_TLB0CFG + tlbn]; - - if (tlbncfg & TLBnCFG_AVAIL) { - tlbm_size = (tlb->mas1 & MAS1_TSIZE_MASK) >> MAS1_TSIZE_SHIFT; - } else { - tlbm_size = (tlbncfg & TLBnCFG_MINSIZE) >> TLBnCFG_MINSIZE_SHIFT; - tlbm_size <<= 1; - } + tlbm_size = (tlb->mas1 & MAS1_TSIZE_MASK) >> MAS1_TSIZE_SHIFT; return 1024ULL << tlbm_size; } diff --git a/target-ppc/op_helper.c b/target-ppc/op_helper.c index be4e539c2d..0d1206a649 100644 --- a/target-ppc/op_helper.c +++ b/target-ppc/op_helper.c @@ -4282,6 +4282,15 @@ void helper_booke206_tlbwe(void) tlb->mas7_3 = ((uint64_t)env->spr[SPR_BOOKE_MAS7] << 32) | env->spr[SPR_BOOKE_MAS3]; tlb->mas1 = env->spr[SPR_BOOKE_MAS1]; + + /* MAV 1.0 only */ + if (!(tlbncfg & TLBnCFG_AVAIL)) { + /* force !AVAIL TLB entries to correct page size */ + tlb->mas1 &= ~MAS1_TSIZE_MASK; + /* XXX can be configured in MMUCSR0 */ + tlb->mas1 |= (tlbncfg & TLBnCFG_MINSIZE) >> 12; + } + /* XXX needs to change when supporting 64-bit e500 */ tlb->mas2 = env->spr[SPR_BOOKE_MAS2] & 0xffffffff; |