ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Make flatview_do_translate() take a MemTxAttrs argument 

As part of plumbing MemTxAttrs down to the IOMMU translate method,
add MemTxAttrs as an argument to flatview_do_translate().

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-13-peter.maydell@linaro.org
This commit is contained in:
Peter Maydell 2018-05-31 14:50:53 +01:00
parent 7446eb07c1
commit 49e14aa827
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
exec.c
View File

@ -541,6 +541,7 @@ unassigned:
* @is_write: whether the translation operation is for write * @is_write: whether the translation operation is for write
* @is_mmio: whether this can be MMIO, set true if it can * @is_mmio: whether this can be MMIO, set true if it can
* @target_as: the address space targeted by the IOMMU * @target_as: the address space targeted by the IOMMU
* @attrs: memory transaction attributes
* *
* This function is called from RCU critical section * This function is called from RCU critical section
*/ */
@ -551,7 +552,8 @@ static MemoryRegionSection flatview_do_translate(FlatView *fv,
hwaddr *page_mask_out, hwaddr *page_mask_out,
bool is_write, bool is_write,
bool is_mmio, bool is_mmio,
AddressSpace **target_as) AddressSpace **target_as,
MemTxAttrs attrs)
{ {
MemoryRegionSection *section; MemoryRegionSection *section;
IOMMUMemoryRegion *iommu_mr; IOMMUMemoryRegion *iommu_mr;
@ -592,7 +594,8 @@ IOMMUTLBEntry address_space_get_iotlb_entry(AddressSpace *as, hwaddr addr,
* but page mask. * but page mask.
*/ */
section = flatview_do_translate(address_space_to_flatview(as), addr, &xlat, section = flatview_do_translate(address_space_to_flatview(as), addr, &xlat,
NULL, &page_mask, is_write, false, &as); NULL, &page_mask, is_write, false, &as,
attrs);
/* Illegal translation */ /* Illegal translation */
if (section.mr == &io_mem_unassigned) { if (section.mr == &io_mem_unassigned) {
@ -627,7 +630,7 @@ MemoryRegion *flatview_translate(FlatView *fv, hwaddr addr, hwaddr *xlat,
/* This can be MMIO, so setup MMIO bit. */ /* This can be MMIO, so setup MMIO bit. */
section = flatview_do_translate(fv, addr, xlat, plen, NULL, section = flatview_do_translate(fv, addr, xlat, plen, NULL,
is_write, true, &as); is_write, true, &as, attrs);
mr = section.mr; mr = section.mr;
if (xen_enabled() && memory_access_is_direct(mr, is_write)) { if (xen_enabled() && memory_access_is_direct(mr, is_write)) {