[ 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@xxxxxxxxxxxxxxxxx
Commit author: Jason-JH.Lin <jason-jh.lin@xxxxxxxxxxxx>
Status in newer kernel trees:
6.12.y | Present (exact SHA1)
6.11.y | Present (exact SHA1)
6.6.y | Not found
Note: The patch differs from the upstream commit:
---
--- - 2024-11-28 07:03:31.668427430 -0500
+++ /tmp/tmp.wAGCAEZAC5 2024-11-28 07:03:31.661714582 -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,16 @@
Signed-off-by: Jason-JH.Lin <jason-jh.lin@xxxxxxxxxxxx>
Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@xxxxxxxxxxxxx>
Signed-off-by: Jassi Brar <jassisinghbrar@xxxxxxxxx>
+Signed-off-by: Bin Lan <bin.lan.cn@xxxxxxxxxxxxx>
---
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 4d62b07c1411..d5f5606585f4 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)
+@@ -623,12 +623,6 @@ static int cmdq_probe(struct platform_device *pdev)
cmdq->mbox.chans[i].con_priv = (void *)&cmdq->thread[i];
}
@@ -51,9 +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);
+@@ -642,6 +636,12 @@ static int cmdq_probe(struct platform_device *pdev)
+ return err;
+ }
+ 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.6.y | Success | Success |
