[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 19/23] intel_iommu: simplify irq region translation
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL 19/23] intel_iommu: simplify irq region translation |
Date: |
Fri, 17 Feb 2017 21:54:54 +0200 |
From: Peter Xu <address@hidden>
Now we have a standalone memory region for MSI, all the irq region
requests should be redirected there. Cleaning up the block with an
assertion instead.
Reviewed-by: Jason Wang <address@hidden>
Signed-off-by: Peter Xu <address@hidden>
Reviewed-by: David Gibson <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
---
hw/i386/intel_iommu.c | 28 ++++++----------------------
1 file changed, 6 insertions(+), 22 deletions(-)
diff --git a/hw/i386/intel_iommu.c b/hw/i386/intel_iommu.c
index 50251c3..86d19bb 100644
--- a/hw/i386/intel_iommu.c
+++ b/hw/i386/intel_iommu.c
@@ -818,28 +818,12 @@ static void vtd_do_iommu_translate(VTDAddressSpace
*vtd_as, PCIBus *bus,
bool writes = true;
VTDIOTLBEntry *iotlb_entry;
- /* Check if the request is in interrupt address range */
- if (vtd_is_interrupt_addr(addr)) {
- if (is_write) {
- /* FIXME: since we don't know the length of the access here, we
- * treat Non-DWORD length write requests without PASID as
- * interrupt requests, too. Withoud interrupt remapping support,
- * we just use 1:1 mapping.
- */
- VTD_DPRINTF(MMU, "write request to interrupt address "
- "gpa 0x%"PRIx64, addr);
- entry->iova = addr & VTD_PAGE_MASK_4K;
- entry->translated_addr = addr & VTD_PAGE_MASK_4K;
- entry->addr_mask = ~VTD_PAGE_MASK_4K;
- entry->perm = IOMMU_WO;
- return;
- } else {
- VTD_DPRINTF(GENERAL, "error: read request from interrupt address "
- "gpa 0x%"PRIx64, addr);
- vtd_report_dmar_fault(s, source_id, addr, VTD_FR_READ, is_write);
- return;
- }
- }
+ /*
+ * We have standalone memory region for interrupt addresses, we
+ * should never receive translation requests in this region.
+ */
+ assert(!vtd_is_interrupt_addr(addr));
+
/* Try to fetch slpte form IOTLB */
iotlb_entry = vtd_lookup_iotlb(s, source_id, addr);
if (iotlb_entry) {
--
MST
[Qemu-devel] [PULL 14/23] pcie: simplify pcie_add_capability(), Michael S. Tsirkin, 2017/02/17
[Qemu-devel] [PULL 16/23] vfio: introduce vfio_get_vaddr(), Michael S. Tsirkin, 2017/02/17
[Qemu-devel] [PULL 15/23] vfio: trace map/unmap for notify as well, Michael S. Tsirkin, 2017/02/17
[Qemu-devel] [PULL 17/23] vfio: allow to notify unmap for very large region, Michael S. Tsirkin, 2017/02/17
[Qemu-devel] [PULL 18/23] intel_iommu: add "caching-mode" option, Michael S. Tsirkin, 2017/02/17
[Qemu-devel] [PULL 19/23] intel_iommu: simplify irq region translation,
Michael S. Tsirkin <=
[Qemu-devel] [PULL 20/23] intel_iommu: renaming gpa to iova where proper, Michael S. Tsirkin, 2017/02/17
[Qemu-devel] [PULL 23/23] intel_iommu: vtd_slpt_level_shift check level, Michael S. Tsirkin, 2017/02/17
[Qemu-devel] [PULL 22/23] intel_iommu: convert dbg macros to trace for trans, Michael S. Tsirkin, 2017/02/17
[Qemu-devel] [PULL 21/23] intel_iommu: convert dbg macros to traces for inv, Michael S. Tsirkin, 2017/02/17
Re: [Qemu-devel] [PULL 00/23] virtio, pci: fixes, features, Peter Maydell, 2017/02/20