aboutsummaryrefslogtreecommitdiff
path: root/cputlb.c
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2016-01-21 14:15:05 +0000
committerPeter Maydell <peter.maydell@linaro.org>2016-01-21 14:15:05 +0000
commitd7898cda81b6efa6b2d7a749882695cdcf280eaa (patch)
tree2e67001b7985d21d62d8b9ad26b46c8173612dc4 /cputlb.c
parentd7f25a9e6a6b2c69a0be6033903b7d6087bcf47d (diff)
downloadqemu-d7898cda81b6efa6b2d7a749882695cdcf280eaa.zip
qemu-d7898cda81b6efa6b2d7a749882695cdcf280eaa.tar.gz
qemu-d7898cda81b6efa6b2d7a749882695cdcf280eaa.tar.bz2
cputlb.c: Use correct address space when looking up MemoryRegionSection
When looking up the MemoryRegionSection for the new TLB entry in tlb_set_page_with_attrs(), use cpu_asidx_from_attrs() to determine the correct address space index for the lookup, and pass it into address_space_translate_for_iotlb(). Signed-off-by: Peter Maydell <peter.maydell@linaro.org> Acked-by: Edgar E. Iglesias <edgar.iglesias@xilinx.com>
Diffstat (limited to 'cputlb.c')
-rw-r--r--cputlb.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/cputlb.c b/cputlb.c
index bf1d50a..f1c1082 100644
--- a/cputlb.c
+++ b/cputlb.c
@@ -356,6 +356,7 @@ void tlb_set_page_with_attrs(CPUState *cpu, target_ulong vaddr,
CPUTLBEntry *te;
hwaddr iotlb, xlat, sz;
unsigned vidx = env->vtlb_index++ % CPU_VTLB_SIZE;
+ int asidx = cpu_asidx_from_attrs(cpu, attrs);
assert(size >= TARGET_PAGE_SIZE);
if (size != TARGET_PAGE_SIZE) {
@@ -363,7 +364,7 @@ void tlb_set_page_with_attrs(CPUState *cpu, target_ulong vaddr,
}
sz = size;
- section = address_space_translate_for_iotlb(cpu, paddr, &xlat, &sz);
+ section = address_space_translate_for_iotlb(cpu, asidx, paddr, &xlat, &sz);
assert(sz >= TARGET_PAGE_SIZE);
#if defined(DEBUG_TLB)