* [PATCH] iommu: qcom: Revert "iommu/arm: Cleanup resources in case of probe error path"
@ 2021-07-05 6:56 ` Marek Szyprowski
0 siblings, 0 replies; 15+ messages in thread
From: Marek Szyprowski @ 2021-07-05 6:56 UTC (permalink / raw)
To: iommu, linux-arm-kernel, linux-arm-msm
Cc: Will Deacon, Joerg Roedel, Rob Clark, Amey Narkhede,
Robin Murphy, Marek Szyprowski
QCOM IOMMU driver calls bus_set_iommu() for every IOMMU device controller,
what fails for the second and latter IOMMU devices. This is intended and
must be not fatal to the driver registration process. Also the cleanup
path should take care of the runtime PM state, what is missing in the
current patch. Revert relevant changes to the QCOM IOMMU driver until
a proper fix is prepared.
This partially reverts commit 249c9dc6aa0db74a0f7908efd04acf774e19b155.
Fixes: 249c9dc6aa0d ("iommu/arm: Cleanup resources in case of probe error path")
Suggested-by: Will Deacon <will@kernel.org>
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
---
drivers/iommu/arm/arm-smmu/qcom_iommu.c | 13 ++-----------
1 file changed, 2 insertions(+), 11 deletions(-)
diff --git a/drivers/iommu/arm/arm-smmu/qcom_iommu.c b/drivers/iommu/arm/arm-smmu/qcom_iommu.c
index 25ed444ff94d..021cf8f65ffc 100644
--- a/drivers/iommu/arm/arm-smmu/qcom_iommu.c
+++ b/drivers/iommu/arm/arm-smmu/qcom_iommu.c
@@ -849,12 +849,10 @@ 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");
- goto err_sysfs_remove;
+ return ret;
}
- ret = bus_set_iommu(&platform_bus_type, &qcom_iommu_ops);
- if (ret)
- goto err_unregister_device;
+ bus_set_iommu(&platform_bus_type, &qcom_iommu_ops);
if (qcom_iommu->local_base) {
pm_runtime_get_sync(dev);
@@ -863,13 +861,6 @@ 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.17.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 15+ messages in thread* [PATCH] iommu: qcom: Revert "iommu/arm: Cleanup resources in case of probe error path"
@ 2021-07-05 6:56 ` Marek Szyprowski
0 siblings, 0 replies; 15+ messages in thread
From: Marek Szyprowski @ 2021-07-05 6:56 UTC (permalink / raw)
To: iommu, linux-arm-kernel, linux-arm-msm
Cc: Will Deacon, Amey Narkhede, Robin Murphy
QCOM IOMMU driver calls bus_set_iommu() for every IOMMU device controller,
what fails for the second and latter IOMMU devices. This is intended and
must be not fatal to the driver registration process. Also the cleanup
path should take care of the runtime PM state, what is missing in the
current patch. Revert relevant changes to the QCOM IOMMU driver until
a proper fix is prepared.
This partially reverts commit 249c9dc6aa0db74a0f7908efd04acf774e19b155.
Fixes: 249c9dc6aa0d ("iommu/arm: Cleanup resources in case of probe error path")
Suggested-by: Will Deacon <will@kernel.org>
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
---
drivers/iommu/arm/arm-smmu/qcom_iommu.c | 13 ++-----------
1 file changed, 2 insertions(+), 11 deletions(-)
diff --git a/drivers/iommu/arm/arm-smmu/qcom_iommu.c b/drivers/iommu/arm/arm-smmu/qcom_iommu.c
index 25ed444ff94d..021cf8f65ffc 100644
--- a/drivers/iommu/arm/arm-smmu/qcom_iommu.c
+++ b/drivers/iommu/arm/arm-smmu/qcom_iommu.c
@@ -849,12 +849,10 @@ 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");
- goto err_sysfs_remove;
+ return ret;
}
- ret = bus_set_iommu(&platform_bus_type, &qcom_iommu_ops);
- if (ret)
- goto err_unregister_device;
+ bus_set_iommu(&platform_bus_type, &qcom_iommu_ops);
if (qcom_iommu->local_base) {
pm_runtime_get_sync(dev);
@@ -863,13 +861,6 @@ 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.17.1
_______________________________________________
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu
^ permalink raw reply related [flat|nested] 15+ messages in thread* Re: [PATCH] iommu: qcom: Revert "iommu/arm: Cleanup resources in case of probe error path"
2021-07-05 6:56 ` Marek Szyprowski
(?)
@ 2021-07-05 14:30 ` Amey Narkhede
-1 siblings, 0 replies; 15+ messages in thread
From: Amey Narkhede @ 2021-07-05 14:30 UTC (permalink / raw)
To: Marek Szyprowski
Cc: iommu, linux-arm-kernel, linux-arm-msm, Marek Szyprowski,
Rob Clark, Will Deacon, Robin Murphy, Joerg Roedel,
Amey Narkhede, Krishna Reddy
On 21/07/05 08:56AM, Marek Szyprowski wrote:
> QCOM IOMMU driver calls bus_set_iommu() for every IOMMU device controller,
> what fails for the second and latter IOMMU devices. This is intended and
> must be not fatal to the driver registration process. Also the cleanup
> path should take care of the runtime PM state, what is missing in the
> current patch. Revert relevant changes to the QCOM IOMMU driver until
> a proper fix is prepared.
>
Apologies for the broken patch I don't have any arm machine to test the
patches. Is this bug unique to qcom iommu?
[...]
Thanks,
Amey
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH] iommu: qcom: Revert "iommu/arm: Cleanup resources in case of probe error path"
@ 2021-07-05 14:30 ` Amey Narkhede
0 siblings, 0 replies; 15+ messages in thread
From: Amey Narkhede @ 2021-07-05 14:30 UTC (permalink / raw)
To: Marek Szyprowski
Cc: linux-arm-msm, Joerg Roedel, Rob Clark, iommu, Robin Murphy,
Amey Narkhede, Will Deacon, linux-arm-kernel, Marek Szyprowski
On 21/07/05 08:56AM, Marek Szyprowski wrote:
> QCOM IOMMU driver calls bus_set_iommu() for every IOMMU device controller,
> what fails for the second and latter IOMMU devices. This is intended and
> must be not fatal to the driver registration process. Also the cleanup
> path should take care of the runtime PM state, what is missing in the
> current patch. Revert relevant changes to the QCOM IOMMU driver until
> a proper fix is prepared.
>
Apologies for the broken patch I don't have any arm machine to test the
patches. Is this bug unique to qcom iommu?
[...]
Thanks,
Amey
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH] iommu: qcom: Revert "iommu/arm: Cleanup resources in case of probe error path"
@ 2021-07-05 14:30 ` Amey Narkhede
0 siblings, 0 replies; 15+ messages in thread
From: Amey Narkhede @ 2021-07-05 14:30 UTC (permalink / raw)
To: Marek Szyprowski
Cc: linux-arm-msm, iommu, Robin Murphy, Amey Narkhede, Will Deacon,
linux-arm-kernel
On 21/07/05 08:56AM, Marek Szyprowski wrote:
> QCOM IOMMU driver calls bus_set_iommu() for every IOMMU device controller,
> what fails for the second and latter IOMMU devices. This is intended and
> must be not fatal to the driver registration process. Also the cleanup
> path should take care of the runtime PM state, what is missing in the
> current patch. Revert relevant changes to the QCOM IOMMU driver until
> a proper fix is prepared.
>
Apologies for the broken patch I don't have any arm machine to test the
patches. Is this bug unique to qcom iommu?
[...]
Thanks,
Amey
_______________________________________________
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH] iommu: qcom: Revert "iommu/arm: Cleanup resources in case of probe error path"
2021-07-05 14:30 ` Amey Narkhede
(?)
@ 2021-07-06 6:40 ` Marek Szyprowski
-1 siblings, 0 replies; 15+ messages in thread
From: Marek Szyprowski @ 2021-07-06 6:40 UTC (permalink / raw)
To: Amey Narkhede
Cc: iommu, linux-arm-kernel, linux-arm-msm, Rob Clark, Will Deacon,
Robin Murphy, Joerg Roedel, Krishna Reddy
On 05.07.2021 16:30, Amey Narkhede wrote:
> On 21/07/05 08:56AM, Marek Szyprowski wrote:
>> QCOM IOMMU driver calls bus_set_iommu() for every IOMMU device controller,
>> what fails for the second and latter IOMMU devices. This is intended and
>> must be not fatal to the driver registration process. Also the cleanup
>> path should take care of the runtime PM state, what is missing in the
>> current patch. Revert relevant changes to the QCOM IOMMU driver until
>> a proper fix is prepared.
>>
> Apologies for the broken patch I don't have any arm machine to test the
> patches. Is this bug unique to qcom iommu?
Frankly, I have no idea. Just grep for bus_set_iommu() and check if the
caller might be executed more than once.
Best regards
--
Marek Szyprowski, PhD
Samsung R&D Institute Poland
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH] iommu: qcom: Revert "iommu/arm: Cleanup resources in case of probe error path"
@ 2021-07-06 6:40 ` Marek Szyprowski
0 siblings, 0 replies; 15+ messages in thread
From: Marek Szyprowski @ 2021-07-06 6:40 UTC (permalink / raw)
To: Amey Narkhede
Cc: linux-arm-msm, Joerg Roedel, Rob Clark, iommu, Will Deacon,
linux-arm-kernel, Robin Murphy
On 05.07.2021 16:30, Amey Narkhede wrote:
> On 21/07/05 08:56AM, Marek Szyprowski wrote:
>> QCOM IOMMU driver calls bus_set_iommu() for every IOMMU device controller,
>> what fails for the second and latter IOMMU devices. This is intended and
>> must be not fatal to the driver registration process. Also the cleanup
>> path should take care of the runtime PM state, what is missing in the
>> current patch. Revert relevant changes to the QCOM IOMMU driver until
>> a proper fix is prepared.
>>
> Apologies for the broken patch I don't have any arm machine to test the
> patches. Is this bug unique to qcom iommu?
Frankly, I have no idea. Just grep for bus_set_iommu() and check if the
caller might be executed more than once.
Best regards
--
Marek Szyprowski, PhD
Samsung R&D Institute Poland
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH] iommu: qcom: Revert "iommu/arm: Cleanup resources in case of probe error path"
@ 2021-07-06 6:40 ` Marek Szyprowski
0 siblings, 0 replies; 15+ messages in thread
From: Marek Szyprowski @ 2021-07-06 6:40 UTC (permalink / raw)
To: Amey Narkhede
Cc: linux-arm-msm, iommu, Will Deacon, linux-arm-kernel, Robin Murphy
On 05.07.2021 16:30, Amey Narkhede wrote:
> On 21/07/05 08:56AM, Marek Szyprowski wrote:
>> QCOM IOMMU driver calls bus_set_iommu() for every IOMMU device controller,
>> what fails for the second and latter IOMMU devices. This is intended and
>> must be not fatal to the driver registration process. Also the cleanup
>> path should take care of the runtime PM state, what is missing in the
>> current patch. Revert relevant changes to the QCOM IOMMU driver until
>> a proper fix is prepared.
>>
> Apologies for the broken patch I don't have any arm machine to test the
> patches. Is this bug unique to qcom iommu?
Frankly, I have no idea. Just grep for bus_set_iommu() and check if the
caller might be executed more than once.
Best regards
--
Marek Szyprowski, PhD
Samsung R&D Institute Poland
_______________________________________________
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH] iommu: qcom: Revert "iommu/arm: Cleanup resources in case of probe error path"
2021-07-05 6:56 ` Marek Szyprowski
(?)
@ 2021-07-06 16:52 ` Will Deacon
-1 siblings, 0 replies; 15+ messages in thread
From: Will Deacon @ 2021-07-06 16:52 UTC (permalink / raw)
To: Marek Szyprowski
Cc: iommu, linux-arm-kernel, linux-arm-msm, Rob Clark, Robin Murphy,
Joerg Roedel, Amey Narkhede, Krishna Reddy
On Mon, Jul 05, 2021 at 08:56:57AM +0200, Marek Szyprowski wrote:
> QCOM IOMMU driver calls bus_set_iommu() for every IOMMU device controller,
> what fails for the second and latter IOMMU devices. This is intended and
> must be not fatal to the driver registration process. Also the cleanup
> path should take care of the runtime PM state, what is missing in the
> current patch. Revert relevant changes to the QCOM IOMMU driver until
> a proper fix is prepared.
>
> This partially reverts commit 249c9dc6aa0db74a0f7908efd04acf774e19b155.
>
> Fixes: 249c9dc6aa0d ("iommu/arm: Cleanup resources in case of probe error path")
> Suggested-by: Will Deacon <will@kernel.org>
> Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
> ---
> drivers/iommu/arm/arm-smmu/qcom_iommu.c | 13 ++-----------
> 1 file changed, 2 insertions(+), 11 deletions(-)
Thanks, Marek:
Acked-by: Will Deacon <will@kernel.org>
Joerg -- please can you pick this up as a fix?
Cheers,
Will
> diff --git a/drivers/iommu/arm/arm-smmu/qcom_iommu.c b/drivers/iommu/arm/arm-smmu/qcom_iommu.c
> index 25ed444ff94d..021cf8f65ffc 100644
> --- a/drivers/iommu/arm/arm-smmu/qcom_iommu.c
> +++ b/drivers/iommu/arm/arm-smmu/qcom_iommu.c
> @@ -849,12 +849,10 @@ 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");
> - goto err_sysfs_remove;
> + return ret;
> }
>
> - ret = bus_set_iommu(&platform_bus_type, &qcom_iommu_ops);
> - if (ret)
> - goto err_unregister_device;
> + bus_set_iommu(&platform_bus_type, &qcom_iommu_ops);
>
> if (qcom_iommu->local_base) {
> pm_runtime_get_sync(dev);
> @@ -863,13 +861,6 @@ 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.17.1
>
^ permalink raw reply [flat|nested] 15+ messages in thread* Re: [PATCH] iommu: qcom: Revert "iommu/arm: Cleanup resources in case of probe error path"
@ 2021-07-06 16:52 ` Will Deacon
0 siblings, 0 replies; 15+ messages in thread
From: Will Deacon @ 2021-07-06 16:52 UTC (permalink / raw)
To: Marek Szyprowski
Cc: linux-arm-msm, Joerg Roedel, Rob Clark, iommu, Amey Narkhede,
Robin Murphy, linux-arm-kernel
On Mon, Jul 05, 2021 at 08:56:57AM +0200, Marek Szyprowski wrote:
> QCOM IOMMU driver calls bus_set_iommu() for every IOMMU device controller,
> what fails for the second and latter IOMMU devices. This is intended and
> must be not fatal to the driver registration process. Also the cleanup
> path should take care of the runtime PM state, what is missing in the
> current patch. Revert relevant changes to the QCOM IOMMU driver until
> a proper fix is prepared.
>
> This partially reverts commit 249c9dc6aa0db74a0f7908efd04acf774e19b155.
>
> Fixes: 249c9dc6aa0d ("iommu/arm: Cleanup resources in case of probe error path")
> Suggested-by: Will Deacon <will@kernel.org>
> Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
> ---
> drivers/iommu/arm/arm-smmu/qcom_iommu.c | 13 ++-----------
> 1 file changed, 2 insertions(+), 11 deletions(-)
Thanks, Marek:
Acked-by: Will Deacon <will@kernel.org>
Joerg -- please can you pick this up as a fix?
Cheers,
Will
> diff --git a/drivers/iommu/arm/arm-smmu/qcom_iommu.c b/drivers/iommu/arm/arm-smmu/qcom_iommu.c
> index 25ed444ff94d..021cf8f65ffc 100644
> --- a/drivers/iommu/arm/arm-smmu/qcom_iommu.c
> +++ b/drivers/iommu/arm/arm-smmu/qcom_iommu.c
> @@ -849,12 +849,10 @@ 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");
> - goto err_sysfs_remove;
> + return ret;
> }
>
> - ret = bus_set_iommu(&platform_bus_type, &qcom_iommu_ops);
> - if (ret)
> - goto err_unregister_device;
> + bus_set_iommu(&platform_bus_type, &qcom_iommu_ops);
>
> if (qcom_iommu->local_base) {
> pm_runtime_get_sync(dev);
> @@ -863,13 +861,6 @@ 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.17.1
>
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 15+ messages in thread* Re: [PATCH] iommu: qcom: Revert "iommu/arm: Cleanup resources in case of probe error path"
@ 2021-07-06 16:52 ` Will Deacon
0 siblings, 0 replies; 15+ messages in thread
From: Will Deacon @ 2021-07-06 16:52 UTC (permalink / raw)
To: Marek Szyprowski
Cc: linux-arm-msm, iommu, Amey Narkhede, Robin Murphy, linux-arm-kernel
On Mon, Jul 05, 2021 at 08:56:57AM +0200, Marek Szyprowski wrote:
> QCOM IOMMU driver calls bus_set_iommu() for every IOMMU device controller,
> what fails for the second and latter IOMMU devices. This is intended and
> must be not fatal to the driver registration process. Also the cleanup
> path should take care of the runtime PM state, what is missing in the
> current patch. Revert relevant changes to the QCOM IOMMU driver until
> a proper fix is prepared.
>
> This partially reverts commit 249c9dc6aa0db74a0f7908efd04acf774e19b155.
>
> Fixes: 249c9dc6aa0d ("iommu/arm: Cleanup resources in case of probe error path")
> Suggested-by: Will Deacon <will@kernel.org>
> Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
> ---
> drivers/iommu/arm/arm-smmu/qcom_iommu.c | 13 ++-----------
> 1 file changed, 2 insertions(+), 11 deletions(-)
Thanks, Marek:
Acked-by: Will Deacon <will@kernel.org>
Joerg -- please can you pick this up as a fix?
Cheers,
Will
> diff --git a/drivers/iommu/arm/arm-smmu/qcom_iommu.c b/drivers/iommu/arm/arm-smmu/qcom_iommu.c
> index 25ed444ff94d..021cf8f65ffc 100644
> --- a/drivers/iommu/arm/arm-smmu/qcom_iommu.c
> +++ b/drivers/iommu/arm/arm-smmu/qcom_iommu.c
> @@ -849,12 +849,10 @@ 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");
> - goto err_sysfs_remove;
> + return ret;
> }
>
> - ret = bus_set_iommu(&platform_bus_type, &qcom_iommu_ops);
> - if (ret)
> - goto err_unregister_device;
> + bus_set_iommu(&platform_bus_type, &qcom_iommu_ops);
>
> if (qcom_iommu->local_base) {
> pm_runtime_get_sync(dev);
> @@ -863,13 +861,6 @@ 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.17.1
>
_______________________________________________
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH] iommu: qcom: Revert "iommu/arm: Cleanup resources in case of probe error path"
2021-07-05 6:56 ` Marek Szyprowski
(?)
@ 2021-07-08 10:03 ` Joerg Roedel
-1 siblings, 0 replies; 15+ messages in thread
From: Joerg Roedel @ 2021-07-08 10:03 UTC (permalink / raw)
To: Marek Szyprowski
Cc: iommu, linux-arm-kernel, linux-arm-msm, Rob Clark, Will Deacon,
Robin Murphy, Amey Narkhede, Krishna Reddy
On Mon, Jul 05, 2021 at 08:56:57AM +0200, Marek Szyprowski wrote:
> QCOM IOMMU driver calls bus_set_iommu() for every IOMMU device controller,
> what fails for the second and latter IOMMU devices. This is intended and
> must be not fatal to the driver registration process. Also the cleanup
> path should take care of the runtime PM state, what is missing in the
> current patch. Revert relevant changes to the QCOM IOMMU driver until
> a proper fix is prepared.
>
> This partially reverts commit 249c9dc6aa0db74a0f7908efd04acf774e19b155.
>
> Fixes: 249c9dc6aa0d ("iommu/arm: Cleanup resources in case of probe error path")
> Suggested-by: Will Deacon <will@kernel.org>
> Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
> ---
> drivers/iommu/arm/arm-smmu/qcom_iommu.c | 13 ++-----------
> 1 file changed, 2 insertions(+), 11 deletions(-)
Applied to iommu/fixes, thanks.
^ permalink raw reply [flat|nested] 15+ messages in thread* Re: [PATCH] iommu: qcom: Revert "iommu/arm: Cleanup resources in case of probe error path"
@ 2021-07-08 10:03 ` Joerg Roedel
0 siblings, 0 replies; 15+ messages in thread
From: Joerg Roedel @ 2021-07-08 10:03 UTC (permalink / raw)
To: Marek Szyprowski
Cc: linux-arm-msm, Rob Clark, iommu, Amey Narkhede, Will Deacon,
linux-arm-kernel, Robin Murphy
On Mon, Jul 05, 2021 at 08:56:57AM +0200, Marek Szyprowski wrote:
> QCOM IOMMU driver calls bus_set_iommu() for every IOMMU device controller,
> what fails for the second and latter IOMMU devices. This is intended and
> must be not fatal to the driver registration process. Also the cleanup
> path should take care of the runtime PM state, what is missing in the
> current patch. Revert relevant changes to the QCOM IOMMU driver until
> a proper fix is prepared.
>
> This partially reverts commit 249c9dc6aa0db74a0f7908efd04acf774e19b155.
>
> Fixes: 249c9dc6aa0d ("iommu/arm: Cleanup resources in case of probe error path")
> Suggested-by: Will Deacon <will@kernel.org>
> Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
> ---
> drivers/iommu/arm/arm-smmu/qcom_iommu.c | 13 ++-----------
> 1 file changed, 2 insertions(+), 11 deletions(-)
Applied to iommu/fixes, thanks.
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 15+ messages in thread* Re: [PATCH] iommu: qcom: Revert "iommu/arm: Cleanup resources in case of probe error path"
@ 2021-07-08 10:03 ` Joerg Roedel
0 siblings, 0 replies; 15+ messages in thread
From: Joerg Roedel @ 2021-07-08 10:03 UTC (permalink / raw)
To: Marek Szyprowski
Cc: linux-arm-msm, iommu, Amey Narkhede, Will Deacon,
linux-arm-kernel, Robin Murphy
On Mon, Jul 05, 2021 at 08:56:57AM +0200, Marek Szyprowski wrote:
> QCOM IOMMU driver calls bus_set_iommu() for every IOMMU device controller,
> what fails for the second and latter IOMMU devices. This is intended and
> must be not fatal to the driver registration process. Also the cleanup
> path should take care of the runtime PM state, what is missing in the
> current patch. Revert relevant changes to the QCOM IOMMU driver until
> a proper fix is prepared.
>
> This partially reverts commit 249c9dc6aa0db74a0f7908efd04acf774e19b155.
>
> Fixes: 249c9dc6aa0d ("iommu/arm: Cleanup resources in case of probe error path")
> Suggested-by: Will Deacon <will@kernel.org>
> Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
> ---
> drivers/iommu/arm/arm-smmu/qcom_iommu.c | 13 ++-----------
> 1 file changed, 2 insertions(+), 11 deletions(-)
Applied to iommu/fixes, thanks.
_______________________________________________
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu
^ permalink raw reply [flat|nested] 15+ messages in thread