Skip to content

Commit a8bd68e

Browse files
Jason-JH.LinJassi Brar
authored andcommitted
mailbox: mtk-cmdq: Move devm_mbox_controller_register() after devm_pm_runtime_enable()
When mtk-cmdq unbinds, a WARN_ON message with condition pm_runtime_get_sync() < 0 occurs. According to the call tracei below: cmdq_mbox_shutdown mbox_free_channel mbox_controller_unregister __devm_mbox_controller_unregister ... The root cause can be deduced to be calling pm_runtime_get_sync() after calling pm_runtime_disable() as observed below: 1. CMDQ driver uses devm_mbox_controller_register() in cmdq_probe() to bind the cmdq device to the mbox_controller, so devm_mbox_controller_unregister() will automatically unregister the device bound to the mailbox controller when the device-managed resource is removed. That means devm_mbox_controller_unregister() and cmdq_mbox_shoutdown() will be called after cmdq_remove(). 2. CMDQ driver also uses devm_pm_runtime_enable() in cmdq_probe() after devm_mbox_controller_register(), so that devm_pm_runtime_disable() will be called after cmdq_remove(), but before devm_mbox_controller_unregister(). To fix this problem, cmdq_probe() needs to move devm_mbox_controller_register() after devm_pm_runtime_enable() to make devm_pm_runtime_disable() be called after devm_mbox_controller_unregister(). Fixes: 623a614 ("mailbox: mediatek: Add Mediatek CMDQ driver") Signed-off-by: Jason-JH.Lin <[email protected]> Reviewed-by: AngeloGioacchino Del Regno <[email protected]> Signed-off-by: Jassi Brar <[email protected]>
1 parent 0e3bb6e commit a8bd68e

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

drivers/mailbox/mtk-cmdq-mailbox.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -689,12 +689,6 @@ static int cmdq_probe(struct platform_device *pdev)
689689
cmdq->mbox.chans[i].con_priv = (void *)&cmdq->thread[i];
690690
}
691691

692-
err = devm_mbox_controller_register(dev, &cmdq->mbox);
693-
if (err < 0) {
694-
dev_err(dev, "failed to register mailbox: %d\n", err);
695-
return err;
696-
}
697-
698692
platform_set_drvdata(pdev, cmdq);
699693

700694
WARN_ON(clk_bulk_prepare(cmdq->pdata->gce_num, cmdq->clocks));
@@ -722,6 +716,12 @@ static int cmdq_probe(struct platform_device *pdev)
722716
pm_runtime_set_autosuspend_delay(dev, CMDQ_MBOX_AUTOSUSPEND_DELAY_MS);
723717
pm_runtime_use_autosuspend(dev);
724718

719+
err = devm_mbox_controller_register(dev, &cmdq->mbox);
720+
if (err < 0) {
721+
dev_err(dev, "failed to register mailbox: %d\n", err);
722+
return err;
723+
}
724+
725725
return 0;
726726
}
727727

0 commit comments

Comments
 (0)