| Message ID | 20210418072150.3288-1-avri.altman@wdc.com |
|---|---|
| State | New |
| Headers | show |
| Series | scsi: ufs: Check for bkops in runtime suspend | expand |
On 18/04/21 10:21 am, Avri Altman wrote: > 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; Can you explain this some more? If hba->dev_info.b_rpm_dev_flush_capable is true, then ufshcd_set_dev_pwr_mode() was not called, so ufshcd_is_ufs_dev_deepsleep() is false i.e. the same result for the condition above. However, it is assumed DeepSleep has the link off so that a full reset and restore is done upon resume, which is necessary to exit DeepSleep. So if you wanted to have DeepSleep with the link on, then the resume logic would also need changes. > ret = ufshcd_link_state_transition(hba, req_link_state, check_for_bkops); > if (ret) > goto set_dev_active; >
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;
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(-)