Merge "scsi: ufs: Flush exception event before suspend" (e982a391) · Commits · e / devices / android_kernel_sony_msm8998

drivers/scsi/ufs/ufshcd.c

+18 −3

Original line number	Diff line number	Diff line
		@@ -3,7 +3,7 @@
		*
		* This code is based on drivers/scsi/ufs/ufshcd.c
		* Copyright (C) 2011-2013 Samsung India Software Operations
		* Copyright (c) 2013-2019, The Linux Foundation. All rights reserved.
		* Copyright (c) 2013-2020, The Linux Foundation. All rights reserved.
		*
		* Authors:
		* Santosh Yaraganavi <santosh.sy@samsung.com>
		@@ -5405,8 +5405,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 */
		@@ -5983,6 +5990,13 @@ static void ufshcd_exception_event_handler(struct work_struct *work)

		out:
		ufshcd_scsi_unblock_requests(hba);
		/*
		* 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;
		}
		@@ -8777,6 +8791,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;