Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f0c31c67 authored by Robin Murphy's avatar Robin Murphy Committed by Greg Kroah-Hartman
Browse files

iommu/dma: Don't reserve PCI I/O windows 



commit 938f1bbe35e3a7cb07e1fa7c512e2ef8bb866bdf upstream.

Even if a host controller's CPU-side MMIO windows into PCI I/O space do
happen to leak into PCI memory space such that it might treat them as
peer addresses, trying to reserve the corresponding I/O space addresses
doesn't do anything to help solve that problem. Stop doing a silly thing.

Fixes: fade1ec0 ("iommu/dma: Avoid PCI host bridge windows")
Reviewed-by: default avatarEric Auger <eric.auger@redhat.com>
Signed-off-by: default avatarRobin Murphy <robin.murphy@arm.com>
Signed-off-by: default avatarJoerg Roedel <jroedel@suse.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d7fcb303

drivers/iommu/dma-iommu.c

+1 −2
Original line number Diff line number Diff line
@@ -112,8 +112,7 @@ static void iova_reserve_pci_windows(struct pci_dev *dev, 
	unsigned long lo, hi;



	resource_list_for_each_entry(window, &bridge->windows) {

		if (resource_type(window->res) != IORESOURCE_MEM &&

		    resource_type(window->res) != IORESOURCE_IO)

		if (resource_type(window->res) != IORESOURCE_MEM)

			continue;



		lo = iova_pfn(iovad, window->res->start - window->offset);