Commit 72fb690e authored by Bean Huo's avatar Bean Huo Committed by Martin K. Petersen
Browse files

scsi: ufs: Add compatibility with 3.1 UFS unit descriptor length 

For UFS 3.1, the normal unit descriptor is 10 bytes larger than the RPMB
unit. However, both descriptors share the same desc_idn, to cover both unit
descriptors with one length, we choose the normal unit descriptor length by
desc_index.

Link: https://lore.kernel.org/r/20200603091959.27618-6-huobean@gmail.com


Reviewed-by: default avatarAvri Altman <avri.altman@wdc.com>
Signed-off-by: default avatarBean Huo <beanhuo@micron.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 7a0bf85b

drivers/scsi/ufs/ufs.h

+1 −0
Original line number Diff line number Diff line
@@ -63,6 +63,7 @@ 
#define UFS_UPIU_MAX_UNIT_NUM_ID	0x7F

#define UFS_MAX_LUNS		(SCSI_W_LUN_BASE + UFS_UPIU_MAX_UNIT_NUM_ID)

#define UFS_UPIU_WLUN_ID	(1 << 7)

#define UFS_RPMB_UNIT		0xC4



/* WriteBooster buffer is available only for the logical unit from 0 to 7 */

#define UFS_UPIU_MAX_WB_LUN_ID	8

drivers/scsi/ufs/ufshcd.c

+8 −3
Original line number Diff line number Diff line
@@ -3083,11 +3083,16 @@ void ufshcd_map_desc_id_to_length(struct ufs_hba *hba, enum desc_idn desc_id, 
EXPORT_SYMBOL(ufshcd_map_desc_id_to_length);



static void ufshcd_update_desc_length(struct ufs_hba *hba,

				      enum desc_idn desc_id,

				      enum desc_idn desc_id, int desc_index,

				      unsigned char desc_len)

{

	if (hba->desc_size[desc_id] == QUERY_DESC_MAX_SIZE &&

	    desc_id != QUERY_DESC_IDN_STRING)

	    desc_id != QUERY_DESC_IDN_STRING && desc_index != UFS_RPMB_UNIT)

		/* For UFS 3.1, the normal unit descriptor is 10 bytes larger

		 * than the RPMB unit, however, both descriptors share the same

		 * desc_idn, to cover both unit descriptors with one length, we

		 * choose the normal unit descriptor length by desc_index.

		 */

		hba->desc_size[desc_id] = desc_len;

}
@@ -3156,7 +3161,7 @@ int ufshcd_read_desc_param(struct ufs_hba *hba, 


	/* Update descriptor length */

	buff_len = desc_buf[QUERY_DESC_LENGTH_OFFSET];

	ufshcd_update_desc_length(hba, desc_id, buff_len);

	ufshcd_update_desc_length(hba, desc_id, desc_index, buff_len);



	/* Check wherher we will not copy more data, than available */

	if (is_kmalloc && (param_offset + param_size) > buff_len)

CRA Git | Maintained and supported by SUSTech CRA and CCSE