falso
/
qemu-irix
mirror of https://github.com/n64decomp/qemu-irix.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

exec: simplify address_space_get_iotlb_entry 

This patch let address_space_get_iotlb_entry() to use the newly
introduced page_mask parameter in flatview_do_translate(). Then we
will be sure the IOTLB can be aligned to page mask, also we should
nicely support huge pages now when introducing a764040.

Fixes: a764040 ("exec: abstract address_space_do_translate()")
Signed-off-by: Peter Xu <peterx@redhat.com>
Signed-off-by: Maxime Coquelin <maxime.coquelin@redhat.com>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
Message-Id: <20171010094247.10173-3-maxime.coquelin@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
(cherry picked from commit 076a93d797)
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
This commit is contained in:
Peter Xu 2017-10-10 11:42:46 +02:00 committed by Michael Roth
parent c9dbe3e0fc
commit ae13e2cfa8
1 changed files with 10 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
exec.c
View File

@ -557,14 +557,14 @@ IOMMUTLBEntry address_space_get_iotlb_entry(AddressSpace *as, hwaddr addr,
bool is_write) bool is_write)
{ {
MemoryRegionSection section; MemoryRegionSection section;
hwaddr xlat, plen; hwaddr xlat, page_mask;
/* Try to get maximum page mask during translation. */ /*
plen = (hwaddr)-1; * This can never be MMIO, and we don't really care about plen,
* but page mask.
/* This can never be MMIO. */ */
section = flatview_do_translate(address_space_to_flatview(as), addr, section = flatview_do_translate(address_space_to_flatview(as), addr, &xlat,
&xlat, &plen, NULL, is_write, false, &as); NULL, &page_mask, is_write, false, &as);
/* Illegal translation */ /* Illegal translation */
if (section.mr == &io_mem_unassigned) { if (section.mr == &io_mem_unassigned) {
@ -575,22 +575,11 @@ IOMMUTLBEntry address_space_get_iotlb_entry(AddressSpace *as, hwaddr addr,
xlat += section.offset_within_address_space - xlat += section.offset_within_address_space -
section.offset_within_region; section.offset_within_region;
if (plen == (hwaddr)-1) {
/*
* We use default page size here. Logically it only happens
* for identity mappings.
*/
plen = TARGET_PAGE_SIZE;
}
/* Convert to address mask */
plen -= 1;
return (IOMMUTLBEntry) { return (IOMMUTLBEntry) {
.target_as = as, .target_as = as,
.iova = addr & ~plen, .iova = addr & ~page_mask,
.translated_addr = xlat & ~plen, .translated_addr = xlat & ~page_mask,
.addr_mask = plen, .addr_mask = page_mask,
/* IOTLBs are for DMAs, and DMA only allows on RAMs. */ /* IOTLBs are for DMAs, and DMA only allows on RAMs. */
.perm = IOMMU_RW, .perm = IOMMU_RW,
}; };