Commit 4d26ba67 authored by Robin Murphy's avatar Robin Murphy Committed by Joerg Roedel
Browse files

iommu: Clean up release_device checks 



Since .release_device is now called through per-device ops, any call
which gets as far as a driver definitely *is* for that driver, for a
device which has successfully passed .probe_device, so all the checks to
that effect are now redundant and can be removed. In the same vein we
can also skip freeing fwspecs which are now managed by core code.

Signed-off-by: default avatarRobin Murphy <robin.murphy@arm.com>
Reviewed-by: default avatarLu Baolu <baolu.lu@linux.intel.com>
Link: https://lore.kernel.org/r/02671dbfad7a3343fc25a44222350efcb455fe3c.1655822151.git.robin.murphy@arm.com


Signed-off-by: default avatarJoerg Roedel <jroedel@suse.de>
parent b321a2fb

drivers/iommu/apple-dart.c

+0 −3
Original line number Diff line number Diff line
@@ -564,9 +564,6 @@ static void apple_dart_release_device(struct device *dev) 
{

	struct apple_dart_master_cfg *cfg = dev_iommu_priv_get(dev);



	if (!cfg)

		return;



	dev_iommu_priv_set(dev, NULL);

	kfree(cfg);

}

drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c

+1 −7
Original line number Diff line number Diff line
@@ -2702,20 +2702,14 @@ static struct iommu_device *arm_smmu_probe_device(struct device *dev) 


static void arm_smmu_release_device(struct device *dev)

{

	struct iommu_fwspec *fwspec = dev_iommu_fwspec_get(dev);

	struct arm_smmu_master *master;



	if (!fwspec || fwspec->ops != &arm_smmu_ops)

		return;

	struct arm_smmu_master *master = dev_iommu_priv_get(dev);



	master = dev_iommu_priv_get(dev);

	if (WARN_ON(arm_smmu_master_sva_enabled(master)))

		iopf_queue_remove_device(master->smmu->evtq.iopf, dev);

	arm_smmu_detach_dev(master);

	arm_smmu_disable_pasid(master);

	arm_smmu_remove_master(master);

	kfree(master);

	iommu_fwspec_free(dev);

}



static struct iommu_group *arm_smmu_device_group(struct device *dev)

drivers/iommu/arm/arm-smmu/arm-smmu.c

+3 −11
Original line number Diff line number Diff line
@@ -1432,27 +1432,19 @@ static struct iommu_device *arm_smmu_probe_device(struct device *dev) 
static void arm_smmu_release_device(struct device *dev)

{

	struct iommu_fwspec *fwspec = dev_iommu_fwspec_get(dev);

	struct arm_smmu_master_cfg *cfg;

	struct arm_smmu_device *smmu;

	struct arm_smmu_master_cfg *cfg = dev_iommu_priv_get(dev);

	int ret;



	if (!fwspec || fwspec->ops != &arm_smmu_ops)

		return;



	cfg  = dev_iommu_priv_get(dev);

	smmu = cfg->smmu;



	ret = arm_smmu_rpm_get(smmu);

	ret = arm_smmu_rpm_get(cfg->smmu);

	if (ret < 0)

		return;



	arm_smmu_master_free_smes(cfg, fwspec);



	arm_smmu_rpm_put(smmu);

	arm_smmu_rpm_put(cfg->smmu);



	dev_iommu_priv_set(dev, NULL);

	kfree(cfg);

	iommu_fwspec_free(dev);

}



static void arm_smmu_probe_finalize(struct device *dev)

drivers/iommu/arm/arm-smmu/qcom_iommu.c

+0 −11
Original line number Diff line number Diff line
@@ -532,16 +532,6 @@ static struct iommu_device *qcom_iommu_probe_device(struct device *dev) 
	return &qcom_iommu->iommu;

}



static void qcom_iommu_release_device(struct device *dev)

{

	struct qcom_iommu_dev *qcom_iommu = to_iommu(dev);



	if (!qcom_iommu)

		return;



	iommu_fwspec_free(dev);

}



static int qcom_iommu_of_xlate(struct device *dev, struct of_phandle_args *args)

{

	struct qcom_iommu_dev *qcom_iommu;
@@ -591,7 +581,6 @@ static const struct iommu_ops qcom_iommu_ops = { 
	.capable	= qcom_iommu_capable,

	.domain_alloc	= qcom_iommu_domain_alloc,

	.probe_device	= qcom_iommu_probe_device,

	.release_device	= qcom_iommu_release_device,

	.device_group	= generic_device_group,

	.of_xlate	= qcom_iommu_of_xlate,

	.pgsize_bitmap	= SZ_4K | SZ_64K | SZ_1M | SZ_16M,

drivers/iommu/exynos-iommu.c

+0 −3
Original line number Diff line number Diff line
@@ -1251,9 +1251,6 @@ static void exynos_iommu_release_device(struct device *dev) 
	struct exynos_iommu_owner *owner = dev_iommu_priv_get(dev);

	struct sysmmu_drvdata *data;



	if (!has_sysmmu(dev))

		return;



	if (owner->domain) {

		struct iommu_group *group = iommu_group_get(dev);