From: Bartlomiej Zolnierkiewicz <B.Zolnierkiewicz@elka.pw.edu.pl>
If drive timeouts final status check we should fail request instead of setting
another handler for the next IRQ.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@elka.pw.edu.pl>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---
25-akpm/drivers/ide/ide-taskfile.c | 28 ++++++++++++----------------
1 files changed, 12 insertions(+), 16 deletions(-)
diff -puN drivers/ide/ide-taskfile.c~ide-pio-in-drive-busy-fix-config_ide_taskfile_io=y drivers/ide/ide-taskfile.c
--- 25/drivers/ide/ide-taskfile.c~ide-pio-in-drive-busy-fix-config_ide_taskfile_io=y 2004-06-20 13:57:24.410431824 -0700
+++ 25-akpm/drivers/ide/ide-taskfile.c 2004-06-20 13:57:24.414431216 -0700
@@ -564,19 +564,16 @@ static u8 wait_drive_not_busy(ide_drive_
ide_startstop_t task_in_intr (ide_drive_t *drive)
{
struct request *rq = HWGROUP(drive)->rq;
- u8 stat, good_stat;
+ u8 stat = HWIF(drive)->INB(IDE_STATUS_REG);
- good_stat = DATA_READY;
- stat = HWIF(drive)->INB(IDE_STATUS_REG);
-check_status:
- if (!OK_STAT(stat, good_stat, BAD_R_STAT)) {
+ if (!OK_STAT(stat, DATA_READY, BAD_R_STAT)) {
if (stat & (ERR_STAT | DRQ_STAT))
return DRIVER(drive)->error(drive, __FUNCTION__, stat);
/* BUSY_STAT: No data yet, so wait for another IRQ. */
ide_set_handler(drive, &task_in_intr, WAIT_WORSTCASE, NULL);
return ide_started;
}
-
+finish_rq:
/*
* Complete previously submitted bios (if any).
* Status was already verifyied.
@@ -595,9 +592,10 @@ check_status:
/* If it was the last datablock check status and finish transfer. */
if (!rq->nr_sectors) {
- good_stat = 0;
stat = wait_drive_not_busy(drive);
- goto check_status;
+ if (!OK_STAT(stat, 0, BAD_R_STAT))
+ return DRIVER(drive)->error(drive, __FUNCTION__, stat);
+ goto finish_rq;
}
/* Still data left to transfer. */
@@ -615,19 +613,16 @@ ide_startstop_t task_mulin_intr (ide_dri
struct request *rq = HWGROUP(drive)->rq;
unsigned int msect = drive->mult_count;
unsigned int nsect;
- u8 stat, good_stat;
+ u8 stat = HWIF(drive)->INB(IDE_STATUS_REG);
- good_stat = DATA_READY;
- stat = HWIF(drive)->INB(IDE_STATUS_REG);
-check_status:
- if (!OK_STAT(stat, good_stat, BAD_R_STAT)) {
+ if (!OK_STAT(stat, DATA_READY, BAD_R_STAT)) {
if (stat & (ERR_STAT | DRQ_STAT))
return DRIVER(drive)->error(drive, __FUNCTION__, stat);
/* BUSY_STAT: No data yet, so wait for another IRQ. */
ide_set_handler(drive, &task_mulin_intr, WAIT_WORSTCASE, NULL);
return ide_started;
}
-
+finish_rq:
/*
* Complete previously submitted bios (if any).
* Status was already verifyied.
@@ -657,9 +652,10 @@ check_status:
/* If it was the last datablock check status and finish transfer. */
if (!rq->nr_sectors) {
- good_stat = 0;
stat = wait_drive_not_busy(drive);
- goto check_status;
+ if (!OK_STAT(stat, 0, BAD_R_STAT))
+ return DRIVER(drive)->error(drive, __FUNCTION__, stat);
+ goto finish_rq;
}
/* Still data left to transfer. */
_