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

Commit f05b5eba authored by Stanley Chu's avatar Stanley Chu Committed by Greg Kroah-Hartman
Browse files

BACKPORT: scsi: ufs: Disable WriteBooster capability in non-supported UFS device 

If UFS device is not qualified to enter the detection of WriteBooster
probing by disallowed UFS version or device quirks, then WriteBooster
capability in host shall be disabled to prevent any WriteBooster
operations in the future.

Link: https://lore.kernel.org/linux-arm-kernel/20200625030430.25048-1-stanley.chu@mediatek.com/


Fixes: 3d17b9b5ab11 ("scsi: ufs: Add write booster feature support")
Signed-off-by: default avatarStanley Chu <stanley.chu@mediatek.com>
Tested-by: default avatarJami Kettunen <jamipkettunen@gmail.com>
Tested-by: default avatarSteev Klimaszewski <steev@kali.org>
Reviewed-by: default avatarAvri Altman <avri.altman@wdc.com>
Reviewed-by: default avatarBean Huo <beanhuo@micron.com>

Bug: 151050916
[ Resolved minor conflict in drivers/scsi/ufs/ufshcd.c ]
(cherry picked from commit a7f1e69d4974666ea40886ee4801aebb2729ea81)
Change-Id: Icb60f39cc5ecf21399e7ff96b30c594fb8667501
Signed-off-by: default avatarStanley Chu <stanley.chu@mediatek.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parent 7d702542

drivers/scsi/ufs/ufshcd.c

+19 −16
Original line number Diff line number Diff line
@@ -6993,20 +6993,30 @@ static int ufshcd_scsi_add_wlus(struct ufs_hba *hba) 


static void ufshcd_wb_probe(struct ufs_hba *hba, u8 *desc_buf)

{

	struct ufs_dev_info *dev_info = &hba->dev_info;

	u8 lun;

	u32 d_lu_wb_buf_alloc;



	if (!ufshcd_is_wb_allowed(hba))

		return;

	/*

	 * Probe WB only for UFS-2.2 and UFS-3.1 (and later) devices or

	 * UFS devices with quirk UFS_DEVICE_QUIRK_SUPPORT_EXTENDED_FEATURES

	 * enabled

	 */

	if (!(dev_info->wspecversion >= 0x310 ||

	      dev_info->wspecversion == 0x220 ||

	     (hba->dev_quirks & UFS_DEVICE_QUIRK_SUPPORT_EXTENDED_FEATURES)))

		goto wb_disabled;



	if (hba->desc_size.dev_desc < DEVICE_DESC_PARAM_EXT_UFS_FEATURE_SUP + 4)

		goto wb_disabled;



	hba->dev_info.d_ext_ufs_feature_sup =

	dev_info->d_ext_ufs_feature_sup =

		get_unaligned_be32(desc_buf +

				   DEVICE_DESC_PARAM_EXT_UFS_FEATURE_SUP);



	if (!(hba->dev_info.d_ext_ufs_feature_sup & UFS_DEV_WRITE_BOOSTER_SUP))

	if (!(dev_info->d_ext_ufs_feature_sup & UFS_DEV_WRITE_BOOSTER_SUP))

		goto wb_disabled;



	/*
@@ -7015,17 +7025,17 @@ static void ufshcd_wb_probe(struct ufs_hba *hba, u8 *desc_buf) 
	 * a max of 1 lun would have wb buffer configured.

	 * Now only shared buffer mode is supported.

	 */

	hba->dev_info.b_wb_buffer_type =

	dev_info->b_wb_buffer_type =

		desc_buf[DEVICE_DESC_PARAM_WB_TYPE];



	hba->dev_info.b_presrv_uspc_en =

	dev_info->b_presrv_uspc_en =

		desc_buf[DEVICE_DESC_PARAM_WB_PRESRV_USRSPC_EN];



	if (hba->dev_info.b_wb_buffer_type == WB_BUF_MODE_SHARED) {

		hba->dev_info.d_wb_alloc_units =

	if (dev_info->b_wb_buffer_type == WB_BUF_MODE_SHARED) {

		dev_info->d_wb_alloc_units =

		get_unaligned_be32(desc_buf +

				   DEVICE_DESC_PARAM_WB_SHARED_ALLOC_UNITS);

		if (!hba->dev_info.d_wb_alloc_units)

		if (!dev_info->d_wb_alloc_units)

			goto wb_disabled;

	} else {

		for (lun = 0; lun < UFS_UPIU_MAX_WB_LUN_ID; lun++) {
@@ -7036,7 +7046,7 @@ static void ufshcd_wb_probe(struct ufs_hba *hba, u8 *desc_buf) 
					(u8 *)&d_lu_wb_buf_alloc,

					sizeof(d_lu_wb_buf_alloc));

			if (d_lu_wb_buf_alloc) {

				hba->dev_info.wb_dedicated_lu = lun;

				dev_info->wb_dedicated_lu = lun;

				break;

			}

		}
@@ -7126,13 +7136,6 @@ static int ufs_get_device_desc(struct ufs_hba *hba) 


	ufs_fixup_device_setup(hba);



	/*

	 * Probe WB only for UFS-3.1 devices or UFS devices with quirk

	 * UFS_DEVICE_QUIRK_SUPPORT_EXTENDED_FEATURES enabled

	 */

	if (dev_info->wspecversion >= 0x310 ||

	    dev_info->wspecversion == 0x220 ||

	    (hba->dev_quirks & UFS_DEVICE_QUIRK_SUPPORT_EXTENDED_FEATURES))

	ufshcd_wb_probe(hba, desc_buf);



	/*