Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2e4bedb4 authored by Neeraj Soni's avatar Neeraj Soni
Browse files

scsi: ufs: Unblock UFS while ICE HW configuration 



Blocking UFS requests while ICE HW is getting
configured is not required as block layer requeues
the requests anyway.

Change-Id: I5aacf772c93eb134a3e48c79b3fbdaefd8378581
Signed-off-by: default avatarNeeraj Soni <neersoni@codeaurora.org>
parent 541fe938

drivers/crypto/msm/ice.c

+3 −0
Original line number Diff line number Diff line
@@ -125,6 +125,9 @@ static int qti_ice_setting_config(struct request *req, 
		return -EPERM;

	}



	if (!setting)

		return -EINVAL;



	if ((short)(crypto_data->key_index) >= 0) {



		memcpy(&setting->crypto_data, crypto_data,

drivers/scsi/ufs/ufs-qcom-ice.c

+11 −31
Original line number Diff line number Diff line
@@ -170,17 +170,15 @@ out: 
static void ufs_qcom_ice_cfg_work(struct work_struct *work)

{

	unsigned long flags;

	struct ice_data_setting ice_set;

	struct ufs_qcom_host *qcom_host =

		container_of(work, struct ufs_qcom_host, ice_cfg_work);

	struct request *req_pending = NULL;



	if (!qcom_host->ice.vops->config_start)

		return;



	spin_lock_irqsave(&qcom_host->ice_work_lock, flags);

	req_pending = qcom_host->req_pending;

	if (!req_pending) {

	if (!qcom_host->req_pending) {

		qcom_host->work_pending = false;

		spin_unlock_irqrestore(&qcom_host->ice_work_lock, flags);

		return;

	}
@@ -189,24 +187,15 @@ static void ufs_qcom_ice_cfg_work(struct work_struct *work) 
	/*

	 * config_start is called again as previous attempt returned -EAGAIN,

	 * this call shall now take care of the necessary key setup.

	 * 'ice_set' will not actually be used, instead the next call to

	 * config_start() for this request, in the normal call flow, will

	 * succeed as the key has now been setup.

	 */

	qcom_host->ice.vops->config_start(qcom_host->ice.pdev,

		qcom_host->req_pending, &ice_set, false);

		qcom_host->req_pending, NULL, false);



	spin_lock_irqsave(&qcom_host->ice_work_lock, flags);

	qcom_host->req_pending = NULL;

	qcom_host->work_pending = false;

	spin_unlock_irqrestore(&qcom_host->ice_work_lock, flags);



	/*

	 * Resume with requests processing. We assume config_start has been

	 * successful, but even if it wasn't we still must resume in order to

	 * allow for the request to be retried.

	 */

	ufshcd_scsi_unblock_requests(qcom_host->hba);



}



/**
@@ -285,18 +274,14 @@ int ufs_qcom_ice_req_setup(struct ufs_qcom_host *qcom_host, 
			 * requires a non-atomic context, this means we should

			 * call the function again from the worker thread to do

			 * the configuration. For this request the error will

			 * propagate so it will be re-queued and until the

			 * configuration is is completed we block further

			 * request processing.

			 * propagate so it will be re-queued.

			 */

			if (err == -EAGAIN) {

				dev_dbg(qcom_host->hba->dev,

					"%s: scheduling task for ice setup\n",

					__func__);



				if (!qcom_host->req_pending) {

					ufshcd_scsi_block_requests(

						qcom_host->hba);

				if (!qcom_host->work_pending) {

					qcom_host->req_pending = cmd->request;



					if (!schedule_work(
@@ -307,10 +292,9 @@ int ufs_qcom_ice_req_setup(struct ufs_qcom_host *qcom_host, 
						&qcom_host->ice_work_lock,

						flags);



						ufshcd_scsi_unblock_requests(

							qcom_host->hba);

						return err;

					}

					qcom_host->work_pending = true;

				}



			} else {
@@ -409,9 +393,7 @@ int ufs_qcom_ice_cfg_start(struct ufs_qcom_host *qcom_host, 
			 * requires a non-atomic context, this means we should

			 * call the function again from the worker thread to do

			 * the configuration. For this request the error will

			 * propagate so it will be re-queued and until the

			 * configuration is is completed we block further

			 * request processing.

			 * propagate so it will be re-queued.

			 */

			if (err == -EAGAIN) {
@@ -419,9 +401,8 @@ int ufs_qcom_ice_cfg_start(struct ufs_qcom_host *qcom_host, 
					"%s: scheduling task for ice setup\n",

					__func__);



				if (!qcom_host->req_pending) {

					ufshcd_scsi_block_requests(

						qcom_host->hba);

				if (!qcom_host->work_pending) {



					qcom_host->req_pending = cmd->request;

					if (!schedule_work(

						&qcom_host->ice_cfg_work)) {
@@ -431,10 +412,9 @@ int ufs_qcom_ice_cfg_start(struct ufs_qcom_host *qcom_host, 
						&qcom_host->ice_work_lock,

						flags);



						ufshcd_scsi_unblock_requests(

							qcom_host->hba);

						return err;

					}

					qcom_host->work_pending = true;

				}



			} else {

drivers/scsi/ufs/ufs-qcom.h

+1 −0
Original line number Diff line number Diff line
@@ -374,6 +374,7 @@ struct ufs_qcom_host { 
	struct work_struct ice_cfg_work;

	struct request *req_pending;

	struct ufs_vreg *vddp_ref_clk;

	bool work_pending;

};



static inline u32