Skip to contentSkip to conversation

ufs: scsi: core: Send a NOP OUT to device before disabling AHIT

PATCH In review Mriganka Chakravarty 2 participants 2 messages Jun 17, 2025 – Jun 18, 2025

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ufs: scsi: core: Send a NOP OUT to device before disabling AHIT

Synopsis databook recommends that the host must send a NOP OUT to device before disabling AHIT(setting AHIT.AH8ITV to 0), if already programmed to a non-zero value.

---
 drivers/ufs/core/ufshcd.c | 10 ++++++++++
 include/ufs/ufshcd.h      |  7 +++++++
 2 files changed, 17 insertions(+)
drivers/ufs/core/ufshcd.c +10 -0
index 4410e7d93b7d..f9a2d15ab2ee 100644
@@ -4507,9 +4507,19 @@ EXPORT_SYMBOL_GPL(ufshcd_uic_hibern8_exit);
 
 static void ufshcd_configure_auto_hibern8(struct ufs_hba *hba)
 {
+	u32 reg_ahit;
+
 	if (!ufshcd_is_auto_hibern8_supported(hba))
 		return;
 
+	if (hba->quirks & UFSHCD_QUIRK_SEND_NOP_BEFORE_AHIT_DISABLE) {
+		reg_ahit = ufshcd_readl(hba, REG_AUTO_HIBERNATE_IDLE_TIMER);
+		if (hba->ahit == 0 &&
+		    FIELD_GET(UFSHCI_AHIBERN8_TIMER_MASK, reg_ahit) != 0)
+			ufshcd_exec_dev_cmd(hba, DEV_CMD_TYPE_NOP,
+					    hba->nop_out_timeout);
+	}
+
 	ufshcd_writel(hba, hba->ahit, REG_AUTO_HIBERNATE_IDLE_TIMER);
 }
 
include/ufs/ufshcd.h +7 -0
index 9b3515cee711..b069d15c1c71 100644
@@ -689,6 +689,13 @@ enum ufshcd_quirks {
 	 * single doorbell mode.
 	 */
 	UFSHCD_QUIRK_BROKEN_LSDBS_CAP			= 1 << 25,
+
+	/*
+	 * This quirk indicates that host must send a NOP OUT to device before
+	 * disabling AHIT(setting AHIT.AH8ITV to 0), if already programmed to a
+	 * non-zero value.
+	 */
+	UFSHCD_QUIRK_SEND_NOP_BEFORE_AHIT_DISABLE	= 1 << 31,
 };
 
 enum ufshcd_caps {
Signature · 1 line
2.50.0.rc2.692.g299adb8693-goog
#1 lore raw
Quoted 7 lines · Mriganka Chakravarty

Synopsis databook recommends that the host must send a NOP OUT to device
before disabling AHIT(setting AHIT.AH8ITV to 0), if already programmed
to a non-zero value.

Hi Mriganka,

Please do not add a quirk without adding a user that needs the quirk.

Thanks.
Peter