Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bb650a1b authored by Xiangliang Yu's avatar Xiangliang Yu Committed by James Bottomley
Browse files

[SCSI] libsas: fix SATA NCQ error 



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

Signed-off-by: default avatarXiangliang Yu <yuxiangl@marvell.com>
Signed-off-by: default avatarJames Bottomley <jbottomley@parallels.com>
parent 5fd5cc83

drivers/scsi/libsas/sas_ata.c

+18 −2
Original line number Diff line number Diff line
@@ -99,19 +99,29 @@ static void sas_ata_task_done(struct sas_task *task) 
	struct sas_ha_struct *sas_ha;

	enum ata_completion_errors ac;

	unsigned long flags;

	struct ata_link *link;



	if (!qc)

		goto qc_already_gone;



	dev = qc->ap->private_data;

	sas_ha = dev->port->ha;

	link = &dev->sata_dev.ap->link;



	spin_lock_irqsave(dev->sata_dev.ap->lock, flags);

	if (stat->stat == SAS_PROTO_RESPONSE || stat->stat == SAM_STAT_GOOD ||

	    ((stat->stat == SAM_STAT_CHECK_CONDITION &&

	      dev->sata_dev.command_set == ATAPI_COMMAND_SET))) {

		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);

		} 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.serror = resp->serror;

		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__,

				    stat->stat);

			/* We saw a SAS error. Send a vague error. */

			if (!link->sactive) {

				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.command = ATA_ERR;

		}