opti621: disable read prefetch
PATCH 1/6 opti621: disable read prefetch
This fixes 2.6.25 regression (kernel.org bugzilla bug #10723) caused by:
commit 912fb29a36a7269ac1c4a4df45bc0ac1d2637972
Author: Bartlomiej Zolnierkiewicz <[email protected]> Date: Fri Oct 19 00:30:11 2007 +0200
opti621: always tune PIO
...
Based on a bugreport from Juergen Kosel & inspired by pata_opti.c code.
Bisected-by Juergen Kosel <[email protected]>
Tested-by Juergen Kosel <[email protected]>
Signed-off-by Bartlomiej Zolnierkiewicz <[email protected]>
---
this patch series is against current -git tree
drivers/ide/pci/opti621.c | 15 ++-------------
1 file changed, 2 insertions(+), 13 deletions(-)
drivers/ide/pci/opti621.c +2 -13
@@ -102,18 +102,6 @@* address: 50 ns, data: 50 ns, recovery: 100 ns. */ -/* #define READ_PREFETCH 0 */ -/* Uncomment for disable read prefetch. -* There is some readprefetch capatibility in hdparm, -* but when I type hdparm -P 1 /dev/hda, I got errors -* and till reset drive is inaccessible. -* This (hw) read prefetch is safe on my drive. -*/ - -#ifndef READ_PREFETCH -#define READ_PREFETCH 0x40/* read prefetch is enabled */ -#endif /* else read prefetch is disabled */ -#define READ_REG 0/* index of Read cycle timing register */ #define WRITE_REG 1/* index of Write cycle timing register */ #define CNTRL_REG 3/* index of Control register */
@@ -264,7 +252,8 @@ static void opti621_set_pio_mode(ide_dri cycle1 = ((first.data_time-1 )<<4 ) | (first.recovery_time-2 ); cycle2 = ((second.data_time-1 )<<4 ) | (second.recovery_time-2 ); - misc =READ_PREFETCH | ((ax-1 )<<4 ) | ((drdy-2 )<<1 ); + + misc = ((ax -1 ) <<4 ) | ((drdy -2 ) <<1 );#ifdef OPTI621_DEBUG printk("%s: master: address: %d, data: %d, "