Skip to content

ufs: core: mcq: Add ufshcd_abort() and error handler support in MCQ mode

Bao D. Nguyen linux-arm-kernel linux-arm-msm linux-mediatek linux-scsi lkml 7 versions – Applied

Status from this message: Applied to 6.5/scsi-staging, thanks!

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v7 Latest7 patches 5 repliesApplied
  2. v67 patches 0 repliesSuperseded
  3. v57 patches 13 repliesSuperseded
Earlier versions · 4
VersionPostedPatchesRepliesStatus
v47 patches0 repliesSuperseded
v37 patches5 repliesSuperseded
v25 patches12 repliesSuperseded
v15 patches8 repliesSuperseded

Changes in v7 from the cover letter

patch #7: Added a new argument force_compl to function ufshcd_mcq_compl_pending_transfer().
Added a new function ufshcd_mcq_compl_all_cqes_lock().
This change is to handle the case where the ufs host controller has been reset by the ufshcd_hba_stop() in ufshcd_host_reset_and_restore() prior to calling ufshcd_complete_requests(). The new logic is added to correctly complete all the commands that have been completed in the Completion Queue, or inform the scsi layer about those commands that are still stuck/pending in the hardware.
---
v5->v6: Addressed Stanley's comments
patch #1,2,3,4,6: unchanged.
patch #5: fixed extra erroneous if() statement introduced in version v5
patch #7: Change ufshcd_complete_requests() to call a new mcq function
ufshcd_mcq_compl_pending_transfer(), leaving ufshcd_transfer_req_compl() to be used in SDB mode only.

Patches in v7 Applied

#Subject and filesSizeRepliesApplied
1/7ufs: core: Combine 32-bit command_desc_base_addr_lo/hidrivers/ufs/core/ufshcd.c include/ufs/ufshci.h+4 -80 replies
2/7ufs: core: Update the ufshcd_clear_cmds() functionalitydrivers/ufs/core/ufshcd.c+21 -160 replies
3/7ufs: mcq: Add supporting functions for mcq abortdrivers/ufs/core/ufs-mcq.c drivers/ufs/core/ufshcd-priv.h drivers/ufs/core/ufshcd.c +2 more+197 -10 replies
4/7ufs: mcq: Add support for clean up mcq resourcesdrivers/ufs/core/ufshcd-priv.h drivers/ufs/core/ufshcd.c+66 -90 replies
5/7ufs: mcq: Added ufshcd_mcq_abort()drivers/ufs/core/ufs-mcq.c drivers/ufs/core/ufshcd-priv.h drivers/ufs/core/ufshcd.c+71 -50 replies
6/7ufs: mcq: Use ufshcd_mcq_poll_cqe_lock() in mcq modedrivers/ufs/core/ufs-mcq.c drivers/ufs/core/ufshcd-priv.h drivers/ufs/core/ufshcd.c +2 more+6 -80 replies
7/7ufs: core: Add error handling for MCQ modedrivers/ufs/core/ufs-mcq.c drivers/ufs/core/ufshcd-priv.h drivers/ufs/core/ufshcd.c+139 -180 replies

Reviews trailers per patch

5 of 7 patches have a Reviewed-by or Acked-by of their own; the series has one for all of them.

PatchBart Van AsscheStanley ChuCan Guo
SeriesR-b T-b R-b
1/7R-b
2/7R-b
3/7R-b
4/7R-b
5/7
6/7R-b
7/7

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes. Scroll the table sideways for all 3 reviewers.

Read the v7 thread

Cover letter [PATCH v7 0/7] ufs: core: mcq: Add ufshcd_abort() and error handler support in MCQ mode

This patch series enable support for ufshcd_abort() and error handler in MCQ mode.

Bao D. Nguyen (7):
ufs: core: Combine 32-bit command_desc_base_addr_lo/hi
ufs: core: Update the ufshcd_clear_cmds() functionality
ufs: mcq: Add supporting functions for mcq abort
ufs: mcq: Add support for clean up mcq resources
ufs: mcq: Added ufshcd_mcq_abort()
ufs: mcq: Use ufshcd_mcq_poll_cqe_lock() in mcq mode
ufs: core: Add error handling for MCQ mode

 drivers/ufs/core/ufs-mcq.c     | 259 ++++++++++++++++++++++++++++++++++++++++-
 drivers/ufs/core/ufshcd-priv.h |  18 ++-
 drivers/ufs/core/ufshcd.c      | 256 ++++++++++++++++++++++++++++++++--------
 drivers/ufs/host/ufs-qcom.c    |   2 +-
 include/ufs/ufshcd.h           |   5 +-
 include/ufs/ufshci.h           |  23 +++-
 6 files changed, 501 insertions(+), 62 deletions(-)

---
Changes compared to v6:
patch #7: Added a new argument force_compl to function ufshcd_mcq_compl_pending_transfer().
Added a new function ufshcd_mcq_compl_all_cqes_lock().
This change is to handle the case where the ufs host controller has been reset by the ufshcd_hba_stop() in ufshcd_host_reset_and_restore() prior to calling ufshcd_complete_requests(). The new logic is added to correctly complete all the commands that have been completed in the Completion Queue, or inform the scsi layer about those commands that are still stuck/pending in the hardware.
---
v5->v6: Addressed Stanley's comments
patch #1,2,3,4,6: unchanged.
patch #5: fixed extra erroneous if() statement introduced in version v5
patch #7: Change ufshcd_complete_requests() to call a new mcq function
ufshcd_mcq_compl_pending_transfer(), leaving ufshcd_transfer_req_compl() to be used in SDB mode only.

Reset the hwq's head and tail slot variables to default values when the ufs host controller hw has been reset.
---
v4->v5:
patch #4: fixed uninitialized variable access introduced in patch v3.
---
v3->v4: Mainly addressed Bart's comments
patch #1: updated the commit message
patch #2: renamed ufshcd_clear_cmds() into ufshcd_clear_cmd() patch #3: removed result arg in ufshcd_mcq_sq_cleanup()
patch #4: removed check for "!rq" in ufshcd_cmd_inflight()
avoided access to door bell register in mcq mode
patch #5, 6: unchanged
patch #7: ufshcd_clear_cmds() to ufshcd_clear_cmd()
---
v2->v3:
patch #1:
New patch per Bart's comment. Helps process utp cmd
descriptor addr easier.
patch #2:
New patch to address Bart's comment regarding potentialoverflow when mcq queue depth becomes greater than 64.
patch #3:
Address Bart's comments
. Replaced ufshcd_mcq_poll_register() with read_poll_timeout() . Replace spin_lock(sq_lock) with mutex(sq_mutex)
. Updated ufshcd_mcq_nullify_cmd() and renamed to ufshcd_mcq_nullify_sqe() . Minor cosmetic changes
patch #4:
Adress Bart's comments. Added new function ufshcd_cmd_inflight() to replace the usage of lrbp->cmd
patch #5:
Continue replacing lrbp->cmd with ufshcd_cmd_inflight()
patch #6:
No change
patch #7:
Address Stanley Chu's comment about clearing hba->dev_cmd.complete in clear ufshcd_wait_for_dev_cmd()
Address Bart's comment.
---
v1->v2:
patch #1: Addressed Powen's comment. Replaced read_poll_timeout() with ufshcd_mcq_poll_register(). The function read_poll_timeout() may sleep while the caller is holding a spin_lock(). Poll the registers in a tight loop instead.

Signature · 1 line
2.7.4