Skip to content

Commit 9413532

Browse files
Xiang Chenmartinkpetersen
authored andcommitted
scsi: hisi_sas: config ATA de-reset as an constrained command for v3 hw
As a unconstrained command, a command can be sent to SATA disk even if SATA disk status is BUSY, ERR or DRQ. If an ATA reset assert is successful but ATA reset de-assert fails, then it will retry the reset de-assert. If reset de- assert retry is successful, we think it is okay to probe the device but actually it still has Err status. Apparently we need to retry the ATA reset assertion and de- assertion instead for this mentioned scenario. As such, we config ATA reset assert as a constrained command, if ATA reset de-assert fails, then ATA reset de-assert retry will also fail. Then we will retry the proper process of ATA reset assert and de-assert again. Signed-off-by: Xiang Chen <[email protected]> Signed-off-by: John Garry <[email protected]> Signed-off-by: Martin K. Petersen <[email protected]>
1 parent c2c1d9d commit 9413532

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

drivers/scsi/hisi_sas/hisi_sas_v3_hw.c

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -351,10 +351,11 @@ struct hisi_sas_err_record_v3 {
351351
#define DIR_TO_DEVICE 2
352352
#define DIR_RESERVED 3
353353

354-
#define CMD_IS_UNCONSTRAINT(cmd) \
355-
((cmd == ATA_CMD_READ_LOG_EXT) || \
356-
(cmd == ATA_CMD_READ_LOG_DMA_EXT) || \
357-
(cmd == ATA_CMD_DEV_RESET))
354+
#define FIS_CMD_IS_UNCONSTRAINED(fis) \
355+
((fis.command == ATA_CMD_READ_LOG_EXT) || \
356+
(fis.command == ATA_CMD_READ_LOG_DMA_EXT) || \
357+
((fis.command == ATA_CMD_DEV_RESET) && \
358+
((fis.control & ATA_SRST) != 0)))
358359

359360
static u32 hisi_sas_read32(struct hisi_hba *hisi_hba, u32 off)
360361
{
@@ -1075,7 +1076,7 @@ static int prep_ata_v3_hw(struct hisi_hba *hisi_hba,
10751076
<< CMD_HDR_FRAME_TYPE_OFF;
10761077
dw1 |= sas_dev->device_id << CMD_HDR_DEV_ID_OFF;
10771078

1078-
if (CMD_IS_UNCONSTRAINT(task->ata_task.fis.command))
1079+
if (FIS_CMD_IS_UNCONSTRAINED(task->ata_task.fis))
10791080
dw1 |= 1 << CMD_HDR_UNCON_CMD_OFF;
10801081

10811082
hdr->dw1 = cpu_to_le32(dw1);

0 commit comments

Comments
 (0)