Re: [PATCH 6.1] mailbox: mtk-cmdq: Move devm_mbox_controller_register() after devm_pm_runtime_enable()

[Sasha Levin <sashal@kernel.org>]

[ Sasha's backport helper bot ]

Hi,

The upstream commit SHA1 provided is correct: a8bd68e4329f9a0ad1b878733e0f80be6a971649

WARNING: Author mismatch between patch and upstream commit:
Backport author: bin.lan.cn@eng.windriver.com
Commit author: Jason-JH.Lin <jason-jh.lin@mediatek.com>


Status in newer kernel trees:
6.12.y | Present (exact SHA1)
6.11.y | Present (exact SHA1)
6.6.y | Not found
6.1.y | Not found

Note: The patch differs from the upstream commit:
---
--- -	2024-11-28 06:59:19.502388170 -0500
+++ /tmp/tmp.fqdcq45T9f	2024-11-28 06:59:19.497067744 -0500
@@ -1,3 +1,5 @@
+[ Upstream commit a8bd68e4329f9a0ad1b878733e0f80be6a971649 ]
+
 When mtk-cmdq unbinds, a WARN_ON message with condition
 pm_runtime_get_sync() < 0 occurs.
 
@@ -30,15 +32,17 @@
 Signed-off-by: Jason-JH.Lin <jason-jh.lin@mediatek.com>
 Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
 Signed-off-by: Jassi Brar <jassisinghbrar@gmail.com>
+[ Resolve minor conflicts ]
+Signed-off-by: Bin Lan <bin.lan.cn@windriver.com>
 ---
  drivers/mailbox/mtk-cmdq-mailbox.c | 12 ++++++------
  1 file changed, 6 insertions(+), 6 deletions(-)
 
 diff --git a/drivers/mailbox/mtk-cmdq-mailbox.c b/drivers/mailbox/mtk-cmdq-mailbox.c
-index f1dfce9e27f5e..4bff73532085b 100644
+index 9465f9081515..3d369c23970c 100644
 --- a/drivers/mailbox/mtk-cmdq-mailbox.c
 +++ b/drivers/mailbox/mtk-cmdq-mailbox.c
-@@ -689,12 +689,6 @@ static int cmdq_probe(struct platform_device *pdev)
+@@ -605,18 +605,18 @@ static int cmdq_probe(struct platform_device *pdev)
  		cmdq->mbox.chans[i].con_priv = (void *)&cmdq->thread[i];
  	}
  
@@ -50,10 +54,9 @@
 -
  	platform_set_drvdata(pdev, cmdq);
  
- 	WARN_ON(clk_bulk_prepare(cmdq->pdata->gce_num, cmdq->clocks));
-@@ -722,6 +716,12 @@ static int cmdq_probe(struct platform_device *pdev)
- 	pm_runtime_set_autosuspend_delay(dev, CMDQ_MBOX_AUTOSUSPEND_DELAY_MS);
- 	pm_runtime_use_autosuspend(dev);
+ 	WARN_ON(clk_bulk_prepare(cmdq->gce_num, cmdq->clocks));
+ 
+ 	cmdq_init(cmdq);
  
 +	err = devm_mbox_controller_register(dev, &cmdq->mbox);
 +	if (err < 0) {
@@ -64,3 +67,6 @@
  	return 0;
  }
  
+-- 
+2.34.1
+
---

Results of testing on various branches:

| Branch                    | Patch Apply | Build Test |
|---------------------------|-------------|------------|
| stable/linux-6.1.y        |  Success    |  Success   |