diff options
| author | Niklas Schnelle <schnelle@linux.ibm.com> | 2023-09-28 17:31:37 +0300 |
|---|---|---|
| committer | Joerg Roedel <jroedel@suse.de> | 2023-10-02 09:43:00 +0300 |
| commit | c76c067e488ccd55734c3e750799caf2c5956db6 (patch) | |
| tree | c4489302a1c2a119afcba4b54535cb4d8c65cbee /arch/s390/pci/pci_bus.c | |
| parent | b6f888709a155b4e748aded93afc9fa43aaa28dd (diff) | |
| download | linux-c76c067e488ccd55734c3e750799caf2c5956db6.tar.xz | |
s390/pci: Use dma-iommu layer
While s390 already has a standard IOMMU driver and previous changes have
added I/O TLB flushing operations this driver is currently only used for
user-space PCI access such as vfio-pci. For the DMA API s390 instead
utilizes its own implementation in arch/s390/pci/pci_dma.c which drives
the same hardware and shares some code but requires a complex and
fragile hand over between DMA API and IOMMU API use of a device and
despite code sharing still leads to significant duplication and
maintenance effort. Let's utilize the common code DMAP API
implementation from drivers/iommu/dma-iommu.c instead allowing us to
get rid of arch/s390/pci/pci_dma.c.
Reviewed-by: Matthew Rosato <mjrosato@linux.ibm.com>
Signed-off-by: Niklas Schnelle <schnelle@linux.ibm.com>
Link: https://lore.kernel.org/r/20230928-dma_iommu-v13-3-9e5fc4dacc36@linux.ibm.com
Signed-off-by: Joerg Roedel <jroedel@suse.de>
Diffstat (limited to 'arch/s390/pci/pci_bus.c')
| -rw-r--r-- | arch/s390/pci/pci_bus.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/arch/s390/pci/pci_bus.c b/arch/s390/pci/pci_bus.c index 32245b970a0c..daa5d7450c7d 100644 --- a/arch/s390/pci/pci_bus.c +++ b/arch/s390/pci/pci_bus.c @@ -47,11 +47,6 @@ static int zpci_bus_prepare_device(struct zpci_dev *zdev) rc = zpci_enable_device(zdev); if (rc) return rc; - rc = zpci_dma_init_device(zdev); - if (rc) { - zpci_disable_device(zdev); - return rc; - } } if (!zdev->has_resources) { |