Skip to content

scsi: ufs: ufs-qcom: Enable SKIP DEVICE RESET Quirk #641

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Pradeep-pvk wants to merge 2 commits into
base: qcom-6.18.y
Choose a base branch
from
+38 −3
Open

scsi: ufs: ufs-qcom: Enable SKIP DEVICE RESET Quirk #641

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
29eb955
FROMLIST: scsi: ufs: core: Add UFSHCD_QUIRK_SKIP_DEVICE_RESET quirk
nitinrawat123 May 31, 2026
7714c54
FROMLIST: scsi: ufs: ufs-qcom: Enable SKIP DEVICE RESET Quirk
nitinrawat123 May 31, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 24 additions & 3 deletions drivers/ufs/host/ufs-qcom.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -753,9 +753,17 @@ static int ufs_qcom_suspend(struct ufs_hba *hba, enum ufs_pm_op pm_op,
if (!ufs_qcom_is_link_active(hba))
ufs_qcom_disable_lane_clks(host);


/* reset the connected UFS device during power down */
if (ufs_qcom_is_link_off(hba) && host->device_reset) {
/*
* For some UFS vendors, skip asserting device reset here.
* These vendor parts keep drawing larger current after reset
* is asserted until it is deasserted, and the 10ms delay is
* not sufficient to prevent OCP (Over Current Protection)
* on the regulator. This is for the powerdown case, so
* the device reset can be asserted later as part of the
* platform shutdown sequence.
*/
if (ufs_qcom_is_link_off(hba) && host->device_reset &&
!(hba->quirks & UFSHCD_QUIRK_SKIP_DEVICE_RESET)) {
ufs_qcom_device_reset_ctrl(hba, true);
/*
* After sending the SSU command, asserting the rst_n
Expand Down Expand Up @@ -1068,6 +1076,19 @@ static struct ufs_dev_quirk ufs_qcom_dev_fixups[] = {
static void ufs_qcom_fixup_dev_quirks(struct ufs_hba *hba)
{
ufshcd_fixup_dev_quirks(hba, ufs_qcom_dev_fixups);

/*
* Some UFS parts keep drawing larger current after reset is asserted
* until it is deasserted. The 10ms delay added after asserting HWRST
* (as done for other vendors) is not sufficient for these parts.
*
* Skip asserting device reset during UFS power down for these parts
* to prevent OCP (Over Current Protection) fault on the regulator.
* This is handled only in shutdown; the device reset will be asserted
* as part of the platform shutdown sequence.
*/
if (hba->dev_info.wmanufacturerid == UFS_VENDOR_MICRON)
hba->quirks |= UFSHCD_QUIRK_SKIP_DEVICE_RESET;
}

static u32 ufs_qcom_get_ufs_hci_version(struct ufs_hba *hba)
Expand Down
14 changes: 14 additions & 0 deletions include/ufs/ufshcd.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -695,6 +695,20 @@ enum ufshcd_quirks {
* because it causes link startup to become unreliable.
*/
UFSHCD_QUIRK_PERFORM_LINK_STARTUP_ONCE = 1 << 26,

/*
* Some UFS devices keep drawing larger current after reset is
* asserted until it is deasserted. Asserting device reset
* during UFS power down causes the device firmware to wake up and
* execute its reset routine, drawing current beyond the permissible
* limit for low-power mode (LPM). This may trigger an OCP fault on
* the regulator supplying power to UFS.
*
* Enable this quirk to skip asserting device reset during UFS power
* down. This is handled only in shutdown; the device reset will be
* asserted as part of the platform shutdown sequence.
*/
UFSHCD_QUIRK_SKIP_DEVICE_RESET = 1 << 27,
};

enum ufshcd_caps {
Expand Down