From: Edgar E. Iglesias <edgar.iglesias@xilinx.com>
Date: Fri, 13 Apr 2018 20:16:57 +0000 (+0200)
Subject: target-microblaze: Bypass MMU with MMU_NOMMU_IDX
X-Git-Tag: qemu-xen-4.12.0-rc1~205^2~28
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=a2de5ca451354155a0d6a9b098cbdd44eabb2da5;p=qemu-xen.git

target-microblaze: Bypass MMU with MMU_NOMMU_IDX

Bypass MMU translation when mmu-index MMU_NOMMU_IDX is used.

Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Edgar E. Iglesias <edgar.iglesias@xilinx.com>
---

diff --git a/target/microblaze/helper.c b/target/microblaze/helper.c
index a9f4ca93e3..261dcc74c7 100644
--- a/target/microblaze/helper.c
+++ b/target/microblaze/helper.c
@@ -58,7 +58,8 @@ int mb_cpu_handle_mmu_fault(CPUState *cs, vaddr address, int size, int rw,
     int prot;
 
     /* Translate if the MMU is available and enabled.  */
-    if (cpu->cfg.use_mmu && (env->sregs[SR_MSR] & MSR_VM)) {
+    if (cpu->cfg.use_mmu && (env->sregs[SR_MSR] & MSR_VM)
+        && mmu_idx != MMU_NOMMU_IDX) {
         uint32_t vaddr, paddr;
         struct microblaze_mmu_lookup lu;