diff options
| author | Scott Wood <scottwood@freescale.com> | 2011-08-18 10:38:40 +0000 |
|---|---|---|
| committer | Alexander Graf <agraf@suse.de> | 2011-10-06 09:48:04 +0200 |
| commit | 2bd9543cd303d9f6cbd37b7466bb03543035156b (patch) | |
| tree | 614611a0841a7a22949fdafe4a35bdbb407b320b /target-ppc/helper.c | |
| parent | bebabbc7aa7d1c5a45ee325838adf58a19f1b1ee (diff) | |
| download | qemu-2bd9543cd303d9f6cbd37b7466bb03543035156b.zip qemu-2bd9543cd303d9f6cbd37b7466bb03543035156b.tar.gz qemu-2bd9543cd303d9f6cbd37b7466bb03543035156b.tar.bz2 | |
ppc: booke206: use MAV=2.0 TSIZE definition, fix 4G pages
This definition is backward compatible with MAV=1.0 as long as
the guest does not set reserved bits in MAS1/MAS4.
Also, fix the shift in booke206_tlb_to_page_size -- it's the base
that should be able to hold a 4G page size, not the shift count.
Signed-off-by: Scott Wood <scottwood@freescale.com>
Signed-off-by: Alexander Graf <agraf@suse.de>
Diffstat (limited to 'target-ppc/helper.c')
| -rw-r--r-- | target-ppc/helper.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/target-ppc/helper.c b/target-ppc/helper.c index 4b3731e..6339be3 100644 --- a/target-ppc/helper.c +++ b/target-ppc/helper.c @@ -1293,7 +1293,7 @@ target_phys_addr_t booke206_tlb_to_page_size(CPUState *env, ppcmas_tlb_t *tlb) { uint32_t tlbncfg; int tlbn = booke206_tlbm_to_tlbn(env, tlb); - target_phys_addr_t tlbm_size; + int tlbm_size; tlbncfg = env->spr[SPR_BOOKE_TLB0CFG + tlbn]; @@ -1301,9 +1301,10 @@ target_phys_addr_t booke206_tlb_to_page_size(CPUState *env, ppcmas_tlb_t *tlb) tlbm_size = (tlb->mas1 & MAS1_TSIZE_MASK) >> MAS1_TSIZE_SHIFT; } else { tlbm_size = (tlbncfg & TLBnCFG_MINSIZE) >> TLBnCFG_MINSIZE_SHIFT; + tlbm_size <<= 1; } - return (1 << (tlbm_size << 1)) << 10; + return 1024ULL << tlbm_size; } /* TLB check function for MAS based SoftTLBs */ |