Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 778de074 authored by Lorenzo Pieralisi's avatar Lorenzo Pieralisi Committed by Will Deacon
Browse files

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



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: default avatarLorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Acked-by: default avatarWill Deacon <will.deacon@arm.com>
Reviewed-by: default avatarRobin Murphy <robin.murphy@arm.com>
Reviewed-by: default avatarTomasz Nowicki <tn@semihalf.com>
Tested-by: default avatarHanjun Guo <hanjun.guo@linaro.org>
Tested-by: default avatarTomasz 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: default avatarWill Deacon <will.deacon@arm.com>
parent ce9babe5

drivers/iommu/arm-smmu-v3.c

+7 −5
Original line number Diff line number Diff line
@@ -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);

	iommu_register_instance(dev->fwnode, &arm_smmu_ops);



#ifdef CONFIG_PCI

	if (pci_bus_type.iommu_ops != &arm_smmu_ops) {

		pci_request_acs();