Skip to content

Commit

Permalink
iommu/of: Remove PCI host bridge node check
Browse files Browse the repository at this point in the history
of_pci_iommu_init() tries to be clever and stop its alias walk at the
device represented by master_np, in case of weird PCI topologies where
the bridge to the IOMMU and the rest of the system is not at the root.
It turns out this is a bit short-sighted, since there are plenty of
other callers of pci_for_each_dma_alias() which would also need the same
behaviour in that situation, and the only platform so far with such a
topology (Cavium ThunderX2) already solves it more generally via a PCI
quirk. As this check is effectively redundant, and returning a boolean
value as an int is a bit broken anyway, let's just get rid of it.

Reported-by: Jean-Philippe Brucker <[email protected]>
Fixes: d87beb7 ("iommu/of: Handle PCI aliases properly")
Signed-off-by: Robin Murphy <[email protected]>
Tested-by: Jean-Philippe Brucker <[email protected]>
Signed-off-by: Joerg Roedel <[email protected]>
  • Loading branch information
rmurphy-arm authored and joergroedel committed Sep 22, 2017
1 parent 986a5f7 commit c0d05cd
Showing 1 changed file with 1 addition and 4 deletions.
5 changes: 1 addition & 4 deletions drivers/iommu/of_iommu.c
Original file line number Diff line number Diff line change
Expand Up @@ -157,10 +157,7 @@ static int of_pci_iommu_init(struct pci_dev *pdev, u16 alias, void *data)

err = of_iommu_xlate(info->dev, &iommu_spec);
of_node_put(iommu_spec.np);
if (err)
return err;

return info->np == pdev->bus->dev.of_node;
return err;
}

const struct iommu_ops *of_iommu_configure(struct device *dev,
Expand Down

0 comments on commit c0d05cd

Please sign in to comment.