android/android_kernel_asus_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[SCSI] libsas: fix SATA NCQ error

Browse Source 
Current version of libsas can not handle SATA NCQ error.
This patch handle SATA NCQ error as AHCI do.

Signed-off-by: Xiangliang Yu <yuxiangl@marvell.com>
Signed-off-by: James Bottomley <jbottomley@parallels.com>
This commit is contained in:
Xiangliang Yu 2011-05-08 19:27:01 +08:00 committed by James Bottomley
parent 5fd5cc83a8
commit bb650a1bef
1 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/scsi/libsas/sas_ata.c
View File

@ -99,19 +99,29 @@ static void sas_ata_task_done(struct sas_task *task)
struct sas_ha_struct *sas_ha; struct sas_ha_struct *sas_ha;
enum ata_completion_errors ac; enum ata_completion_errors ac;
unsigned long flags; unsigned long flags;
struct ata_link *link;
if (!qc) if (!qc)
goto qc_already_gone; goto qc_already_gone;
dev = qc->ap->private_data; dev = qc->ap->private_data;
sas_ha = dev->port->ha; sas_ha = dev->port->ha;
link = &dev->sata_dev.ap->link;
spin_lock_irqsave(dev->sata_dev.ap->lock, flags); spin_lock_irqsave(dev->sata_dev.ap->lock, flags);
if (stat->stat == SAS_PROTO_RESPONSE || stat->stat == SAM_STAT_GOOD || if (stat->stat == SAS_PROTO_RESPONSE || stat->stat == SAM_STAT_GOOD ||
((stat->stat == SAM_STAT_CHECK_CONDITION && ((stat->stat == SAM_STAT_CHECK_CONDITION &&
dev->sata_dev.command_set == ATAPI_COMMAND_SET))) { dev->sata_dev.command_set == ATAPI_COMMAND_SET))) {
ata_tf_from_fis(resp->ending_fis, &dev->sata_dev.tf); ata_tf_from_fis(resp->ending_fis, &dev->sata_dev.tf);
if (!link->sactive) {
qc->err_mask |= ac_err_mask(dev->sata_dev.tf.command); qc->err_mask |= ac_err_mask(dev->sata_dev.tf.command);
} else {
link->eh_info.err_mask |= ac_err_mask(dev->sata_dev.tf.command);
if (unlikely(link->eh_info.err_mask))
qc->flags |= ATA_QCFLAG_FAILED;
}
dev->sata_dev.sstatus = resp->sstatus; dev->sata_dev.sstatus = resp->sstatus;
dev->sata_dev.serror = resp->serror; dev->sata_dev.serror = resp->serror;
dev->sata_dev.scontrol = resp->scontrol; dev->sata_dev.scontrol = resp->scontrol;
@ -121,7 +131,13 @@ static void sas_ata_task_done(struct sas_task *task)
SAS_DPRINTK("%s: SAS error %x\n", __func__, SAS_DPRINTK("%s: SAS error %x\n", __func__,
stat->stat); stat->stat);
/* We saw a SAS error. Send a vague error. */ /* We saw a SAS error. Send a vague error. */
if (!link->sactive) {
qc->err_mask = ac; qc->err_mask = ac;
} else {
link->eh_info.err_mask |= AC_ERR_DEV;
qc->flags |= ATA_QCFLAG_FAILED;
}
dev->sata_dev.tf.feature = 0x04; /* status err */ dev->sata_dev.tf.feature = 0x04; /* status err */
dev->sata_dev.tf.command = ATA_ERR; dev->sata_dev.tf.command = ATA_ERR;
} }