aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Filippov <jcmvbkbc@gmail.com>2011-11-22 11:59:16 +0400
committerBlue Swirl <blauwirbel@gmail.com>2011-11-26 09:44:34 +0000
commit0fdd2e1d06884b0236c2f124c1cfd2dd4765341a (patch)
tree9e90bdcebc86893896b798c4aaf202367ea67cef
parent40897c9c160393df922dfdb59cfa210048d3071d (diff)
downloadqemu-arm-0fdd2e1d06884b0236c2f124c1cfd2dd4765341a.tar.gz
target-xtensa: fix MMUv3 initialization
- ITLB/DTLB ways 5 and 6 have 4 and 8 entries respectively; - ITLB/DTLB way 6 attr field is set to 3 on reset. Signed-off-by: Max Filippov <jcmvbkbc@gmail.com> Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
-rw-r--r--target-xtensa/helper.c2
-rw-r--r--target-xtensa/overlay_tool.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/target-xtensa/helper.c b/target-xtensa/helper.c
index fc85815a63..2a0cb1a562 100644
--- a/target-xtensa/helper.c
+++ b/target-xtensa/helper.c
@@ -273,7 +273,7 @@ static void reset_tlb_mmu_ways56(CPUState *env,
entry[6][ei].vaddr = ei << 29;
entry[6][ei].paddr = ei << 29;
entry[6][ei].asid = 1;
- entry[6][ei].attr = 2;
+ entry[6][ei].attr = 3;
}
}
}
diff --git a/target-xtensa/overlay_tool.h b/target-xtensa/overlay_tool.h
index 9cef27d03e..df19cc96ea 100644
--- a/target-xtensa/overlay_tool.h
+++ b/target-xtensa/overlay_tool.h
@@ -256,7 +256,7 @@
.way_size = { \
(refill_way_size), (refill_way_size), \
(refill_way_size), (refill_way_size), \
- 4, 2, 2, 1, 1, 1, \
+ 4, (way56) ? 4 : 2, (way56) ? 8 : 2, 1, 1, 1, \
}, \
.varway56 = (way56), \
.nrefillentries = (refill_way_size) * 4, \