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: OcKyfRdoygl4NlbifNKphjrqF9eMTsc7HaAp4fx09KL1dKr3pPyN9mgrK0ISjazY6CE1Mm7hVH
 SYn0uYWJ3QAQG52Cy6ljEMzz0lrr31s0hIZOBB5JDrkKSNHTcrY9AQu6mx3jomngudeV697R72
 Rss2cUuGfUFQxNLFLEdu7d6o9MHv0sbvw9+3S1zJFnaxZMBayD8JyCgCkgX9T+rz0IVymfyuwo
 kKzojIByNYuiUb2SJk05P7i+xrhCPCGfBOfq9VNbmHK5ypi4Py3Etto6Wmo6WoXB9D/yrNnJIc
 Hpw=
From:   Avri Altman <Avri.Altman@wdc.com>
To:     "Bao D. Nguyen" <nguyenb@codeaurora.org>,
        "cang@codeaurora.org" <cang@codeaurora.org>,
        "asutoshd@codeaurora.org" <asutoshd@codeaurora.org>,
        "martin.petersen@oracle.com" <martin.petersen@oracle.com>,
        "linux-scsi@vger.kernel.org" <linux-scsi@vger.kernel.org>
CC:     "linux-arm-msm@vger.kernel.org" <linux-arm-msm@vger.kernel.org>,
        Alim Akhtar <alim.akhtar@samsung.com>,
        "James E.J. Bottomley" <jejb@linux.ibm.com>,
        YueHaibing <yuehaibing@huawei.com>,
        Bean Huo <beanhuo@micron.com>,
        open list <linux-kernel@vger.kernel.org>
Subject: RE: [PATCH v1 2/2] scsi: ufs: Support reading UFS's Vcc voltage from
 device tree
Thread-Topic: [PATCH v1 2/2] scsi: ufs: Support reading UFS's Vcc voltage from
 device tree
Thread-Index: AQHWgCVjnykcytgHNk6DNhNz/3ZIoalmYjdg
Date:   Sun, 13 Sep 2020 09:37:47 +0000
Message-ID: <BY5PR04MB67051C08A73119B554E4F352FC220@BY5PR04MB6705.namprd04.prod.outlook.com>
References: <cover.1598939393.git.nguyenb@codeaurora.org>
 <69db325a09d5c3fa7fc260db031b1e498b601c25.1598939393.git.nguyenb@codeaurora.org>
In-Reply-To: <69db325a09d5c3fa7fc260db031b1e498b601c25.1598939393.git.nguyenb@codeaurora.org>
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: 3d0a0be7-6af0-47ed-f8e1-08d857c8aced
X-MS-Exchange-CrossTenant-originalarrivaltime: 13 Sep 2020 09:37:47.7615
 (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: PoyPUXT1+u+10K4G0LoFqQVfafLyO41fjqmreVqoeiORT5fc3dRVZjUzlC5OiUBsvigjqVvhfv7vV5etpoxgMA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR04MB6069
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
>=20
> The UFS specifications supports a range of Vcc operating voltage
> from 2.4-3.6V depending on the device and manufacturers.
> Allows selecting the UFS Vcc voltage level by setting the
> UFS's entry vcc-voltage-level in the device tree. If UFS's
> vcc-voltage-level setting is not found in the device tree,
> use default values provided by the driver.
>=20
> Signed-off-by: Can Guo <cang@codeaurora.org>
> Signed-off-by: Asutosh Das <asutoshd@codeaurora.org>
> Signed-off-by: Bao D. Nguyen <nguyenb@codeaurora.org>
> ---
>  drivers/scsi/ufs/ufshcd-pltfrm.c | 15 ++++++++++++---
>  1 file changed, 12 insertions(+), 3 deletions(-)
>=20
> diff --git a/drivers/scsi/ufs/ufshcd-pltfrm.c b/drivers/scsi/ufs/ufshcd-p=
ltfrm.c
> index 3db0af6..48f429c 100644
> --- a/drivers/scsi/ufs/ufshcd-pltfrm.c
> +++ b/drivers/scsi/ufs/ufshcd-pltfrm.c
> @@ -104,10 +104,11 @@ static int ufshcd_parse_clock_info(struct ufs_hba
> *hba)
>  static int ufshcd_populate_vreg(struct device *dev, const char *name,
>                 struct ufs_vreg **out_vreg)
>  {
> -       int ret =3D 0;
> +       int len, ret =3D 0;
>         char prop_name[MAX_PROP_SIZE];
>         struct ufs_vreg *vreg =3D NULL;
>         struct device_node *np =3D dev->of_node;
> +       const __be32 *prop;
>=20
>         if (!np) {
>                 dev_err(dev, "%s: non DT initialization\n", __func__);
> @@ -138,8 +139,16 @@ static int ufshcd_populate_vreg(struct device *dev,
> const char *name,
>                         vreg->min_uV =3D UFS_VREG_VCC_1P8_MIN_UV;
>                         vreg->max_uV =3D UFS_VREG_VCC_1P8_MAX_UV;
>                 } else {
> -                       vreg->min_uV =3D UFS_VREG_VCC_MIN_UV;
> -                       vreg->max_uV =3D UFS_VREG_VCC_MAX_UV;
> +                       prop =3D of_get_property(np, "vcc-voltage-level",=
 &len);
> +                       if (!prop || (len !=3D (2 * sizeof(__be32)))) {
> +                               dev_warn(dev, "%s vcc-voltage-level prope=
rty.\n",
> +                                       prop ? "invalid format" : "no");
> +                               vreg->min_uV =3D UFS_VREG_VCC_MIN_UV;
> +                               vreg->max_uV =3D UFS_VREG_VCC_MAX_UV;
> +                       } else {
> +                               vreg->min_uV =3D be32_to_cpup(&prop[0]);
> +                               vreg->max_uV =3D be32_to_cpup(&prop[1]);
> +                       }
>                 }
>         } else if (!strcmp(name, "vccq")) {
>                 vreg->min_uV =3D UFS_VREG_VCCQ_MIN_UV;
> --
Maybe instead call ufshcd_populate_vreg with the new name,
To not break the function flow, and just add another else if ?