shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-06 02:50:49 +09:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Revert "FROMLIST: scsi: ufs: Flush exception event before suspend""

Browse Source 
This reverts commit 4b4777168d which was a
revert of commit 12db3a26e4.  We added it
back by hand after the scsi upstream tree merge

Bug: 143632303
Cc: Sayali Lokhande <sayalil@codeaurora.org>
Cc: Asutosh Das <asutoshd@codeaurora.org>
Cc: Can Guo <cang@codeaurora.org>
Cc: Asutosh Das <asutoshd@codeaurora.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I36f2931b04f7963b7121511d6061c13a18891b77
This commit is contained in:
Greg Kroah-Hartman
2020-02-03 15:51:00 +00:00
parent 7881aee544
commit bf01359e5f
1 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
drivers/scsi/ufs/ufshcd.c
View File

@@ -4800,8 +4800,15 @@ ufshcd_transfer_rsp_status(struct ufs_hba *hba, struct ufshcd_lrb *lrbp)
* UFS device needs urgent BKOPs.
*/
if (!hba->pm_op_in_progress &&
ufshcd_is_exception_event(lrbp->ucd_rsp_ptr))
schedule_work(&hba->eeh_work);
ufshcd_is_exception_event(lrbp->ucd_rsp_ptr)) {
/*
* Prevent suspend once eeh_work is scheduled
* to avoid deadlock between ufshcd_suspend
* and exception event handler.
*/
if (schedule_work(&hba->eeh_work))
pm_runtime_get_noresume(hba->dev);
}
break;
case UPIU_TRANSACTION_REJECT_UPIU:
/* TODO: handle Reject UPIU Response */
@@ -5257,7 +5264,14 @@ static void ufshcd_exception_event_handler(struct work_struct *work)
out:
ufshcd_scsi_unblock_requests(hba);
pm_runtime_put_sync(hba->dev);
/*
* pm_runtime_get_noresume is called while scheduling
* eeh_work to avoid suspend racing with exception work.
* Hence decrement usage counter using pm_runtime_put_noidle
* to allow suspend on completion of exception event handler.
*/
pm_runtime_put_noidle(hba->dev);
pm_runtime_put(hba->dev);
return;
}
@@ -7987,6 +8001,7 @@ static int ufshcd_suspend(struct ufs_hba *hba, enum ufs_pm_op pm_op)
goto enable_gating;
}
flush_work(&hba->eeh_work);
ret = ufshcd_link_state_transition(hba, req_link_state, 1);
if (ret)
goto set_dev_active;