From: Adrian Hunter <adrian.hunter@intel.com>
To: alexandre.belloni@bootlin.com
Cc: Frank.Li@nxp.com, linux-i3c@lists.infradead.org,
linux-kernel@vger.kernel.org
Subject: [PATCH V4 04/17] i3c: mipi-i3c-hci: Wait for DMA ring restart to complete
Date: Fri, 15 May 2026 19:26:08 +0300 [thread overview]
Message-ID: <20260515162621.57719-5-adrian.hunter@intel.com> (raw)
In-Reply-To: <20260515162621.57719-1-adrian.hunter@intel.com>
Although hci_dma_dequeue_xfer() is serialized against itself via
control_mutex, this does not guarantee that a DMA ring restart
triggered by a previous invocation has fully completed.
When the function is called again in rapid succession, the DMA ring may
still be transitioning back to the running state, which may confound or
disrupt further state changes.
Address this by waiting for the DMA ring restart to complete before
continuing.
Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
Reviewed-by: Frank Li <Frank.Li@nxp.com>
---
Changes in V4:
Add Frank's Rev'd-by
Changes in V2 and V3:
None
drivers/i3c/master/mipi-i3c-hci/dma.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/drivers/i3c/master/mipi-i3c-hci/dma.c b/drivers/i3c/master/mipi-i3c-hci/dma.c
index c3da6eab8eae..3b14bc87bdf6 100644
--- a/drivers/i3c/master/mipi-i3c-hci/dma.c
+++ b/drivers/i3c/master/mipi-i3c-hci/dma.c
@@ -617,6 +617,7 @@ static bool hci_dma_dequeue_xfer(struct i3c_hci *hci,
}
/* restart the ring */
+ reinit_completion(&rh->op_done);
mipi_i3c_hci_resume(hci);
rh_reg_write(RING_CONTROL, RING_CTRL_ENABLE);
rh_reg_write(RING_CONTROL, RING_CTRL_ENABLE | RING_CTRL_RUN_STOP);
@@ -625,6 +626,8 @@ static bool hci_dma_dequeue_xfer(struct i3c_hci *hci,
spin_unlock_irq(&hci->lock);
+ wait_for_completion_timeout(&rh->op_done, HZ);
+
return did_unqueue;
}
--
2.51.0
next prev parent reply other threads:[~2026-05-15 16:26 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-05-15 16:26 [PATCH V4 00/17] i3c: mipi-i3c-hci: DMA abort, recovery and related improvements Adrian Hunter
2026-05-15 16:26 ` [PATCH V4 01/17] i3c: mipi-i3c-hci: Fix suspend behavior when bus disable falls back to software reset Adrian Hunter
2026-05-15 16:26 ` [PATCH V4 02/17] i3c: mipi-i3c-hci: Preserve RUN bit when aborting DMA ring Adrian Hunter
2026-05-15 16:26 ` [PATCH V4 03/17] i3c: mipi-i3c-hci: Prevent DMA enqueue while ring is aborting or in error Adrian Hunter
2026-05-15 16:26 ` Adrian Hunter [this message]
2026-05-15 16:26 ` [PATCH V4 05/17] i3c: mipi-i3c-hci: Move hci_dma_xfer_done() definition Adrian Hunter
2026-05-15 16:26 ` [PATCH V4 06/17] i3c: mipi-i3c-hci: Call hci_dma_xfer_done() from dequeue path Adrian Hunter
2026-05-15 16:26 ` [PATCH V4 07/17] i3c: mipi-i3c-hci: Complete transfer lists immediately on error Adrian Hunter
2026-05-15 16:26 ` [PATCH V4 08/17] i3c: mipi-i3c-hci: Avoid restarting DMA ring after aborting wrong transfer Adrian Hunter
2026-05-15 16:26 ` [PATCH V4 09/17] i3c: mipi-i3c-hci: Add DMA ring abort/reset quirk for Intel controllers Adrian Hunter
2026-05-15 16:26 ` [PATCH V4 10/17] i3c: mipi-i3c-hci: Factor out hci_dma_abort() Adrian Hunter
2026-05-15 16:26 ` [PATCH V4 11/17] i3c: mipi-i3c-hci: Add DMA ring abort quirk for Intel controllers Adrian Hunter
2026-05-15 16:26 ` [PATCH V4 12/17] i3c: mipi-i3c-hci: Factor out reset-and-restore helper Adrian Hunter
2026-05-15 16:26 ` [PATCH V4 13/17] i3c: mipi-i3c-hci: Add DMA-mode recovery for internal controller errors Adrian Hunter
2026-05-15 16:26 ` [PATCH V4 14/17] i3c: mipi-i3c-hci: Wait for NoOp commands to complete Adrian Hunter
2026-05-15 16:26 ` [PATCH V4 15/17] i3c: mipi-i3c-hci: Base timeouts on actual transfer start time Adrian Hunter
2026-05-15 16:26 ` [PATCH V4 16/17] i3c: mipi-i3c-hci: Consolidate DMA ring allocation Adrian Hunter
2026-05-15 16:26 ` [PATCH V4 17/17] i3c: mipi-i3c-hci: Increase DMA transfer ring size to maximum Adrian Hunter
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260515162621.57719-5-adrian.hunter@intel.com \
--to=adrian.hunter@intel.com \
--cc=Frank.Li@nxp.com \
--cc=alexandre.belloni@bootlin.com \
--cc=linux-i3c@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox