* [PATCH v2 1/3] slimbus: qcom-ngd: use correct error in message of pdr_add_lookup() failure
@ 2022-08-30 17:52 Krzysztof Kozlowski
2022-08-30 17:52 ` [PATCH v2 2/3] slimbus: qcom-ngd: cleanup in probe error path Krzysztof Kozlowski
2022-09-09 9:42 ` [PATCH v2 1/3] slimbus: qcom-ngd: use correct error in message of pdr_add_lookup() failure Srinivas Kandagatla
0 siblings, 2 replies; 3+ messages in thread
From: Krzysztof Kozlowski @ 2022-08-30 17:52 UTC (permalink / raw)
To: Andy Gross, Bjorn Andersson, Konrad Dybcio, Srinivas Kandagatla,
Greg Kroah-Hartman, linux-arm-msm, alsa-devel, linux-kernel
Cc: Krzysztof Kozlowski, stable
Use correct error code, instead of previous 'ret' value, when printing
error from pdr_add_lookup() failure.
Cc: <stable@vger.kernel.org>
Fixes: e1ae85e1830e ("slimbus: qcom-ngd-ctrl: add Protection Domain Restart Support")
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
---
Changes since v1:
1. Correct typo
2. Return 'ret' instead of again PTR_ERR
---
drivers/slimbus/qcom-ngd-ctrl.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/slimbus/qcom-ngd-ctrl.c b/drivers/slimbus/qcom-ngd-ctrl.c
index 0aa8408464ad..f4f330b9fa72 100644
--- a/drivers/slimbus/qcom-ngd-ctrl.c
+++ b/drivers/slimbus/qcom-ngd-ctrl.c
@@ -1581,8 +1581,9 @@ static int qcom_slim_ngd_ctrl_probe(struct platform_device *pdev)
pds = pdr_add_lookup(ctrl->pdr, "avs/audio", "msm/adsp/audio_pd");
if (IS_ERR(pds) && PTR_ERR(pds) != -EALREADY) {
+ ret = PTR_ERR(pds);
dev_err(dev, "pdr add lookup failed: %d\n", ret);
- return PTR_ERR(pds);
+ return ret;
}
platform_driver_register(&qcom_slim_ngd_driver);
--
2.34.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH v2 2/3] slimbus: qcom-ngd: cleanup in probe error path
2022-08-30 17:52 [PATCH v2 1/3] slimbus: qcom-ngd: use correct error in message of pdr_add_lookup() failure Krzysztof Kozlowski
@ 2022-08-30 17:52 ` Krzysztof Kozlowski
2022-09-09 9:42 ` [PATCH v2 1/3] slimbus: qcom-ngd: use correct error in message of pdr_add_lookup() failure Srinivas Kandagatla
1 sibling, 0 replies; 3+ messages in thread
From: Krzysztof Kozlowski @ 2022-08-30 17:52 UTC (permalink / raw)
To: Andy Gross, Bjorn Andersson, Konrad Dybcio, Srinivas Kandagatla,
Greg Kroah-Hartman, linux-arm-msm, alsa-devel, linux-kernel
Cc: Krzysztof Kozlowski, stable
Add proper error path in probe() to cleanup resources previously
acquired/allocated to fix warnings visible during probe deferral:
notifier callback qcom_slim_ngd_ssr_notify already registered
WARNING: CPU: 6 PID: 70 at kernel/notifier.c:28 notifier_chain_register+0x5c/0x90
Modules linked in:
CPU: 6 PID: 70 Comm: kworker/u16:1 Not tainted 6.0.0-rc3-next-20220830 #380
Call trace:
notifier_chain_register+0x5c/0x90
srcu_notifier_chain_register+0x44/0x90
qcom_register_ssr_notifier+0x38/0x4c
qcom_slim_ngd_ctrl_probe+0xd8/0x400
platform_probe+0x6c/0xe0
really_probe+0xbc/0x2d4
__driver_probe_device+0x78/0xe0
driver_probe_device+0x3c/0x12c
__device_attach_driver+0xb8/0x120
bus_for_each_drv+0x78/0xd0
__device_attach+0xa8/0x1c0
device_initial_probe+0x18/0x24
bus_probe_device+0xa0/0xac
deferred_probe_work_func+0x88/0xc0
process_one_work+0x1d4/0x320
worker_thread+0x2cc/0x44c
kthread+0x110/0x114
ret_from_fork+0x10/0x20
Cc: <stable@vger.kernel.org>
Fixes: e1ae85e1830e ("slimbus: qcom-ngd-ctrl: add Protection Domain Restart Support")
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
---
Changes since v1:
1. None
---
drivers/slimbus/qcom-ngd-ctrl.c | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
diff --git a/drivers/slimbus/qcom-ngd-ctrl.c b/drivers/slimbus/qcom-ngd-ctrl.c
index f4f330b9fa72..bacc6af1d51e 100644
--- a/drivers/slimbus/qcom-ngd-ctrl.c
+++ b/drivers/slimbus/qcom-ngd-ctrl.c
@@ -1576,18 +1576,27 @@ static int qcom_slim_ngd_ctrl_probe(struct platform_device *pdev)
ctrl->pdr = pdr_handle_alloc(slim_pd_status, ctrl);
if (IS_ERR(ctrl->pdr)) {
dev_err(dev, "Failed to init PDR handle\n");
- return PTR_ERR(ctrl->pdr);
+ ret = PTR_ERR(ctrl->pdr);
+ goto err_pdr_alloc;
}
pds = pdr_add_lookup(ctrl->pdr, "avs/audio", "msm/adsp/audio_pd");
if (IS_ERR(pds) && PTR_ERR(pds) != -EALREADY) {
ret = PTR_ERR(pds);
dev_err(dev, "pdr add lookup failed: %d\n", ret);
- return ret;
+ goto err_pdr_lookup;
}
platform_driver_register(&qcom_slim_ngd_driver);
return of_qcom_slim_ngd_register(dev, ctrl);
+
+err_pdr_alloc:
+ qcom_unregister_ssr_notifier(ctrl->notifier, &ctrl->nb);
+
+err_pdr_lookup:
+ pdr_handle_release(ctrl->pdr);
+
+ return ret;
}
static int qcom_slim_ngd_ctrl_remove(struct platform_device *pdev)
--
2.34.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH v2 1/3] slimbus: qcom-ngd: use correct error in message of pdr_add_lookup() failure
2022-08-30 17:52 [PATCH v2 1/3] slimbus: qcom-ngd: use correct error in message of pdr_add_lookup() failure Krzysztof Kozlowski
2022-08-30 17:52 ` [PATCH v2 2/3] slimbus: qcom-ngd: cleanup in probe error path Krzysztof Kozlowski
@ 2022-09-09 9:42 ` Srinivas Kandagatla
1 sibling, 0 replies; 3+ messages in thread
From: Srinivas Kandagatla @ 2022-09-09 9:42 UTC (permalink / raw)
To: Krzysztof Kozlowski, Andy Gross, Bjorn Andersson, Konrad Dybcio,
Greg Kroah-Hartman, linux-arm-msm, alsa-devel, linux-kernel
Cc: stable
On 30/08/2022 18:52, Krzysztof Kozlowski wrote:
> Use correct error code, instead of previous 'ret' value, when printing
> error from pdr_add_lookup() failure.
>
> Cc: <stable@vger.kernel.org>
> Fixes: e1ae85e1830e ("slimbus: qcom-ngd-ctrl: add Protection Domain Restart Support")
> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
>
> ---
>
Applied all thanks,
--srini
> Changes since v1:
> 1. Correct typo
> 2. Return 'ret' instead of again PTR_ERR
> ---
> drivers/slimbus/qcom-ngd-ctrl.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/slimbus/qcom-ngd-ctrl.c b/drivers/slimbus/qcom-ngd-ctrl.c
> index 0aa8408464ad..f4f330b9fa72 100644
> --- a/drivers/slimbus/qcom-ngd-ctrl.c
> +++ b/drivers/slimbus/qcom-ngd-ctrl.c
> @@ -1581,8 +1581,9 @@ static int qcom_slim_ngd_ctrl_probe(struct platform_device *pdev)
>
> pds = pdr_add_lookup(ctrl->pdr, "avs/audio", "msm/adsp/audio_pd");
> if (IS_ERR(pds) && PTR_ERR(pds) != -EALREADY) {
> + ret = PTR_ERR(pds);
> dev_err(dev, "pdr add lookup failed: %d\n", ret);
> - return PTR_ERR(pds);
> + return ret;
> }
>
> platform_driver_register(&qcom_slim_ngd_driver);
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-09-09 9:42 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-08-30 17:52 [PATCH v2 1/3] slimbus: qcom-ngd: use correct error in message of pdr_add_lookup() failure Krzysztof Kozlowski
2022-08-30 17:52 ` [PATCH v2 2/3] slimbus: qcom-ngd: cleanup in probe error path Krzysztof Kozlowski
2022-09-09 9:42 ` [PATCH v2 1/3] slimbus: qcom-ngd: use correct error in message of pdr_add_lookup() failure Srinivas Kandagatla
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).