FAILED: patch "[PATCH] slimbus: qcom-ngd-ctrl: Initialize controller resources in" failed to apply to 6.1-stable tree
Subsystems (3)
[email protected]
maintainerThe patch below does not apply to the 6.1-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.1.y
git checkout FETCH_HEAD
git cherry-pick -x 07c564ea5fb859b7381429de935d5df4781947c6
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2026061535-tables-coil-a9e2@gregkh' --subject-prefix 'PATCH 6.1.y' HEAD^..
Possible dependencies:
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 07c564ea5fb859b7381429de935d5df4781947c6 Mon Sep 17 00:00:00 2001
From: Bjorn Andersson <[email protected]>
Date: Sat, 30 May 2026 21:44:19 +0100
Subject: [PATCH] slimbus: qcom-ngd-ctrl: Initialize controller resources in
controller
The work structs and work queue are controller resources, create and destroy them in the controller context. Creating them as part of the child device's probe path seems to be okay now that the controller's probe has been updated, but if for some reason the child does not probe successfully a SSR or PDR notification will schedule_work() on an uninitialized "ngd_up_work".
Move the initialization of these controller resources to the controller probe function to avoid any issues, and to clarify the ownership.
drivers/slimbus/qcom-ngd-ctrl.c +16 -22
@@ -1582,25 +1582,8 @@ static int qcom_slim_ngd_probe(struct platform_device *pdev)pm_runtime_enable (dev);pm_runtime_get_noresume (dev); ret =qcom_slim_ngd_qmi_svc_event_init (ctrl); -if (ret) { +if (ret)dev_err (&pdev->dev,"QMI service registration failed:%d" , ret); -return ret; - } - -INIT_WORK (&ctrl->m_work, qcom_slim_ngd_master_worker); -INIT_WORK (&ctrl->ngd_up_work, qcom_slim_ngd_up_worker); - ctrl->mwq =create_singlethread_workqueue ("ngd_master" ); -if (!ctrl->mwq) { -dev_err (&pdev->dev,"Failed to start master worker\n" ); - ret = -ENOMEM ; - goto wq_err; - } - -return 0 ; -wq_err: -qcom_slim_ngd_qmi_svc_event_deinit (&ctrl->qmi); -if (ctrl->mwq) -destroy_workqueue (ctrl->mwq);return ret; }
@@ -1653,9 +1636,18 @@ static int qcom_slim_ngd_ctrl_probe(struct platform_device *pdev)init_completion (&ctrl->qmi.qmi_comp);init_completion (&ctrl->qmi_up); +INIT_WORK (&ctrl->m_work, qcom_slim_ngd_master_worker); +INIT_WORK (&ctrl->ngd_up_work, qcom_slim_ngd_up_worker); + + ctrl->mwq =create_singlethread_workqueue ("ngd_master" ); +if (!ctrl->mwq) +return dev_err_probe (dev, -ENOMEM ,"Failed to start master worker\n" ); + ctrl->pdr =pdr_handle_alloc (slim_pd_status, ctrl); -if (IS_ERR (ctrl->pdr)) -return dev_err_probe (dev,PTR_ERR (ctrl->pdr),"Failed to init PDR handle\n" ); +if (IS_ERR (ctrl->pdr)) { + ret =dev_err_probe (dev,PTR_ERR (ctrl->pdr),"Failed to init PDR handle\n" ); + goto err_destroy_mwq; + } ret =of_qcom_slim_ngd_register (dev, ctrl);if (ret)
@@ -1682,6 +1674,8 @@ static int qcom_slim_ngd_ctrl_probe(struct platform_device *pdev)qcom_slim_ngd_unregister (ctrl); err_pdr_release:pdr_handle_release (ctrl->pdr); +err_destroy_mwq: +destroy_workqueue (ctrl->mwq);return ret; }
@@ -1694,6 +1688,8 @@ static void qcom_slim_ngd_ctrl_remove(struct platform_device *pdev)qcom_unregister_ssr_notifier (ctrl->notifier, &ctrl->nb);qcom_slim_ngd_unregister (ctrl); + +destroy_workqueue (ctrl->mwq); }static void qcom_slim_ngd_remove (struct platform_device *pdev)
@@ -1704,8 +1700,6 @@ static void qcom_slim_ngd_remove(struct platform_device *pdev)qcom_slim_ngd_enable (ctrl, false);qcom_slim_ngd_exit_dma (ctrl);qcom_slim_ngd_qmi_svc_event_deinit (&ctrl->qmi); -if (ctrl->mwq) -destroy_workqueue (ctrl->mwq);kfree (ctrl->ngd); ctrl->ngd =NULL ;
Sasha Levin
maintainerPATCH 1/1 slimbus: qcom-ngd-ctrl: Initialize controller resources in controller
From: Bjorn Andersson <[email protected]>
[ Upstream commit 07c564ea5fb859b7381429de935d5df4781947c6 ]
The work structs and work queue are controller resources, create and destroy them in the controller context. Creating them as part of the child device's probe path seems to be okay now that the controller's probe has been updated, but if for some reason the child does not probe successfully a SSR or PDR notification will schedule_work() on an uninitialized "ngd_up_work".
Move the initialization of these controller resources to the controller probe function to avoid any issues, and to clarify the ownership.
--- drivers/slimbus/qcom-ngd-ctrl.c | 33 +++++++++++++-------------------- 1 file changed, 13 insertions(+), 20 deletions(-)
drivers/slimbus/qcom-ngd-ctrl.c +13 -20
@@ -1506,25 +1506,8 @@ static int qcom_slim_ngd_probe(struct platform_device *pdev)pm_runtime_enable (dev);pm_runtime_get_noresume (dev); ret =qcom_slim_ngd_qmi_svc_event_init (ctrl); -if (ret) { +if (ret)dev_err (&pdev->dev,"QMI service registration failed:%d" , ret); -return ret; - } - -INIT_WORK (&ctrl->m_work, qcom_slim_ngd_master_worker); -INIT_WORK (&ctrl->ngd_up_work, qcom_slim_ngd_up_worker); - ctrl->mwq =create_singlethread_workqueue ("ngd_master" ); -if (!ctrl->mwq) { -dev_err (&pdev->dev,"Failed to start master worker\n" ); - ret = -ENOMEM ; - goto wq_err; - } - -return 0 ; -wq_err: -qcom_slim_ngd_qmi_svc_event_deinit (&ctrl->qmi); -if (ctrl->mwq) -destroy_workqueue (ctrl->mwq);return ret; }
@@ -1582,6 +1565,13 @@ static int qcom_slim_ngd_ctrl_probe(struct platform_device *pdev)init_completion (&ctrl->qmi.qmi_comp);init_completion (&ctrl->qmi_up); +INIT_WORK (&ctrl->m_work, qcom_slim_ngd_master_worker); +INIT_WORK (&ctrl->ngd_up_work, qcom_slim_ngd_up_worker); + + ctrl->mwq =create_singlethread_workqueue ("ngd_master" ); +if (!ctrl->mwq) +return dev_err_probe (dev, -ENOMEM ,"Failed to start master worker\n" ); + ctrl->pdr =pdr_handle_alloc (slim_pd_status, ctrl);if (IS_ERR (ctrl->pdr)) { ret = dev_err_probe(dev, PTR_ERR(ctrl->pdr),
@@ -1603,14 +1593,19 @@ static int qcom_slim_ngd_ctrl_probe(struct platform_device *pdev) err_pdr_lookup:pdr_handle_release (ctrl->pdr); +destroy_workqueue (ctrl->mwq);return ret; }static int qcom_slim_ngd_ctrl_remove (struct platform_device *pdev) { +struct qcom_slim_ngd_ctrl *ctrl =platform_get_drvdata (pdev); +platform_driver_unregister (&qcom_slim_ngd_driver); +destroy_workqueue (ctrl->mwq); +return 0 ; }
@@ -1624,8 +1619,6 @@ static int qcom_slim_ngd_remove(struct platform_device *pdev)qcom_slim_ngd_enable (ctrl, false);qcom_slim_ngd_exit_dma (ctrl);qcom_slim_ngd_qmi_svc_event_deinit (&ctrl->qmi); -if (ctrl->mwq) -destroy_workqueue (ctrl->mwq);kfree (ctrl->ngd); ctrl->ngd =NULL ;
Signature · 1 line
2.53.0