sugar/linux
1
0
Fork 0
Code Activity

scsi: ufs: core: Remove UFS_DEVICE_QUIRK_DELAY_AFTER_LPM quirk

Browse Source 
After the UFS device VCC is turned off, all the UFS device manufacturers
require a period of power-off time before the VCC can be turned on
again. This requirement has been confirmed with all the UFS device
manufacturer's datasheets.

Remove the UFS_DEVICE_QUIRK_DELAY_AFTER_LPM quirk in the UFS core driver
and implement a universal delay that is required by all the UFS device
manufacturers. In addition, remove the support for this quirk in the
platform drivers.

Signed-off-by: Bao D. Nguyen <quic_nguyenb@quicinc.com>
Reviewed-by: Peter Wang <peter.wang@mediatek.com>
Reviewed-by: Bart Van Assche <bvanassche@acm.org>
Link: https://patch.msgid.link/25f134d5a42e8b8365be64d512d1bb5fc2bce6ff.1760383740.git.quic_nguyenb@quicinc.com
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
This commit is contained in:
Bao D. Nguyen
2025-10-13 12:38:15 -07:00
committed by Martin K. Petersen
parent 3a86608788
commit f8e82ae65e
4 changed files with 6 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/ufs/core/ufshcd.c
View File

@@ -9774,10 +9774,9 @@ static void ufshcd_vreg_set_lpm(struct ufs_hba *hba)
} }
/* /*
* Some UFS devices require delay after VCC power rail is turned-off. * All UFS devices require delay after VCC power rail is turned-off.
*/ */
if (vcc_off && hba->vreg_info.vcc && if (vcc_off && hba->vreg_info.vcc && !hba->vreg_info.vcc->always_on)
hba->dev_quirks & UFS_DEVICE_QUIRK_DELAY_AFTER_LPM)
usleep_range(5000, 5100); usleep_range(5000, 5100);
} }

11
drivers/ufs/host/ufs-mediatek.c
View File

@@ -41,8 +41,7 @@ static void _ufs_mtk_clk_scale(struct ufs_hba *hba, bool scale_up);
static const struct ufs_dev_quirk ufs_mtk_dev_fixups[] = { static const struct ufs_dev_quirk ufs_mtk_dev_fixups[] = {
{ .wmanufacturerid = UFS_ANY_VENDOR, { .wmanufacturerid = UFS_ANY_VENDOR,
.model = UFS_ANY_MODEL, .model = UFS_ANY_MODEL,
.quirk = UFS_DEVICE_QUIRK_DELAY_AFTER_LPM | .quirk = UFS_DEVICE_QUIRK_DELAY_BEFORE_LPM },
UFS_DEVICE_QUIRK_DELAY_BEFORE_LPM },
{ .wmanufacturerid = UFS_VENDOR_SKHYNIX, { .wmanufacturerid = UFS_VENDOR_SKHYNIX,
.model = "H9HQ21AFAMZDAR", .model = "H9HQ21AFAMZDAR",
.quirk = UFS_DEVICE_QUIRK_SUPPORT_EXTENDED_FEATURES }, .quirk = UFS_DEVICE_QUIRK_SUPPORT_EXTENDED_FEATURES },
@@ -1889,15 +1888,13 @@ static void ufs_mtk_fixup_dev_quirks(struct ufs_hba *hba)
{ {
ufshcd_fixup_dev_quirks(hba, ufs_mtk_dev_fixups); ufshcd_fixup_dev_quirks(hba, ufs_mtk_dev_fixups);
if (ufs_mtk_is_broken_vcc(hba) && hba->vreg_info.vcc && if (ufs_mtk_is_broken_vcc(hba) && hba->vreg_info.vcc) {
(hba->dev_quirks & UFS_DEVICE_QUIRK_DELAY_AFTER_LPM)) {
hba->vreg_info.vcc->always_on = true; hba->vreg_info.vcc->always_on = true;
/* /*
* VCC will be kept always-on thus we don't * VCC will be kept always-on thus we don't
* need any delay during regulator operations * need any delay before putting device's VCC in LPM mode.
*/ */
hba->dev_quirks &= ~(UFS_DEVICE_QUIRK_DELAY_BEFORE_LPM | hba->dev_quirks &= ~UFS_DEVICE_QUIRK_DELAY_BEFORE_LPM;
UFS_DEVICE_QUIRK_DELAY_AFTER_LPM);
} }
ufs_mtk_vreg_fix_vcc(hba); ufs_mtk_vreg_fix_vcc(hba);

3
drivers/ufs/host/ufs-qcom.c
View File

@@ -1024,9 +1024,6 @@ static struct ufs_dev_quirk ufs_qcom_dev_fixups[] = {
{ .wmanufacturerid = UFS_VENDOR_SKHYNIX, { .wmanufacturerid = UFS_VENDOR_SKHYNIX,
.model = UFS_ANY_MODEL, .model = UFS_ANY_MODEL,
.quirk = UFS_DEVICE_QUIRK_DELAY_BEFORE_LPM }, .quirk = UFS_DEVICE_QUIRK_DELAY_BEFORE_LPM },
{ .wmanufacturerid = UFS_VENDOR_TOSHIBA,
.model = UFS_ANY_MODEL,
.quirk = UFS_DEVICE_QUIRK_DELAY_AFTER_LPM },
{ .wmanufacturerid = UFS_VENDOR_WDC, { .wmanufacturerid = UFS_VENDOR_WDC,
.model = UFS_ANY_MODEL, .model = UFS_ANY_MODEL,
.quirk = UFS_DEVICE_QUIRK_HOST_PA_TACTIVATE }, .quirk = UFS_DEVICE_QUIRK_HOST_PA_TACTIVATE },

7
include/ufs/ufs_quirks.h
View File

@@ -100,13 +100,6 @@ struct ufs_dev_quirk {
*/ */
#define UFS_DEVICE_QUIRK_SUPPORT_EXTENDED_FEATURES (1 << 10) #define UFS_DEVICE_QUIRK_SUPPORT_EXTENDED_FEATURES (1 << 10)
/*
* Some UFS devices require delay after VCC power rail is turned-off.
* Enable this quirk to introduce 5ms delays after VCC power-off during
* suspend flow.
*/
#define UFS_DEVICE_QUIRK_DELAY_AFTER_LPM (1 << 11)
/* /*
* Some ufs devices may need more time to be in hibern8 before exiting. * Some ufs devices may need more time to be in hibern8 before exiting.
* Enable this quirk to give it an additional 100us. * Enable this quirk to give it an additional 100us.