slimbus: qcom-ngd-ctrl: Add timeout for wait operation
authorViken Dadhaniya <quic_vdadhani@quicinc.com>
Tue, 30 Apr 2024 09:12:38 +0000 (10:12 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 3 May 2024 05:30:32 +0000 (07:30 +0200)
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>
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Link: https://lore.kernel.org/r/20240430091238.35209-2-srinivas.kandagatla@linaro.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/slimbus/qcom-ngd-ctrl.c

index efeba8275a6691e20be511e4dcef6ce15e087b61..a09a26bf4988ff200e4f9aa177edd0eb04e9e62f 100644 (file)
@@ -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);