[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH for-2.5 02/15] s390x/pci : fix up s390 pci iommu tra
From: |
Cornelia Huck |
Subject: |
[Qemu-devel] [PATCH for-2.5 02/15] s390x/pci : fix up s390 pci iommu translation function |
Date: |
Mon, 9 Nov 2015 16:56:19 +0100 |
From: Yi Min Zhao <address@hidden>
On s390x, each pci device has its own iommu, which is only properly
setup in qemu once the mpcifc instruction used to register the
translation table has been intercepted. Therefore, for a pci device that
is not configured or has not been initialized, proper translation is
neither required nor possible. Moreover, we may not have a host bridge
device ready yet.
This was exposed by a recent vfio change that triggers iommu translation
during the initialization of the vfio pci device. Let's do an early exit
in that case.
Reviewed-by: Cornelia Huck <address@hidden>
Reviewed-by: Jens Freimann <address@hidden>
Signed-off-by: Yi Min Zhao <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>
---
hw/s390x/s390-pci-bus.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/hw/s390x/s390-pci-bus.c b/hw/s390x/s390-pci-bus.c
index 560b66a..d5712ae 100644
--- a/hw/s390x/s390-pci-bus.c
+++ b/hw/s390x/s390-pci-bus.c
@@ -309,8 +309,7 @@ static IOMMUTLBEntry s390_translate_iommu(MemoryRegion
*iommu, hwaddr addr,
uint64_t pte;
uint32_t flags;
S390PCIBusDevice *pbdev = container_of(iommu, S390PCIBusDevice, mr);
- S390pciState *s = S390_PCI_HOST_BRIDGE(pci_device_root_bus(pbdev->pdev)
- ->qbus.parent);
+ S390pciState *s;
IOMMUTLBEntry ret = {
.target_as = &address_space_memory,
.iova = 0,
@@ -319,8 +318,13 @@ static IOMMUTLBEntry s390_translate_iommu(MemoryRegion
*iommu, hwaddr addr,
.perm = IOMMU_NONE,
};
+ if (!pbdev->configured || !pbdev->pdev) {
+ return ret;
+ }
+
DPRINTF("iommu trans addr 0x%" PRIx64 "\n", addr);
+ s = S390_PCI_HOST_BRIDGE(pci_device_root_bus(pbdev->pdev)->qbus.parent);
/* s390 does not have an APIC mapped to main storage so we use
* a separate AddressSpace only for msix notifications
*/
--
2.6.3
- [Qemu-devel] [PATCH for-2.5 00/15] s390x patches for 2.5, Cornelia Huck, 2015/11/09
- [Qemu-devel] [PATCH for-2.5 01/15] s390x/css: sense data endianness, Cornelia Huck, 2015/11/09
- [Qemu-devel] [PATCH for-2.5 02/15] s390x/pci : fix up s390 pci iommu translation function,
Cornelia Huck <=
- [Qemu-devel] [PATCH for-2.5 12/15] qdev: provide qdev_reset_all_fn(), Cornelia Huck, 2015/11/09
- [Qemu-devel] [PATCH for-2.5 07/15] pc-bios/s390-ccw: Always adjust virtio sector count, Cornelia Huck, 2015/11/09
- [Qemu-devel] [PATCH for-2.5 11/15] pc-bios/s390-ccw: rebuild image, Cornelia Huck, 2015/11/09
- [Qemu-devel] [PATCH for-2.5 04/15] MAINTAINERS: update virtio-ccw/s390 git tree, Cornelia Huck, 2015/11/09
- [Qemu-devel] [PATCH for-2.5 10/15] pc-bios/s390-ccw: El Torito 16-bit boot image size field workaround, Cornelia Huck, 2015/11/09
- [Qemu-devel] [PATCH for-2.5 09/15] pc-bios/s390-ccw: El Torito s390x boot entry check, Cornelia Huck, 2015/11/09
- [Qemu-devel] [PATCH for-2.5 15/15] s390: deprecate the non-ccw machine in 2.5, Cornelia Huck, 2015/11/09
- [Qemu-devel] [PATCH for-2.5 03/15] MAINTAINERS: update s390 file patterns, Cornelia Huck, 2015/11/09
- [Qemu-devel] [PATCH for-2.5 05/15] s390x: switch to memory_region_allocate_system_memory, Cornelia Huck, 2015/11/09
- [Qemu-devel] [PATCH for-2.5 13/15] s390x/ipl: clean up qom definitions and turn into TYPE_DEVICE, Cornelia Huck, 2015/11/09