|
|
@@ -1490,7 +1490,7 @@ static int ata_eh_read_log_10h(struct ata_device *dev,
|
|
|
tf->hob_lbah = buf[10];
|
|
|
tf->nsect = buf[12];
|
|
|
tf->hob_nsect = buf[13];
|
|
|
- if (ata_id_has_ncq_autosense(dev->id))
|
|
|
+ if (dev->class == ATA_DEV_ZAC && ata_id_has_ncq_autosense(dev->id))
|
|
|
tf->auxiliary = buf[14] << 16 | buf[15] << 8 | buf[16];
|
|
|
|
|
|
return 0;
|
|
|
@@ -1737,7 +1737,8 @@ void ata_eh_analyze_ncq_error(struct ata_link *link)
|
|
|
memcpy(&qc->result_tf, &tf, sizeof(tf));
|
|
|
qc->result_tf.flags = ATA_TFLAG_ISADDR | ATA_TFLAG_LBA | ATA_TFLAG_LBA48;
|
|
|
qc->err_mask |= AC_ERR_DEV | AC_ERR_NCQ;
|
|
|
- if ((qc->result_tf.command & ATA_SENSE) || qc->result_tf.auxiliary) {
|
|
|
+ if (dev->class == ATA_DEV_ZAC &&
|
|
|
+ ((qc->result_tf.command & ATA_SENSE) || qc->result_tf.auxiliary)) {
|
|
|
char sense_key, asc, ascq;
|
|
|
|
|
|
sense_key = (qc->result_tf.auxiliary >> 16) & 0xff;
|
|
|
@@ -1791,10 +1792,11 @@ static unsigned int ata_eh_analyze_tf(struct ata_queued_cmd *qc,
|
|
|
}
|
|
|
|
|
|
switch (qc->dev->class) {
|
|
|
- case ATA_DEV_ATA:
|
|
|
case ATA_DEV_ZAC:
|
|
|
if (stat & ATA_SENSE)
|
|
|
ata_eh_request_sense(qc, qc->scsicmd);
|
|
|
+ /* fall through */
|
|
|
+ case ATA_DEV_ATA:
|
|
|
if (err & ATA_ICRC)
|
|
|
qc->err_mask |= AC_ERR_ATA_BUS;
|
|
|
if (err & (ATA_UNC | ATA_AMNF))
|