From: Alexander Graf <agraf@suse.de>
Date: Wed, 2 Jul 2014 17:09:47 +0000 (+0200)
Subject: PPC: Fix booke206 TLB with phys addrs > 32bit
X-Git-Tag: qemu-xen-4.6.0-rc1~322^2~4
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=da89a1cf92be6c195ff35afd253a11b427a152c3;p=qemu-upstream-4.6-testing.git

PPC: Fix booke206 TLB with phys addrs > 32bit

We were truncating physical addresses to 32bit when using qemu-system-ppc
with a booke206 TLB implementation. This patch fixes that and makes the full
address space available.

Signed-off-by: Alexander Graf <agraf@suse.de>
---

diff --git a/target-ppc/mmu_helper.c b/target-ppc/mmu_helper.c
index 4d6b1e20c..4a34a73ad 100644
--- a/target-ppc/mmu_helper.c
+++ b/target-ppc/mmu_helper.c
@@ -897,10 +897,10 @@ static hwaddr booke206_tlb_to_page_size(CPUPPCState *env,
 
 /* TLB check function for MAS based SoftTLBs */
 static int ppcmas_tlb_check(CPUPPCState *env, ppcmas_tlb_t *tlb,
-                            hwaddr *raddrp,
-                     target_ulong address, uint32_t pid)
+                            hwaddr *raddrp, target_ulong address,
+                            uint32_t pid)
 {
-    target_ulong mask;
+    hwaddr mask;
     uint32_t tlb_pid;
 
     if (!msr_cm) {