Report the original command on failures that causes auto sense.

Keep the ATA_R_QUIET flag if set during autosense.

2 files changed, 7 insertions, 4 deletions

diff --git a/sys/dev/ata/ata-all.h b/sys/dev/ata/ata-all.h
index 4adc7929d3cf..da86b4ec1ec9 100644
--- a/sys/dev/ata/ata-all.h
+++ b/sys/dev/ata/ata-all.h
@@ -193,6 +193,7 @@ struct ata_request {
 	    u_int8_t		ccb[16];	/* ATAPI command block */
 	    struct atapi_sense	sense_data;	/* ATAPI request sense data */
 	    u_int8_t		sense_key;	/* ATAPI request sense key */
+	    u_int8_t		sense_cmd;	/* ATAPI saved command */
 	} atapi;
     } u;
 
diff --git a/sys/dev/ata/ata-queue.c b/sys/dev/ata/ata-queue.c
index a243efc53e81..e881a1e35048 100644
--- a/sys/dev/ata/ata-queue.c
+++ b/sys/dev/ata/ata-queue.c
@@ -338,14 +338,15 @@ ata_completed(void *context, int dummy)
                 			sizeof(struct atapi_sense),
 					0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
 
-	    bcopy(ccb, request->u.atapi.ccb, 16);
 	    request->u.atapi.sense_key = request->error;
+	    request->u.atapi.sense_cmd = request->u.atapi.ccb[0];
+	    bcopy(ccb, request->u.atapi.ccb, 16);
 	    request->data = (caddr_t)&request->u.atapi.sense_data;
 	    request->bytecount = sizeof(struct atapi_sense);
 	    request->transfersize = sizeof(struct atapi_sense);
 	    request->timeout = 5;
-	    request->flags =
-		ATA_R_ATAPI | ATA_R_READ | ATA_R_IMMEDIATE | ATA_R_REQUEUE;
+	    request->flags &= (ATA_R_ATAPI | ATA_R_QUIET);
+	    request->flags |= (ATA_R_READ | ATA_R_IMMEDIATE | ATA_R_REQUEUE);
 	    ata_queue_request(request);
 	    return;
 	}
@@ -466,7 +467,8 @@ ata_cmd2str(struct ata_request *request)
     static char buffer[20];
 
     if (request->flags & ATA_R_ATAPI) {
-	switch (request->u.atapi.ccb[0]) {
+	switch (request->u.atapi.sense_cmd ?
+		request->u.atapi.sense_cmd : request->u.atapi.ccb[0]) {
 	case 0x00: return ("TEST_UNIT_READY");
 	case 0x01: return ("REZERO");
 	case 0x03: return ("REQUEST_SENSE");