[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 09/25] s390x/pci: fix failures of dma map/unmap
From: |
Cornelia Huck |
Subject: |
[Qemu-devel] [PULL 09/25] s390x/pci: fix failures of dma map/unmap |
Date: |
Mon, 11 Jul 2016 10:08:56 +0200 |
From: Yi Min Zhao <address@hidden>
In commit d78c19b5cf4821d0c198f4132a085bdbf19dda4c, vfio code stores
the IOMMU's offset_within_address_space and adjusts the IOVA before
calling vfio_dma_map/vfio_dma_unmap. But s390_translate_iommu already
considers the base address of an IOMMU memory region.
Thus we use pal as the size and 0x0 as the base address to initialize
IOMMU memory subregion.
Signed-off-by: Yi Min Zhao <address@hidden>
Reviewed-by: Pierre Morel <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>
---
hw/s390x/s390-pci-bus.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/hw/s390x/s390-pci-bus.c b/hw/s390x/s390-pci-bus.c
index a77c10c..8f03b82 100644
--- a/hw/s390x/s390-pci-bus.c
+++ b/hw/s390x/s390-pci-bus.c
@@ -498,11 +498,9 @@ static const MemoryRegionOps s390_msi_ctrl_ops = {
void s390_pci_iommu_enable(S390PCIBusDevice *pbdev)
{
- uint64_t size = pbdev->pal - pbdev->pba + 1;
-
memory_region_init_iommu(&pbdev->iommu_mr, OBJECT(&pbdev->mr),
- &s390_iommu_ops, "iommu-s390", size);
- memory_region_add_subregion(&pbdev->mr, pbdev->pba, &pbdev->iommu_mr);
+ &s390_iommu_ops, "iommu-s390", pbdev->pal + 1);
+ memory_region_add_subregion(&pbdev->mr, 0, &pbdev->iommu_mr);
pbdev->iommu_enabled = true;
}
--
2.9.0
- [Qemu-devel] [PULL 00/25] s390x patches for 2.7, Cornelia Huck, 2016/07/11
- [Qemu-devel] [PULL 01/25] pc-bios/s390-ccw: Pass selected SCSI device to IPL, Cornelia Huck, 2016/07/11
- [Qemu-devel] [PULL 06/25] s390x/css: use define for "virtual-css-bridge" literal, Cornelia Huck, 2016/07/11
- [Qemu-devel] [PULL 09/25] s390x/pci: fix failures of dma map/unmap,
Cornelia Huck <=
- [Qemu-devel] [PULL 04/25] s390x/ipl: fix reboots for migration from different bios, Cornelia Huck, 2016/07/11
- [Qemu-devel] [PULL 05/25] s390x/css: factor out some generic code from virtio_ccw_device_realize(), Cornelia Huck, 2016/07/11
- [Qemu-devel] [PULL 14/25] s390x/pci: enforce zPCI state checking, Cornelia Huck, 2016/07/11
- [Qemu-devel] [PULL 08/25] s390x/css: Unplug handler of virtual css bridge, Cornelia Huck, 2016/07/11
- [Qemu-devel] [PULL 12/25] s390x/pci: unify FH_ macros, Cornelia Huck, 2016/07/11
- [Qemu-devel] [PULL 19/25] s390x/pci: enable zpci hot-plug/hot-unplug, Cornelia Huck, 2016/07/11
- [Qemu-devel] [PULL 17/25] s390x/pci: introduce S390PCIBusDevice qdev, Cornelia Huck, 2016/07/11
- [Qemu-devel] [PULL 03/25] s390x/ipl: Support IPL from selected SCSI device, Cornelia Huck, 2016/07/11
- [Qemu-devel] [PULL 02/25] pc-bios/s390-ccw.img: rebuild image, Cornelia Huck, 2016/07/11
- [Qemu-devel] [PULL 15/25] s390x/pci: introduce S390PCIBus, Cornelia Huck, 2016/07/11