evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[PATCH] libata-dev: Use new AC_ERR_* flags

Browse source 
- Use new AC_ERR_* flags as done in Tejun's patches
  - In ata_qc_timeout(), replace ac_err_mask(drv_stat) with AC_ERR_TIMEOUT.
    This makes time out handler always report error to upper layer.
    Otherwise if the drv_stat looks good, libata might falsely report OK to the upper layer.

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

===
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
This commit is contained in:
Albert Lee 2006-02-08 16:50:29 +08:00 • committed by Jeff Garzik
parent 20ea079e58
commit 555a896506
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -3315,7 +3315,7 @@ static int ata_pio_first_block(struct ata_port *ap)
/* sleep-wait for BSY to clear */ /* sleep-wait for BSY to clear */
DPRINTK("busy wait\n"); DPRINTK("busy wait\n");
if (ata_busy_sleep(ap, ATA_TMOUT_DATAOUT_QUICK, ATA_TMOUT_DATAOUT)) { if (ata_busy_sleep(ap, ATA_TMOUT_DATAOUT_QUICK, ATA_TMOUT_DATAOUT)) {
qc->err_mask |= AC_ERR_ATA_BUS; qc->err_mask |= AC_ERR_TIMEOUT;
ap->hsm_task_state = HSM_ST_TMOUT; ap->hsm_task_state = HSM_ST_TMOUT;
goto err_out; goto err_out;
} }
@ -3324,7 +3324,7 @@ static int ata_pio_first_block(struct ata_port *ap)
status = ata_chk_status(ap); status = ata_chk_status(ap);
if ((status & (ATA_BUSY | ATA_DRQ)) != ATA_DRQ) { if ((status & (ATA_BUSY | ATA_DRQ)) != ATA_DRQ) {
/* device status error */ /* device status error */
qc->err_mask |= AC_ERR_ATA_BUS; qc->err_mask |= AC_ERR_HSM;
ap->hsm_task_state = HSM_ST_ERR; ap->hsm_task_state = HSM_ST_ERR;
goto err_out; goto err_out;
} }
@ -3684,7 +3684,7 @@ static void ata_qc_timeout(struct ata_queued_cmd *qc)
ap->hsm_task_state = HSM_ST_IDLE; ap->hsm_task_state = HSM_ST_IDLE;
/* complete taskfile transaction */ /* complete taskfile transaction */
qc->err_mask |= ac_err_mask(drv_stat); qc->err_mask |= AC_ERR_TIMEOUT;
break; break;
} }
@ -4365,7 +4365,7 @@ fsm_start:
/* check device status */ /* check device status */
if (unlikely((status & (ATA_BUSY | ATA_DRQ)) != ATA_DRQ)) { if (unlikely((status & (ATA_BUSY | ATA_DRQ)) != ATA_DRQ)) {
/* Wrong status. Let EH handle this */ /* Wrong status. Let EH handle this */
qc->err_mask |= AC_ERR_ATA_BUS; qc->err_mask |= AC_ERR_HSM;
ap->hsm_task_state = HSM_ST_ERR; ap->hsm_task_state = HSM_ST_ERR;
goto fsm_start; goto fsm_start;
} }
@ -4394,7 +4394,7 @@ fsm_start:
/* ATA PIO protocol */ /* ATA PIO protocol */
if (unlikely((status & ATA_DRQ) == 0)) { if (unlikely((status & ATA_DRQ) == 0)) {
/* handle BSY=0, DRQ=0 as error */ /* handle BSY=0, DRQ=0 as error */
qc->err_mask |= AC_ERR_ATA_BUS; qc->err_mask |= AC_ERR_HSM;
ap->hsm_task_state = HSM_ST_ERR; ap->hsm_task_state = HSM_ST_ERR;
goto fsm_start; goto fsm_start;
} }
@ -4416,7 +4416,7 @@ fsm_start:
case HSM_ST_LAST: case HSM_ST_LAST:
if (unlikely(status & ATA_DRQ)) { if (unlikely(status & ATA_DRQ)) {
/* handle DRQ=1 as error */ /* handle DRQ=1 as error */
qc->err_mask |= AC_ERR_ATA_BUS; qc->err_mask |= AC_ERR_HSM;
ap->hsm_task_state = HSM_ST_ERR; ap->hsm_task_state = HSM_ST_ERR;
goto fsm_start; goto fsm_start;
} }