| Message ID | 20240306091642.9123-1-quic_vdadhani@quicinc.com |
|---|---|
| State | Accepted |
| Commit | 98241a774db49988f25b7b3657026ce51ccec293 |
| Headers | show |
| Series | [v2] slimbus: qcom-ngd-ctrl: Add timeout for wait operation | expand |
On Wed, 06 Mar 2024 14:46:42 +0530, Viken Dadhaniya wrote: > In current driver qcom_slim_ngd_up_worker() indefinitely > waiting for ctrl->qmi_up completion object. This is > resulting in workqueue lockup on Kthread. > > Added wait_for_completion_interruptible_timeout to > allow the thread to wait for specific timeout period and > bail out instead waiting infinitely. > > [...] Applied, thanks! [1/1] slimbus: qcom-ngd-ctrl: Add timeout for wait operation commit: b12bd525ca6e06c5ba93a49904f580f7f0021cbd Best regards,
diff --git a/drivers/slimbus/qcom-ngd-ctrl.c b/drivers/slimbus/qcom-ngd-ctrl.c index efeba8275a66..a09a26bf4988 100644 --- a/drivers/slimbus/qcom-ngd-ctrl.c +++ b/drivers/slimbus/qcom-ngd-ctrl.c @@ -1451,7 +1451,11 @@ static void qcom_slim_ngd_up_worker(struct work_struct *work) ctrl = container_of(work, struct qcom_slim_ngd_ctrl, ngd_up_work); /* Make sure qmi service is up before continuing */ - wait_for_completion_interruptible(&ctrl->qmi_up); + if (!wait_for_completion_interruptible_timeout(&ctrl->qmi_up, + msecs_to_jiffies(MSEC_PER_SEC))) { + dev_err(ctrl->dev, "QMI wait timeout\n"); + return; + } mutex_lock(&ctrl->ssr_lock); qcom_slim_ngd_enable(ctrl, true);
In current driver qcom_slim_ngd_up_worker() indefinitely waiting for ctrl->qmi_up completion object. This is resulting in workqueue lockup on Kthread. Added wait_for_completion_interruptible_timeout to allow the thread to wait for specific timeout period and bail out instead waiting infinitely. Fixes: a899d324863a ("slimbus: qcom-ngd-ctrl: add Sub System Restart support") Cc: stable@vger.kernel.org Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org> Signed-off-by: Viken Dadhaniya <quic_vdadhani@quicinc.com> --- v1 -> v2: - Remove macro and add value inline. - add fix, cc and review tag. --- --- drivers/slimbus/qcom-ngd-ctrl.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)