From mboxrd@z Thu Jan 1 00:00:00 1970 From: Robin Murphy Subject: Re: [PATCH v7 05/16] drivers: iommu: arm-smmu: convert struct device of_node to fwnode usage Date: Wed, 9 Nov 2016 14:43:18 +0000 Message-ID: <7ab465a8-f1ae-91ef-12fd-50f498af3d6e@arm.com> References: <20161109141948.19244-1-lorenzo.pieralisi@arm.com> <20161109141948.19244-6-lorenzo.pieralisi@arm.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <20161109141948.19244-6-lorenzo.pieralisi-5wv7dgnIgG8@public.gmane.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: iommu-bounces-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org Errors-To: iommu-bounces-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org To: Lorenzo Pieralisi , iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org Cc: linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org, linux-acpi-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, Marc Zyngier , Will Deacon , "Rafael J. Wysocki" , linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-pci-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, Sinan Kaya , Dennis Chen , Tomasz Nowicki , Prem Mallappa , Jon Masters List-Id: linux-acpi@vger.kernel.org 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 > Tested-by: Hanjun Guo > Tested-by: Tomasz Nowicki > Cc: Will Deacon > Cc: Hanjun Guo > Cc: Robin Murphy Reviewed-by: Robin Murphy > --- > 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); > >