From: Stanley Jhu <stanleyjhu@google.com>
To: "Martin K . Petersen" <mkp@kernel.org>,
"James E . J . Bottomley"
<James.Bottomley@HansenPartnership.com>
Cc: Alim Akhtar <alim.akhtar@samsung.com>,
Bart Van Assche <bvanassche@acm.org>,
Bean Huo <beanhuo@micron.com>,
Brian Norris <briannorris@chromium.org>,
Can Guo <can.guo@oss.qualcomm.com>,
Peter Wang <peter.wang@mediatek.com>,
John Garry <john.garry@linux.dev>,
"Rafael J . Wysocki" <rafael@kernel.org>,
Praveen Talari <praveen.talari@oss.qualcomm.com>,
linux-scsi@vger.kernel.org, linux-pm@vger.kernel.org,
linux-kernel@vger.kernel.org, stable@vger.kernel.org,
Stanley Jhu <stanleyjhu@google.com>
Subject: [PATCH 0/2] scsi: ufs: core: Fix post-reset runtime PM recovery after eef1d74bf88f
Date: Thu, 5 Nov 2026 15:15:16 +0800 [thread overview]
Message-ID: <20261105071518.1458428-1-stanleyjhu@google.com> (raw)
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@google.com>
("[PATCH v2] block: Keep RPM_ACTIVE in blk_pre_runtime_resume() when
already active")
- Message-ID: <20261029040002.2100002-1-stanleyjhu@google.com>
("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
next reply other threads:[~2026-11-05 7:15 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-05 7:15 Stanley Jhu [this message]
2026-11-05 7:15 ` [PATCH 1/2] scsi: ufs: core: Skip redundant variant resume after error recovery power-up Stanley Jhu
[not found] ` <sashiko-outbox-198692@kernel.org>
2026-11-05 14:43 ` Stanley Jhu
2026-11-05 7:15 ` [PATCH 2/2] scsi: ufs: core: Wake consumer queues on suspended W-LUN recovery Stanley Jhu
[not found] ` <sashiko-outbox-198693@kernel.org>
2026-11-05 14:43 ` Stanley Jhu
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=20261105071518.1458428-1-stanleyjhu@google.com \
--to=stanleyjhu@google.com \
--cc=James.Bottomley@HansenPartnership.com \
--cc=alim.akhtar@samsung.com \
--cc=beanhuo@micron.com \
--cc=briannorris@chromium.org \
--cc=bvanassche@acm.org \
--cc=can.guo@oss.qualcomm.com \
--cc=john.garry@linux.dev \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=mkp@kernel.org \
--cc=peter.wang@mediatek.com \
--cc=praveen.talari@oss.qualcomm.com \
--cc=rafael@kernel.org \
--cc=stable@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
all inboxes | Powered by JetHome®