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;
IronPort-SDR: rLZrDTY104Su6o25/+re3TTcXEEAIOsof8bVHfBFkXZYyXdeZhEANLUYrBYYvqMQK4l+RzoUxc
 fhPkdEOs2ln0DmJjRx2QXJd+Jee6dMcVKlAREWRHfuItKkO+Z4ezMIB5A59pOuX5RRGyhposTJ
 4PJeecsvzEuLvzZIgb23qYSQKHY3M62BPf3eb9OSPVOO5Rs6aCcWBIkAbRPRi+uOg48KR84SmA
 SzPkZwhdNKbjqQaUu2XDVNGWtN3G3tJfpB0mBPyVMonBSioQfOJhsMh8s1fbxJwxAxEmNOcyqp
 Rbc=
From:   Avri Altman <Avri.Altman@wdc.com>
To:     Yue Hu <zbestahu@gmail.com>,
        "alim.akhtar@samsung.com" <alim.akhtar@samsung.com>,
        "martin.petersen@oracle.com" <martin.petersen@oracle.com>,
        "jejb@linux.ibm.com" <jejb@linux.ibm.com>,
        "linux-scsi@vger.kernel.org" <linux-scsi@vger.kernel.org>
CC:     "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
        "huyue2@yulong.com" <huyue2@yulong.com>,
        "zbestahu@163.com" <zbestahu@163.com>
Subject: RE: [PATCH v2] scsi: ufs: Tidy up WB configuration code
Thread-Topic: [PATCH v2] scsi: ufs: Tidy up WB configuration code
Thread-Index: AQHXG5hz1NzUwW1fXEGGT76FBnKcDKqJZHjg
Date:   Thu, 18 Mar 2021 08:10:57 +0000
Message-ID: <DM6PR04MB65756A57F0620AB2C107B349FC699@DM6PR04MB6575.namprd04.prod.outlook.com>
References: <20210318014544.1976-1-zbestahu@gmail.com>
In-Reply-To: <20210318014544.1976-1-zbestahu@gmail.com>
Accept-Language: en-US
Content-Language: en-US
wdcipoutbound: EOP-TRUE
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-MS-Exchange-CrossTenant-Network-Message-Id: bc9dccc0-bc63-42d3-5ac2-08d8e9e55c51
X-MS-Exchange-CrossTenant-originalarrivaltime: 18 Mar 2021 08:10:57.6751
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: b61c8803-16f3-4c35-9b17-6f65f441df86
X-MS-Exchange-CrossTenant-mailboxtype: HOSTED
X-MS-Exchange-CrossTenant-userprincipalname: moAgQqmu7AcqAzkElUmVsKuxlX7VSDdUb5lUm08h8x4LwKTqItFxXTpkzrUNVcTiXXsnruZz/hR3iY9qS6tVmA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR04MB4026
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org


>=20
> -int ufshcd_wb_ctrl(struct ufs_hba *hba, bool enable)
> +static int __ufshcd_wb_toggle(struct ufs_hba *hba, bool set, enum flag_i=
dn
> idn)
>  {
> -       int ret;
>         u8 index;
>         enum query_opcode opcode;
What I meant is:
	enum query_opcode opcode =3D set ? UPIU_QUERY_OPCODE_SET_FLAG :=20
					       UPIU_QUERY_OPCODE_CLEAR_FLAG;

Either way, you can add my Reviewed-by tag.

Thanks,
Avri

>=20
> +       if (set)
> +               opcode =3D UPIU_QUERY_OPCODE_SET_FLAG;
> +       else
> +               opcode =3D UPIU_QUERY_OPCODE_CLEAR_FLAG;
> +
> +       index =3D ufshcd_wb_get_query_index(hba);
> +       return ufshcd_query_flag_retry(hba, opcode, idn, index, NULL);
> +}
> +
> +int ufshcd_wb_toggle(struct ufs_hba *hba, bool enable)
> +{
> +       int ret;
> +
>         if (!ufshcd_is_wb_allowed(hba))
>                 return 0;
>=20
>         if (!(enable ^ hba->dev_info.wb_enabled))
>                 return 0;
> -       if (enable)
> -               opcode =3D UPIU_QUERY_OPCODE_SET_FLAG;
> -       else
> -               opcode =3D UPIU_QUERY_OPCODE_CLEAR_FLAG;
>=20
> -       index =3D ufshcd_wb_get_query_index(hba);
> -       ret =3D ufshcd_query_flag_retry(hba, opcode,
> -                                     QUERY_FLAG_IDN_WB_EN, index, NULL);
> +       ret =3D __ufshcd_wb_toggle(hba, enable, QUERY_FLAG_IDN_WB_EN);
>         if (ret) {
> -               dev_err(hba->dev, "%s write booster %s failed %d\n",
> +               dev_err(hba->dev, "%s Write Booster %s failed %d\n",
>                         __func__, enable ? "enable" : "disable", ret);
>                 return ret;
>         }
>=20
>         hba->dev_info.wb_enabled =3D enable;
> -       dev_dbg(hba->dev, "%s write booster %s %d\n",
> -                       __func__, enable ? "enable" : "disable", ret);
> +       dev_info(hba->dev, "%s Write Booster %s\n",
> +                       __func__, enable ? "enabled" : "disabled");
>=20
>         return ret;
>  }
>=20
> -static int ufshcd_wb_toggle_flush_during_h8(struct ufs_hba *hba, bool se=
t)
> +static void ufshcd_wb_toggle_flush_during_h8(struct ufs_hba *hba, bool s=
et)
>  {
> -       int val;
> -       u8 index;
> -
> -       if (set)
> -               val =3D  UPIU_QUERY_OPCODE_SET_FLAG;
> -       else
> -               val =3D UPIU_QUERY_OPCODE_CLEAR_FLAG;
> +       int ret;
>=20
> -       index =3D ufshcd_wb_get_query_index(hba);
> -       return ufshcd_query_flag_retry(hba, val,
> -                               QUERY_FLAG_IDN_WB_BUFF_FLUSH_DURING_HIBER=
N8,
> -                               index, NULL);
> +       ret =3D __ufshcd_wb_toggle(hba, set,
> +                       QUERY_FLAG_IDN_WB_BUFF_FLUSH_DURING_HIBERN8);
> +       if (ret) {
> +               dev_err(hba->dev, "%s: WB-Buf Flush during H8 %s failed: =
%d\n",
> +                       __func__, set ? "enable" : "disable", ret);
> +               return;
> +       }
> +       dev_dbg(hba->dev, "%s WB-Buf Flush during H8 %s\n",
> +                       __func__, set ? "enabled" : "disabled");
>  }
>=20
> -static inline int ufshcd_wb_toggle_flush(struct ufs_hba *hba, bool enabl=
e)
> +static inline void ufshcd_wb_toggle_flush(struct ufs_hba *hba, bool enab=
le)
>  {
>         int ret;
> -       u8 index;
> -       enum query_opcode opcode;
>=20
>         if (!ufshcd_is_wb_allowed(hba) ||
>             hba->dev_info.wb_buf_flush_enabled =3D=3D enable)
> -               return 0;
> -
> -       if (enable)
> -               opcode =3D UPIU_QUERY_OPCODE_SET_FLAG;
> -       else
> -               opcode =3D UPIU_QUERY_OPCODE_CLEAR_FLAG;
> +               return;
>=20
> -       index =3D ufshcd_wb_get_query_index(hba);
> -       ret =3D ufshcd_query_flag_retry(hba, opcode,
> -                                     QUERY_FLAG_IDN_WB_BUFF_FLUSH_EN, in=
dex,
> -                                     NULL);
> +       ret =3D __ufshcd_wb_toggle(hba, enable,
> QUERY_FLAG_IDN_WB_BUFF_FLUSH_EN);
>         if (ret) {
>                 dev_err(hba->dev, "%s WB-Buf Flush %s failed %d\n", __fun=
c__,
>                         enable ? "enable" : "disable", ret);
> -               goto out;
> +               return;
>         }
>=20
>         hba->dev_info.wb_buf_flush_enabled =3D enable;
>=20
> -       dev_dbg(hba->dev, "WB-Buf Flush %s\n", enable ? "enabled" : "disa=
bled");
> -out:
> -       return ret;
> -
> +       dev_dbg(hba->dev, "%s WB-Buf Flush %s\n",
> +                       __func__, enable ? "enabled" : "disabled");
>  }
>=20
>  static bool ufshcd_wb_presrv_usrspc_keep_vcc_on(struct ufs_hba *hba,
> diff --git a/drivers/scsi/ufs/ufshcd.h b/drivers/scsi/ufs/ufshcd.h
> index 18e56c1..eddc819 100644
> --- a/drivers/scsi/ufs/ufshcd.h
> +++ b/drivers/scsi/ufs/ufshcd.h
> @@ -1099,7 +1099,7 @@ int ufshcd_exec_raw_upiu_cmd(struct ufs_hba
> *hba,
>                              u8 *desc_buff, int *buff_len,
>                              enum query_opcode desc_op);
>=20
> -int ufshcd_wb_ctrl(struct ufs_hba *hba, bool enable);
> +int ufshcd_wb_toggle(struct ufs_hba *hba, bool enable);
>=20
>  /* Wrapper functions for safely calling variant operations */
>  static inline const char *ufshcd_get_var_name(struct ufs_hba *hba)
> --
> 1.9.1