Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
IronPort-SDR: j1630EsLVyHICqlZbPaoDTLRfow8l8n/Ew82QQLb8cZkv3BOyZSe5czP2spILPif7kPtIyTrVH
 gAPw/eLDpQd0tanADcP8s2F+I7WO3v/h2o4O9+47AM1/ThnETj0r1o/8Ii0SWmb27MbdQuPNV7
 ODKfxnNJxKtLFmh7y+bKvy2OTVR4wJU2Ly/t9zVWyXng1VQ2zgJ2isaRIlJT6h5ymsjCxguHYR
 FWFQ5tG562DCERIyrSgdSfimPdZBGnwP2Gsk9K6EFcv4r0fKXEOubNqqPkSz55+SMG5e8shSHN
 Da8=
From:   Avri Altman <Avri.Altman@wdc.com>
To:     Can Guo <cang@codeaurora.org>,
        "asutoshd@codeaurora.org" <asutoshd@codeaurora.org>,
        "nguyenb@codeaurora.org" <nguyenb@codeaurora.org>,
        "rnayak@codeaurora.org" <rnayak@codeaurora.org>,
        "linux-scsi@vger.kernel.org" <linux-scsi@vger.kernel.org>,
        "kernel-team@android.com" <kernel-team@android.com>,
        "saravanak@google.com" <saravanak@google.com>,
        "salyzyn@google.com" <salyzyn@google.com>
CC:     Alim Akhtar <alim.akhtar@samsung.com>,
        Pedro Sousa <pedrom.sousa@synopsys.com>,
        "James E.J. Bottomley" <jejb@linux.ibm.com>,
        "Martin K. Petersen" <martin.petersen@oracle.com>,
        Bean Huo <beanhuo@micron.com>,
        Tomas Winkler <tomas.winkler@intel.com>,
        Stanley Chu <stanley.chu@mediatek.com>,
        Venkat Gopalakrishnan <venkatg@codeaurora.org>,
        open list <linux-kernel@vger.kernel.org>
Subject: RE: [PATCH v4 3/7] scsi: ufs: Fix up auto hibern8 enablement
Thread-Topic: [PATCH v4 3/7] scsi: ufs: Fix up auto hibern8 enablement
Thread-Index: AQHVme4fVbWYprW9XEWIKx6qvICz0aeKZSMQ
Date:   Thu, 14 Nov 2019 09:23:08 +0000
Message-ID: <MN2PR04MB69913B9DBCEE72322A741F14FC710@MN2PR04MB6991.namprd04.prod.outlook.com>
References: <1573627552-12615-1-git-send-email-cang@codeaurora.org>
 <1573627552-12615-4-git-send-email-cang@codeaurora.org>
In-Reply-To: <1573627552-12615-4-git-send-email-cang@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: ebe4d2f3-6ec1-4611-70bf-08d768e4431f
X-MS-Exchange-CrossTenant-originalarrivaltime: 14 Nov 2019 09:23:08.2766
 (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: 9eCtadQ/k/Z54IxG4mWOVZjWAdHX8RpdFVYRazw87jhS9QxSzS9GCeXHHmwYcqtvAoCcl60xaaVZ1YCfeERu5w==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR04MB7037
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
> Fix up possible unclocked register access to auto hibern8 register in res=
ume path
> and through sysfs entry. Meanwhile, enable auto hibern8 only after device=
 is
> fully initialized in probe path.
>=20
> Signed-off-by: Can Guo <cang@codeaurora.org>
Acked-by: Avri Altman <avri.altman@wdc.com>

> ---
>  drivers/scsi/ufs/ufs-sysfs.c | 17 +++++++++++------
>  drivers/scsi/ufs/ufshcd.c    | 12 ++++++------
>  2 files changed, 17 insertions(+), 12 deletions(-)
>=20
> diff --git a/drivers/scsi/ufs/ufs-sysfs.c b/drivers/scsi/ufs/ufs-sysfs.c =
index
> 969a36b..6c2f19e 100644
> --- a/drivers/scsi/ufs/ufs-sysfs.c
> +++ b/drivers/scsi/ufs/ufs-sysfs.c
> @@ -126,13 +126,18 @@ static void ufshcd_auto_hibern8_update(struct
> ufs_hba *hba, u32 ahit)
>                 return;
>=20
>         spin_lock_irqsave(hba->host->host_lock, flags);
> -       if (hba->ahit =3D=3D ahit)
> -               goto out_unlock;
> -       hba->ahit =3D ahit;
> -       if (!pm_runtime_suspended(hba->dev))
> -               ufshcd_writel(hba, hba->ahit, REG_AUTO_HIBERNATE_IDLE_TIM=
ER);
> -out_unlock:
> +       if (hba->ahit !=3D ahit)
> +               hba->ahit =3D ahit;
>         spin_unlock_irqrestore(hba->host->host_lock, flags);
> +       if (!pm_runtime_suspended(hba->dev)) {
> +               pm_runtime_get_sync(hba->dev);
> +               ufshcd_hold(hba, false);
> +               spin_lock_irqsave(hba->host->host_lock, flags);
> +               ufshcd_writel(hba, hba->ahit, REG_AUTO_HIBERNATE_IDLE_TIM=
ER);
> +               spin_unlock_irqrestore(hba->host->host_lock, flags);
Call ufshcd_auto_hibern8_enable instead of open coding?=20

> +               ufshcd_release(hba);
> +               pm_runtime_put(hba->dev);
> +       }
>  }
>=20
>  /* Convert Auto-Hibernate Idle Timer register value to microseconds */ d=
iff --git
> a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c index 525f8e6..f1=
2f5a7
> 100644
> --- a/drivers/scsi/ufs/ufshcd.c
> +++ b/drivers/scsi/ufs/ufshcd.c
> @@ -6892,9 +6892,6 @@ static int ufshcd_probe_hba(struct ufs_hba *hba)
>         /* UniPro link is active now */
>         ufshcd_set_link_active(hba);
>=20
> -       /* Enable Auto-Hibernate if configured */
> -       ufshcd_auto_hibern8_enable(hba);
> -
>         ret =3D ufshcd_verify_dev_init(hba);
>         if (ret)
>                 goto out;
> @@ -6945,6 +6942,9 @@ static int ufshcd_probe_hba(struct ufs_hba *hba)
>         /* set the state as operational after switching to desired gear *=
/
>         hba->ufshcd_state =3D UFSHCD_STATE_OPERATIONAL;
>=20
> +       /* Enable Auto-Hibernate if configured */
> +       ufshcd_auto_hibern8_enable(hba);
> +
>         /*
>          * If we are in error handling context or in power management cal=
lbacks
>          * context, no need to scan the host @@ -7962,12 +7962,12 @@ stat=
ic int
> ufshcd_resume(struct ufs_hba *hba, enum ufs_pm_op pm_op)
>         if (hba->clk_scaling.is_allowed)
>                 ufshcd_resume_clkscaling(hba);
>=20
> -       /* Schedule clock gating in case of no access to UFS device yet *=
/
> -       ufshcd_release(hba);
> -
>         /* Enable Auto-Hibernate if configured */
>         ufshcd_auto_hibern8_enable(hba);
>=20
> +       /* Schedule clock gating in case of no access to UFS device yet *=
/
> +       ufshcd_release(hba);
> +
>         goto out;
>=20
>  set_old_link_state:
> --
> The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum=
,
> a Linux Foundation Collaborative Project