SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Make flatview_extend_translation() take a MemTxAttrs argument

Browse Source 
As part of plumbing MemTxAttrs down to the IOMMU translate method,
add MemTxAttrs as an argument to flatview_extend_translation().
Its callers either have an attrs value to hand, or don't care
and can use MEMTXATTRS_UNSPECIFIED.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-id: 20180521140402.23318-7-peter.maydell@linaro.org
This commit is contained in:
Peter Maydell 2018-05-31 14:50:52 +01:00
parent fddffa4268
commit 53d0790dfe
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
exec.c
View File

@ -3495,9 +3495,9 @@ bool address_space_access_valid(AddressSpace *as, hwaddr addr,
static hwaddr static hwaddr
flatview_extend_translation(FlatView *fv, hwaddr addr, flatview_extend_translation(FlatView *fv, hwaddr addr,
hwaddr target_len, hwaddr target_len,
MemoryRegion *mr, hwaddr base, hwaddr len, MemoryRegion *mr, hwaddr base, hwaddr len,
bool is_write) bool is_write, MemTxAttrs attrs)
{ {
hwaddr done = 0; hwaddr done = 0;
hwaddr xlat; hwaddr xlat;
@ -3574,7 +3574,7 @@ void *address_space_map(AddressSpace *as,
memory_region_ref(mr); memory_region_ref(mr);
*plen = flatview_extend_translation(fv, addr, len, mr, xlat, *plen = flatview_extend_translation(fv, addr, len, mr, xlat,
l, is_write); l, is_write, attrs);
ptr = qemu_ram_ptr_length(mr->ram_block, xlat, plen, true); ptr = qemu_ram_ptr_length(mr->ram_block, xlat, plen, true);
rcu_read_unlock(); rcu_read_unlock();
@ -3659,8 +3659,13 @@ int64_t address_space_cache_init(MemoryRegionCache *cache,
mr = cache->mrs.mr; mr = cache->mrs.mr;
memory_region_ref(mr); memory_region_ref(mr);
if (memory_access_is_direct(mr, is_write)) { if (memory_access_is_direct(mr, is_write)) {
/* We don't care about the memory attributes here as we're only
* doing this if we found actual RAM, which behaves the same
* regardless of attributes; so UNSPECIFIED is fine.
*/
l = flatview_extend_translation(cache->fv, addr, len, mr, l = flatview_extend_translation(cache->fv, addr, len, mr,
cache->xlat, l, is_write); cache->xlat, l, is_write,
MEMTXATTRS_UNSPECIFIED);
cache->ptr = qemu_ram_ptr_length(mr->ram_block, cache->xlat, &l, true); cache->ptr = qemu_ram_ptr_length(mr->ram_block, cache->xlat, &l, true);
} else { } else {
cache->ptr = NULL; cache->ptr = NULL;