[PATCH 0/2] scsi: ufs: core: Fix post-reset runtime PM recovery after eef1d74bf88f

From: Stanley Jhu

Date: Thu Nov 05 2026 - 02:16:13 EST


Since commit eef1d74bf88f ("PM: runtime: Only set runtime_error on
suspend callback failures"), rpm_resume() resets ufs_device_wlun to
RPM_SUSPENDED and leaves power.runtime_error at 0 when W-LUN runtime
resume fails. When error handling subsequently resets and restores the
host and link, two runtime PM recovery gaps are exposed:

1. ufshcd_err_handling_prepare() calls ufshcd_vops_resume() while
ufs_device_wlun remains RPM_SUSPENDED, so the next ufs_device_wlun
runtime resume calls ufshcd_vops_resume() a second consecutive time
without an intervening ufshcd_vops_suspend(), leaking core_clk and
iface_clk enable counts in ufs_qcom_resume() via qcom_ice_resume().
2. ufshcd_recover_pm_error() checks only power.runtime_error and skips
consumer queue recovery, leaving waking I/O blocked in
__bio_queue_enter() until another request touches the same queue.

Patch 1 tracks POST_CHANGE variant suspend state in
hba->is_vops_suspended so ufshcd_vops_resume() pairs 1:1 with
ufshcd_vops_suspend() across error recovery. Patch 2 wakes consumer
request queues when ufs_device_wlun is runtime-suspended in
ufshcd_recover_pm_error() so consumer pm_request_resume() resumes
ufs_device_wlun via the runtime PM device link.

This series applies on top of two prerequisite patches so repeated
post-failure W-LUN runtime resumes keep wlun q->pm_only and
clk_gating.active_reqs balanced:
- Message-ID: <20261104112744.1630864-1-stanleyjhu@xxxxxxxxxx>
("[PATCH v2] block: Keep RPM_ACTIVE in blk_pre_runtime_resume() when
already active")
- Message-ID: <20261029040002.2100002-1-stanleyjhu@xxxxxxxxxx>
("scsi: ufs: core: Keep clock-gating hold on failed W-LUN runtime
resume")

Tested: QEMU ARM64 UFS in SDB and MCQ modes with injected W-LUN
runtime-resume START STOP UNIT and fatal UIC error recovery, verifying
immediate consumer wake, 1:1 variant suspend/resume pairing, and idle
clock gating.

Stanley Jhu (2):
scsi: ufs: core: Skip redundant variant resume after error recovery
power-up
scsi: ufs: core: Wake consumer queues on suspended W-LUN recovery

drivers/ufs/core/ufshcd-priv.h | 21 ++++++++++++++++-----
drivers/ufs/core/ufshcd.c | 4 +++-
include/ufs/ufshcd.h | 2 ++
3 files changed, 21 insertions(+), 6 deletions(-)

--
2.56.0.385.gac671c819a-goog