[v6,05/10] scsi: ufs: add quirk to fix abnormal ocs fatal error

Commit Message

Alim Akhtar April 17, 2020, 5:59 p.m. UTC

From: Kiwoong Kim <[e-mail]>

Some architectures determines if fatal error for OCS
occurrs to check status in response upiu. This patch
is to prevent from reporting command results with that.

Signed-off-by: Kiwoong Kim <[e-mail]>
Signed-off-by: Alim Akhtar <[e-mail]>
---
 drivers/scsi/ufs/ufshcd.c | 6 ++++++
 drivers/scsi/ufs/ufshcd.h | 6 ++++++
 2 files changed, 12 insertions(+)

Comments

Avri Altman April 20, 2020, 8:55 a.m. UTC | #1

> 
> From: Kiwoong Kim <[e-mail]>
> 
> Some architectures determines if fatal error for OCS
> occurrs to check status in response upiu. This patch
Typo - occurs

> is to prevent from reporting command results with that.
> 
> Signed-off-by: Kiwoong Kim <[e-mail]>
> Signed-off-by: Alim Akhtar <[e-mail]>
> ---
>  drivers/scsi/ufs/ufshcd.c | 6 ++++++
>  drivers/scsi/ufs/ufshcd.h | 6 ++++++
>  2 files changed, 12 insertions(+)
> 
> diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c
> index b32fcedcdcb9..8c07caff0a5c 100644
> --- a/drivers/scsi/ufs/ufshcd.c
> +++ b/drivers/scsi/ufs/ufshcd.c
> @@ -4794,6 +4794,12 @@ ufshcd_transfer_rsp_status(struct ufs_hba *hba,
> struct ufshcd_lrb *lrbp)
>         /* overall command status of utrd */
>         ocs = ufshcd_get_tr_ocs(lrbp);
> 
> +       if (hba->quirks & UFSHCD_QUIRK_BROKEN_OCS_FATAL_ERROR) {
> +               if (be32_to_cpu(lrbp->ucd_rsp_ptr->header.dword_1) &
> +                                       MASK_RSP_UPIU_RESULT)
> +                       ocs = OCS_SUCCESS;
> +       }
> +
Not sure that I follow what this quirk is all about.
Your code overrides ocs by open coding ufshcd_get_rsp_upiu_result.

Normally OCS is in utp transfer req descriptor, dword 2, bits 0..7.
My understanding from your description, is that some fatal error might occur,
But the host controller does not report it, and it still needs to be checked in the response upiu.
Evidently you are not doing so.
Please elaborate your description.

P.S.
The ocs is being evaluated in device management commands as well,
Isn't this something you need to attend?

Thanks,
Avri

>         switch (ocs) {
>         case OCS_SUCCESS:
>                 result = ufshcd_get_req_rsp(lrbp->ucd_rsp_ptr);
> diff --git a/drivers/scsi/ufs/ufshcd.h b/drivers/scsi/ufs/ufshcd.h
> index a9b9ace9fc72..e1d09c2c4302 100644
> --- a/drivers/scsi/ufs/ufshcd.h
> +++ b/drivers/scsi/ufs/ufshcd.h
> @@ -541,6 +541,12 @@ enum ufshcd_quirks {
>          * resolution of the values of PRDTO and PRDTL in UTRD as byte.
>          */
>         UFSHCD_QUIRK_PRDT_BYTE_GRAN                     = 1 << 9,
> +
> +       /*
> +        * This quirk needs to be enabled if the host controller reports
> +        * OCS FATAL ERROR with device error through sense data
> +        */
> +       UFSHCD_QUIRK_BROKEN_OCS_FATAL_ERROR             = 1 << 10,
>  };
> 
>  enum ufshcd_caps {
> --
> 2.17.1

Kiwoong Kim April 21, 2020, 7:46 a.m. UTC | #2

> -----Original Message-----
> From: Avri Altman <[e-mail]>
> Sent: Monday, April 20, 2020 5:56 PM
> To: Alim Akhtar <[e-mail]>; [e-mail]
> Cc: [e-mail]; [e-mail];
> [e-mail]; [e-mail]; [e-mail];
> [e-mail]; [e-mail]; linux-samsung-
> [e-mail]; [e-mail]; linux-
> [e-mail]
> Subject: RE: [PATCH v6 05/10] scsi: ufs: add quirk to fix abnormal ocs
> fatal error
> 
> >
> > From: Kiwoong Kim <[e-mail]>
> >
> > Some architectures determines if fatal error for OCS occurrs to check
> > status in response upiu. This patch
> Typo - occurs
> 
> > is to prevent from reporting command results with that.
> >
> > Signed-off-by: Kiwoong Kim <[e-mail]>
> > Signed-off-by: Alim Akhtar <[e-mail]>
> > ---
> >  drivers/scsi/ufs/ufshcd.c | 6 ++++++
> >  drivers/scsi/ufs/ufshcd.h | 6 ++++++
> >  2 files changed, 12 insertions(+)
> >
> > diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c
> > index b32fcedcdcb9..8c07caff0a5c 100644
> > --- a/drivers/scsi/ufs/ufshcd.c
> > +++ b/drivers/scsi/ufs/ufshcd.c
> > @@ -4794,6 +4794,12 @@ ufshcd_transfer_rsp_status(struct ufs_hba *hba,
> > struct ufshcd_lrb *lrbp)
> >         /* overall command status of utrd */
> >         ocs = ufshcd_get_tr_ocs(lrbp);
> >
> > +       if (hba->quirks & UFSHCD_QUIRK_BROKEN_OCS_FATAL_ERROR) {
> > +               if (be32_to_cpu(lrbp->ucd_rsp_ptr->header.dword_1) &
> > +                                       MASK_RSP_UPIU_RESULT)
> > +                       ocs = OCS_SUCCESS;
> > +       }
> > +
> Not sure that I follow what this quirk is all about.
> Your code overrides ocs by open coding ufshcd_get_rsp_upiu_result.
> 
> Normally OCS is in utp transfer req descriptor, dword 2, bits 0..7.
> My understanding from your description, is that some fatal error might
> occur, But the host controller does not report it, and it still needs to
> be checked in the response upiu.
> Evidently you are not doing so.
> Please elaborate your description.
> 
> P.S.
> The ocs is being evaluated in device management commands as well, Isn't
> this something you need to attend?
> 
> Thanks,
> Avri
> 
> >         switch (ocs) {
> >         case OCS_SUCCESS:
> >                 result = ufshcd_get_req_rsp(lrbp->ucd_rsp_ptr);
> > diff --git a/drivers/scsi/ufs/ufshcd.h b/drivers/scsi/ufs/ufshcd.h
> > index a9b9ace9fc72..e1d09c2c4302 100644
> > --- a/drivers/scsi/ufs/ufshcd.h
> > +++ b/drivers/scsi/ufs/ufshcd.h
> > @@ -541,6 +541,12 @@ enum ufshcd_quirks {
> >          * resolution of the values of PRDTO and PRDTL in UTRD as byte.
> >          */
> >         UFSHCD_QUIRK_PRDT_BYTE_GRAN                     = 1 << 9,
> > +
> > +       /*
> > +        * This quirk needs to be enabled if the host controller reports
> > +        * OCS FATAL ERROR with device error through sense data
> > +        */
> > +       UFSHCD_QUIRK_BROKEN_OCS_FATAL_ERROR             = 1 << 10,
> >  };
> >
> >  enum ufshcd_caps {
> > --
> > 2.17.1
Avri

As specified in the spec, OCS isn't supposed to refer to the contents of RESPONSE UPIU.
But, Exynos host behaves like that in some cases, e.g. a value of 'state' in is isn't GOOD(00h).

For QUERY RESPONSE, its offset, i.e. " dword_1" is reserved, so currently no impact, I think.
But if you feel another condition is necessary to identify if this request is QUERY REQEUST or not, we can add more.

Thanks

Kiwoong Kim April 21, 2020, 7:51 a.m. UTC | #3

> -----Original Message-----
> From: Avri Altman <[e-mail]>
> Sent: Monday, April 20, 2020 5:56 PM
> To: Alim Akhtar <[e-mail]>; [e-mail]
> Cc: [e-mail]; [e-mail];
> [e-mail]; [e-mail]; [e-mail];
> [e-mail]; [e-mail]; linux-samsung-
> [e-mail]; [e-mail]; linux-
> [e-mail]
> Subject: RE: [PATCH v6 05/10] scsi: ufs: add quirk to fix abnormal ocs
> fatal error
> 
> >
> > From: Kiwoong Kim <[e-mail]>
> >
> > Some architectures determines if fatal error for OCS occurrs to check
> > status in response upiu. This patch
> Typo - occurs
> 
> > is to prevent from reporting command results with that.
> >
> > Signed-off-by: Kiwoong Kim <[e-mail]>
> > Signed-off-by: Alim Akhtar <[e-mail]>
> > ---
> >  drivers/scsi/ufs/ufshcd.c | 6 ++++++
> >  drivers/scsi/ufs/ufshcd.h | 6 ++++++
> >  2 files changed, 12 insertions(+)
> >
> > diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c
> > index b32fcedcdcb9..8c07caff0a5c 100644
> > --- a/drivers/scsi/ufs/ufshcd.c
> > +++ b/drivers/scsi/ufs/ufshcd.c
> > @@ -4794,6 +4794,12 @@ ufshcd_transfer_rsp_status(struct ufs_hba *hba,
> > struct ufshcd_lrb *lrbp)
> >         /* overall command status of utrd */
> >         ocs = ufshcd_get_tr_ocs(lrbp);
> >
> > +       if (hba->quirks & UFSHCD_QUIRK_BROKEN_OCS_FATAL_ERROR) {
> > +               if (be32_to_cpu(lrbp->ucd_rsp_ptr->header.dword_1) &
> > +                                       MASK_RSP_UPIU_RESULT)
> > +                       ocs = OCS_SUCCESS;
> > +       }
> > +
> Not sure that I follow what this quirk is all about.
> Your code overrides ocs by open coding ufshcd_get_rsp_upiu_result.
> 
> Normally OCS is in utp transfer req descriptor, dword 2, bits 0..7.
> My understanding from your description, is that some fatal error might
> occur, But the host controller does not report it, and it still needs to
> be checked in the response upiu.
> Evidently you are not doing so.
> Please elaborate your description.
> 
> P.S.
> The ocs is being evaluated in device management commands as well, Isn't
> this something you need to attend?
> 
> Thanks,
> Avri
> 
> >         switch (ocs) {
> >         case OCS_SUCCESS:
> >                 result = ufshcd_get_req_rsp(lrbp->ucd_rsp_ptr);
> > diff --git a/drivers/scsi/ufs/ufshcd.h b/drivers/scsi/ufs/ufshcd.h
> > index a9b9ace9fc72..e1d09c2c4302 100644
> > --- a/drivers/scsi/ufs/ufshcd.h
> > +++ b/drivers/scsi/ufs/ufshcd.h
> > @@ -541,6 +541,12 @@ enum ufshcd_quirks {
> >          * resolution of the values of PRDTO and PRDTL in UTRD as byte.
> >          */
> >         UFSHCD_QUIRK_PRDT_BYTE_GRAN                     = 1 << 9,
> > +
> > +       /*
> > +        * This quirk needs to be enabled if the host controller reports
> > +        * OCS FATAL ERROR with device error through sense data
> > +        */
> > +       UFSHCD_QUIRK_BROKEN_OCS_FATAL_ERROR             = 1 << 10,
> >  };
> >
> >  enum ufshcd_caps {
> > --
> > 2.17.1
Avri

As specified in the spec, OCS isn't supposed to refer to the contents of RESPONSE UPIU.
But, Exynos host behaves like that in some cases, e.g. a value of 'state' in is isn't GOOD(00h).

For QUERY RESPONSE, its offset, i.e. " dword_1" is reserved, so currently no impact, I think.
But if you feel another condition is necessary to identify if this request is QUERY REQEUST or not, we can add more.

Thanks

Avri Altman April 21, 2020, 12:07 p.m. UTC | #4

> 
> > -----Original Message-----
> > From: Avri Altman <[e-mail]>
> > Sent: Monday, April 20, 2020 5:56 PM
> > To: Alim Akhtar <[e-mail]>; [e-mail]
> > Cc: [e-mail]; [e-mail];
> > [e-mail]; [e-mail];
> [e-mail];
> > [e-mail]; [e-mail]; linux-samsung-
> > [e-mail]; [e-mail]; linux-
> > [e-mail]
> > Subject: RE: [PATCH v6 05/10] scsi: ufs: add quirk to fix abnormal ocs
> > fatal error
> >
> > >
> > > From: Kiwoong Kim <[e-mail]>
> > >
> > > Some architectures determines if fatal error for OCS occurrs to check
> > > status in response upiu. This patch
> > Typo - occurs
> >
> > > is to prevent from reporting command results with that.
> > >
> > > Signed-off-by: Kiwoong Kim <[e-mail]>
> > > Signed-off-by: Alim Akhtar <[e-mail]>
> > > ---
> > >  drivers/scsi/ufs/ufshcd.c | 6 ++++++
> > >  drivers/scsi/ufs/ufshcd.h | 6 ++++++
> > >  2 files changed, 12 insertions(+)
> > >
> > > diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c
> > > index b32fcedcdcb9..8c07caff0a5c 100644
> > > --- a/drivers/scsi/ufs/ufshcd.c
> > > +++ b/drivers/scsi/ufs/ufshcd.c
> > > @@ -4794,6 +4794,12 @@ ufshcd_transfer_rsp_status(struct ufs_hba
> *hba,
> > > struct ufshcd_lrb *lrbp)
> > >         /* overall command status of utrd */
> > >         ocs = ufshcd_get_tr_ocs(lrbp);
> > >
> > > +       if (hba->quirks & UFSHCD_QUIRK_BROKEN_OCS_FATAL_ERROR) {
> > > +               if (be32_to_cpu(lrbp->ucd_rsp_ptr->header.dword_1) &
> > > +                                       MASK_RSP_UPIU_RESULT)
> > > +                       ocs = OCS_SUCCESS;
> > > +       }
> > > +
> > Not sure that I follow what this quirk is all about.
> > Your code overrides ocs by open coding ufshcd_get_rsp_upiu_result.
> >
> > Normally OCS is in utp transfer req descriptor, dword 2, bits 0..7.
> > My understanding from your description, is that some fatal error might
> > occur, But the host controller does not report it, and it still needs to
> > be checked in the response upiu.
> > Evidently you are not doing so.
> > Please elaborate your description.
> >
> > P.S.
> > The ocs is being evaluated in device management commands as well, Isn't
> > this something you need to attend?
> >
> > Thanks,
> > Avri
> >
> > >         switch (ocs) {
> > >         case OCS_SUCCESS:
> > >                 result = ufshcd_get_req_rsp(lrbp->ucd_rsp_ptr);
> > > diff --git a/drivers/scsi/ufs/ufshcd.h b/drivers/scsi/ufs/ufshcd.h
> > > index a9b9ace9fc72..e1d09c2c4302 100644
> > > --- a/drivers/scsi/ufs/ufshcd.h
> > > +++ b/drivers/scsi/ufs/ufshcd.h
> > > @@ -541,6 +541,12 @@ enum ufshcd_quirks {
> > >          * resolution of the values of PRDTO and PRDTL in UTRD as byte.
> > >          */
> > >         UFSHCD_QUIRK_PRDT_BYTE_GRAN                     = 1 << 9,
> > > +
> > > +       /*
> > > +        * This quirk needs to be enabled if the host controller reports
> > > +        * OCS FATAL ERROR with device error through sense data
> > > +        */
> > > +       UFSHCD_QUIRK_BROKEN_OCS_FATAL_ERROR             = 1 << 10,
> > >  };
> > >
> > >  enum ufshcd_caps {
> > > --
> > > 2.17.1
> Avri
> 
> As specified in the spec, OCS isn't supposed to refer to the contents of
> RESPONSE UPIU.
> But, Exynos host behaves like that in some cases, e.g. a value of 'state' in is
> isn't GOOD(00h).
OK.
I still think that you might consider rewording your commit, explaining this quirk better.
Specifically you might not want to say "if fatal..." because fatal code (0x7) is just one error code out of many.
Also you might want to use ufshcd_get_rsp_upiu_result() in the quirk body instead of open coding it.

> 
> For QUERY RESPONSE, its offset, i.e. " dword_1" is reserved, so currently no
> impact, I think.
> But if you feel another condition is necessary to identify if this request is
> QUERY REQEUST or not, we can add more.
No need, as long as you are ok with whatever ufshcd_get_tr_ocs() returns in ufshcd_wait_for_dev_cmd().

Thanks,
Avri

> 
> Thanks

Christoph Hellwig April 22, 2020, 6:55 a.m. UTC | #5

On Fri, Apr 17, 2020 at 11:29:39PM +0530, Alim Akhtar wrote:
> From: Kiwoong Kim <[e-mail]>
> 
> Some architectures determines if fatal error for OCS
> occurrs to check status in response upiu. This patch
> is to prevent from reporting command results with that.

What does "Some architectures" mean?  All this seems to be about
error propagation to the SCSI midlyaer, so this sounds rather
strange.

Alim Akhtar April 26, 2020, 3:54 p.m. UTC | #6

Hi Avri

> -----Original Message-----
> From: Avri Altman <[e-mail]>
> Sent: 21 April 2020 17:37
> To: Kiwoong Kim <[e-mail]>; 'Alim Akhtar'
> <[e-mail]>; [e-mail]; [e-mail]
> Cc: [e-mail]; [e-mail]; [e-mail];
> [e-mail]; [e-mail]; linux-samsung-
> [e-mail]; [e-mail]; linux-
> [e-mail]
> Subject: RE: [PATCH v6 05/10] scsi: ufs: add quirk to fix abnormal ocs fatal error
> 
> >
> > > -----Original Message-----
> > > From: Avri Altman <[e-mail]>
> > > Sent: Monday, April 20, 2020 5:56 PM
> > > To: Alim Akhtar <[e-mail]>; [e-mail]
> > > Cc: [e-mail]; [e-mail];
> > > [e-mail]; [e-mail];
> > [e-mail];
> > > [e-mail]; [e-mail]; linux-samsung-
> > > [e-mail]; [e-mail]; linux-
> > > [e-mail]
> > > Subject: RE: [PATCH v6 05/10] scsi: ufs: add quirk to fix abnormal
> > > ocs fatal error
> > >
> > > >
> > > > From: Kiwoong Kim <[e-mail]>
> > > >
> > > > Some architectures determines if fatal error for OCS occurrs to
> > > > check status in response upiu. This patch
> > > Typo - occurs
> > >
> > > > is to prevent from reporting command results with that.
> > > >
> > > > Signed-off-by: Kiwoong Kim <[e-mail]>
> > > > Signed-off-by: Alim Akhtar <[e-mail]>
> > > > ---
> > > >  drivers/scsi/ufs/ufshcd.c | 6 ++++++  drivers/scsi/ufs/ufshcd.h |
> > > > 6 ++++++
> > > >  2 files changed, 12 insertions(+)
> > > >
> > > > diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c
> > > > index b32fcedcdcb9..8c07caff0a5c 100644
> > > > --- a/drivers/scsi/ufs/ufshcd.c
> > > > +++ b/drivers/scsi/ufs/ufshcd.c
> > > > @@ -4794,6 +4794,12 @@ ufshcd_transfer_rsp_status(struct ufs_hba
> > *hba,
> > > > struct ufshcd_lrb *lrbp)
> > > >         /* overall command status of utrd */
> > > >         ocs = ufshcd_get_tr_ocs(lrbp);
> > > >
> > > > +       if (hba->quirks & UFSHCD_QUIRK_BROKEN_OCS_FATAL_ERROR) {
> > > > +               if (be32_to_cpu(lrbp->ucd_rsp_ptr->header.dword_1) &
> > > > +                                       MASK_RSP_UPIU_RESULT)
> > > > +                       ocs = OCS_SUCCESS;
> > > > +       }
> > > > +
> > > Not sure that I follow what this quirk is all about.
> > > Your code overrides ocs by open coding ufshcd_get_rsp_upiu_result.
> > >
> > > Normally OCS is in utp transfer req descriptor, dword 2, bits 0..7.
> > > My understanding from your description, is that some fatal error
> > > might occur, But the host controller does not report it, and it
> > > still needs to be checked in the response upiu.
> > > Evidently you are not doing so.
> > > Please elaborate your description.
> > >
> > > P.S.
> > > The ocs is being evaluated in device management commands as well,
> > > Isn't this something you need to attend?
> > >
> > > Thanks,
> > > Avri
> > >
> > > >         switch (ocs) {
> > > >         case OCS_SUCCESS:
> > > >                 result = ufshcd_get_req_rsp(lrbp->ucd_rsp_ptr);
> > > > diff --git a/drivers/scsi/ufs/ufshcd.h b/drivers/scsi/ufs/ufshcd.h
> > > > index a9b9ace9fc72..e1d09c2c4302 100644
> > > > --- a/drivers/scsi/ufs/ufshcd.h
> > > > +++ b/drivers/scsi/ufs/ufshcd.h
> > > > @@ -541,6 +541,12 @@ enum ufshcd_quirks {
> > > >          * resolution of the values of PRDTO and PRDTL in UTRD as byte.
> > > >          */
> > > >         UFSHCD_QUIRK_PRDT_BYTE_GRAN                     = 1 << 9,
> > > > +
> > > > +       /*
> > > > +        * This quirk needs to be enabled if the host controller reports
> > > > +        * OCS FATAL ERROR with device error through sense data
> > > > +        */
> > > > +       UFSHCD_QUIRK_BROKEN_OCS_FATAL_ERROR             = 1 << 10,
> > > >  };
> > > >
> > > >  enum ufshcd_caps {
> > > > --
> > > > 2.17.1
> > Avri
> >
> > As specified in the spec, OCS isn't supposed to refer to the contents
> > of RESPONSE UPIU.
> > But, Exynos host behaves like that in some cases, e.g. a value of
> > 'state' in is isn't GOOD(00h).
> OK.
> I still think that you might consider rewording your commit, explaining this quirk
> better.
> Specifically you might not want to say "if fatal..." because fatal code (0x7) is just
> one error code out of many.
> Also you might want to use ufshcd_get_rsp_upiu_result() in the quirk body
> instead of open coding it.
> 
> >
> > For QUERY RESPONSE, its offset, i.e. " dword_1" is reserved, so
> > currently no impact, I think.
> > But if you feel another condition is necessary to identify if this
> > request is QUERY REQEUST or not, we can add more.
> No need, as long as you are ok with whatever ufshcd_get_tr_ocs() returns in
> ufshcd_wait_for_dev_cmd().
> 
I will update the commit message to make it clear in the next version of the patch set.

> Thanks,
> Avri
> 
> >
> > Thanks

Alim Akhtar April 26, 2020, 3:57 p.m. UTC | #7

> -----Original Message-----
> From: Christoph Hellwig <[e-mail]>
> Sent: 22 April 2020 12:26
> To: Alim Akhtar <[e-mail]>
> Cc: [e-mail]; [e-mail];
[e-mail];
> [e-mail]; [e-mail]; [e-mail];
> [e-mail]; [e-mail];
> [e-mail]; [e-mail]; linux-arm-
> [e-mail]; [e-mail]
> Subject: Re: [PATCH v6 05/10] scsi: ufs: add quirk to fix abnormal ocs
fatal error
> 
> On Fri, Apr 17, 2020 at 11:29:39PM +0530, Alim Akhtar wrote:
> > From: Kiwoong Kim <[e-mail]>
> >
> > Some architectures determines if fatal error for OCS occurrs to check
> > status in response upiu. This patch is to prevent from reporting
> > command results with that.
> 
> What does "Some architectures" mean?  All this seems to be about error
> propagation to the SCSI midlyaer, so this sounds rather strange.
Ok will update the commit message with more details.

Patch

diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c
index b32fcedcdcb9..8c07caff0a5c 100644
--- a/drivers/scsi/ufs/ufshcd.c
+++ b/drivers/scsi/ufs/ufshcd.c
@@ -4794,6 +4794,12 @@  ufshcd_transfer_rsp_status(struct ufs_hba *hba, struct ufshcd_lrb *lrbp)
 	/* overall command status of utrd */
 	ocs = ufshcd_get_tr_ocs(lrbp);
 
+	if (hba->quirks & UFSHCD_QUIRK_BROKEN_OCS_FATAL_ERROR) {
+		if (be32_to_cpu(lrbp->ucd_rsp_ptr->header.dword_1) &
+					MASK_RSP_UPIU_RESULT)
+			ocs = OCS_SUCCESS;
+	}
+
 	switch (ocs) {
 	case OCS_SUCCESS:
 		result = ufshcd_get_req_rsp(lrbp->ucd_rsp_ptr);
diff --git a/drivers/scsi/ufs/ufshcd.h b/drivers/scsi/ufs/ufshcd.h
index a9b9ace9fc72..e1d09c2c4302 100644
--- a/drivers/scsi/ufs/ufshcd.h
+++ b/drivers/scsi/ufs/ufshcd.h
@@ -541,6 +541,12 @@  enum ufshcd_quirks {
 	 * resolution of the values of PRDTO and PRDTL in UTRD as byte.
 	 */
 	UFSHCD_QUIRK_PRDT_BYTE_GRAN			= 1 << 9,
+
+	/*
+	 * This quirk needs to be enabled if the host controller reports
+	 * OCS FATAL ERROR with device error through sense data
+	 */
+	UFSHCD_QUIRK_BROKEN_OCS_FATAL_ERROR		= 1 << 10,
 };
 
 enum ufshcd_caps {