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

Commit 1c848984 authored by Albert Lee's avatar Albert Lee Committed by Jeff Garzik
Browse files

[PATCH] libata: determine the err_mask when the error is found 



  - move "qc->err_mask |= AC_ERR_ATA_BUS" to where the error is found
  - add "assert(qc->err_mask)" to ata_pio_error() to make sure qc->err_mask was available when we enter the error state

Signed-off-by: default avatarAlbert Lee <albertcc@tw.ibm.com>

============
Signed-off-by: default avatarJeff Garzik <jgarzik@pobox.com>
parent a22e2eb0

drivers/scsi/libata-core.c

+9 −1
Original line number Original line Diff line number Diff line
@@ -2830,6 +2830,7 @@ static unsigned long ata_pio_poll(struct ata_port *ap) 
	status = ata_chk_status(ap);

	status = ata_chk_status(ap);

	if (status & ATA_BUSY) {

	if (status & ATA_BUSY) {

		if (time_after(jiffies, ap->pio_task_timeout)) {

		if (time_after(jiffies, ap->pio_task_timeout)) {

			qc->err_mask |= AC_ERR_ATA_BUS;

			ap->hsm_task_state = HSM_ST_TMOUT;

			ap->hsm_task_state = HSM_ST_TMOUT;

			return 0;

			return 0;

		}

		}
@@ -2880,6 +2881,7 @@ static int ata_pio_complete (struct ata_port *ap) 




	drv_stat = ata_wait_idle(ap);

	drv_stat = ata_wait_idle(ap);

	if (!ata_ok(drv_stat)) {

	if (!ata_ok(drv_stat)) {

		qc->err_mask |= __ac_err_mask(drv_stat);

		ap->hsm_task_state = HSM_ST_ERR;

		ap->hsm_task_state = HSM_ST_ERR;

		return 0;

		return 0;

	}

	}
@@ -3195,6 +3197,7 @@ static void atapi_pio_bytes(struct ata_queued_cmd *qc) 
err_out:

err_out:

	printk(KERN_INFO "ata%u: dev %u: ATAPI check failed\n",

	printk(KERN_INFO "ata%u: dev %u: ATAPI check failed\n",

	      ap->id, dev->devno);

	      ap->id, dev->devno);

	qc->err_mask |= AC_ERR_ATA_BUS;

	ap->hsm_task_state = HSM_ST_ERR;

	ap->hsm_task_state = HSM_ST_ERR;

}

}
@@ -3244,6 +3247,7 @@ static void ata_pio_block(struct ata_port *ap) 
	} else {

	} else {

		/* handle BSY=0, DRQ=0 as error */

		/* handle BSY=0, DRQ=0 as error */

		if ((status & ATA_DRQ) == 0) {

		if ((status & ATA_DRQ) == 0) {

			qc->err_mask |= AC_ERR_ATA_BUS;

			ap->hsm_task_state = HSM_ST_ERR;

			ap->hsm_task_state = HSM_ST_ERR;

			return;

			return;

		}

		}
@@ -3261,9 +3265,13 @@ static void ata_pio_error(struct ata_port *ap) 
	qc = ata_qc_from_tag(ap, ap->active_tag);

	qc = ata_qc_from_tag(ap, ap->active_tag);

	assert(qc != NULL);

	assert(qc != NULL);





	/* make sure qc->err_mask is available to 

	 * know what's wrong and recover

	 */

	assert(qc->err_mask);



	ap->hsm_task_state = HSM_ST_IDLE;

	ap->hsm_task_state = HSM_ST_IDLE;





	qc->err_mask |= AC_ERR_ATA_BUS;

	ata_poll_qc_complete(qc);

	ata_poll_qc_complete(qc);

}

}