| Message ID | 20201117165839.1643377-2-jaegeuk@kernel.org |
|---|---|
| State | New |
| Headers | show |
| Series | [v5,1/7] scsi: ufs: avoid to call REQ_CLKS_OFF to CLKS_OFF | expand |
On 2020-11-18 00:58, Jaegeuk Kim wrote: > Once UFS was gated with CLKS_OFF, it should not call REQ_CLKS_OFF > again, which > caused hibern8_enter failure. > > Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org> Reviewed-by: Can Guo <cang@codeaurora.org> > --- > 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 b8f573a02713..cc8d5f0c3fdc 100644 > --- a/drivers/scsi/ufs/ufshcd.c > +++ b/drivers/scsi/ufs/ufshcd.c > @@ -1745,7 +1745,8 @@ static void __ufshcd_release(struct ufs_hba *hba) > if (hba->clk_gating.active_reqs || hba->clk_gating.is_suspended || > hba->ufshcd_state != UFSHCD_STATE_OPERATIONAL || > ufshcd_any_tag_in_use(hba) || hba->outstanding_tasks || > - hba->active_uic_cmd || hba->uic_async_done) > + hba->active_uic_cmd || hba->uic_async_done || > + hba->clk_gating.state == CLKS_OFF) > return; > > hba->clk_gating.state = REQ_CLKS_OFF;
diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c index b8f573a02713..cc8d5f0c3fdc 100644 --- a/drivers/scsi/ufs/ufshcd.c +++ b/drivers/scsi/ufs/ufshcd.c @@ -1745,7 +1745,8 @@ static void __ufshcd_release(struct ufs_hba *hba) if (hba->clk_gating.active_reqs || hba->clk_gating.is_suspended || hba->ufshcd_state != UFSHCD_STATE_OPERATIONAL || ufshcd_any_tag_in_use(hba) || hba->outstanding_tasks || - hba->active_uic_cmd || hba->uic_async_done) + hba->active_uic_cmd || hba->uic_async_done || + hba->clk_gating.state == CLKS_OFF) return; hba->clk_gating.state = REQ_CLKS_OFF;
Once UFS was gated with CLKS_OFF, it should not call REQ_CLKS_OFF again, which caused hibern8_enter failure. Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org> --- drivers/scsi/ufs/ufshcd.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)