From f2c5d24c0a1b1a6b1f6a2633cfdd8540dc7f4d85 Mon Sep 17 00:00:00 2001 From: "Bao D. Nguyen" Date: Mon, 29 Jun 2020 17:59:48 -0700 Subject: [PATCH] scsi: ufshcd: Allow zero value setting to Auto-Hibernate Timer The zero value Auto-Hibernate Timer is a valid setting, and it indicates the Auto-Hibernate feature being disabled. Correctly support this setting. In addition, when this value is queried from sysfs, read from the host controller's register and return that value instead of using the RAM value. Change-Id: I6ad0e00ae485549cb18f704907149d8a69961e5f Signed-off-by: Bao D. Nguyen --- drivers/scsi/ufs/ufs-sysfs.c | 9 ++++++++- drivers/scsi/ufs/ufshcd-qti.c | 4 ++-- drivers/scsi/ufs/ufshcd.c | 4 ++-- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/drivers/scsi/ufs/ufs-sysfs.c b/drivers/scsi/ufs/ufs-sysfs.c index 5f37c8175e4e..dbb79d675254 100644 --- a/drivers/scsi/ufs/ufs-sysfs.c +++ b/drivers/scsi/ufs/ufs-sysfs.c @@ -145,12 +145,19 @@ static u32 ufshcd_us_to_ahit(unsigned int timer) static ssize_t auto_hibern8_show(struct device *dev, struct device_attribute *attr, char *buf) { + u32 ahit; struct ufs_hba *hba = dev_get_drvdata(dev); if (!ufshcd_is_auto_hibern8_supported(hba)) return -EOPNOTSUPP; - return snprintf(buf, PAGE_SIZE, "%d\n", ufshcd_ahit_to_us(hba->ahit)); + pm_runtime_get_sync(hba->dev); + ufshcd_hold(hba, false); + ahit = ufshcd_readl(hba, REG_AUTO_HIBERNATE_IDLE_TIMER); + ufshcd_release(hba); + pm_runtime_put_sync(hba->dev); + + return scnprintf(buf, PAGE_SIZE, "%d\n", ufshcd_ahit_to_us(ahit)); } static ssize_t auto_hibern8_store(struct device *dev, diff --git a/drivers/scsi/ufs/ufshcd-qti.c b/drivers/scsi/ufs/ufshcd-qti.c index 8ae31a43b135..31759c1c3364 100644 --- a/drivers/scsi/ufs/ufshcd-qti.c +++ b/drivers/scsi/ufs/ufshcd-qti.c @@ -4851,8 +4851,8 @@ void ufshcd_auto_hibern8_enable(struct ufs_hba *hba) { unsigned long flags; - if (!ufshcd_is_auto_hibern8_supported(hba) || !hba->ahit - || (hba->quirks & UFSHCD_QUIRK_BROKEN_AUTO_HIBERN8)) + if (!ufshcd_is_auto_hibern8_supported(hba) || + (hba->quirks & UFSHCD_QUIRK_BROKEN_AUTO_HIBERN8)) return; spin_lock_irqsave(hba->host->host_lock, flags); diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c index 8e3a69631b15..ed9e1b9b443c 100644 --- a/drivers/scsi/ufs/ufshcd.c +++ b/drivers/scsi/ufs/ufshcd.c @@ -4147,8 +4147,8 @@ void ufshcd_auto_hibern8_enable(struct ufs_hba *hba) { unsigned long flags; - if (!ufshcd_is_auto_hibern8_supported(hba) || !hba->ahit - || (hba->quirks & UFSHCD_QUIRK_BROKEN_AUTO_HIBERN8)) + if (!ufshcd_is_auto_hibern8_supported(hba) || + (hba->quirks & UFSHCD_QUIRK_BROKEN_AUTO_HIBERN8)) return; spin_lock_irqsave(hba->host->host_lock, flags);