android/android_kernel_asus_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

iommu/arm-smmu-v3: Convert struct device of_node to fwnode usage

Browse Source 
Current ARM SMMU v3 driver rely on the struct device.of_node pointer for
device look-up and iommu_ops retrieval.

In preparation for ACPI probing enablement, convert the driver to use
the struct device.fwnode member for device and iommu_ops look-up so that
the driver infrastructure can be used also on systems that do not
associate an of_node pointer to a struct device (eg ACPI), making the
device look-up and iommu_ops retrieval firmware agnostic.

Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Acked-by: Will Deacon <will.deacon@arm.com>
Reviewed-by: Robin Murphy <robin.murphy@arm.com>
Reviewed-by: Tomasz Nowicki <tn@semihalf.com>
Tested-by: Hanjun Guo <hanjun.guo@linaro.org>
Tested-by: Tomasz Nowicki <tn@semihalf.com>
Cc: Will Deacon <will.deacon@arm.com>
Cc: Hanjun Guo <hanjun.guo@linaro.org>
Cc: Robin Murphy <robin.murphy@arm.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
This commit is contained in:
Lorenzo Pieralisi 2016-11-21 10:01:38 +00:00 committed by Will Deacon
parent ce9babe5f6
commit 778de07453
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/iommu/arm-smmu-v3.c
View File

@ -1723,13 +1723,14 @@ static struct platform_driver arm_smmu_driver;
static int arm_smmu_match_node(struct device *dev, void *data) static int arm_smmu_match_node(struct device *dev, void *data)
{ {
return dev->of_node == data; return dev->fwnode == data;
} }
static struct arm_smmu_device *arm_smmu_get_by_node(struct device_node *np) static
struct arm_smmu_device *arm_smmu_get_by_fwnode(struct fwnode_handle *fwnode)
{ {
struct device *dev = driver_find_device(&arm_smmu_driver.driver, NULL, struct device *dev = driver_find_device(&arm_smmu_driver.driver, NULL,
np, arm_smmu_match_node); fwnode, arm_smmu_match_node);
put_device(dev); put_device(dev);
return dev ? dev_get_drvdata(dev) : NULL; return dev ? dev_get_drvdata(dev) : NULL;
} }
@ -1765,7 +1766,7 @@ static int arm_smmu_add_device(struct device *dev)
master = fwspec->iommu_priv; master = fwspec->iommu_priv;
smmu = master->smmu; smmu = master->smmu;
} else { } else {
smmu = arm_smmu_get_by_node(to_of_node(fwspec->iommu_fwnode)); smmu = arm_smmu_get_by_fwnode(fwspec->iommu_fwnode);
if (!smmu) if (!smmu)
return -ENODEV; return -ENODEV;
master = kzalloc(sizeof(*master), GFP_KERNEL); master = kzalloc(sizeof(*master), GFP_KERNEL);
@ -2634,7 +2635,8 @@ static int arm_smmu_device_dt_probe(struct platform_device *pdev)
return ret; return ret;
/* And we're up. Go go go! */ /* And we're up. Go go go! */
of_iommu_set_ops(dev->of_node, &arm_smmu_ops); iommu_register_instance(dev->fwnode, &arm_smmu_ops);
#ifdef CONFIG_PCI #ifdef CONFIG_PCI
if (pci_bus_type.iommu_ops != &arm_smmu_ops) { if (pci_bus_type.iommu_ops != &arm_smmu_ops) {
pci_request_acs(); pci_request_acs();