diff options
author | Alan Cox <alan@lxorguk.ukuu.org.uk> | 2005-06-27 18:24:25 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-27 20:36:40 -0400 |
commit | 68ad9910b0525d0194f9c316c7cb14adbf8e0c0c (patch) | |
tree | 9d853ef1fdbced01c14749dadffe533c75745df6 | |
parent | 58ecd15652979f2001dc296dcfd303cc1bd33ce7 (diff) |
[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.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/ide/ide-iops.c b/drivers/ide/ide-iops.c index 53024942a7eb..b443b04a4c5a 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) | |||
1181 | pre_reset(drive); | 1181 | pre_reset(drive); |
1182 | SELECT_DRIVE(drive); | 1182 | SELECT_DRIVE(drive); |
1183 | udelay (20); | 1183 | udelay (20); |
1184 | hwif->OUTB(WIN_SRST, IDE_COMMAND_REG); | 1184 | hwif->OUTBSYNC(drive, WIN_SRST, IDE_COMMAND_REG); |
1185 | ndelay(400); | ||
1185 | hwgroup->poll_timeout = jiffies + WAIT_WORSTCASE; | 1186 | hwgroup->poll_timeout = jiffies + WAIT_WORSTCASE; |
1186 | hwgroup->polling = 1; | 1187 | hwgroup->polling = 1; |
1187 | __ide_set_handler(drive, &atapi_reset_pollfunc, HZ/20, NULL); | 1188 | __ide_set_handler(drive, &atapi_reset_pollfunc, HZ/20, NULL); |