Blocking mailboxes may lead to sleep during the kick operation, which conflicts with some virtio devices (e.g.: virtio-can) that kicks their virtqueues with spinlock(s) held.
Align to the behavior of all the other remoteproc drivers that use a mailbox to perform the kick (i.e.: omap, st, stm32, ti_k3_*, xlnx_r5) and move to a non-blocking mailbox here as well. As a side effect of this modification, remove the close-reopen action on the mailboxes during restart and shutdown. Signed-off-by: Francesco Valla <[email protected]> --- drivers/remoteproc/imx_rproc.c | 49 ++++++------------------------------------ drivers/remoteproc/imx_rproc.h | 1 - 2 files changed, 6 insertions(+), 44 deletions(-) diff --git a/drivers/remoteproc/imx_rproc.c b/drivers/remoteproc/imx_rproc.c index 745ce52cd822..100440328f92 100644 --- a/drivers/remoteproc/imx_rproc.c +++ b/drivers/remoteproc/imx_rproc.c @@ -97,7 +97,7 @@ struct imx_rproc_mem { /* Linux has permission to handle the Logical Machine of remote cores */ #define IMX_RPROC_FLAGS_SM_LMM_CTRL BIT(0) -static int imx_rproc_xtr_mbox_init(struct rproc *rproc, bool tx_block); +static int imx_rproc_xtr_mbox_init(struct rproc *rproc); static void imx_rproc_free_mbox(void *data); /* Forward declarations for platform operations */ @@ -444,7 +444,7 @@ static int imx_rproc_start(struct rproc *rproc) struct device *dev = priv->dev; int ret; - ret = imx_rproc_xtr_mbox_init(rproc, true); + ret = imx_rproc_xtr_mbox_init(rproc); if (ret) return ret; @@ -712,7 +712,7 @@ static void imx_rproc_kick(struct rproc *rproc, int vqid) static int imx_rproc_attach(struct rproc *rproc) { - return imx_rproc_xtr_mbox_init(rproc, true); + return imx_rproc_xtr_mbox_init(rproc); } static int imx_rproc_scu_api_detach(struct rproc *rproc) @@ -877,7 +877,7 @@ static void imx_rproc_rx_callback(struct mbox_client *cl, void *msg) queue_work(priv->workqueue, &priv->rproc_work); } -static int imx_rproc_xtr_mbox_init(struct rproc *rproc, bool tx_block) +static int imx_rproc_xtr_mbox_init(struct rproc *rproc) { struct imx_rproc *priv = rproc->priv; struct device *dev = priv->dev; @@ -900,7 +900,7 @@ static int imx_rproc_xtr_mbox_init(struct rproc *rproc, bool tx_block) cl = &priv->cl; cl->dev = dev; - cl->tx_block = tx_block; + cl->tx_block = false; cl->tx_tout = 100; cl->knows_txdone = false; cl->rx_callback = imx_rproc_rx_callback; @@ -1223,22 +1223,6 @@ static int imx_rproc_detect_mode(struct imx_rproc *priv) return priv->ops->detect_mode(priv->rproc); } -static int imx_rproc_sys_off_handler(struct sys_off_data *data) -{ - struct rproc *rproc = data->cb_data; - int ret; - - imx_rproc_free_mbox(rproc); - - ret = imx_rproc_xtr_mbox_init(rproc, false); - if (ret) { - dev_err(&rproc->dev, "Failed to request non-blocking mbox\n"); - return NOTIFY_BAD; - } - - return NOTIFY_DONE; -} - static void imx_rproc_destroy_workqueue(void *data) { struct workqueue_struct *workqueue = data; @@ -1285,7 +1269,7 @@ static int imx_rproc_probe(struct platform_device *pdev) INIT_WORK(&priv->rproc_work, imx_rproc_vq_work); - ret = imx_rproc_xtr_mbox_init(rproc, true); + ret = imx_rproc_xtr_mbox_init(rproc); if (ret) return ret; @@ -1315,26 +1299,6 @@ static int imx_rproc_probe(struct platform_device *pdev) if (rproc->state != RPROC_DETACHED) rproc->auto_boot = of_property_read_bool(np, "fsl,auto-boot"); - if (dcfg->flags & IMX_RPROC_NEED_SYSTEM_OFF) { - /* - * setup mailbox to non-blocking mode in - * [SYS_OFF_MODE_POWER_OFF_PREPARE, SYS_OFF_MODE_RESTART_PREPARE] - * phase before invoking [SYS_OFF_MODE_POWER_OFF, SYS_OFF_MODE_RESTART] - * atomic chain, see kernel/reboot.c. - */ - ret = devm_register_sys_off_handler(dev, SYS_OFF_MODE_POWER_OFF_PREPARE, - SYS_OFF_PRIO_DEFAULT, - imx_rproc_sys_off_handler, rproc); - if (ret) - return dev_err_probe(dev, ret, "register power off handler failure\n"); - - ret = devm_register_sys_off_handler(dev, SYS_OFF_MODE_RESTART_PREPARE, - SYS_OFF_PRIO_DEFAULT, - imx_rproc_sys_off_handler, rproc); - if (ret) - return dev_err_probe(dev, ret, "register restart handler failure\n"); - } - pm_runtime_enable(dev); ret = pm_runtime_resume_and_get(dev); if (ret) @@ -1447,7 +1411,6 @@ static const struct imx_rproc_dcfg imx_rproc_cfg_imx8ulp = { static const struct imx_rproc_dcfg imx_rproc_cfg_imx7ulp = { .att = imx_rproc_att_imx7ulp, .att_size = ARRAY_SIZE(imx_rproc_att_imx7ulp), - .flags = IMX_RPROC_NEED_SYSTEM_OFF, }; static const struct imx_rproc_dcfg imx_rproc_cfg_imx7d = { diff --git a/drivers/remoteproc/imx_rproc.h b/drivers/remoteproc/imx_rproc.h index 0d7d48352a10..9a1400d0d081 100644 --- a/drivers/remoteproc/imx_rproc.h +++ b/drivers/remoteproc/imx_rproc.h @@ -16,7 +16,6 @@ struct imx_rproc_att { }; /* dcfg flags */ -#define IMX_RPROC_NEED_SYSTEM_OFF BIT(0) #define IMX_RPROC_NEED_CLKS BIT(1) struct imx_rproc_plat_ops { -- 2.55.0
