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

Commit 9b41ed79 authored by Kiwoong Kim's avatar Kiwoong Kim Committed by Greg Kroah-Hartman
Browse files

scsi: ufs: introduce UFSHCD_QUIRK_PRDT_BYTE_GRAN quirk 



[ Upstream commit 75b1cc4ad63afa28c1a045b5157c008f405f06a9 ]

Some UFS host controllers may think granularities of PRDT length and
offset as bytes, not double words.

Signed-off-by: default avatarKiwoong Kim <kwmad.kim@samsung.com>
Reviewed-by: default avatarSubhash Jadavani <subhashj@codeaurora.org>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: default avatarSasha Levin <alexander.levin@verizon.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 26cbe162

drivers/scsi/ufs/ufshcd.c

+21 −7
Original line number Diff line number Diff line
@@ -1088,7 +1088,7 @@ ufshcd_send_uic_cmd(struct ufs_hba *hba, struct uic_command *uic_cmd) 
 *

 * Returns 0 in case of success, non-zero value in case of failure

 */

static int ufshcd_map_sg(struct ufshcd_lrb *lrbp)

static int ufshcd_map_sg(struct ufs_hba *hba, struct ufshcd_lrb *lrbp)

{

	struct ufshcd_sg_entry *prd_table;

	struct scatterlist *sg;
@@ -1102,6 +1102,11 @@ static int ufshcd_map_sg(struct ufshcd_lrb *lrbp) 
		return sg_segments;



	if (sg_segments) {

		if (hba->quirks & UFSHCD_QUIRK_PRDT_BYTE_GRAN)

			lrbp->utr_descriptor_ptr->prd_table_length =

				cpu_to_le16((u16)(sg_segments *

					sizeof(struct ufshcd_sg_entry)));

		else

			lrbp->utr_descriptor_ptr->prd_table_length =

				cpu_to_le16((u16) (sg_segments));
@@ -1465,7 +1470,7 @@ static int ufshcd_queuecommand(struct Scsi_Host *host, struct scsi_cmnd *cmd) 


	ufshcd_comp_scsi_upiu(hba, lrbp);



	err = ufshcd_map_sg(lrbp);

	err = ufshcd_map_sg(hba, lrbp);

	if (err) {

		lrbp->cmd = NULL;

		clear_bit_unlock(tag, &hba->lrb_in_use);
@@ -2320,12 +2325,21 @@ static void ufshcd_host_memory_configure(struct ufs_hba *hba) 
				cpu_to_le32(upper_32_bits(cmd_desc_element_addr));



		/* Response upiu and prdt offset should be in double words */

		if (hba->quirks & UFSHCD_QUIRK_PRDT_BYTE_GRAN) {

			utrdlp[i].response_upiu_offset =

				cpu_to_le16(response_offset);

			utrdlp[i].prd_table_offset =

				cpu_to_le16(prdt_offset);

			utrdlp[i].response_upiu_length =

				cpu_to_le16(ALIGNED_UPIU_SIZE);

		} else {

			utrdlp[i].response_upiu_offset =

				cpu_to_le16((response_offset >> 2));

			utrdlp[i].prd_table_offset =

				cpu_to_le16((prdt_offset >> 2));

			utrdlp[i].response_upiu_length =

				cpu_to_le16(ALIGNED_UPIU_SIZE >> 2);

		}



		hba->lrb[i].utr_descriptor_ptr = (utrdlp + i);

		hba->lrb[i].ucd_req_ptr =

drivers/scsi/ufs/ufshcd.h

+6 −0
Original line number Diff line number Diff line
@@ -474,6 +474,12 @@ struct ufs_hba { 
	 */

	#define UFSHCD_QUIRK_BROKEN_UFS_HCI_VERSION		UFS_BIT(5)



	/*

	 * This quirk needs to be enabled if the host contoller regards

	 * resolution of the values of PRDTO and PRDTL in UTRD as byte.

	 */

	#define UFSHCD_QUIRK_PRDT_BYTE_GRAN			UFS_BIT(7)



	unsigned int quirks;	/* Deviations from standard UFSHCI spec. */



	/* Device deviations from standard UFS device spec. */