Re: [PATCH] iommu/qcom: Cleanup resources in case of probe error path

2021-06-08 Thread Amey Narkhede 
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 
> > ---
> >  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(_iommu->iommu, _iommu_ops, dev);
> > if (ret) {
> > dev_err(dev, "Failed to register iommu\n");
> > -   return ret;
> > +   goto err_sysfs_remove;
> > }
> >
> > -   bus_set_iommu(_bus_type, _iommu_ops);
> > +   ret = bus_set_iommu(_bus_type, _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(_iommu->iommu);
> > +
> > +err_sysfs_remove:
> > +   iommu_device_sysfs_remove(_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
___
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu

Re: [PATCH] iommu/qcom: Cleanup resources in case of probe error path

2021-06-08 Thread Will Deacon 
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 
> ---
>  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(_iommu->iommu, _iommu_ops, dev);
>   if (ret) {
>   dev_err(dev, "Failed to register iommu\n");
> - return ret;
> + goto err_sysfs_remove;
>   }
> 
> - bus_set_iommu(_bus_type, _iommu_ops);
> + ret = bus_set_iommu(_bus_type, _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(_iommu->iommu);
> +
> +err_sysfs_remove:
> + iommu_device_sysfs_remove(_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
___
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu

[PATCH] iommu/qcom: Cleanup resources in case of probe error path

2021-04-21 Thread 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 
---
 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(_iommu->iommu, _iommu_ops, dev);
if (ret) {
dev_err(dev, "Failed to register iommu\n");
-   return ret;
+   goto err_sysfs_remove;
}

-   bus_set_iommu(_bus_type, _iommu_ops);
+   ret = bus_set_iommu(_bus_type, _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(_iommu->iommu);
+
+err_sysfs_remove:
+   iommu_device_sysfs_remove(_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.
___
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu