ANDROID: scsi: ufs: add UFSHCD_ANDROID_QUIRK_SET_IID_TO_ONE

Add UFSHCD_ANDROID_QUIRK_SET_IID_TO_ONE for host controllers which break
when the Tag, LUN, and IID in the UPIU are all 0. In such cases set the
IID to 1 if the quirk is set.

Bug: 303649600
Change-Id: I43b410e947cffdf0b4acd2c38ba6b1432b2f1342
Signed-off-by: Konstantin Vyshetsky <[email protected]>

Author: Konstantin Vyshetsky

drivers/ufs/core/ufshcd.c

@@ -2744,6 +2744,9 @@ static int ufshcd_compose_devman_upiu(struct ufs_hba *hba,
 	else
 		ret = -EINVAL;
 
+	if (!ret && hba->android_quirks & UFSHCD_ANDROID_QUIRK_SET_IID_TO_ONE)
+		lrbp->ucd_req_ptr->header.iid = 1;
+
 	return ret;
 }
 
@@ -2768,6 +2771,8 @@ static int ufshcd_comp_scsi_upiu(struct ufs_hba *hba, struct ufshcd_lrb *lrbp)
 	if (likely(lrbp->cmd)) {
 		ufshcd_prepare_req_desc_hdr(lrbp, &upiu_flags, lrbp->cmd->sc_data_direction, 0);
 		ufshcd_prepare_utp_scsi_cmd_upiu(lrbp, upiu_flags);
+		if (hba->android_quirks & UFSHCD_ANDROID_QUIRK_SET_IID_TO_ONE)
+			lrbp->ucd_req_ptr->header.iid = 1;
 	} else {
 		ret = -EINVAL;
 	}

include/ufs/ufshcd.h

@@ -691,6 +691,9 @@ enum ufshcd_android_quirks {
 	 * 64-bit addressing support.
 	 */
 	UFSHCD_ANDROID_QUIRK_36BIT_ADDRESS_DMA		= 1 << 3,
+
+	/* Set IID to one. */
+	UFSHCD_ANDROID_QUIRK_SET_IID_TO_ONE		= 1 << 30,
 };
 
 enum ufshcd_caps {