Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
From:   "Bean Huo (beanhuo)" <beanhuo@micron.com>
To:     Stanley Chu <stanley.chu@mediatek.com>,
        "linux-scsi@vger.kernel.org" <linux-scsi@vger.kernel.org>,
        "martin.petersen@oracle.com" <martin.petersen@oracle.com>,
        "avri.altman@wdc.com" <avri.altman@wdc.com>,
        "alim.akhtar@samsung.com" <alim.akhtar@samsung.com>,
        "jejb@linux.ibm.com" <jejb@linux.ibm.com>
CC:     "asutoshd@codeaurora.org" <asutoshd@codeaurora.org>,
        "cang@codeaurora.org" <cang@codeaurora.org>,
        "matthias.bgg@gmail.com" <matthias.bgg@gmail.com>,
        "bvanassche@acm.org" <bvanassche@acm.org>,
        "linux-mediatek@lists.infradead.org" 
        <linux-mediatek@lists.infradead.org>,
        "linux-arm-kernel@lists.infradead.org" 
        <linux-arm-kernel@lists.infradead.org>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
        "kuohong.wang@mediatek.com" <kuohong.wang@mediatek.com>,
        "peter.wang@mediatek.com" <peter.wang@mediatek.com>,
        "chun-hung.wu@mediatek.com" <chun-hung.wu@mediatek.com>,
        "andy.teng@mediatek.com" <andy.teng@mediatek.com>,
        "chaotian.jing@mediatek.com" <chaotian.jing@mediatek.com>,
        "cc.chou@mediatek.com" <cc.chou@mediatek.com>
Subject: RE: [EXT] [PATCH v2] scsi: ufs: Disable WriteBooster capability in
 non-supported UFS device
Thread-Topic: [EXT] [PATCH v2] scsi: ufs: Disable WriteBooster capability in
 non-supported UFS device
Thread-Index: AQHWSp1b4+/jX4X5T0+517Im0/M4b6jpIHNA
Date:   Thu, 25 Jun 2020 10:26:41 +0000
Message-ID: <BN7PR08MB568428CA4AC7FA9E6BB854FADB920@BN7PR08MB5684.namprd08.prod.outlook.com>
References: <20200625030430.25048-1-stanley.chu@mediatek.com>
In-Reply-To: <20200625030430.25048-1-stanley.chu@mediatek.com>
Accept-Language: en-150, en-US
Content-Language: en-US
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-MS-Exchange-CrossTenant-Network-Message-Id: b07a64e3-208d-464d-435a-08d818f24061
X-MS-Exchange-CrossTenant-originalarrivaltime: 25 Jun 2020 10:26:41.2154
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: f38a5ecd-2813-4862-b11b-ac1d563c806f
X-MS-Exchange-CrossTenant-mailboxtype: HOSTED
X-MS-Exchange-CrossTenant-userprincipalname: rNDrY/pM/YYh96ZkJWbMOA6PHLV79H4X4xOQl3Sj4dG9d8teQiMzXiN7ggFFVrqK3J+x0gMWnvHwwRRWBzgv5Q==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN7PR08MB4323
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

>=20
> If UFS device is not qualified to enter the detection of WriteBooster pro=
bing by
> disallowed UFS version or device quirks, then WriteBooster capability in =
host
> shall be disabled to prevent any WriteBooster operations in the future.
>=20
> Fixes: 3d17b9b5ab11 ("scsi: ufs: Add write booster feature support")
> Signed-off-by: Stanley Chu <stanley.chu@mediatek.com>
> Tested-by: Steev Klimaszewski <steev@kali.org>
> Reviewed-by: Avri Altman <avri.altman@wdc.com>

Thanks fix this.

Reviewed-by: Bean Huo <beanhuo@micron.com>

Bean

> ---
>  drivers/scsi/ufs/ufshcd.c | 35 +++++++++++++++++++----------------
>  1 file changed, 19 insertions(+), 16 deletions(-)
>=20
> diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c index
> f173ad1bd79f..c62bd47beeaa 100644
> --- a/drivers/scsi/ufs/ufshcd.c
> +++ b/drivers/scsi/ufs/ufshcd.c
> @@ -6847,21 +6847,31 @@ static int ufshcd_scsi_add_wlus(struct ufs_hba
> *hba)
>=20
>  static void ufshcd_wb_probe(struct ufs_hba *hba, u8 *desc_buf)  {
> +	struct ufs_dev_info *dev_info =3D &hba->dev_info;
>  	u8 lun;
>  	u32 d_lu_wb_buf_alloc;
>=20
>  	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 >=3D 0x310 ||
> +	      dev_info->wspecversion =3D=3D 0x220 ||
> +	     (hba->dev_quirks &
> UFS_DEVICE_QUIRK_SUPPORT_EXTENDED_FEATURES)))
> +		goto wb_disabled;
>=20
>  	if (hba->desc_size[QUERY_DESC_IDN_DEVICE] <
>  	    DEVICE_DESC_PARAM_EXT_UFS_FEATURE_SUP + 4)
>  		goto wb_disabled;
>=20
> -	hba->dev_info.d_ext_ufs_feature_sup =3D
> +	dev_info->d_ext_ufs_feature_sup =3D
>  		get_unaligned_be32(desc_buf +
>=20
> DEVICE_DESC_PARAM_EXT_UFS_FEATURE_SUP);
>=20
> -	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;
>=20
>  	/*
> @@ -6870,17 +6880,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 =3D
> +	dev_info->b_wb_buffer_type =3D
>  		desc_buf[DEVICE_DESC_PARAM_WB_TYPE];
>=20
> -	hba->dev_info.b_presrv_uspc_en =3D
> +	dev_info->b_presrv_uspc_en =3D
>  		desc_buf[DEVICE_DESC_PARAM_WB_PRESRV_USRSPC_EN];
>=20
> -	if (hba->dev_info.b_wb_buffer_type =3D=3D WB_BUF_MODE_SHARED) {
> -		hba->dev_info.d_wb_alloc_units =3D
> +	if (dev_info->b_wb_buffer_type =3D=3D WB_BUF_MODE_SHARED) {
> +		dev_info->d_wb_alloc_units =3D
>  		get_unaligned_be32(desc_buf +
>=20
> 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 =3D 0; lun < UFS_UPIU_MAX_WB_LUN_ID; lun++) { @@ -
> 6891,7 +6901,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 =3D lun;
> +				dev_info->wb_dedicated_lu =3D lun;
>  				break;
>  			}
>  		}
> @@ -6977,14 +6987,7 @@ static int ufs_get_device_desc(struct ufs_hba *hba=
)
>=20
>  	ufs_fixup_device_setup(hba);
>=20
> -	/*
> -	 * Probe WB only for UFS-3.1 devices or UFS devices with quirk
> -	 * UFS_DEVICE_QUIRK_SUPPORT_EXTENDED_FEATURES enabled
> -	 */
> -	if (dev_info->wspecversion >=3D 0x310 ||
> -	    dev_info->wspecversion =3D=3D 0x220 ||
> -	    (hba->dev_quirks &
> UFS_DEVICE_QUIRK_SUPPORT_EXTENDED_FEATURES))
> -		ufshcd_wb_probe(hba, desc_buf);
> +	ufshcd_wb_probe(hba, desc_buf);
>=20
>  	/*
>  	 * ufshcd_read_string_desc returns size of the string
> --
> 2.18.0