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

diff --cc drivers/pci/p2pdma.c
index a98126a,84ba305..a4994aa
--- 1/drivers/pci/p2pdma.c
--- 2/drivers/pci/p2pdma.c
+++ b/drivers/pci/p2pdma.c
@@@ -18,8 -18,11 +18,9 @@@
  #include <linux/percpu-refcount.h>
  #include <linux/random.h>
  #include <linux/seq_buf.h>
+ #include <linux/iommu.h>
  
  struct pci_p2pdma {
 -      struct percpu_ref devmap_ref;
 -      struct completion devmap_ref_done;
        struct gen_pool *pool;
        bool p2pmem_published;
  };