summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlan Cox <alan@lxorguk.ukuu.org.uk>2005-06-27 15:24:25 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-27 17:36:40 -0700
commit68ad9910b0525d0194f9c316c7cb14adbf8e0c0c (patch)
tree9d853ef1fdbced01c14749dadffe533c75745df6
parent58ecd15652979f2001dc296dcfd303cc1bd33ce7 (diff)
downloadop-kernel-dev-68ad9910b0525d0194f9c316c7cb14adbf8e0c0c.zip
op-kernel-dev-68ad9910b0525d0194f9c316c7cb14adbf8e0c0c.tar.gz
[PATCH] ide: IDE timing violation on reset
Pretty much theoretical for non MMIO thankfully. We _must_ use OUTBSYNC for commands or they may be posted and thus ruin the 400nS required delay. Signed-off-by: Alan Cox <alan@redhat.com> Acked-by: Bartlomiej Zolnierkiewicz <B.Zolnierkiewicz@elka.pw.edu.pl> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--drivers/ide/ide-iops.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/ide/ide-iops.c b/drivers/ide/ide-iops.c
index 5302494..b443b04 100644
--- a/drivers/ide/ide-iops.c
+++ b/drivers/ide/ide-iops.c
@@ -1181,7 +1181,8 @@ static ide_startstop_t do_reset1 (ide_drive_t *drive, int do_not_try_atapi)
pre_reset(drive);
SELECT_DRIVE(drive);
udelay (20);
- hwif->OUTB(WIN_SRST, IDE_COMMAND_REG);
+ hwif->OUTBSYNC(drive, WIN_SRST, IDE_COMMAND_REG);
+ ndelay(400);
hwgroup->poll_timeout = jiffies + WAIT_WORSTCASE;
hwgroup->polling = 1;
__ide_set_handler(drive, &atapi_reset_pollfunc, HZ/20, NULL);
OpenPOWER on IntegriCloud