[v6,8/8] scsi: libsas: Update SATA dev FIS in sas_ata_task_done()

Message ID 1665998435-199946-9-git-send-email-john.garry@huawei.com
State New
Headers
Series libsas and drivers: NCQ error handling |

Commit Message

John Garry Oct. 17, 2022, 9:20 a.m. UTC
  In sas_ata_task_done(), for commands which complete with error we set
the SATA dev FIS status field with ATA_ERR. In ata_eh_analyze_tf() this
would be interpreted as a HSM error. Set ATA_DRDY, which will lead libata
to judge as a device error, which is a safer bet.

Signed-off-by: John Garry <john.garry@huawei.com>
---
 drivers/scsi/libsas/sas_ata.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
  

Comments

Niklas Cassel Oct. 17, 2022, 10:41 a.m. UTC | #1
On Mon, Oct 17, 2022 at 05:20:35PM +0800, John Garry wrote:
> In sas_ata_task_done(), for commands which complete with error we set
> the SATA dev FIS status field with ATA_ERR. In ata_eh_analyze_tf() this
> would be interpreted as a HSM error. Set ATA_DRDY, which will lead libata
> to judge as a device error, which is a safer bet.
> 
> Signed-off-by: John Garry <john.garry@huawei.com>
> ---
>  drivers/scsi/libsas/sas_ata.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/scsi/libsas/sas_ata.c b/drivers/scsi/libsas/sas_ata.c
> index 61f64d54e67d..78e6046fb55a 100644
> --- a/drivers/scsi/libsas/sas_ata.c
> +++ b/drivers/scsi/libsas/sas_ata.c
> @@ -139,8 +139,8 @@ static void sas_ata_task_done(struct sas_task *task)
>  				qc->flags |= ATA_QCFLAG_FAILED;
>  			}
>  
> -			dev->sata_dev.fis[3] = 0x04; /* status err */
> -			dev->sata_dev.fis[2] = ATA_ERR;
> +			dev->sata_dev.fis[2] = ATA_ERR | ATA_DRDY; /* tf status */
> +			dev->sata_dev.fis[3] = ATA_ABORTED; /* tf error */
>  		}
>  	}
>  
> -- 
> 2.35.3
> 

Reviewed-by: Niklas Cassel <niklas.cassel@wdc.com>
  

Patch

diff --git a/drivers/scsi/libsas/sas_ata.c b/drivers/scsi/libsas/sas_ata.c
index 61f64d54e67d..78e6046fb55a 100644
--- a/drivers/scsi/libsas/sas_ata.c
+++ b/drivers/scsi/libsas/sas_ata.c
@@ -139,8 +139,8 @@  static void sas_ata_task_done(struct sas_task *task)
 				qc->flags |= ATA_QCFLAG_FAILED;
 			}
 
-			dev->sata_dev.fis[3] = 0x04; /* status err */
-			dev->sata_dev.fis[2] = ATA_ERR;
+			dev->sata_dev.fis[2] = ATA_ERR | ATA_DRDY; /* tf status */
+			dev->sata_dev.fis[3] = ATA_ABORTED; /* tf error */
 		}
 	}