| Message ID | 20161109141948.19244-6-lorenzo.pieralisi@arm.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 09/11/16 14:19, Lorenzo Pieralisi wrote: > Current ARM SMMU 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> > 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> Reviewed-by: Robin Murphy <robin.murphy@arm.com> > --- > drivers/iommu/arm-smmu.c | 11 ++++++----- > 1 file changed, 6 insertions(+), 5 deletions(-) > > diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c > index 8f72814..8a3c2a4 100644 > --- a/drivers/iommu/arm-smmu.c > +++ b/drivers/iommu/arm-smmu.c > @@ -1379,13 +1379,14 @@ static bool arm_smmu_capable(enum iommu_cap cap) > > 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, > - np, arm_smmu_match_node); > + fwnode, arm_smmu_match_node); > put_device(dev); > return dev ? dev_get_drvdata(dev) : NULL; > } > @@ -1403,7 +1404,7 @@ static int arm_smmu_add_device(struct device *dev) > if (ret) > goto out_free; > } else if (fwspec && fwspec->ops == &arm_smmu_ops) { > - smmu = arm_smmu_get_by_node(to_of_node(fwspec->iommu_fwnode)); > + smmu = arm_smmu_get_by_fwnode(fwspec->iommu_fwnode); > } else { > return -ENODEV; > } > @@ -2007,7 +2008,7 @@ static int arm_smmu_device_dt_probe(struct platform_device *pdev) > } > } > > - of_iommu_set_ops(dev->of_node, &arm_smmu_ops); > + fwnode_iommu_set_ops(dev->fwnode, &arm_smmu_ops); > platform_set_drvdata(pdev, smmu); > arm_smmu_device_reset(smmu); > >
diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c index 8f72814..8a3c2a4 100644 --- a/drivers/iommu/arm-smmu.c +++ b/drivers/iommu/arm-smmu.c @@ -1379,13 +1379,14 @@ static bool arm_smmu_capable(enum iommu_cap cap) 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, - np, arm_smmu_match_node); + fwnode, arm_smmu_match_node); put_device(dev); return dev ? dev_get_drvdata(dev) : NULL; } @@ -1403,7 +1404,7 @@ static int arm_smmu_add_device(struct device *dev) if (ret) goto out_free; } else if (fwspec && fwspec->ops == &arm_smmu_ops) { - smmu = arm_smmu_get_by_node(to_of_node(fwspec->iommu_fwnode)); + smmu = arm_smmu_get_by_fwnode(fwspec->iommu_fwnode); } else { return -ENODEV; } @@ -2007,7 +2008,7 @@ static int arm_smmu_device_dt_probe(struct platform_device *pdev) } } - of_iommu_set_ops(dev->of_node, &arm_smmu_ops); + fwnode_iommu_set_ops(dev->fwnode, &arm_smmu_ops); platform_set_drvdata(pdev, smmu); arm_smmu_device_reset(smmu);