From: Bjorn Helgaas <bhelgaas@google.com>
Date: Mon, 13 May 2019 23:34:45 +0000 (-0500)
Subject: Merge branch 'pci/iova-dma-ranges'
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=f2e94683162565ff02d8d7386fadee175ab55e40;p=linux.git

Merge branch 'pci/iova-dma-ranges'

  - Add list of legal DMA address ranges to PCI host bridge (Srinath
    Mannam)

  - Reserve inaccessible DMA ranges so IOMMU doesn't allocate them (Srinath
    Mannam)

  - Parse iProc DT dma-ranges to learn what PCI devices can reach via DMA
    (Srinath Mannam)

* pci/iova-dma-ranges:
  PCI: iproc: Add sorted dma ranges resource entries to host bridge
  iommu/dma: Reserve IOVA for PCIe inaccessible DMA address
  PCI: Add dma_ranges window list

# Conflicts:
#	drivers/pci/probe.c
---

f2e94683162565ff02d8d7386fadee175ab55e40
diff --cc drivers/pci/probe.c
index 50cd9c17c08fe,2a651089a6068..0dc42f0eb66d0
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@@ -586,9 -586,17 +586,10 @@@ static void pci_release_host_bridge_dev
  	kfree(to_pci_host_bridge(dev));
  }
  
 -struct pci_host_bridge *pci_alloc_host_bridge(size_t priv)
 +static void pci_init_host_bridge(struct pci_host_bridge *bridge)
  {
 -	struct pci_host_bridge *bridge;
 -
 -	bridge = kzalloc(sizeof(*bridge) + priv, GFP_KERNEL);
 -	if (!bridge)
 -		return NULL;
 -
  	INIT_LIST_HEAD(&bridge->windows);
+ 	INIT_LIST_HEAD(&bridge->dma_ranges);
 -	bridge->dev.release = pci_release_host_bridge_dev;
  
  	/*
  	 * We assume we can manage these PCIe features.  Some systems may