From: Richard Henderson <richard.henderson@linaro.org>
Date: Fri, 29 Dec 2017 03:26:52 +0000 (-0800)
Subject: target/hppa: Only use EXCP_DTLB_MISS
X-Git-Tag: v2.12.0-rc0~121^2~11
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=46559e8184b23e539912bb78764e662b5eabb537;p=thirdparty%2Fqemu.git

target/hppa: Only use EXCP_DTLB_MISS

Unknown why this works, but if we return EXCP_ITLB_MISS we
will triple-fault the first userland instruction fetch.
Is it something to do with having a combined I/DTLB?

Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---

diff --git a/target/hppa/mem_helper.c b/target/hppa/mem_helper.c
index bf7559ba9e5..ab160c2a74b 100644
--- a/target/hppa/mem_helper.c
+++ b/target/hppa/mem_helper.c
@@ -96,7 +96,9 @@ int hppa_get_physical_address(CPUHPPAState *env, vaddr addr, int mmu_idx,
     if (ent == NULL || !ent->entry_valid) {
         phys = 0;
         prot = 0;
-        ret = (type & PAGE_EXEC ? EXCP_ITLB_MISS : EXCP_DTLB_MISS);
+        /* ??? Unconditionally report data tlb miss,
+           even if this is an instruction fetch.  */
+        ret = EXCP_DTLB_MISS;
         goto egress;
     }