Skip to content

i3c: mipi-i3c-hci: DMA abort, recovery and related improvements

Adrian Hunter linux-i3c lkml 5 versions – Applied

Status from this message: Applied, thanks!

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v5 Latest17 patches 1 replyApplied
  2. v417 patches 8 repliesSuperseded
  3. v316 patches 13 repliesSuperseded
Earlier versions · 2
VersionPostedPatchesRepliesStatus
v216 patches2 repliesSuperseded
v116 patches11 repliesSuperseded

Patches in v5 Applied

#Subject and filesSizeRepliesApplied
1/17i3c: mipi-i3c-hci: Fix suspend behavior when bus disable falls back to software resetdrivers/i3c/master/mipi-i3c-hci/core.c+3 -80 replies
2/17i3c: mipi-i3c-hci: Preserve RUN bit when aborting DMA ringdrivers/i3c/master/mipi-i3c-hci/dma.c+1 -10 replies
3/17i3c: mipi-i3c-hci: Prevent DMA enqueue while ring is aborting or in errordrivers/i3c/master/mipi-i3c-hci/core.c drivers/i3c/master/mipi-i3c-hci/dma.c drivers/i3c/master/mipi-i3c-hci/hci.h+26 -20 replies
4/17i3c: mipi-i3c-hci: Wait for DMA ring restart to completedrivers/i3c/master/mipi-i3c-hci/dma.c+3 -00 replies
5/17i3c: mipi-i3c-hci: Move hci_dma_xfer_done() definitiondrivers/i3c/master/mipi-i3c-hci/dma.c+49 -490 replies
6/17i3c: mipi-i3c-hci: Call hci_dma_xfer_done() from dequeue pathdrivers/i3c/master/mipi-i3c-hci/dma.c+2 -00 replies
7/17i3c: mipi-i3c-hci: Complete transfer lists immediately on errordrivers/i3c/master/mipi-i3c-hci/dma.c drivers/i3c/master/mipi-i3c-hci/hci.h+5 -20 replies
8/17i3c: mipi-i3c-hci: Avoid restarting DMA ring after aborting wrong transferdrivers/i3c/master/mipi-i3c-hci/dma.c drivers/i3c/master/mipi-i3c-hci/hci.h+16 -00 replies
9/17i3c: mipi-i3c-hci: Add DMA ring abort/reset quirk for Intel controllersdrivers/i3c/master/mipi-i3c-hci/core.c drivers/i3c/master/mipi-i3c-hci/dma.c drivers/i3c/master/mipi-i3c-hci/hci.h+20 -10 replies
10/17i3c: mipi-i3c-hci: Factor out hci_dma_abort()drivers/i3c/master/mipi-i3c-hci/dma.c+8 -30 replies
11/17i3c: mipi-i3c-hci: Add DMA ring abort quirk for Intel controllersdrivers/i3c/master/mipi-i3c-hci/core.c drivers/i3c/master/mipi-i3c-hci/dma.c drivers/i3c/master/mipi-i3c-hci/hci.h+33 -40 replies
12/17i3c: mipi-i3c-hci: Factor out reset-and-restore helperdrivers/i3c/master/mipi-i3c-hci/core.c drivers/i3c/master/mipi-i3c-hci/hci.h+19 -20 replies
13/17i3c: mipi-i3c-hci: Add DMA-mode recovery for internal controller errorsdrivers/i3c/master/mipi-i3c-hci/cmd.h drivers/i3c/master/mipi-i3c-hci/core.c drivers/i3c/master/mipi-i3c-hci/dma.c +1 more+92 -90 replies
14/17i3c: mipi-i3c-hci: Wait for NoOp commands to completedrivers/i3c/master/mipi-i3c-hci/dma.c+33 -60 replies
15/17i3c: mipi-i3c-hci: Base timeouts on actual transfer start timedrivers/i3c/master/mipi-i3c-hci/core.c drivers/i3c/master/mipi-i3c-hci/dma.c drivers/i3c/master/mipi-i3c-hci/hci.h +1 more+48 -20 replies
16/17i3c: mipi-i3c-hci: Consolidate DMA ring allocationdrivers/i3c/master/mipi-i3c-hci/dma.c+8 -130 replies
17/17i3c: mipi-i3c-hci: Increase DMA transfer ring size to maximumdrivers/i3c/master/mipi-i3c-hci/dma.c+1 -10 replies

Reviews trailers per patch

All 17 patches have a Reviewed-by or Acked-by.

PatchFrank Li
1/17R-b
2/17R-b
3/17R-b
4/17R-b
5/17R-b
6/17R-b
7/17R-b
8/17R-b
9/17R-b
10/17R-b
11/17R-b
12/17R-b
13/17R-b
14/17R-b
15/17R-b
16/17R-b
17/17R-b

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.

Read the v5 thread

Cover letter [PATCH V5 00/17] i3c: mipi-i3c-hci: DMA abort, recovery and related improvements

Hi

This series improves the robustness of the MIPI I3C HCI DMA mode driver, addressing issues observed during error handling and recovery.

Note all patches have now been reviewed by Frank.

Patch 1 ensures suspend always invokes io->suspend.

Patches 2-4 fix issues in the existing DMA abort path: preserving the RUN bit during abort per the MIPI specification, blocking enqueue during abort/error, and waiting for ring restart completion.

Patches 5-8 improve how partially completed transfer lists are handled during dequeue: moving hci_dma_xfer_done() earlier so completed responses are processed before NoOp replacement, completing transfer lists immediately on error rather than deferring, and detecting when an abort races with transfer completion to avoid restarting the wrong transfer list.

Patches 9-11 add Intel-specific quirks for DMA ring abort: a PIO queue reset after abort, and an HC_CONTROL ABORT before the ring-level abort.

Patch 12 factors out a reset-and-restore helper from the suspend path for reuse.

Patch 13 adds a full DMA recovery path for internal controller errors. When the hardware reports a TID mismatch or the ring becomes stuck, the driver now resets and restores the controller, terminating all in-flight transfers with an error status.

Patch 14 makes NoOp command handling observable: instead of discarding NoOp responses, the driver now waits for them to complete and triggers recovery if they fail.

Patch 15 adjusts transfer timeout accounting to start from when a transfer actually begins execution rather than when it was queued, preventing premature timeouts behind slow predecessors.

Patches 16-17 are minor optimizations: consolidating the DMA command and response ring into a single coherent allocation, and increasing the ring size to the maximum 255 entries to avoid ring-space exhaustion.

Changes in V5:

i3c: mipi-i3c-hci: Avoid restarting DMA ring after aborting wrong transfer
i3c: mipi-i3c-hci: Add DMA ring abort/reset quirk for Intel controllers
i3c: mipi-i3c-hci: Factor out hci_dma_abort()
i3c: mipi-i3c-hci: Add DMA ring abort quirk for Intel controllers
i3c: mipi-i3c-hci: Add DMA-mode recovery for internal controller errors
i3c: mipi-i3c-hci: Base timeouts on actual transfer start time
i3c: mipi-i3c-hci: Consolidate DMA ring allocation
Add Frank's Rev'd-by

Changes in V4:

i3c: mipi-i3c-hci: Add DMA ring abort/reset quirk for Intel controllers
Inline HCI_QUIRK_DMA_ABORT_REQUIRES_PIO_RESET check at call site instead of using a helper function

i3c: mipi-i3c-hci: Factor out hci_dma_abort()
New patch

i3c: mipi-i3c-hci: Add DMA ring abort quirk for Intel controllers
Factor out hci_dma_abort() into a preceding patch
Make hci_dma_requires_hc_abort_quirk() void; move quirk check to caller

i3c: mipi-i3c-hci: Base timeouts on actual transfer start time
Rename start_time to start_jiffies

i3c: mipi-i3c-hci: Consolidate DMA ring allocation
Cache allocation size in xfer_alloc_sz to avoid recomputing in hci_dma_free()

Changes in V3:

i3c: mipi-i3c-hci: Fix suspend behavior when bus disable falls back to software reset
i3c: mipi-i3c-hci: Preserve RUN bit when aborting DMA ring
Add Frank's rev'd-by

i3c: mipi-i3c-hci: Add DMA-mode recovery for internal controller errors
When erroring out transfers, ensure the final transfer of a transfer list is processed last

Changes in V2:

i3c: mipi-i3c-hci: Fix suspend behavior when bus disable falls back to software reset
Always return 0 from suspend callback
Amend commit message

i3c: mipi-i3c-hci: Preserve RUN bit when aborting DMA ring
Improve commit message

i3c: mipi-i3c-hci: Prevent DMA enqueue while ring is aborting or in error
Improve commit message

i3c: mipi-i3c-hci: Wait for DMA ring restart to complete
None

i3c: mipi-i3c-hci: Move hci_dma_xfer_done() definition
Add Frank's Rev'd-by

i3c: mipi-i3c-hci: Call hci_dma_xfer_done() from dequeue path
Add Frank's Rev'd-by

i3c: mipi-i3c-hci: Complete transfer lists immediately on error
Rename completing_xfer to final_xfer

i3c: mipi-i3c-hci: Avoid restarting DMA ring after aborting wrong transfer
Rename completing_xfer to final_xfer

i3c: mipi-i3c-hci: Add DMA ring abort/reset quirk for Intel controllers
None

i3c: mipi-i3c-hci: Add DMA ring abort quirk for Intel controllers
None

i3c: mipi-i3c-hci: Factor out reset-and-restore helper
Drop redundant i3c_hci_sync_irq_inactive(hci) from i3c_hci_reset_and_restore() because it is called by hci->io->suspend() anyway

i3c: mipi-i3c-hci: Add DMA-mode recovery for internal controller errors
Rename completing_xfer to final_xfer
Add hci_dma_xfer_done() before checking for an already complete transfer
Improve commit message

i3c: mipi-i3c-hci: Wait for NoOp commands to complete
Rename completing_xfer to final_xfer Add missing reinit_completion()

i3c: mipi-i3c-hci: Base timeouts on actual transfer start time
Do not flag the next transfer as started when there is an error which halts the controller
Instead flag it started at the end of hci_dma_dequeue_xfer() Use hci_start_xfer() in pio.c

i3c: mipi-i3c-hci: Consolidate DMA ring allocation
Check for failed allocation before assignments to avoid doing arithmetic with NULL pointers

i3c: mipi-i3c-hci: Increase DMA transfer ring size to maximum
None

Adrian Hunter (17):
i3c: mipi-i3c-hci: Fix suspend behavior when bus disable falls back to software reset
i3c: mipi-i3c-hci: Preserve RUN bit when aborting DMA ring
i3c: mipi-i3c-hci: Prevent DMA enqueue while ring is aborting or in error
i3c: mipi-i3c-hci: Wait for DMA ring restart to complete
i3c: mipi-i3c-hci: Move hci_dma_xfer_done() definition
i3c: mipi-i3c-hci: Call hci_dma_xfer_done() from dequeue path
i3c: mipi-i3c-hci: Complete transfer lists immediately on error
i3c: mipi-i3c-hci: Avoid restarting DMA ring after aborting wrong transfer
i3c: mipi-i3c-hci: Add DMA ring abort/reset quirk for Intel controllers
i3c: mipi-i3c-hci: Factor out hci_dma_abort()
i3c: mipi-i3c-hci: Add DMA ring abort quirk for Intel controllers
i3c: mipi-i3c-hci: Factor out reset-and-restore helper
i3c: mipi-i3c-hci: Add DMA-mode recovery for internal controller errors
i3c: mipi-i3c-hci: Wait for NoOp commands to complete
i3c: mipi-i3c-hci: Base timeouts on actual transfer start time
i3c: mipi-i3c-hci: Consolidate DMA ring allocation
i3c: mipi-i3c-hci: Increase DMA transfer ring size to maximum

 drivers/i3c/master/mipi-i3c-hci/cmd.h  |   6 +
 drivers/i3c/master/mipi-i3c-hci/core.c |  82 ++++++--
 drivers/i3c/master/mipi-i3c-hci/dma.c  | 333 +++++++++++++++++++++++++--------
 drivers/i3c/master/mipi-i3c-hci/hci.h  |  22 +++
 drivers/i3c/master/mipi-i3c-hci/pio.c  |   1 +
 5 files changed, 354 insertions(+), 90 deletions(-)

Regards
Adrian