From 4144ed4868ef58ebe2c9f388e5afea11a4b598c4 Mon Sep 17 00:00:00 2001
From: Jaegeuk Kim <jaegeuk@google.com>
Date: Mon, 16 Apr 2018 14:39:54 -0700
Subject: [PATCH] scsi: ufs: fix LINERESET on hibern8 without power hole
This patch fixes the previous workaround which consumes lots of power by
giving EINVAL on ufshcd_suspend().
Bug: 78058462
Bug: 77551464
Bug: 79276122
Fixes: d42e73ebf49a ("scsi: ufs: fix LINERESET on hibern8")
Change-Id: I5660e5f097fa31bb0914669bda28598a1de062c2
Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
---
drivers/scsi/ufs/ufshcd.c | 22 +++++++++++++++++++---
drivers/scsi/ufs/ufshcd.h | 1 +
2 files changed, 20 insertions(+), 3 deletions(-)
diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c
index 78cec71f6cac..89876f391369 100644
--- a/drivers/scsi/ufs/ufshcd.c
+++ b/drivers/scsi/ufs/ufshcd.c
@@ -3206,8 +3206,12 @@ int ufshcd_query_descriptor(struct ufs_hba *hba,
int retries;
for (retries = QUERY_REQ_RETRIES; retries > 0; retries--) {
- err = __ufshcd_query_descriptor(hba, opcode, idn, index,
+ err = -EAGAIN;
+ down_read(&hba->query_lock);
+ if (!ufshcd_is_link_hibern8(hba))
+ err = __ufshcd_query_descriptor(hba, opcode, idn, index,
selector, desc_buf, buf_len);
+ up_read(&hba->query_lock);
if (!err || err == -EINVAL)
break;
}
@@ -7900,8 +7904,8 @@ static int ufshcd_suspend(struct ufs_hba *hba, enum ufs_pm_op pm_op)
enum ufs_pm_level pm_lvl;
enum ufs_dev_pwr_mode req_dev_pwr_mode;
enum uic_link_state req_link_state;
+ bool need_upwrite = false;
- hba->pm_op_in_progress = 1;
if (!ufshcd_is_shutdown_pm(pm_op)) {
pm_lvl = ufshcd_is_runtime_pm(pm_op) ?
hba->rpm_lvl : hba->spm_lvl;
@@ -7912,6 +7916,14 @@ static int ufshcd_suspend(struct ufs_hba *hba, enum ufs_pm_op pm_op)
req_link_state = UIC_LINK_OFF_STATE;
}
+ if (ufshcd_is_runtime_pm(pm_op) &&
+ req_link_state == UIC_LINK_HIBERN8_STATE) {
+ need_upwrite = true;
+ if (!down_write_trylock(&hba->query_lock))
+ return -EBUSY;
+ }
+ hba->pm_op_in_progress = 1;
+
/*
* If we can't transition into any of the low power modes
* just gate the clocks.
@@ -8032,6 +8044,8 @@ enable_gating:
ufshcd_release_all(hba);
out:
hba->pm_op_in_progress = 0;
+ if (need_upwrite)
+ up_write(&hba->query_lock);
if (ret)
ufshcd_update_error_stats(hba, UFS_ERR_SUSPEND);
@@ -8443,7 +8457,8 @@ static ssize_t ufshcd_health_show(struct device *dev,
pm_runtime_get_sync(hba->dev);
err = ufshcd_read_health_desc(hba, desc_buf, buff_len);
- pm_runtime_put_sync(hba->dev);
+ pm_runtime_mark_last_busy(hba->dev);
+ pm_runtime_put_noidle(hba->dev);
if (err)
return err;
@@ -9103,6 +9118,7 @@ int ufshcd_init(struct ufs_hba *hba, void __iomem *mmio_base, unsigned int irq)
mutex_init(&hba->dev_cmd.lock);
init_rwsem(&hba->clk_scaling_lock);
+ init_rwsem(&hba->query_lock);
/* Initialize device management tag acquire wait queue */
init_waitqueue_head(&hba->dev_cmd.tag_wq);
diff --git a/drivers/scsi/ufs/ufshcd.h b/drivers/scsi/ufs/ufshcd.h
index aefb2c700ba4..2d3fa84df3a8 100644
--- a/drivers/scsi/ufs/ufshcd.h
+++ b/drivers/scsi/ufs/ufshcd.h
@@ -891,6 +891,7 @@ struct ufs_hba {
bool is_urgent_bkops_lvl_checked;
struct rw_semaphore clk_scaling_lock;
+ struct rw_semaphore query_lock;
/* If set, don't gate device ref_clk during clock gating */
bool no_ref_clk_gating;
--
GitLab