aic94xx: fix smartctl utility problem

PATCH In review Gilbert Wu 2 participants 3 messages Sep 14, 2007 SCSI

Share & tools

Gilbert Wu

author

2007-09-14 17:23 UTC #0 lore raw

PATCH 1/1 aic94xx: fix smartctl utility problem

Fixed the problem that "smartctl -a /dev/some_sata_disk -d ata" does not work on SATA device. ( The smartctl v5.38 does need "-d ata" option.)
The aic94xx need to return ATA output register for all ATA commands
except ATA Read/Write commands.
The aic94xx also mark out the DRQ bit from status register which is
treated as AC_ERR_HSM (host state machine violation) error by top layer if it set to one.
The firmware of aic94xx chip handle all ATA handshaking, data transfer
and return ATA output register which is sent by the device. So the DRQ bit may not reflect the last state of device when the command finished and it is no meaning for the caller.

Signed-off-by Gilbert Wu <[email protected]>

drivers/scsi/aic94xx/aic94xx_task.c +35 -0

diff -urN a/drivers/scsi/aic94xx/aic94xx_task.c b/drivers/scsi/aic94xx/aic94xx_task.c
@@ -25,6 +25,7 @@
  */
 
 #include <linux/spinlock.h>
+#include <linux/ata.h>
 #include "aic94xx.h"
 #include "aic94xx_sas.h"
 #include "aic94xx_hwi.h"

@@ -220,6 +221,7 @@
 			memcpy(&resp->ending_fis[0], r+16, 24);
 			ts->buf_valid_size = sizeof(*resp);
 		}
+		resp->ending_fis[2] &= ~ATA_DRQ;
 	}
 
 	asd_invalidate_edb(escb, edb_id);

@@ -257,6 +259,11 @@
 		ts->stat = SAS_PROTO_RESPONSE;
 		asd_get_response_tasklet(ascb, dl);
 		break;
+	case TC_CSMI:
+		ts->resp = SAS_TASK_COMPLETE;
+		ts->stat = SAM_GOOD;
+		asd_get_response_tasklet(ascb, dl);
+		break;
 	case TF_OPEN_REJECT:
 		ts->resp = SAS_TASK_UNDELIVERED;
 		ts->stat = SAS_OPEN_REJECT;

@@ -374,7 +381,32 @@
 }
 
 /* ---------- ATA ---------- */
+int is_ata_rw_cmd(u8 ata_cmd)
+{
 
+	switch (ata_cmd) {
+	case ATA_CMD_READ:
+	case ATA_CMD_READ_EXT:
+	case ATA_CMD_WRITE:
+	case ATA_CMD_WRITE_EXT:
+	case ATA_CMD_WRITE_FUA_EXT:
+	case ATA_CMD_FPDMA_READ:
+	case ATA_CMD_FPDMA_WRITE:
+	case ATA_CMD_PIO_READ:
+	case ATA_CMD_PIO_READ_EXT:
+	case ATA_CMD_PIO_WRITE:
+	case ATA_CMD_PIO_WRITE_EXT:
+	case ATA_CMD_READ_MULTI:
+	case ATA_CMD_READ_MULTI_EXT:
+	case ATA_CMD_WRITE_MULTI:
+	case ATA_CMD_WRITE_MULTI_EXT:
+	case ATA_CMD_WRITE_MULTI_FUA_EXT:
+	case ATA_CMD_VERIFY:
+	case ATA_CMD_VERIFY_EXT:
+		return 1;
+	}
+	return 0;
+}
 static int asd_build_ata_ascb(struct asd_ascb *ascb, struct sas_task *task,
 			      gfp_t gfp_flags)
 {

@@ -427,6 +459,9 @@
 			flags |= STP_AFFIL_POLICY;
 		scb->ata_task.flags = flags;
 	}
+	if (!is_ata_rw_cmd(scb->ata_task.fis.command))
+		scb->ata_task.ata_flags|=CSMI_TASK;
+
 	ascb->tasklet_complete = asd_task_tasklet_complete;
 
 	if (likely(!task->ata_task.device_control_reg_update))

Jeff Garzik

2007-09-14 17:26 UTC #1 lore raw

Quoted 13 lines · Gilbert Wu

Fixed the problem that "smartctl -a /dev/some_sata_disk -d ata" does not work on SATA device. ( The smartctl v5.38 does need "-d ata" option.)
The aic94xx need to return ATA output register for all ATA commands
except ATA Read/Write commands.
The aic94xx also mark out the DRQ bit from status register which is
treated as AC_ERR_HSM (host state machine violation) error by top layer if it set to one.
The firmware of aic94xx chip handle all ATA handshaking, data transfer
and return ATA output register which is sent by the device. So the DRQ bit may not reflect the last state of device when the command finished and it is no meaning for the caller.

Quoted 1 line

Signed-off-by Gilbert Wu <[email protected]>

ACK, thanks for your patience

drivers/scsi/aic94xx/aic94xx_task.c line 463

Quoted 6 lines

drivers/scsi/aic94xx/aic94xx_task.c +2 -0

@@ -427,6 +459,9 @@
 			flags |= STP_AFFIL_POLICY;
 		scb->ata_task.flags = flags;
 	}
+	if (!is_ata_rw_cmd(scb->ata_task.fis.command))
+		scb->ata_task.ata_flags|=CSMI_TASK;

Minor style complaint: add spaces around "|="

Regards,

Jeff

Wu, Gilbert

author

2007-09-14 17:30 UTC #2 lore raw

HI Jeff,

Oops! I missed that one and will resend again.

Thanks!
Gilbert

-----Original Message-----
From: Jeff Garzik [mailto:[email protected]]
Sent: Friday, September 14, 2007 10:27 AM
To: Wu, Gilbert
Cc: [email protected]
Subject: Re: [PATCH] aic94xx: fix smartctl utility problem

Quoted 7 lines · Gilbert Wu

Fixed the problem that "smartctl -a /dev/some_sata_disk -d ata" does not work on SATA device. ( The smartctl v5.38 does need "-d ata" option.)
The aic94xx need to return ATA output register for all ATA commands
except ATA Read/Write commands.
The aic94xx also mark out the DRQ bit from status register which is
treated as AC_ERR_HSM (host state machine violation) error by top

layer

Quoted 2 lines

if it set to one.
The firmware of aic94xx chip handle all ATA handshaking, data

transfer