Merge "scsi: ufs: commit descriptors before setting the doorbell" (da0bd546) · Commits · e / devices / samsung / android_kernel_samsung_msm8916

drivers/scsi/ufs/ufshcd.c

+6 −0

Original line number	Diff line number	Diff line
		@@ -1495,6 +1495,8 @@ void ufshcd_send_command(struct ufs_hba *hba, unsigned int task_tag)
		ufshcd_clk_scaling_start_busy(hba);
		__set_bit(task_tag, &hba->outstanding_reqs);
		ufshcd_writel(hba, 1 << task_tag, REG_UTP_TRANSFER_REQ_DOOR_BELL);
		/* Make sure that doorbell is commited immediately */
		wmb();
		ufshcd_cond_add_cmd_trace(hba, task_tag, "send");
		UFSHCD_UPDATE_TAG_STATS(hba, task_tag);
		}
		@@ -2057,6 +2059,8 @@ static int ufshcd_queuecommand(struct Scsi_Host host, struct scsi_cmnd cmd)
		goto out;
		}

		/* Make sure descriptors are ready before ringing the doorbell */
		wmb();
		/* issue command to the controller */
		spin_lock_irqsave(hba->host->host_lock, flags);
		ufshcd_send_command(hba, tag);
		@@ -2258,6 +2262,8 @@ static int ufshcd_exec_dev_cmd(struct ufs_hba *hba,

		hba->dev_cmd.complete = &wait;

		/* Make sure descriptors are ready before ringing the doorbell */
		wmb();
		spin_lock_irqsave(hba->host->host_lock, flags);
		ufshcd_send_command(hba, tag);
		spin_unlock_irqrestore(hba->host->host_lock, flags);