Commit 33beadb3 authored by Clark Wang's avatar Clark Wang Committed by Alexandre Belloni
Browse files

i3c: master: svc: fix cpu schedule in spin lock 



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: default avatarClark Wang <xiaoning.wang@nxp.com>
Fixes: 05be23ef ("i3c: master: svc: add runtime pm support")
Reviewed-by: default avatarMiquel Raynal <miquel.raynal@bootlin.com>
Link: https://lore.kernel.org/r/20230517033030.3068085-2-xiaoning.wang@nxp.com


Signed-off-by: default avatarAlexandre Belloni <alexandre.belloni@bootlin.com>
parent 1c5ee2a7

drivers/i3c/master/svc-i3c-master.c

+10 −9
Original line number Diff line number Diff line
@@ -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