adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-29 12:16:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

[PATCH] libata-dev: handle DRQ=1 ERR=1 (revised)

Browse source 
Handle DRQ=1 ERR=1 situation. Revised according to what IDE try_to_flush_leftover_data() does.

Changes:
 - For ATA PIO writes and ATAPI devices, just stop the HSM and let EH handle it.
 - For ATA PIO reads, read only one block of junk data and then let EH handle it.

Signed-off-by: Albert Lee <albertcc@tw.ibm.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
This commit is contained in:
Albert Lee 2006-04-01 17:38:43 +08:00 committed by Jeff Garzik
parent 6e07e16404
commit eee6c32f5f
1 changed files with 32 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
drivers/scsi/libata-core.c
View file

@ -3640,13 +3640,16 @@ fsm_start:
/* Device should not ask for data transfer (DRQ=1) /* Device should not ask for data transfer (DRQ=1)
* when it finds something wrong. * when it finds something wrong.
* Anyway, we respect DRQ here and let HSM go on * We ignore DRQ here and stop the HSM by
* without changing hsm_task_state to HSM_ST_ERR. * changing hsm_task_state to HSM_ST_ERR and
* let the EH abort the command or reset the device.
*/ */
if (unlikely(status & (ATA_ERR | ATA_DF))) { if (unlikely(status & (ATA_ERR | ATA_DF))) {
printk(KERN_WARNING "ata%d: DRQ=1 with device error, dev_stat 0x%X\n", printk(KERN_WARNING "ata%d: DRQ=1 with device error, dev_stat 0x%X\n",
ap->id, status); ap->id, status);
qc->err_mask |= AC_ERR_DEV; qc->err_mask |= AC_ERR_DEV;
ap->hsm_task_state = HSM_ST_ERR;
goto fsm_start;
} }
/* Send the CDB (atapi) or the first data block (ata pio out). /* Send the CDB (atapi) or the first data block (ata pio out).
@ -3693,13 +3696,16 @@ fsm_start:
/* Device should not ask for data transfer (DRQ=1) /* Device should not ask for data transfer (DRQ=1)
* when it finds something wrong. * when it finds something wrong.
* Anyway, we respect DRQ here and let HSM go on * We ignore DRQ here and stop the HSM by
* without changing hsm_task_state to HSM_ST_ERR. * changing hsm_task_state to HSM_ST_ERR and
* let the EH abort the command or reset the device.
*/ */
if (unlikely(status & (ATA_ERR | ATA_DF))) { if (unlikely(status & (ATA_ERR | ATA_DF))) {
printk(KERN_WARNING "ata%d: DRQ=1 with device error, dev_stat 0x%X\n", printk(KERN_WARNING "ata%d: DRQ=1 with device error, dev_stat 0x%X\n",
ap->id, status); ap->id, status);
qc->err_mask |= AC_ERR_DEV; qc->err_mask |= AC_ERR_DEV;
ap->hsm_task_state = HSM_ST_ERR;
goto fsm_start;
} }
atapi_pio_bytes(qc); atapi_pio_bytes(qc);
@ -3717,20 +3723,32 @@ fsm_start:
goto fsm_start; goto fsm_start;
} }
/* Some devices may ask for data transfer (DRQ=1) /* For PIO reads, some devices may ask for
* alone with ERR=1 for PIO reads. * data transfer (DRQ=1) alone with ERR=1.
* We respect DRQ here and let HSM go on without * We respect DRQ here and transfer one
* changing hsm_task_state to HSM_ST_ERR. * block of junk data before changing the
* hsm_task_state to HSM_ST_ERR.
*
* For PIO writes, ERR=1 DRQ=1 doesn't make
* sense since the data block has been
* transferred to the device.
*/ */
if (unlikely(status & (ATA_ERR | ATA_DF))) { if (unlikely(status & (ATA_ERR | ATA_DF))) {
/* For writes, ERR=1 DRQ=1 doesn't make
* sense since the data block has been
* transferred to the device.
*/
WARN_ON(qc->tf.flags & ATA_TFLAG_WRITE);
/* data might be corrputed */ /* data might be corrputed */
qc->err_mask |= AC_ERR_DEV; qc->err_mask |= AC_ERR_DEV;
if (!(qc->tf.flags & ATA_TFLAG_WRITE)) {
ata_pio_sectors(qc);
ata_altstatus(ap);
status = ata_wait_idle(ap);
}
/* ata_pio_sectors() might change the
* state to HSM_ST_LAST. so, the state
* is changed after ata_pio_sectors().
*/
ap->hsm_task_state = HSM_ST_ERR;
goto fsm_start;
} }
ata_pio_sectors(qc); ata_pio_sectors(qc);