Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
IronPort-SDR: iRTJHoZ/W4xLGUfSARfR7toyosmjvCXN8qw5J86d0D61YjI9adQ32TtxAohzqlWkN7oneINXEl
 niNxmMFIQ0mxgR4uQjT8Xb2nF+m8NBGwcmoh8e/DKKgXYEnZigO9R2BCvdiqyWbsL5oz1gKT4z
 qjkdv4Y+FADBK80vfArSS+ktdoUaUdsLMfjCxkwAUtwcxJ1OOA96f0ddD0OK8duQOo6tKj1ZjP
 qIKzuQEGCARkDampqtruYha1C5xf+uGL5351au4QYMUGf4sYy3+K7mZbmQRvo6B00csCPXDPxu
 hko=
IronPort-SDR: 4D0ZExdbv/LjFpmI0stICE3JUgslQ/jVgljbpgChdX4cMtVeBQ2ujIdzG/6zuPJcGxGe/mZ7xf
 0l7VGtrQWikWiNHWHuTOQeojg1l1RiGJIsjf5qWJk0cm3WAmXYtvUAeMAfP+ILpqDvRpVhbqYG
 qGdJMwIlvsSOBJlCrX5bq1Hi7Q8eIL9xPyBpq5p1azSVeUyNE/XoI1YXIz04H5hDdd2KS7TlwY
 4nhiTqV9R1QZKoqZ4SFvMYxMxuPr5k9ZOVHELBCmYMlKHEYIyjJZTBFB85r/GdemExICaQOYme
 GE1xXBF1p4f5rXXq5OM55Mpf
IronPort-SDR: IRSLbvLKgH2VOlJ7Oci00Hk4NPrXuNy4SA3I1kaZ61OeLVz5cp6dTUa97qlvFdTASQ5DJpye96
 pshpfF2Fo3/dZT4FChnIskf7SEtW3iiRofp2T9osl5xA0xO8QfKtNCBlO9K36BCKOhVxXAlSVV
 5Tg6zzg4rzyAiusdEhf6/e2yl+OfAli4y+eLjJt3jLxIucSuja/5XSyth9kP9K0I4nPZ6kpyD4
 LGnhod48ItgrWM6TykS1wZAy9af8av2utUAO/5e/M80MSWnOhMMDlDEOI+nEgCJE9yzDgw5rM/
 BF0=
WDCIronportException: Internal
From:   Avri Altman <avri.altman@wdc.com>
To:     "James E . J . Bottomley" <jejb@linux.vnet.ibm.com>,
        "Martin K . Petersen" <martin.petersen@oracle.com>,
        linux-scsi@vger.kernel.org, Adrian Hunter <adrian.hunter@intel.com>
Cc:     linux-kernel@vger.kernel.org, Avri Altman <avri.altman@wdc.com>,
        Alex Lemberg <alex.lemberg@wdc.com>
Subject: [PATCH] scsi: ufs: Check for bkops in runtime suspend
Date:   Sun, 18 Apr 2021 10:21:50 +0300
Message-Id: <20210418072150.3288-1-avri.altman@wdc.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Precedence: bulk

The UFS driver allowed BKOPS and WB Flush operations to be completed on
Runtime suspend. Adding the DeepSleep support, this is no longer true:
the driver will ignore BKOPS and WB Flush states, and force a link state
transition to UIC_LINK_OFF_STATE.

Do not ignore BKOPS and WB Flush on runtme suspend flow.

fixes: fe1d4c2ebcae (scsi: ufs: Add DeepSleep feature)

Suggested-by: Alex Lemberg <alex.lemberg@wdc.com>
Signed-off-by: Avri Altman <avri.altman@wdc.com>
---
 drivers/scsi/ufs/ufshcd.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c
index 58d7f264c664..1a0cac670aba 100644
--- a/drivers/scsi/ufs/ufshcd.c
+++ b/drivers/scsi/ufs/ufshcd.c
@@ -8755,7 +8755,8 @@ static int ufshcd_suspend(struct ufs_hba *hba, enum ufs_pm_op pm_op)
 	 * In the case of DeepSleep, the device is expected to remain powered
 	 * with the link off, so do not check for bkops.
 	 */
-	check_for_bkops = !ufshcd_is_ufs_dev_deepsleep(hba);
+	check_for_bkops = !ufshcd_is_ufs_dev_deepsleep(hba) ||
+			  hba->dev_info.b_rpm_dev_flush_capable;
 	ret = ufshcd_link_state_transition(hba, req_link_state, check_for_bkops);
 	if (ret)
 		goto set_dev_active;
-- 
2.25.1