Skip to contentSkip to conversation

intel-iommu: Fix lookup in add device

PATCH Applied Alex Williamson 3 participants 3 messages Nov 13, 2012 – Nov 17, 2012

Subsystems (2)
PCI IOMMU
lore
Share & tools
lore

Alex Williamson

author
#0 lore raw

PATCH 1/1 intel-iommu: Fix lookup in add device

We can't assume this device exists, fall back to the bridge itself.

Signed-off-by Alex Williamson <[email protected]>
Tested-by Matthew Thode <[email protected]>
Cc [email protected]
---
 drivers/iommu/intel-iommu.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/iommu/intel-iommu.c +2 -2
index d4a4cd4..0badfa4 100644
@@ -4108,7 +4108,7 @@ static void swap_pci_ref(struct pci_dev **from, struct pci_dev *to)
 static int intel_iommu_add_device(struct device *dev)
 {
 	struct pci_dev *pdev = to_pci_dev(dev);
-	struct pci_dev *bridge, *dma_pdev;
+	struct pci_dev *bridge, *dma_pdev = NULL;
 	struct iommu_group *group;
 	int ret;
 

@@ -4122,7 +4122,7 @@ static int intel_iommu_add_device(struct device *dev)
 			dma_pdev = pci_get_domain_bus_and_slot(
 						pci_domain_nr(pdev->bus),
 						bridge->subordinate->number, 0);
-		else
+		if (!dma_pdev)
 			dma_pdev = pci_dev_get(bridge);
 	} else
 		dma_pdev = pci_dev_get(pdev);
#1 lore raw
Quoted 24 lines · Alex Williamson

We can't assume this device exists, fall back to the bridge itself.

Signed-off-by Alex Williamson <[email protected]>
Tested-by Matthew Thode <[email protected]>
Cc [email protected]
---
 drivers/iommu/intel-iommu.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/iommu/intel-iommu.c +1 -1
index d4a4cd4..0badfa4 100644
@@ -4108,7 +4108,7 @@ static void swap_pci_ref(struct pci_dev **from, struct pci_dev *to)
 static int intel_iommu_add_device(struct device *dev)
 {
 	struct pci_dev *pdev = to_pci_dev(dev);
-	struct pci_dev *bridge, *dma_pdev;
+	struct pci_dev *bridge, *dma_pdev = NULL;
 	struct iommu_group *group;
 	int ret;

drivers/iommu/intel-iommu.c static int intel_iommu_add_device(struct device *dev) · line 4128

Quoted 8 lines
drivers/iommu/intel-iommu.c +1 -1
@@ -4122,7 +4122,7 @@ static int intel_iommu_add_device(struct device *dev)
 			dma_pdev = pci_get_domain_bus_and_slot(
 						pci_domain_nr(pdev->bus),
 						bridge->subordinate->number, 0);
-		else
+		if (!dma_pdev)
 			dma_pdev = pci_dev_get(bridge);
 	} else
 		dma_pdev = pci_dev_get(pdev);

I've tested this and it works just fine.

Signature · 1 line
-- Matthew Thode (prometheanfire)