|
@@ -1195,7 +1195,7 @@ static void ata_eh_analyze_ncq_error(struct ata_port *ap)
|
|
|
/* we've got the perpetrator, condemn it */
|
|
|
qc = __ata_qc_from_tag(ap, tag);
|
|
|
memcpy(&qc->result_tf, &tf, sizeof(tf));
|
|
|
- qc->err_mask |= AC_ERR_DEV;
|
|
|
+ qc->err_mask |= AC_ERR_DEV | AC_ERR_NCQ;
|
|
|
ehc->i.err_mask &= ~AC_ERR_DEV;
|
|
|
}
|
|
|
|
|
@@ -1616,7 +1616,7 @@ static void ata_eh_report(struct ata_port *ap)
|
|
|
"cmd %02x/%02x:%02x:%02x:%02x:%02x/%02x:%02x:%02x:%02x:%02x/%02x "
|
|
|
"tag %d cdb 0x%x data %u %s\n "
|
|
|
"res %02x/%02x:%02x:%02x:%02x:%02x/%02x:%02x:%02x:%02x:%02x/%02x "
|
|
|
- "Emask 0x%x (%s)\n",
|
|
|
+ "Emask 0x%x (%s)%s\n",
|
|
|
cmd->command, cmd->feature, cmd->nsect,
|
|
|
cmd->lbal, cmd->lbam, cmd->lbah,
|
|
|
cmd->hob_feature, cmd->hob_nsect,
|
|
@@ -1627,7 +1627,8 @@ static void ata_eh_report(struct ata_port *ap)
|
|
|
res->lbal, res->lbam, res->lbah,
|
|
|
res->hob_feature, res->hob_nsect,
|
|
|
res->hob_lbal, res->hob_lbam, res->hob_lbah,
|
|
|
- res->device, qc->err_mask, ata_err_string(qc->err_mask));
|
|
|
+ res->device, qc->err_mask, ata_err_string(qc->err_mask),
|
|
|
+ qc->err_mask & AC_ERR_NCQ ? " <F>" : "");
|
|
|
}
|
|
|
}
|
|
|
|