leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libata-scsi: generate correct ATA pass-through sense

Browse Source 
Generate ATA pass-through sense for both fixed and descriptor
format sense.

Signed-off-by: Hannes Reinecke <hare@suse.com>
Signed-off-by: Tejun Heo <tj@kernel.org>
This commit is contained in:
Hannes Reinecke 2016-04-04 11:44:02 +02:00 committed by Tejun Heo
parent 3852e37382
commit 11093cb1ef
1 changed files with 58 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

91
drivers/ata/libata-scsi.c
View File

@ -1016,43 +1016,68 @@ static void ata_gen_passthru_sense(struct ata_queued_cmd *qc)
&sense_key, &asc, &ascq, verbose); &sense_key, &asc, &ascq, verbose);
ata_scsi_set_sense(cmd, sense_key, asc, ascq); ata_scsi_set_sense(cmd, sense_key, asc, ascq);
} else { } else {
/* ATA PASS-THROUGH INFORMATION AVAILABLE */ /*
ata_scsi_set_sense(cmd, RECOVERED_ERROR, 0, 0x1D); * ATA PASS-THROUGH INFORMATION AVAILABLE
* Always in descriptor format sense.
*/
scsi_build_sense_buffer(1, cmd->sense_buffer,
RECOVERED_ERROR, 0, 0x1D);
} }
/* if ((cmd->sense_buffer[0] & 0x7f) >= 0x72) {
* Sense data is current and format is descriptor. u8 len;
*/
sb[0] = 0x72;
desc[0] = 0x09; /* descriptor format */
len = sb[7];
desc = (char *)scsi_sense_desc_find(sb, len + 8, 9);
if (!desc) {
if (SCSI_SENSE_BUFFERSIZE < len + 14)
return;
sb[7] = len + 14;
desc = sb + 8 + len;
}
desc[0] = 9;
desc[1] = 12;
/*
* Copy registers into sense buffer.
*/
desc[2] = 0x00;
desc[3] = tf->feature; /* == error reg */
desc[5] = tf->nsect;
desc[7] = tf->lbal;
desc[9] = tf->lbam;
desc[11] = tf->lbah;
desc[12] = tf->device;
desc[13] = tf->command; /* == status reg */
/* set length of additional sense data */ /*
sb[7] = 14; * Fill in Extend bit, and the high order bytes
desc[1] = 12; * if applicable.
*/
/* if (tf->flags & ATA_TFLAG_LBA48) {
* Copy registers into sense buffer. desc[2] |= 0x01;
*/ desc[4] = tf->hob_nsect;
desc[2] = 0x00; desc[6] = tf->hob_lbal;
desc[3] = tf->feature; /* == error reg */ desc[8] = tf->hob_lbam;
desc[5] = tf->nsect; desc[10] = tf->hob_lbah;
desc[7] = tf->lbal; }
desc[9] = tf->lbam; } else {
desc[11] = tf->lbah; /* Fixed sense format */
desc[12] = tf->device; desc[0] = tf->feature;
desc[13] = tf->command; /* == status reg */ desc[1] = tf->command; /* status */
desc[2] = tf->device;
/* desc[3] = tf->nsect;
* Fill in Extend bit, and the high order bytes desc[0] = 0;
* if applicable. if (tf->flags & ATA_TFLAG_LBA48) {
*/ desc[8] |= 0x80;
if (tf->flags & ATA_TFLAG_LBA48) { if (tf->hob_nsect)
desc[2] |= 0x01; desc[8] |= 0x40;
desc[4] = tf->hob_nsect; if (tf->hob_lbal || tf->hob_lbam || tf->hob_lbah)
desc[6] = tf->hob_lbal; desc[8] |= 0x20;
desc[8] = tf->hob_lbam; }
desc[10] = tf->hob_lbah; desc[9] = tf->lbal;
desc[10] = tf->lbam;
desc[11] = tf->lbah;
} }
} }