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: uHJVictUU0hpHt3izabcGVLq1ac2CzmX1Xmcd32hlic++50sm6O3EW33PJvSn7Osi/GBRQlfVw
 Ub0xhSqxVxMDS6v00AZwyfTnjucgOmDct0Howuf1dphHqpwDtsUdSvXVKMSGMUOrjoOuYqomsk
 bUKMJ0wVjACeLdpl99Qv06nlpZXxfUrgkn29ux9car3fCg26o7MOTy4p6bij5PxAykc7fG7QOT
 P+HS9IUVU9IOijLliU2VgKK9LLCXUK0y4dEuYLbEIbMU9PvrhJFqBddIEqlDFFj9eLR4HPoPMQ
 IYI=
From:   Avri Altman <Avri.Altman@wdc.com>
To:     Adrian Hunter <adrian.hunter@intel.com>,
        "Martin K . Petersen" <martin.petersen@oracle.com>,
        "James E . J . Bottomley" <jejb@linux.ibm.com>
CC:     "linux-scsi@vger.kernel.org" <linux-scsi@vger.kernel.org>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
        Alim Akhtar <alim.akhtar@samsung.com>,
        Bean Huo <huobean@gmail.com>, Can Guo <cang@codeaurora.org>,
        Asutosh Das <asutoshd@codeaurora.org>,
        Stanley Chu <stanley.chu@mediatek.com>
Subject: RE: [PATCH] scsi: ufs: Fix incorrect ufshcd_state after
 ufshcd_reset_and_restore()
Thread-Topic: [PATCH] scsi: ufs: Fix incorrect ufshcd_state after
 ufshcd_reset_and_restore()
Thread-Index: AQHXDs/Xkhs8QX6wuUWaLAgULwpYvqpwRSFA
Date:   Tue, 2 Mar 2021 07:01:14 +0000
Message-ID: <DM6PR04MB65753E738C556F035A56F77CFC999@DM6PR04MB6575.namprd04.prod.outlook.com>
References: <20210301191940.15247-1-adrian.hunter@intel.com>
In-Reply-To: <20210301191940.15247-1-adrian.hunter@intel.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: cd5456f6-185f-4de3-d5d7-08d8dd48f855
X-MS-Exchange-CrossTenant-originalarrivaltime: 02 Mar 2021 07:01:14.5827
 (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: RHkBRgp9BM0LqF4BTKfSLgevzUhnE+xYVJoSi1Vi6XRDK/5LPjpnnESRwtywNp/7N8VziPX3Kr4o0soU7BvJPA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR04MB4491
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

=20
> If ufshcd_probe_hba() fails it sets ufshcd_state to UFSHCD_STATE_ERROR,
> however, if it is called again, as it is within a loop in
> ufshcd_reset_and_restore(), and succeeds, then it will not set the state
> back to UFSHCD_STATE_OPERATIONAL unless the state was
> UFSHCD_STATE_RESET.
>=20
> That can result in the state being UFSHCD_STATE_ERROR even though
> ufshcd_reset_and_restore() is successful and returns zero.
>=20
> Fix by initializing the state to UFSHCD_STATE_RESET in the start of each
> loop in ufshcd_reset_and_restore().  If there is an error,
> ufshcd_reset_and_restore() will change the state to UFSHCD_STATE_ERROR,
> otherwise ufshcd_probe_hba() will have set the state appropriately.
>=20
> Fixes: 4db7a2360597 ("scsi: ufs: Fix concurrency of error handler and oth=
er
> error recovery paths")
> Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
I think that CanG recent series addressed that issue as well, can you take =
a look?
https://lore.kernel.org/lkml/1614145010-36079-2-git-send-email-cang@codeaur=
ora.org/


> ---
>  drivers/scsi/ufs/ufshcd.c | 2 ++
>  1 file changed, 2 insertions(+)
>=20
> diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c
> index 77161750c9fb..91a403afe038 100644
> --- a/drivers/scsi/ufs/ufshcd.c
> +++ b/drivers/scsi/ufs/ufshcd.c
> @@ -7031,6 +7031,8 @@ static int ufshcd_reset_and_restore(struct ufs_hba
> *hba)
>         spin_unlock_irqrestore(hba->host->host_lock, flags);
>=20
>         do {
> +               hba->ufshcd_state =3D UFSHCD_STATE_RESET;
> +
>                 /* Reset the attached device */
>                 ufshcd_device_reset(hba);
>=20
> --
> 2.17.1