[PATCH] ide-taskfile.c fixups/cleanups part #2 [1/9]
From: Bartlomiej Zolnierkiewicz (B.Zolnierkiewicz_at_elka.pw.edu.pl)
Date: 06/30/04
- Previous message: Bartlomiej Zolnierkiewicz: "[PATCH] ide-taskfile.c fixups/cleanups part #2 [4/9]"
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
To: linux-ide@vger.kernel.org Date: Wed, 30 Jun 2004 17:24:05 +0200
[PATCH] ide: PIO-out fixes for ide-taskfile.c (CONFIG_IDE_TASKFILE_IO=n)
- in task_out_intr() fix off-by-1 bug and (stat & DRQ_STAT) check,
previously "if" was always true for rq->current_nr_sectors == 1
- fail request if DRQ_STAT is not set and rq->current_nr_sectors != 0
(instead of setting handler and waiting for the next IRQ) or if DRQ_STAT
is set but !rq->current_nr_sectors (in task_mulout_intr() this was OK)
- in task_mulout_intr() check also DRIVE_READY and WRERR_STAT status bits
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@elka.pw.edu.pl>
linux-2.6.7-bk11-bzolnier/drivers/ide/ide-taskfile.c | 31 +++++++++----------
1 files changed, 16 insertions(+), 15 deletions(-)
diff -puN drivers/ide/ide-taskfile.c~ide_tf_pio_out_fixes drivers/ide/ide-taskfile.c
--- linux-2.6.7-bk11/drivers/ide/ide-taskfile.c~ide_tf_pio_out_fixes 2004-06-28 21:15:54.030210376 +0200
+++ linux-2.6.7-bk11-bzolnier/drivers/ide/ide-taskfile.c 2004-06-28 21:15:54.035209616 +0200
@@ -409,6 +409,10 @@ ide_startstop_t task_out_intr (ide_drive
if (!OK_STAT(stat = hwif->INB(IDE_STATUS_REG), DRIVE_READY, drive->bad_wstat)) {
return DRIVER(drive)->error(drive, "task_out_intr", stat);
}
+
+ if (((stat & DRQ_STAT) == 0) ^ !rq->current_nr_sectors)
+ return DRIVER(drive)->error(drive, __FUNCTION__, stat);
+
/*
* Safe to update request for partial completions.
* We have a good STATUS CHECK!!!
@@ -416,9 +420,8 @@ ide_startstop_t task_out_intr (ide_drive
if (!rq->current_nr_sectors)
if (!DRIVER(drive)->end_request(drive, 1, 0))
return ide_stopped;
- if ((rq->current_nr_sectors==1) ^ (stat & DRQ_STAT)) {
- task_buffer_sectors(drive, rq, 1, IDE_PIO_OUT);
- }
+
+ task_buffer_sectors(drive, rq, 1, IDE_PIO_OUT);
ide_set_handler(drive, &task_out_intr, WAIT_WORSTCASE, NULL);
return ide_started;
}
@@ -461,18 +464,16 @@ ide_startstop_t task_mulout_intr (ide_dr
u8 stat = hwif->INB(IDE_STATUS_REG);
struct request *rq = HWGROUP(drive)->rq;
- if (!OK_STAT(stat, DATA_READY, BAD_R_STAT) || !rq->current_nr_sectors) {
- if (stat & (ERR_STAT|DRQ_STAT)) {
- return DRIVER(drive)->error(drive, "task_mulout_intr", stat);
- }
- /* Handle last IRQ, occurs after all data was sent. */
- if (!rq->current_nr_sectors) {
- DRIVER(drive)->end_request(drive, 1, 0);
- return ide_stopped;
- }
- /* no data yet, so wait for another interrupt */
- ide_set_handler(drive, &task_mulout_intr, WAIT_WORSTCASE, NULL);
- return ide_started;
+ if (!OK_STAT(stat, DRIVE_READY, drive->bad_wstat))
+ return DRIVER(drive)->error(drive, __FUNCTION__, stat);
+
+ if (((stat & DRQ_STAT) == 0) ^ !rq->current_nr_sectors)
+ return DRIVER(drive)->error(drive, __FUNCTION__, stat);
+
+ /* Handle last IRQ, occurs after all data was sent. */
+ if (!rq->current_nr_sectors) {
+ DRIVER(drive)->end_request(drive, 1, 0);
+ return ide_stopped;
}
task_buffer_multi_sectors(drive, rq, IDE_PIO_OUT);
_
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
- Previous message: Bartlomiej Zolnierkiewicz: "[PATCH] ide-taskfile.c fixups/cleanups part #2 [4/9]"
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
Relevant Pages
|
|
