VIA IDE v3.33, with vt82c576, vt8233c, vt8233a (UDMA133) support
Hi!
Attached you can find an update to the VIA driver, against 2.5.1. It adds support for an old revision of the vt82c576 chip, and for the new vt8233c (vt8233 + 3Com NIC) and vt8233a (vt8233 + UDMA133) chips.
It was tested only on other VIA chips, as I don't have any of the newly added ones, though it should just work on those.
Bundled are a couple changes to my entries in the MAINTAINERS file, added an ID for the 8233a in pci_ids.h and with that a couple fixes to the VIA entries in the file (order, tabs/spaces).
Please merge into 2.5.1. I think it can go into 2.4 later, as soon as it gets enough testing.
Signature · 2 lines
Vojtech Pavlik SuSE Labs
MAINTAINERS +4 -4
@@ -843,7 +843,7 @@ M: [email protected] L: [email protected] W: http://www.suse.cz/development/joystick/ -S: Supported +S: Maintained KERNEL AUTOMOUNTER (AUTOFS) P: H. Peter Anvin
@@ -1538,7 +1538,7 @@ M: [email protected] L: [email protected] L: [email protected] -S: Supported +S: Maintained USB BLUETOOTH DRIVER P: Greg Kroah-Hartman
@@ -1561,7 +1561,7 @@ L: [email protected] L: [email protected] W: http://www.suse.cz/development/input/ -S: Supported +S: Maintained USB HUB P: Johannes Erdfelt
@@ -1612,7 +1612,7 @@ M: [email protected] L: [email protected] L: [email protected] -S: Supported +S: Maintained USB SE401 DRIVER P: Jeroen Vreeken
drivers/ide/ide-timing.h +20 -18
@@ -2,11 +2,9 @@#define _IDE_TIMING_H/* -* $Id: ide-timing.h,v 1.5 2001/01/15 21:48:56 vojtech Exp $ +* $Id: ide-timing.h,v 1.6 2001/12/23 22:47:56 vojtech Exp $ * -* Copyright (c) 1999-2000 Vojtech Pavlik -* -* Sponsored by SuSE +* Copyright (c) 1999-2001 Vojtech Pavlik */ /*
@@ -25,16 +23,14 @@* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * * Should you need to contact me, the author, you can do so either by -* e-mail - mail your message to <[email protected]>, or by paper mail: -* Vojtech Pavlik, Ucitelska 1576, Prague 8, 182 00 Czech Republic +* e-mail - mail your message to <[email protected]>, or by paper mail: +* Vojtech Pavlik, Simunkova 1594, Prague 8, 182 00 Czech Republic */ #include <linux/hdreg.h> -#ifndef XFER_PIO_5 #define XFER_PIO_5 0x0d#define XFER_UDMA_SLOW 0x4f -#endif struct ide_timing {short mode;
@@ -49,13 +45,15 @@ };/* -* PIO 0-5, MWDMA 0-2 and UDMA 0-5 timings (in nanoseconds). +* PIO 0-5, MWDMA 0-2 and UDMA 0-6 timings (in nanoseconds). * These were taken from ATA/ATAPI-6 standard, rev 0a, except -* for PIO 5, which is a nonstandard extension. +* for PIO 5, which is a nonstandard extension and UDMA6, which +* is currently supported only by Maxtor drives. */ static struct ide_timing ide_timing[] = { + {XFER_UDMA_6 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,15 }, {XFER_UDMA_5 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,20 }, {XFER_UDMA_4 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,30 }, {XFER_UDMA_3 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,45 },
@@ -105,6 +103,7 @@#define EZ (v,unit) ((v)?ENOUGH(v,unit):0)#define XFER_MODE 0xf0 +#define XFER_UDMA_133 0x48#define XFER_UDMA_100 0x44#define XFER_UDMA_66 0x42#define XFER_UDMA 0x40
@@ -123,6 +122,9 @@if ((map &XFER_UDMA ) && (id->field_valid &4 )) {/* Want UDMA and UDMA bitmap valid */ +if ((map &XFER_UDMA_133 ) ==XFER_UDMA_133 ) +if ((best = (id->dma_ultra &0x0040 ) ?XFER_UDMA_6 :0 ))return best; +if ((map &XFER_UDMA_100 ) ==XFER_UDMA_100 )if ((best = (id->dma_ultra &0x0020 ) ?XFER_UDMA_5 :0 ))return best;
@@ -174,14 +176,14 @@static void ide_timing_quantize (struct ide_timing *t,struct ide_timing *q,int T ,int UT ) { - q->setup =EZ (t->setup,T ); - q->act8b =EZ (t->act8b,T ); - q->rec8b =EZ (t->rec8b,T ); - q->cyc8b =EZ (t->cyc8b,T ); - q->active =EZ (t->active,T ); - q->recover =EZ (t->recover,T ); - q->cycle =EZ (t->cycle,T ); - q->udma =EZ (t->udma,UT ); + q->setup =EZ (t->setup *1000 ,T ); + q->act8b =EZ (t->act8b *1000 ,T ); + q->rec8b =EZ (t->rec8b *1000 ,T ); + q->cyc8b =EZ (t->cyc8b *1000 ,T ); + q->active =EZ (t->active *1000 ,T ); + q->recover =EZ (t->recover *1000 ,T ); + q->cycle =EZ (t->cycle *1000 ,T ); + q->udma =EZ (t->udma *1000 ,UT ); }static void ide_timing_merge (struct ide_timing *a,struct ide_timing *b,struct ide_timing *m,unsigned int what)
drivers/ide/via82cxxx.c +77 -52
295 lines not on this page · raw message
include/linux/pci_ids.h +5 -4
@@ -946,11 +946,12 @@#define PCI_DEVICE_ID_VIA_8233_7 0x3065#define PCI_DEVICE_ID_VIA_82C686_6 0x3068#define PCI_DEVICE_ID_VIA_8233_0 0x3074 -#define PCI_DEVICE_ID_VIA_8622 0x3102 -#define PCI_DEVICE_ID_VIA_8233C_0 0x3109 -#define PCI_DEVICE_ID_VIA_8361 0x3112#define PCI_DEVICE_ID_VIA_8633_0 0x3091#define PCI_DEVICE_ID_VIA_8367_0 0x3099 +#define PCI_DEVICE_ID_VIA_8622 0x3102 +#define PCI_DEVICE_ID_VIA_8233C_0 0x3109 +#define PCI_DEVICE_ID_VIA_8361 0x3112 +#define PCI_DEVICE_ID_VIA_8233A 0x3147#define PCI_DEVICE_ID_VIA_86C100A 0x6100#define PCI_DEVICE_ID_VIA_8231 0x8231#define PCI_DEVICE_ID_VIA_8231_4 0x8235
@@ -960,7 +961,7 @@#define PCI_DEVICE_ID_VIA_82C597_1 0x8597#define PCI_DEVICE_ID_VIA_82C598_1 0x8598#define PCI_DEVICE_ID_VIA_8601_1 0x8601 -#define PCI_DEVICE_ID_VIA_8505_1 0X8605 +#define PCI_DEVICE_ID_VIA_8505_1 0x8605#define PCI_DEVICE_ID_VIA_8633_1 0xB091#define PCI_DEVICE_ID_VIA_8367_1 0xB099