summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjimharris <jimharris@FreeBSD.org>2014-03-17 22:30:54 +0000
committerjimharris <jimharris@FreeBSD.org>2014-03-17 22:30:54 +0000
commitfc7cc577add3bfe60023dfca84d3e395522c3a5d (patch)
treec57104a8d22d8f850f1a2490a1acaaf60ee96747
parentc66496c9cf7da6ec2bd7646d6bd4370b7f85dfc5 (diff)
downloadFreeBSD-src-fc7cc577add3bfe60023dfca84d3e395522c3a5d.zip
FreeBSD-src-fc7cc577add3bfe60023dfca84d3e395522c3a5d.tar.gz
isci: Ensure ATA passthrough commands with RETURN_RESPONSE bit set
translate their response. Sponsored by: Intel Discussed with: scottl MFC after: 3 days
-rw-r--r--sys/dev/isci/scil/sati_passthrough.c12
1 files changed, 10 insertions, 2 deletions
diff --git a/sys/dev/isci/scil/sati_passthrough.c b/sys/dev/isci/scil/sati_passthrough.c
index c2f3941..a083bd5 100644
--- a/sys/dev/isci/scil/sati_passthrough.c
+++ b/sys/dev/isci/scil/sati_passthrough.c
@@ -441,6 +441,13 @@ SATI_STATUS sati_passthrough_16_translate_command(
sati_set_ata_lba_mid_exp(register_fis, sati_get_cdb_byte(cdb, 9));
sati_set_ata_lba_high_exp(register_fis, sati_get_cdb_byte(cdb, 11));
}
+
+ if (PASSTHROUGH_CDB_CK_COND(cdb) ||
+ PASSTHROUGH_CDB_PROTOCOL(cdb) == PASSTHROUGH_RETURN_RESPONSE)
+ {
+ sequence->is_translate_response_required = TRUE;
+ }
+
sati_set_ata_features(register_fis, sati_get_cdb_byte(cdb, 4));
sati_set_ata_sector_count(register_fis, sati_get_cdb_byte(cdb, 6));
sati_set_ata_lba_low(register_fis, sati_get_cdb_byte(cdb, 8));
@@ -483,6 +490,8 @@ SATI_STATUS sati_passthrough_translate_response(
return SATI_FAILURE_CHECK_RESPONSE_DATA;
}
+ sequence->state = SATI_SEQUENCE_STATE_FINAL;
+
// If the user set the check condition bit, fill out the sense data
if (PASSTHROUGH_CDB_CK_COND(cdb) ||
PASSTHROUGH_CDB_PROTOCOL(cdb) == PASSTHROUGH_RETURN_RESPONSE)
@@ -496,10 +505,9 @@ SATI_STATUS sati_passthrough_translate_response(
SCSI_ASC_NO_ADDITIONAL_SENSE,
SCSI_ASCQ_ATA_PASS_THROUGH_INFORMATION_AVAILABLE
);
+ return SATI_FAILURE_CHECK_RESPONSE_DATA;
}
- sequence->state = SATI_SEQUENCE_STATE_FINAL;
-
return SATI_COMPLETE;
}
OpenPOWER on IntegriCloud