From mboxrd@z Thu Jan 1 00:00:00 1970 From: Robin Murphy Subject: Re: [PATCH v7 06/16] drivers: iommu: arm-smmu-v3: convert struct device of_node to fwnode usage Date: Wed, 9 Nov 2016 14:44:07 +0000 Message-ID: <5d824cfb-6b38-405d-d5f6-96590247efd8@arm.com> References: <20161109141948.19244-1-lorenzo.pieralisi@arm.com> <20161109141948.19244-7-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-7-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 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 > 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-v3.c | 12 +++++++----- > 1 file changed, 7 insertions(+), 5 deletions(-) > > diff --git a/drivers/iommu/arm-smmu-v3.c b/drivers/iommu/arm-smmu-v3.c > index e6f9b2d..fef9f60 100644 > --- a/drivers/iommu/arm-smmu-v3.c > +++ b/drivers/iommu/arm-smmu-v3.c > @@ -1723,13 +1723,14 @@ static struct platform_driver arm_smmu_driver; > > 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; > } > @@ -1765,7 +1766,7 @@ static int arm_smmu_add_device(struct device *dev) > master = fwspec->iommu_priv; > smmu = master->smmu; > } else { > - smmu = arm_smmu_get_by_node(to_of_node(fwspec->iommu_fwnode)); > + smmu = arm_smmu_get_by_fwnode(fwspec->iommu_fwnode); > if (!smmu) > return -ENODEV; > master = kzalloc(sizeof(*master), GFP_KERNEL); > @@ -2634,7 +2635,8 @@ static int arm_smmu_device_dt_probe(struct platform_device *pdev) > return ret; > > /* And we're up. Go go go! */ > - of_iommu_set_ops(dev->of_node, &arm_smmu_ops); > + fwnode_iommu_set_ops(dev->fwnode, &arm_smmu_ops); > + > #ifdef CONFIG_PCI > if (pci_bus_type.iommu_ops != &arm_smmu_ops) { > pci_request_acs(); >