This is a note to let you know that I've just added the patch titled
bus: mhi: core: Fix invalid error returning in mhi_queue
to the 5.12-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
bus-mhi-core-fix-invalid-error-returning-in-mhi_queue.patch
and it can be found in the queue-5.12 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 0ecc1c70dcd32c0f081b173a1a5d89952686f271 Mon Sep 17 00:00:00 2001
From: Loic Poulain <loic.poulain@xxxxxxxxxx>
Date: Fri, 26 Feb 2021 11:53:02 +0100
Subject: bus: mhi: core: Fix invalid error returning in mhi_queue
From: Loic Poulain <loic.poulain@xxxxxxxxxx>
commit 0ecc1c70dcd32c0f081b173a1a5d89952686f271 upstream.
mhi_queue returns an error when the doorbell is not accessible in
the current state. This can happen when the device is in non M0
state, like M3, and needs to be waken-up prior ringing the DB. This
case is managed earlier by triggering an asynchronous M3 exit via
controller resume/suspend callbacks, that in turn will cause M0
transition and DB update.
So, since it's not an error but just delaying of doorbell update, there
is no reason to return an error.
This also fixes a use after free error for skb case, indeed a caller
queuing skb will try to free the skb if the queueing fails, but in
that case queueing has been done.
Fixes: a8f75cb348fd ("mhi: core: Factorize mhi queuing")
Signed-off-by: Loic Poulain <loic.poulain@xxxxxxxxxx>
Reviewed-by: Jeffrey Hugo <jhugo@xxxxxxxxxxxxxx>
Reviewed-by: Bhaumik Bhatt <bbhatt@xxxxxxxxxxxxxx>
Reviewed-by: Manivannan Sadhasivam <manivannan.sadhasivam@xxxxxxxxxx>
Link: https://lore.kernel.org/r/1614336782-5809-1-git-send-email-loic.poulain@xxxxxxxxxx
Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/bus/mhi/core/main.c | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
--- a/drivers/bus/mhi/core/main.c
+++ b/drivers/bus/mhi/core/main.c
@@ -1077,12 +1077,8 @@ static int mhi_queue(struct mhi_device *
if (mhi_chan->dir == DMA_TO_DEVICE)
atomic_inc(&mhi_cntrl->pending_pkts);
- if (unlikely(!MHI_DB_ACCESS_VALID(mhi_cntrl))) {
- ret = -EIO;
- goto exit_unlock;
- }
-
- mhi_ring_chan_db(mhi_cntrl, mhi_chan);
+ if (likely(MHI_DB_ACCESS_VALID(mhi_cntrl)))
+ mhi_ring_chan_db(mhi_cntrl, mhi_chan);
if (dir == DMA_FROM_DEVICE)
mhi_cntrl->runtime_put(mhi_cntrl);
Patches currently in stable-queue which might be from loic.poulain@xxxxxxxxxx are
queue-5.12/bus-mhi-pci_generic-remove-wq_mem_reclaim-flag-from-state-workqueue.patch
queue-5.12/bus-mhi-core-fix-invalid-error-returning-in-mhi_queue.patch
queue-5.12/bus-mhi-core-fix-mhi-runtime_pm-behavior.patch
queue-5.12/bus-mhi-core-fix-check-for-syserr-at-power_up.patch
