diff options
Diffstat (limited to 'drivers/ide/opti621.c')
| -rw-r--r-- | drivers/ide/opti621.c | 77 |
1 files changed, 3 insertions, 74 deletions
diff --git a/drivers/ide/opti621.c b/drivers/ide/opti621.c index f1d70d6630fe..1a53a4c375ed 100644 --- a/drivers/ide/opti621.c +++ b/drivers/ide/opti621.c | |||
| @@ -8,77 +8,6 @@ | |||
| 8 | * Jan Harkes <jaharkes@cwi.nl>, | 8 | * Jan Harkes <jaharkes@cwi.nl>, |
| 9 | * Mark Lord <mlord@pobox.com> | 9 | * Mark Lord <mlord@pobox.com> |
| 10 | * Some parts of code are from ali14xx.c and from rz1000.c. | 10 | * Some parts of code are from ali14xx.c and from rz1000.c. |
| 11 | * | ||
| 12 | * OPTi is trademark of OPTi, Octek is trademark of Octek. | ||
| 13 | * | ||
| 14 | * I used docs from OPTi databook, from ftp.opti.com, file 9123-0002.ps | ||
| 15 | * and disassembled/traced setupvic.exe (DOS program). | ||
| 16 | * It increases kernel code about 2 kB. | ||
| 17 | * I don't have this card no more, but I hope I can get some in case | ||
| 18 | * of needed development. | ||
| 19 | * My card is Octek PIDE 1.01 (on card) or OPTiViC (program). | ||
| 20 | * It has a place for a secondary connector in circuit, but nothing | ||
| 21 | * is there. Also BIOS says no address for | ||
| 22 | * secondary controller (see bellow in ide_init_opti621). | ||
| 23 | * I've only tested this on my system, which only has one disk. | ||
| 24 | * It's Western Digital WDAC2850, with PIO mode 3. The PCI bus | ||
| 25 | * is at 20 MHz (I have DX2/80, I tried PCI at 40, but I got random | ||
| 26 | * lockups). I tried the OCTEK double speed CD-ROM and | ||
| 27 | * it does not work! But I can't boot DOS also, so it's probably | ||
| 28 | * hardware fault. I have connected Conner 80MB, the Seagate 850MB (no | ||
| 29 | * problems) and Seagate 1GB (as slave, WD as master). My experiences | ||
| 30 | * with the third, 1GB drive: I got 3MB/s (hdparm), but sometimes | ||
| 31 | * it slows to about 100kB/s! I don't know why and I have | ||
| 32 | * not this drive now, so I can't try it again. | ||
| 33 | * I write this driver because I lost the paper ("manual") with | ||
| 34 | * settings of jumpers on the card and I have to boot Linux with | ||
| 35 | * Loadlin except LILO, cause I have to run the setupvic.exe program | ||
| 36 | * already or I get disk errors (my test: rpm -Vf | ||
| 37 | * /usr/X11R6/bin/XF86_SVGA - or any big file). | ||
| 38 | * Some numbers from hdparm -t /dev/hda: | ||
| 39 | * Timing buffer-cache reads: 32 MB in 3.02 seconds =10.60 MB/sec | ||
| 40 | * Timing buffered disk reads: 16 MB in 5.52 seconds = 2.90 MB/sec | ||
| 41 | * I have 4 Megs/s before, but I don't know why (maybe changes | ||
| 42 | * in hdparm test). | ||
| 43 | * After release of 0.1, I got some successful reports, so it might work. | ||
| 44 | * | ||
| 45 | * The main problem with OPTi is that some timings for master | ||
| 46 | * and slave must be the same. For example, if you have master | ||
| 47 | * PIO 3 and slave PIO 0, driver have to set some timings of | ||
| 48 | * master for PIO 0. Second problem is that opti621_set_pio_mode | ||
| 49 | * got only one drive to set, but have to set both drives. | ||
| 50 | * This is solved in compute_pios. If you don't set | ||
| 51 | * the second drive, compute_pios use ide_get_best_pio_mode | ||
| 52 | * for autoselect mode (you can change it to PIO 0, if you want). | ||
| 53 | * If you then set the second drive to another PIO, the old value | ||
| 54 | * (automatically selected) will be overrided by yours. | ||
| 55 | * There is a 25/33MHz switch in configuration | ||
| 56 | * register, but driver is written for use at any frequency. | ||
| 57 | * | ||
| 58 | * Version 0.1, Nov 8, 1996 | ||
| 59 | * by Jaromir Koutek, for 2.1.8. | ||
| 60 | * Initial version of driver. | ||
| 61 | * | ||
| 62 | * Version 0.2 | ||
| 63 | * Number 0.2 skipped. | ||
| 64 | * | ||
| 65 | * Version 0.3, Nov 29, 1997 | ||
| 66 | * by Mark Lord (probably), for 2.1.68 | ||
| 67 | * Updates for use with new IDE block driver. | ||
| 68 | * | ||
| 69 | * Version 0.4, Dec 14, 1997 | ||
| 70 | * by Jan Harkes | ||
| 71 | * Fixed some errors and cleaned the code. | ||
| 72 | * | ||
| 73 | * Version 0.5, Jan 2, 1998 | ||
| 74 | * by Jaromir Koutek | ||
| 75 | * Updates for use with (again) new IDE block driver. | ||
| 76 | * Update of documentation. | ||
| 77 | * | ||
| 78 | * Version 0.6, Jan 2, 1999 | ||
| 79 | * by Jaromir Koutek | ||
| 80 | * Reversed to version 0.3 of the driver, because | ||
| 81 | * 0.5 doesn't work. | ||
| 82 | */ | 11 | */ |
| 83 | 12 | ||
| 84 | #include <linux/types.h> | 13 | #include <linux/types.h> |
| @@ -133,12 +62,12 @@ static u8 read_reg(int reg) | |||
| 133 | return ret; | 62 | return ret; |
| 134 | } | 63 | } |
| 135 | 64 | ||
| 136 | static void opti621_set_pio_mode(ide_drive_t *drive, const u8 pio) | 65 | static void opti621_set_pio_mode(ide_hwif_t *hwif, ide_drive_t *drive) |
| 137 | { | 66 | { |
| 138 | ide_hwif_t *hwif = drive->hwif; | ||
| 139 | ide_drive_t *pair = ide_get_pair_dev(drive); | 67 | ide_drive_t *pair = ide_get_pair_dev(drive); |
| 140 | unsigned long flags; | 68 | unsigned long flags; |
| 141 | unsigned long mode = XFER_PIO_0 + pio, pair_mode; | 69 | unsigned long mode = drive->pio_mode, pair_mode; |
| 70 | const u8 pio = mode - XFER_PIO_0; | ||
| 142 | u8 tim, misc, addr_pio = pio, clk; | 71 | u8 tim, misc, addr_pio = pio, clk; |
| 143 | 72 | ||
| 144 | /* DRDY is default 2 (by OPTi Databook) */ | 73 | /* DRDY is default 2 (by OPTi Databook) */ |