linux-arm-msm.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] iommu/qcom: Cleanup resources in case of probe error path
@ 2021-04-21 22:10 Amey Narkhede
  2021-06-08  9:29 ` Will Deacon
  0 siblings, 1 reply; 3+ messages in thread
From: Amey Narkhede @ 2021-04-21 22:10 UTC (permalink / raw)
  To: Rob Clark
  Cc: Will Deacon, Robin Murphy, Joerg Roedel, iommu, linux-arm-msm,
	linux-arm-kernel, linux-kernel, Amey Narkhede

If device registration fails, remove sysfs attribute
and if setting bus callbacks fails, unregister the device
and cleanup the sysfs attribute.

Signed-off-by: Amey Narkhede <ameynarkhede03@gmail.com>
---
 drivers/iommu/arm/arm-smmu/qcom_iommu.c | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/drivers/iommu/arm/arm-smmu/qcom_iommu.c b/drivers/iommu/arm/arm-smmu/qcom_iommu.c
index 4294abe389b2..5fa128a1f7f0 100644
--- a/drivers/iommu/arm/arm-smmu/qcom_iommu.c
+++ b/drivers/iommu/arm/arm-smmu/qcom_iommu.c
@@ -850,10 +850,12 @@ static int qcom_iommu_device_probe(struct platform_device *pdev)
 	ret = iommu_device_register(&qcom_iommu->iommu, &qcom_iommu_ops, dev);
 	if (ret) {
 		dev_err(dev, "Failed to register iommu\n");
-		return ret;
+		goto err_sysfs_remove;
 	}

-	bus_set_iommu(&platform_bus_type, &qcom_iommu_ops);
+	ret = bus_set_iommu(&platform_bus_type, &qcom_iommu_ops);
+	if (ret)
+		goto err_unregister_device;

 	if (qcom_iommu->local_base) {
 		pm_runtime_get_sync(dev);
@@ -862,6 +864,14 @@ static int qcom_iommu_device_probe(struct platform_device *pdev)
 	}

 	return 0;
+
+err_unregister_device:
+	iommu_device_unregister(&qcom_iommu->iommu);
+
+err_sysfs_remove:
+	iommu_device_sysfs_remove(&qcom_iommu->iommu);
+
+	return ret;
 }

 static int qcom_iommu_device_remove(struct platform_device *pdev)
--
2.31.1

I assume its ok to leave pm_runtime_enable in case of error.

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH] iommu/qcom: Cleanup resources in case of probe error path
  2021-04-21 22:10 [PATCH] iommu/qcom: Cleanup resources in case of probe error path Amey Narkhede
@ 2021-06-08  9:29 ` Will Deacon
  2021-06-08 14:55   ` Amey Narkhede
  0 siblings, 1 reply; 3+ messages in thread
From: Will Deacon @ 2021-06-08  9:29 UTC (permalink / raw)
  To: Amey Narkhede
  Cc: Rob Clark, Robin Murphy, Joerg Roedel, iommu, linux-arm-msm,
	linux-arm-kernel, linux-kernel

On Thu, Apr 22, 2021 at 03:40:30AM +0530, Amey Narkhede wrote:
> If device registration fails, remove sysfs attribute
> and if setting bus callbacks fails, unregister the device
> and cleanup the sysfs attribute.
> 
> Signed-off-by: Amey Narkhede <ameynarkhede03@gmail.com>
> ---
>  drivers/iommu/arm/arm-smmu/qcom_iommu.c | 14 ++++++++++++--
>  1 file changed, 12 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/iommu/arm/arm-smmu/qcom_iommu.c b/drivers/iommu/arm/arm-smmu/qcom_iommu.c
> index 4294abe389b2..5fa128a1f7f0 100644
> --- a/drivers/iommu/arm/arm-smmu/qcom_iommu.c
> +++ b/drivers/iommu/arm/arm-smmu/qcom_iommu.c
> @@ -850,10 +850,12 @@ static int qcom_iommu_device_probe(struct platform_device *pdev)
>  	ret = iommu_device_register(&qcom_iommu->iommu, &qcom_iommu_ops, dev);
>  	if (ret) {
>  		dev_err(dev, "Failed to register iommu\n");
> -		return ret;
> +		goto err_sysfs_remove;
>  	}
> 
> -	bus_set_iommu(&platform_bus_type, &qcom_iommu_ops);
> +	ret = bus_set_iommu(&platform_bus_type, &qcom_iommu_ops);
> +	if (ret)
> +		goto err_unregister_device;
> 
>  	if (qcom_iommu->local_base) {
>  		pm_runtime_get_sync(dev);
> @@ -862,6 +864,14 @@ static int qcom_iommu_device_probe(struct platform_device *pdev)
>  	}
> 
>  	return 0;
> +
> +err_unregister_device:
> +	iommu_device_unregister(&qcom_iommu->iommu);
> +
> +err_sysfs_remove:
> +	iommu_device_sysfs_remove(&qcom_iommu->iommu);
> +
> +	return ret;

It looks like we're also missing this logic in arm-smmu/arm-smmu.c and
arm-smmu-v3/arm-smmu-v3.c. Would you be able to fix those up too, please?

Will

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH] iommu/qcom: Cleanup resources in case of probe error path
  2021-06-08  9:29 ` Will Deacon
@ 2021-06-08 14:55   ` Amey Narkhede
  0 siblings, 0 replies; 3+ messages in thread
From: Amey Narkhede @ 2021-06-08 14:55 UTC (permalink / raw)
  To: Will Deacon
  Cc: Rob Clark, Robin Murphy, Joerg Roedel, iommu, linux-arm-msm,
	linux-arm-kernel, linux-kernel

On 21/06/08 10:29AM, Will Deacon wrote:
> On Thu, Apr 22, 2021 at 03:40:30AM +0530, Amey Narkhede wrote:
> > If device registration fails, remove sysfs attribute
> > and if setting bus callbacks fails, unregister the device
> > and cleanup the sysfs attribute.
> >
> > Signed-off-by: Amey Narkhede <ameynarkhede03@gmail.com>
> > ---
> >  drivers/iommu/arm/arm-smmu/qcom_iommu.c | 14 ++++++++++++--
> >  1 file changed, 12 insertions(+), 2 deletions(-)
> >
> > diff --git a/drivers/iommu/arm/arm-smmu/qcom_iommu.c b/drivers/iommu/arm/arm-smmu/qcom_iommu.c
> > index 4294abe389b2..5fa128a1f7f0 100644
> > --- a/drivers/iommu/arm/arm-smmu/qcom_iommu.c
> > +++ b/drivers/iommu/arm/arm-smmu/qcom_iommu.c
> > @@ -850,10 +850,12 @@ static int qcom_iommu_device_probe(struct platform_device *pdev)
> >  	ret = iommu_device_register(&qcom_iommu->iommu, &qcom_iommu_ops, dev);
> >  	if (ret) {
> >  		dev_err(dev, "Failed to register iommu\n");
> > -		return ret;
> > +		goto err_sysfs_remove;
> >  	}
> >
> > -	bus_set_iommu(&platform_bus_type, &qcom_iommu_ops);
> > +	ret = bus_set_iommu(&platform_bus_type, &qcom_iommu_ops);
> > +	if (ret)
> > +		goto err_unregister_device;
> >
> >  	if (qcom_iommu->local_base) {
> >  		pm_runtime_get_sync(dev);
> > @@ -862,6 +864,14 @@ static int qcom_iommu_device_probe(struct platform_device *pdev)
> >  	}
> >
> >  	return 0;
> > +
> > +err_unregister_device:
> > +	iommu_device_unregister(&qcom_iommu->iommu);
> > +
> > +err_sysfs_remove:
> > +	iommu_device_sysfs_remove(&qcom_iommu->iommu);
> > +
> > +	return ret;
>
> It looks like we're also missing this logic in arm-smmu/arm-smmu.c and
> arm-smmu-v3/arm-smmu-v3.c. Would you be able to fix those up too, please?
>
> Will

Sure, I will send a v2 with this and new patches.

Thanks,
Amey

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2021-06-08 14:56 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-04-21 22:10 [PATCH] iommu/qcom: Cleanup resources in case of probe error path Amey Narkhede
2021-06-08  9:29 ` Will Deacon
2021-06-08 14:55   ` Amey Narkhede

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).