diff options
| author | Christoph Hellwig <hch@lst.de> | 2023-06-12 10:21:16 +0200 |
|---|---|---|
| committer | Christoph Hellwig <hch@lst.de> | 2023-07-31 17:54:27 +0200 |
| commit | f9a38ea5172a3365f4594335ed5d63e15af2fd18 (patch) | |
| tree | db8757899fbdab035d525f9ae492b6d888c9a644 /drivers/pci/xen-pcifront.c | |
| parent | 358cd9afd069992cf5170f02987011f51a163d1d (diff) | |
| download | lwn-f9a38ea5172a3365f4594335ed5d63e15af2fd18.tar.gz lwn-f9a38ea5172a3365f4594335ed5d63e15af2fd18.zip | |
x86: always initialize xen-swiotlb when xen-pcifront is enabling
Remove the dangerous late initialization of xen-swiotlb in
pci_xen_swiotlb_init_late and instead just always initialize
xen-swiotlb in the boot code if CONFIG_XEN_PCIDEV_FRONTEND is
enabled and Xen PV PCI is possible.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Juergen Gross <jgross@suse.com>
Diffstat (limited to 'drivers/pci/xen-pcifront.c')
| -rw-r--r-- | drivers/pci/xen-pcifront.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/pci/xen-pcifront.c b/drivers/pci/xen-pcifront.c index 83c0ab50676d..11636634ae51 100644 --- a/drivers/pci/xen-pcifront.c +++ b/drivers/pci/xen-pcifront.c @@ -22,7 +22,6 @@ #include <linux/bitops.h> #include <linux/time.h> #include <linux/ktime.h> -#include <linux/swiotlb.h> #include <xen/platform_pci.h> #include <asm/xen/swiotlb-xen.h> @@ -669,11 +668,6 @@ static int pcifront_connect_and_init_dma(struct pcifront_device *pdev) spin_unlock(&pcifront_dev_lock); - if (!err && !is_swiotlb_active(&pdev->xdev->dev)) { - err = pci_xen_swiotlb_init_late(); - if (err) - dev_err(&pdev->xdev->dev, "Could not setup SWIOTLB!\n"); - } return err; } |