]> Git Repo - linux.git/commitdiff
i3c: master: svc: fix cpu schedule in spin lock
authorClark Wang <[email protected]>
Wed, 17 May 2023 03:30:29 +0000 (11:30 +0800)
committerAlexandre Belloni <[email protected]>
Sun, 4 Jun 2023 22:50:51 +0000 (00:50 +0200)
pm_runtime_resume_and_get() may call sleep(). It cannot be used in
svc_i3c_master_start_xfer_locked(), because it is in a spin lock.

Move the pm runtime operations to svc_i3c_master_enqueue_xfer().

Signed-off-by: Clark Wang <[email protected]>
Fixes: 05be23ef78f7 ("i3c: master: svc: add runtime pm support")
Reviewed-by: Miquel Raynal <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Alexandre Belloni <[email protected]>
drivers/i3c/master/svc-i3c-master.c

index bca3a4352ad1cec28f6e8d2f190838d1aa9b897a..4edf33ed207d031e682e61230fa19b4a9a5bb2d1 100644 (file)
@@ -1096,12 +1096,6 @@ static void svc_i3c_master_start_xfer_locked(struct svc_i3c_master *master)
        if (!xfer)
                return;
 
-       ret = pm_runtime_resume_and_get(master->dev);
-       if (ret < 0) {
-               dev_err(master->dev, "<%s> Cannot get runtime PM.\n", __func__);
-               return;
-       }
-
        svc_i3c_master_clear_merrwarn(master);
        svc_i3c_master_flush_fifo(master);
 
@@ -1116,9 +1110,6 @@ static void svc_i3c_master_start_xfer_locked(struct svc_i3c_master *master)
                        break;
        }
 
-       pm_runtime_mark_last_busy(master->dev);
-       pm_runtime_put_autosuspend(master->dev);
-
        xfer->ret = ret;
        complete(&xfer->comp);
 
@@ -1139,6 +1130,13 @@ static void svc_i3c_master_enqueue_xfer(struct svc_i3c_master *master,
                                        struct svc_i3c_xfer *xfer)
 {
        unsigned long flags;
+       int ret;
+
+       ret = pm_runtime_resume_and_get(master->dev);
+       if (ret < 0) {
+               dev_err(master->dev, "<%s> Cannot get runtime PM.\n", __func__);
+               return;
+       }
 
        init_completion(&xfer->comp);
        spin_lock_irqsave(&master->xferqueue.lock, flags);
@@ -1149,6 +1147,9 @@ static void svc_i3c_master_enqueue_xfer(struct svc_i3c_master *master,
                svc_i3c_master_start_xfer_locked(master);
        }
        spin_unlock_irqrestore(&master->xferqueue.lock, flags);
+
+       pm_runtime_mark_last_busy(master->dev);
+       pm_runtime_put_autosuspend(master->dev);
 }
 
 static bool
This page took 0.058879 seconds and 4 git commands to generate.