Merge "scsi: ufs: clear UTRD, UPIU req and rsp before new transfers" (f75b4f52) · Commits · e / devices / android_kernel_sony_msm8994

drivers/scsi/ufs/ufshcd.c

+12 −3

Original line number	Diff line number	Diff line
		@@ -1384,6 +1384,7 @@ static int ufshcd_map_sg(struct ufshcd_lrb *lrbp)
		cpu_to_le32(lower_32_bits(sg->dma_address));
		prd_table[i].upper_addr =
		cpu_to_le32(upper_32_bits(sg->dma_address));
		prd_table[i].reserved = 0;
		}
		} else {
		lrbp->utr_descriptor_ptr->prd_table_length = 0;
		@@ -1466,7 +1467,8 @@ static void ufshcd_prepare_req_desc_hdr(struct ufshcd_lrb *lrbp,

		/* Transfer request descriptor header fields */
		req_desc->header.dword_0 = cpu_to_le32(dword_0);

		/* dword_1 is reserved, hence it is set to 0 */
		req_desc->header.dword_1 = 0;
		/*
		* assigning invalid value for command status. Controller
		* updates OCS on command completion, with the command
		@@ -1474,6 +1476,8 @@ static void ufshcd_prepare_req_desc_hdr(struct ufshcd_lrb *lrbp,
		*/
		req_desc->header.dword_2 =
		cpu_to_le32(OCS_INVALID_COMMAND_STATUS);
		/* dword_3 is reserved, hence it is set to 0 */
		req_desc->header.dword_3 = 0;
		}

		/**
		@@ -1486,6 +1490,7 @@ static
		void ufshcd_prepare_utp_scsi_cmd_upiu(struct ufshcd_lrb *lrbp, u32 upiu_flags)
		{
		struct utp_upiu_req *ucd_req_ptr = lrbp->ucd_req_ptr;
		unsigned short cdb_len;

		/* command descriptor fields */
		ucd_req_ptr->header.dword_0 = UPIU_HEADER_DWORD(
		@@ -1500,8 +1505,12 @@ void ufshcd_prepare_utp_scsi_cmd_upiu(struct ufshcd_lrb *lrbp, u32 upiu_flags)
		ucd_req_ptr->sc.exp_data_transfer_len =
		cpu_to_be32(lrbp->cmd->sdb.length);

		memcpy(ucd_req_ptr->sc.cdb, lrbp->cmd->cmnd,
		(min_t(unsigned short, lrbp->cmd->cmd_len, MAX_CDB_SIZE)));
		cdb_len = min_t(unsigned short, lrbp->cmd->cmd_len, MAX_CDB_SIZE);
		memcpy(ucd_req_ptr->sc.cdb, lrbp->cmd->cmnd, cdb_len);
		if (cdb_len < MAX_CDB_SIZE)
		memset(ucd_req_ptr->sc.cdb + cdb_len, 0,
		(MAX_CDB_SIZE - cdb_len));
		memset(lrbp->ucd_rsp_ptr, 0, sizeof(struct utp_upiu_rsp));
		}

		/**