Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'pci-v5.2-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci
Pull PCI fix from Bjorn Helgaas:
"If an IOMMU is present, ignore the P2PDMA whitelist we added for v5.2
because we don't yet know how to support P2PDMA in that case (Logan
Gunthorpe)"
* tag 'pci-v5.2-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci:
PCI/P2PDMA: Ignore root complex whitelist when an IOMMU is present
+4
+4
drivers/pci/p2pdma.c
+4
drivers/pci/p2pdma.c
···
18
18
#include <linux/percpu-refcount.h>
19
19
#include <linux/random.h>
20
20
#include <linux/seq_buf.h>
21
+
#include <linux/iommu.h>
21
22
22
23
struct pci_p2pdma {
23
24
struct gen_pool *pool;
···
299
298
struct pci_host_bridge *host = pci_find_host_bridge(dev->bus);
300
299
struct pci_dev *root = pci_get_slot(host->bus, PCI_DEVFN(0, 0));
301
300
unsigned short vendor, device;
301
+
302
+
if (iommu_present(dev->dev.bus))
303
+
return false;
302
304
303
305
if (!root)
304
306
return false;