patch-2.4.2 linux/drivers/ide/via82cxxx.c

Next file: linux/drivers/ieee1394/guid.c
Previous file: linux/drivers/ide/rapide.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.4.1/linux/drivers/ide/via82cxxx.c linux/drivers/ide/via82cxxx.c
@@ -1,7 +1,7 @@
 /*
- * $Id: via82cxxx.c,v 2.1e 2000/10/03 10:01:00 vojtech Exp $
+ * $Id: via82cxxx.c,v 3.20 2001/01/27 10:13:60 vojtech Exp $
  *
- *  Copyright (c) 2000 Vojtech Pavlik
+ *  Copyright (c) 2000-2001 Vojtech Pavlik
  *
  *  Based on the work of:
  *	Michel Aubry
@@ -12,23 +12,34 @@
  */
 
 /*
- * VIA vt82c586 IDE driver for Linux. Supports
+ * VIA IDE driver for Linux. Supports
  *
- *   vt82c586, vt82c586a, vt82c586b, vt82c596a, vt82c596b, vt82c686a, vt8231
+ *   vt82c586, vt82c586a, vt82c586b, vt82c596a, vt82c596b,
+ *   vt82c686, vt82c686a, vt82c686b, vt8231, vt8233
  *
  * southbridges, which can be found in
  *
- *  VIA Apollo VP, VPX, VPX/97, VP2, VP2/97, VP3, MVP3, MVP4
- *  VIA Apollo Pro, Pro Plus, Pro 133, Pro 133A, ProMedia 601, ProSavage 605
- *  VIA Apollo KX133, KT133
- *  AMD-640, AMD-750 IronGate
- *
- * chipsets. Supports PIO 0-5, MWDMA 0-2, SWDMA 0-2 and
- * UDMA 0-5 (includes UDMA33, 66 and 100) modes. UDMA100 isn't possible
- * on any of the supported chipsets yet.
- *
- * UDMA66 and higher modes are autodetected only in case the BIOS has enabled them.
- * To force UDMA66, use 'ide0=ata66' or 'ide1=ata66' on the kernel command line.
+ *  VIA Apollo VP, VPX, VPX/97, VP2, VP2/97, VP3, MVP3, MVP4, P6, Pro,
+ *  Pro Plus, Pro 133, Pro 133A, ProMedia PM601, ProSavage PM133, PLE133,
+ *  Pro 266, KX133, KT133, ProSavage KM133, KT133A, KT266
+ *  PC-Chips VXPro, VXPro+, TXPro-III, TXPro-AGP, ViaGra, BXToo, BXTel
+ *  AMD 640, 640 AGP, 750 IronGate
+ *  ETEQ 6618, 6628, 6638
+ *  Micron Samurai
+ *
+ * chipsets. Supports
+ *
+ *   PIO 0-5, MWDMA 0-2, SWDMA 0-2 and UDMA 0-5
+ *
+ * (this includes UDMA33, 66 and 100) modes. UDMA66 and higher modes are
+ * autodetected only in case the BIOS has detected a 80 wire cable. To ignore
+ * the BIOS data, use 'ide0=ata66' or 'ide1=ata66' on the kernel command line.
+ *
+ * For correct operation it's needed to tell the driver the speed of the PCI
+ * bus. The default, and most common value is 33 MHz. Most likely, your system
+ * is using this value and you don't need to use any command line options. If
+ * you run your PCI bus speed at 25, 30, 37, 40 or 42 MHz, use the 'idebus=xx'
+ * option of the IDE driver. Note that this has nothing to do with UDMA66.
  */
 
 /*
@@ -52,23 +63,16 @@
  */
 
 #include <linux/config.h>
-#include <linux/types.h>
 #include <linux/kernel.h>
-#include <linux/timer.h>
-#include <linux/mm.h>
 #include <linux/ioport.h>
-#include <linux/interrupt.h>
 #include <linux/blkdev.h>
-#include <linux/hdreg.h>
 #include <linux/pci.h>
 #include <linux/init.h>
-#include <linux/delay.h>
 #include <linux/ide.h>
 #include <asm/io.h>
 
-#include "ide_modes.h"
+#include "ide-timing.h"
 
-#define VIA_BM_BASE		0x20
 #define VIA_IDE_ENABLE		0x40
 #define VIA_IDE_CONFIG		0x41
 #define VIA_FIFO_CONFIG		0x43
@@ -76,90 +80,49 @@
 #define VIA_MISC_2		0x45
 #define VIA_MISC_3		0x46
 #define VIA_DRIVE_TIMING	0x48
+#define VIA_8BIT_TIMING		0x4e
 #define VIA_ADDRESS_SETUP	0x4c
 #define VIA_UDMA_TIMING		0x50
-#define VIA_PRI_SECTOR_SIZE	0x60
-#define VIA_SEC_SECTOR_SIZE	0x68
+
+#define VIA_UDMA		0x07
+#define VIA_UDMA_NONE		0x00
+#define VIA_UDMA_33		0x01
+#define VIA_UDMA_66		0x02
+#define VIA_UDMA_100		0x03
+#define VIA_BAD_PREQ		0x10
+#define VIA_BAD_CLK66		0x20
+#define VIA_SET_FIFO		0x40
+#define VIA_SET_THRESH		0x80
 
 /*
  * VIA SouthBridge chips.
  */
 
-static const struct {
+static struct via_isa_bridge {
 	char *name;
 	unsigned short id;
-	unsigned char speed;
+	unsigned char rev_min;
+	unsigned char rev_max;
+	unsigned char flags;
 } via_isa_bridges[] = {
-	{ "vt8231",	PCI_DEVICE_ID_VIA_8231,     XFER_UDMA_4 },
-	{ "vt82c686a",	PCI_DEVICE_ID_VIA_82C686,   XFER_UDMA_4 },
-	{ "vt82c596b",	PCI_DEVICE_ID_VIA_82C596,   XFER_UDMA_4 },
-	{ "vt82c596a",	PCI_DEVICE_ID_VIA_82C596,   XFER_UDMA_2 },
-	{ "vt82c586b",	PCI_DEVICE_ID_VIA_82C586_0, XFER_UDMA_2 },
-	{ "vt82c586a",	PCI_DEVICE_ID_VIA_82C586_0, XFER_UDMA_2 },
-	{ "vt82c586",	PCI_DEVICE_ID_VIA_82C586_0, XFER_MW_DMA_2 },
-	{ "Unknown SouthBridge",	0,	    XFER_UDMA_2 },
+	{ "vt8233",	PCI_DEVICE_ID_VIA_8233_0,   0x00, 0x2f, VIA_UDMA_100 },
+	{ "vt8231",	PCI_DEVICE_ID_VIA_8231,     0x00, 0x2f, VIA_UDMA_66 },
+	{ "vt82c686b",	PCI_DEVICE_ID_VIA_82C686,   0x40, 0x4f, VIA_UDMA_100 },
+	{ "vt82c686a",	PCI_DEVICE_ID_VIA_82C686,   0x10, 0x2f, VIA_UDMA_66 },
+	{ "vt82c686",	PCI_DEVICE_ID_VIA_82C686,   0x00, 0x0f, VIA_UDMA_66 },
+	{ "vt82c596b",	PCI_DEVICE_ID_VIA_82C596,   0x10, 0x2f, VIA_UDMA_66 },
+	{ "vt82c596a",	PCI_DEVICE_ID_VIA_82C596,   0x00, 0x0f, VIA_UDMA_33 | VIA_BAD_CLK66 },
+	{ "vt82c586b",	PCI_DEVICE_ID_VIA_82C586_0, 0x40, 0x4f, VIA_UDMA_33 | VIA_SET_FIFO | VIA_BAD_PREQ },
+	{ "vt82c586b",	PCI_DEVICE_ID_VIA_82C586_0, 0x30, 0x3f, VIA_UDMA_33 | VIA_SET_FIFO },
+	{ "vt82c586a",	PCI_DEVICE_ID_VIA_82C586_0, 0x20, 0x2f, VIA_UDMA_33 | VIA_SET_FIFO },
+	{ "vt82c586",	PCI_DEVICE_ID_VIA_82C586_0, 0x00, 0x0f, VIA_UDMA_NONE | VIA_SET_FIFO },
+	{ NULL }
 };
 
-static unsigned char via_config;
+static struct via_isa_bridge *via_config;
 static unsigned char via_enabled;
-static unsigned int via_ata66;
-
-/*
- * PIO 0-5, MWDMA 0-2 and UDMA 0-5 timings (in nanoseconds).
- * These were taken from ATA/ATAPI-6 standard, rev 0a, except
- * for PIO 5, which is a nonstandard extension.
- *
- * Dilemma: 8-bit (register) PIO accesses need more relaxed timing.
- * Hopefully the chipset is taking care of that. If it doesn't
- * do so, define VIA_USE_8_BIT_TIMING to see if it helps.
- */
-
-#ifndef XFER_PIO_5
-#define XFER_PIO_5		0x0d
-#endif
-
-static const struct {
-	int mode;
-	char *name;
-	short setup;	/* t1 */
-	short active;	/* t2  or tD */
-	short recover;	/* t2i or tK */
-	short cycle;	/* t0 */
-	short udma;	/* t2CYCTYP/2 */
-} via_timing[] = {
-	{ XFER_UDMA_5,    "UDMA5", 25,  70,  25, 120,  20 },
-	{ XFER_UDMA_4,    "UDMA4", 25,  70,  25, 120,  30 },
-	{ XFER_UDMA_3,    "UDMA3", 25,  70,  25, 120,  45 },
-
-	{ XFER_UDMA_2,    "UDMA2", 25,  70,  25, 120,  60 },
-	{ XFER_UDMA_1,    "UDMA1", 25,  70,  25, 120,  80 },
-	{ XFER_UDMA_0,    "UDMA0", 25,  70,  25, 120, 120 },
-
-	{ XFER_MW_DMA_2,  "MDMA2", 25,  70,  25, 120,   0 },
-	{ XFER_MW_DMA_1,  "MDMA1", 45,  80,  50, 150,   0 },
-	{ XFER_MW_DMA_0,  "MDMA0", 60, 215, 215, 480,   0 },
-
-	{ XFER_SW_DMA_2,  "SDMA2", 60, 120, 120, 240,   0 },
-	{ XFER_SW_DMA_1,  "SDMA1", 90, 240, 240, 480,   0 },
-	{ XFER_SW_DMA_0,  "SDMA0",120, 480, 480, 960,   0 },
-
-	{ XFER_PIO_5,     "PIO5",  20,  50,  30, 100,   0 },
-	{ XFER_PIO_4,     "PIO4",  25,  70,  25, 120,   0 },
-	{ XFER_PIO_3,     "PIO3",  30,  80,  70, 180,   0 },
-
-#ifdef VIA_USE_8_BIT_TIMING
-	{ XFER_PIO_2,     "PIO2",  30, 290,  60, 330,   0 },
-	{ XFER_PIO_1,     "PIO1",  50, 290, 100, 383,   0 },
-	{ XFER_PIO_0,     "PIO0",  70, 290, 300, 600,   0 },
-#else
-	{ XFER_PIO_2,     "PIO2",  30, 100,  90, 240,   0 },
-	{ XFER_PIO_1,     "PIO1",  50, 125, 100, 383,   0 },
-	{ XFER_PIO_0,     "PIO0",  70, 165, 150, 600,   0 },
-#endif
-
-	{ XFER_PIO_SLOW,  "SLOW", 120, 290, 240, 960,   0 },
-	{ 0 }
-};
+static unsigned int via_80w;
+static unsigned int via_clock;
 
 /*
  * VIA /proc entry.
@@ -170,11 +133,10 @@
 #include <linux/stat.h>
 #include <linux/proc_fs.h>
 
-int via_proc = 0;
+int via_proc, via_base;
 static struct pci_dev *bmide_dev, *isa_dev;
 extern int (*via_display_info)(char *, char **, off_t, int); /* ide-proc.c */
 
-static char *via_fifo[] = { " 1 ", "3/4", "1/2", "1/4" };
 static char *via_control3[] = { "No limit", "64", "128", "192" };
 
 #define via_print(format, arg...) p += sprintf(p, format "\n" , ## arg)
@@ -183,89 +145,89 @@
 
 static int via_get_info(char *buffer, char **addr, off_t offset, int count)
 {
-	short pci_clock, speed[4], cycle[4], setup[4], active[4], recover[4], umul[4], uen[4], udma[4];
+	short speed[4], cycle[4], setup[4], active[4],
+		recover[4], uen[4], udma[4], active8b[4], recover8b[4];
 	struct pci_dev *dev = bmide_dev;
-	unsigned int v, u, i, base;
-	unsigned short c, size0, size1;
-	unsigned char t, c0, c1;
+	unsigned int v, u, i;
+	unsigned short c, w;
+	unsigned char t, x;
 	char *p = buffer;
 
 	via_print("----------VIA BusMastering IDE Configuration----------------");
 
-	via_print("Driver Version:                     2.1e");
+	via_print("Driver Version:                     3.20");
+	via_print("South Bridge:                       VIA %s", via_config->name);
 
 	pci_read_config_byte(isa_dev, PCI_REVISION_ID, &t);
-	via_print("South Bridge:                       VIA %s rev %#x", via_isa_bridges[via_config].name, t);
-
-	pci_read_config_word(dev, PCI_COMMAND, &c);
-	via_print("Command register:                   %#x", c);
-
-	pci_read_config_byte(dev, PCI_LATENCY_TIMER, &t);
-	via_print("Latency timer:                      %d", t);
+	pci_read_config_byte(dev, PCI_REVISION_ID, &x);
+	via_print("Revision:                           ISA %#x IDE %#x", t, x);
 
-	pci_clock = system_bus_clock();
-	via_print("PCI clock:                          %dMHz", pci_clock);
+	via_print("BM-DMA base:                        %#x", via_base);
+	via_print("PCI clock:                          %dMHz", via_clock);
 
 	pci_read_config_byte(dev, VIA_MISC_1, &t);
-	via_print("Master Read  Cycle IRDY:            %dws", (t & 64) >>6 );
-	via_print("Master Write Cycle IRDY:            %dws", (t & 32) >> 5 );
-	via_print("FIFO Output Data 1/2 Clock Advance: %s", (t & 16) ? "on" : "off" );
-	via_print("BM IDE Status Register Read Retry:  %s", (t & 8) ? "on" : "off" );
+	via_print("Master Read  Cycle IRDY:            %dws", (t & 64) >> 6);
+	via_print("Master Write Cycle IRDY:            %dws", (t & 32) >> 5);
+	via_print("BM IDE Status Register Read Retry:  %s", (t & 8) ? "yes" : "no");
 
 	pci_read_config_byte(dev, VIA_MISC_3, &t);
-	via_print("Max DRDY Pulse Width:               %s%s", via_control3[(t & 0x03)], (t & 0x03) ? "PCI clocks" : "");
+	via_print("Max DRDY Pulse Width:               %s%s", via_control3[(t & 0x03)], (t & 0x03) ? " PCI clocks" : "");
 
 	via_print("-----------------------Primary IDE-------Secondary IDE------");
-	via_print("Read DMA FIFO flush:   %10s%20s", (t & 0x80) ? "on" : "off", (t & 0x40) ? "on" : "off" );
-	via_print("End Sect. FIFO flush:  %10s%20s", (t & 0x20) ? "on" : "off", (t & 0x10) ? "on" : "off" );
+	via_print("Read DMA FIFO flush:   %10s%20s", (t & 0x80) ? "yes" : "no", (t & 0x40) ? "yes" : "no");
+	via_print("End Sector FIFO flush: %10s%20s", (t & 0x20) ? "yes" : "no", (t & 0x10) ? "yes" : "no");
 
 	pci_read_config_byte(dev, VIA_IDE_CONFIG, &t);
-	via_print("Prefetch Buffer:       %10s%20s", (t & 0x80) ? "on" : "off", (t & 0x20) ? "on" : "off" );
-	via_print("Post Write Buffer:     %10s%20s", (t & 0x40) ? "on" : "off", (t & 0x10) ? "on" : "off" );
+	via_print("Prefetch Buffer:       %10s%20s", (t & 0x80) ? "yes" : "no", (t & 0x20) ? "yes" : "no");
+	via_print("Post Write Buffer:     %10s%20s", (t & 0x40) ? "yes" : "no", (t & 0x10) ? "yes" : "no");
 
-	pci_read_config_byte(dev, VIA_FIFO_CONFIG, &t);
-	via_print("FIFO size:             %10d%20d", 16 - (((t >> 5) & 1) + ((t >> 6) & 1)) * 8,
-							  (((t >> 5) & 1) + ((t >> 6) & 1)) * 8);
-	via_print("Threshold Prim.:       %10s%20s", via_fifo[(t >> 2) & 3], via_fifo[t & 3]);
-
-	pci_read_config_word(dev, VIA_PRI_SECTOR_SIZE, &size0);
-	pci_read_config_word(dev, VIA_SEC_SECTOR_SIZE, &size1);
-	via_print("Bytes Per Sector:      %10d%20d", size0 & 0xfff, size1 & 0xfff);
+	pci_read_config_byte(dev, VIA_IDE_ENABLE, &t);
+	via_print("Enabled:               %10s%20s", (t & 0x02) ? "yes" : "no", (t & 0x01) ? "yes" : "no");
 
-	pci_read_config_dword(dev, VIA_BM_BASE, &base);
-	base = (base & 0xfff0) ;
+	c = inb(via_base + 0x02) | (inb(via_base + 0x0a) << 8);
+	via_print("Simplex only:          %10s%20s", (c & 0x80) ? "yes" : "no", (c & 0x8000) ? "yes" : "no");
 
-	c0 = inb((unsigned short)base + 0x02);
-	c1 = inb((unsigned short)base + 0x0a);
-
-	via_print("Both channels togth:   %10s%20s", (c0 & 0x80) ? "no" : "yes", (c1 & 0x80) ? "no" : "yes" );
+	via_print("Cable Type:            %10s%20s", (via_80w & 1) ? "80w" : "40w", (via_80w & 2) ? "80w" : "40w");
 
 	via_print("-------------------drive0----drive1----drive2----drive3-----");
 
-	via_print("BMDMA enabled: %10s%10s%10s%10s", (c0 & 0x20) ? "yes" : "no", (c0 & 0x40) ? "yes" : "no",
-						     (c1 & 0x20) ? "yes" : "no", (c1 & 0x40) ? "yes" : "no" );
-
 	pci_read_config_byte(dev, VIA_ADDRESS_SETUP, &t);
 	pci_read_config_dword(dev, VIA_DRIVE_TIMING, &v);
-	pci_read_config_dword(dev, VIA_UDMA_TIMING, &u);
+	pci_read_config_word(dev, VIA_8BIT_TIMING, &w);
+
+	if (via_config->flags & VIA_UDMA)
+		pci_read_config_dword(dev, VIA_UDMA_TIMING, &u);
+	else u = 0;
 
 	for (i = 0; i < 4; i++) {
-		setup[i]   = ((t >>  ((3 - i) << 1)     ) & 0x3) + 1;
-		active[i]  = ((v >> (((3 - i) << 3) + 4)) & 0xf) + 1;
-		recover[i] = ((v >>  ((3 - i) << 3)     ) & 0xf) + 1;
-		udma[i]    = ((u >>  ((3 - i) << 3)     ) & 0x7) + 2;
-		umul[i]    = ((u >> (((3 - i) & 2) << 3)) & 0x8) ? 2 : 1;
-		uen[i]     = ((u >> ((3 - i) << 3)) & 0x20) ? 1 : 0;
-		speed[i] = uen[i] ? 20 * pci_clock * umul[i] / udma[i] :
-				    20 * pci_clock / (active[i] + recover[i]);
-		cycle[i] = uen[i] ? 1000 / (pci_clock * umul[i]) * udma[i] :
-				    1000 / pci_clock * (active[i] + recover[i]);
-	}
-
-	via_print_drive("Transfer Mode: ", "%10s", uen[i] ? "UDMA" : "DMA/PIO");
-	via_print_drive("Address Setup: ", "%8dns", (1000 / pci_clock) * setup[i]);
-	via_print_drive("Active Pulse:  ", "%8dns", (1000 / pci_clock) * active[i]);
-	via_print_drive("Recovery Time: ", "%8dns", (1000 / pci_clock) * recover[i]);
+		setup[i]     = ((t >> ((3 - i) << 1)) & 0x3) + 1;
+		recover8b[i] = ((w >> ((1 - (i >> 1)) << 3)) & 0xf) + 1;
+		active8b[i]  = ((w >> (((1 - (i >> 1)) << 3) + 4)) & 0xf) + 1;
+		active[i]    = ((v >> (((3 - i) << 3) + 4)) & 0xf) + 1;
+		recover[i]   = ((v >> ((3 - i) << 3)) & 0xf) + 1;
+		udma[i]      = ((u >> ((3 - i) << 3)) & 0x7) + 2;
+
+		if ((via_config->flags & VIA_UDMA) == VIA_UDMA_100) {
+			speed[i] = 2000 / udma[i];
+			cycle[i] = 10 * udma[i];
+			continue;
+		}
+
+		uen[i]   = (u >> ((3 - i) << 3)) & 0x20;
+		udma[i] *= ((u >> (((3 - i) & 2) << 3)) & 0x8) ? 1 : 2;
+
+		speed[i] = 40 * via_clock / (uen[i] ? udma[i] : (active[i] + recover[i]) * 2);
+		cycle[i] = 1000 / via_clock * (uen[i] ? udma[i] : (active[i] + recover[i]) * 2) / 2;
+	}
+
+	via_print_drive("Transfer Mode: ", "%10s",
+			(c & ((i & 1) ? 0x40 : 0x20) << ((i & 2) << 2)) ? (uen[i] ? "UDMA" : "DMA") : "PIO");
+
+	via_print_drive("Address Setup: ", "%8dns", (1000 / via_clock) * setup[i]);
+	via_print_drive("Cmd Active:    ", "%8dns", (1000 / via_clock) * active8b[i]);
+	via_print_drive("Cmd Recovery:  ", "%8dns", (1000 / via_clock) * recover8b[i]);
+	via_print_drive("Data Active:   ", "%8dns", (1000 / via_clock) * active[i]);
+	via_print_drive("Data Recovery: ", "%8dns", (1000 / via_clock) * recover[i]);
 	via_print_drive("Cycle Time:    ", "%8dns", cycle[i]);
 	via_print_drive("Transfer Rate: ", "%4d.%dMB/s", speed[i] / 10, speed[i] % 10);
 
@@ -274,302 +236,243 @@
 
 #endif
 
-#define FIT(v,min,max) ((v)>(max)?(max):((v)<(min)?(min):(v)))
-#define ENOUGH(v,un) (((v)-1)/(un)+1)
-
-#ifdef DEBUG
-#define via_write_config_byte(dev,number,value) do {\
-		printk(KERN_DEBUG "VP_IDE: Setting register %#x to %#x\n", number, value);\
-		pci_write_config_byte(dev,number,value); } while (0)
-#else
-#define via_write_config_byte	pci_write_config_byte
-#endif
+/*
+ * via_set_speed() writes timing values to the chipset registers
+ */
 
-static int via_set_speed(ide_drive_t *drive, byte speed)
+static void via_set_speed(struct pci_dev *dev, unsigned char dn, struct ide_timing *timing)
 {
-	struct pci_dev *dev = HWIF(drive)->pci_dev;
-	int i, T, err = 0;
-	unsigned char t, setup, active, recover, cycle;
-
-	if (drive->dn > 3) return -1;
-
-	T = 1000 / system_bus_clock();
-
-	if (speed > via_isa_bridges[via_config].speed)
-		speed = via_isa_bridges[via_config].speed;
+	unsigned char t;
 
-	for (i = 0; via_timing[i].mode && via_timing[i].mode != speed; i++);
+	pci_read_config_byte(dev, VIA_ADDRESS_SETUP, &t);
+	t = (t & ~(3 << ((3 - dn) << 1))) | ((FIT(timing->setup, 1, 4) - 1) << ((3 - dn) << 1));
+	pci_write_config_byte(dev, VIA_ADDRESS_SETUP, t);
 
-#ifdef DEBUG
-	printk(KERN_DEBUG "VP_IDE: Setting drive %d to %s\n", drive->dn, via_timing[i].name);
-#endif
+	pci_write_config_byte(dev, VIA_8BIT_TIMING + (1 - (dn >> 1)),
+		((FIT(timing->act8b, 1, 16) - 1) << 4) | (FIT(timing->rec8b, 1, 16) - 1));
 
-	setup   = ENOUGH(via_timing[i].setup,   T);
-	active  = ENOUGH(via_timing[i].active,  T);
-	recover = ENOUGH(via_timing[i].recover, T);
-	cycle   = ENOUGH(via_timing[i].cycle,   T);
+	pci_write_config_byte(dev, VIA_DRIVE_TIMING + (3 - dn),
+		((FIT(timing->active, 1, 16) - 1) << 4) | (FIT(timing->recover, 1, 16) - 1));
 
-	if (active + recover < cycle) {
-		active += (cycle - (active + recover)) / 2;
-		recover = cycle - active;
+	switch (via_config->flags & VIA_UDMA) {
+		case VIA_UDMA_33:  t = timing->udma ? (0xe0 | (FIT(timing->udma, 2, 5) - 2)) : 0x03; break;
+		case VIA_UDMA_66:  t = timing->udma ? (0xe8 | (FIT(timing->udma, 2, 9) - 2)) : 0x0f; break;
+		case VIA_UDMA_100: t = timing->udma ? (0xe0 | (FIT(timing->udma, 2, 9) - 2)) : 0x07; break;
+		default: return;
 	}
 
-/*
- * PIO address setup
- */
-
-	pci_read_config_byte(dev, VIA_ADDRESS_SETUP, &t);
-	t = (t & ~(3 << ((3 - drive->dn) << 1))) | (FIT(setup - 1, 0, 3) << ((3 - drive->dn) << 1));
-	via_write_config_byte(dev, VIA_ADDRESS_SETUP, t);
+	pci_write_config_byte(dev, VIA_UDMA_TIMING + (3 - dn), t);
+}
 
 /*
- * PIO active & recover
+ * via_set_drive() computes timing values configures the drive and
+ * the chipset to a desired transfer mode. It also can be called
+ * by upper layers.
  */
 
-	via_write_config_byte(dev, VIA_DRIVE_TIMING + (3 - drive->dn),
-		(FIT(active - 1, 0, 0xf) << 4) | FIT(recover - 1, 0, 0xf));
-
-/*
- * UDMA cycle
- */
+static int via_set_drive(ide_drive_t *drive, unsigned char speed)
+{
+	ide_drive_t *peer = HWIF(drive)->drives + (~drive->dn & 1);
+	struct ide_timing t, p;
+	int T, UT;
+
+	if (speed != XFER_PIO_SLOW && speed != drive->current_speed)
+		if (ide_config_drive_speed(drive, speed))
+			printk(KERN_WARNING "ide%d: Drive %d didn't accept speed setting. Oh, well.\n",
+				drive->dn >> 1, drive->dn & 1);
+
+	T = 1000 / via_clock;
+
+	switch (via_config->flags & VIA_UDMA) {
+		case VIA_UDMA_33:   UT = T;   break;
+		case VIA_UDMA_66:   UT = T/2; break;
+		case VIA_UDMA_100:  UT = 10;  break;
+		default:	    UT = T;   break;
+	}
 
-	switch(via_isa_bridges[via_config].speed) {
-		case XFER_UDMA_2: t = via_timing[i].udma ? (0xe0 | (FIT(ENOUGH(via_timing[i].udma, T), 2, 5) - 2)) : 0x03; break;
-		case XFER_UDMA_4: t = via_timing[i].udma ? (0xe8 | (FIT(ENOUGH(via_timing[i].udma, T/2), 2, 9) - 2)) : 0x0f; break;
-        }
+	ide_timing_compute(drive, speed, &t, T, UT);
 
-	if (via_isa_bridges[via_config].speed != XFER_MW_DMA_2)
-		via_write_config_byte(dev, VIA_UDMA_TIMING + (3 - drive->dn), t);
+	if (peer->present) {
+		ide_timing_compute(peer, peer->current_speed, &p, T, UT);
+		ide_timing_merge(&p, &t, &t, IDE_TIMING_8BIT);
+	}
 
-/*
- * Drive init
- */
+	via_set_speed(HWIF(drive)->pci_dev, drive->dn, &t);
 
-	if (!drive->init_speed) drive->init_speed = speed;
-	if ((err = ide_config_drive_speed(drive, speed)))
-		return err;
+	if (!drive->init_speed)
+		drive->init_speed = speed;
 	drive->current_speed = speed;
 
 	return 0;
 }
 
-static void config_chipset_for_pio(ide_drive_t *drive)
-{
-	short eide_pio_timing[] = {600, 383, 240, 180, 120, 100};
-	signed char pio, ide_pio;
-
-	if (drive->id->eide_pio_iordy > 0) {	/* Has timing table */
-		for (pio = 5; pio >= 0; pio--)
-			if (drive->id->eide_pio_iordy <= eide_pio_timing[pio])
-				break;
-	} else {				/* No timing table -> use mode capabilities */
-		pio = (drive->id->eide_pio_modes & 4) ? 5 :
-		      (drive->id->eide_pio_modes & 2) ? 4 :
-		      (drive->id->eide_pio_modes & 1) ? 3 :
-		      (drive->id->tPIO == 2) ? 2 :
-		      (drive->id->tPIO == 1) ? 1 : 0;
-	}
-
-	ide_pio = ide_get_best_pio_mode(drive, 255, 5, NULL);
-	pio = (pio >= ide_pio) ? pio : ide_pio;	/* Phew. What about the blacklist? */
-
-	if (!pio) pio = (!drive->id->tPIO) ? XFER_PIO_0 : XFER_PIO_SLOW;
-		else pio += XFER_PIO_0;
-
-	/* Fixup because of broken ide-probe.c */
-	drive->dn = HWIF(drive)->channel * 2 + (drive->select.b.unit & 1); 
-
-	via_set_speed(drive, pio);
-}
+/*
+ * via82cxxx_tune_drive() is a callback from upper layers for
+ * PIO-only tuning.
+ */
 
-static void via82cxxx_tune_drive(ide_drive_t *drive, byte pio)
+static void via82cxxx_tune_drive(ide_drive_t *drive, unsigned char pio)
 {
+	if (!((via_enabled >> HWIF(drive)->channel) & 1))
+		return;
+
 	if (pio == 255) {
-		config_chipset_for_pio(drive);
+		via_set_drive(drive, ide_find_best_mode(drive, XFER_PIO | XFER_EPIO));
 		return;
 	}
-	
-	if (pio > 5) pio = 5;
-	
-	via_set_speed(drive, XFER_PIO_0 + pio);
+
+	via_set_drive(drive, XFER_PIO_0 + MIN(pio, 5));
 }
 
 #ifdef CONFIG_BLK_DEV_IDEDMA
 
-static int config_chipset_for_dma(ide_drive_t *drive)
+/*
+ * via82cxxx_dmaproc() is a callback from upper layers that can do
+ * a lot, but we use it for DMA/PIO tuning only, delegating everything
+ * else to the default ide_dmaproc().
+ */
+
+int via82cxxx_dmaproc(ide_dma_action_t func, ide_drive_t *drive)
 {
-	struct hd_driveid *id = drive->id;
-	unsigned char ultra66 = eighty_ninty_three(drive);
-	unsigned char speed =
-
-		((id->dma_ultra & 0x0010) && ultra66) ? XFER_UDMA_4 :
-		((id->dma_ultra & 0x0008) && ultra66) ? XFER_UDMA_3 :
-		(id->dma_ultra & 0x0004) ? XFER_UDMA_2 :
-		(id->dma_ultra & 0x0002) ? XFER_UDMA_1 :
-		(id->dma_ultra & 0x0001) ? XFER_UDMA_0 :
-		(id->dma_mword & 0x0004) ? XFER_MW_DMA_2 :
-		(id->dma_mword & 0x0002) ? XFER_MW_DMA_1 :
-		(id->dma_mword & 0x0001) ? XFER_MW_DMA_0 :
-		(id->dma_1word & 0x0004) ? XFER_SW_DMA_2 :
-		(id->dma_1word & 0x0002) ? XFER_SW_DMA_1 :
-		(id->dma_1word & 0x0001) ? XFER_SW_DMA_0 : 0;
-		
-	if (!speed) return (int) ide_dma_off_quietly;
 
-	via_set_speed(drive, speed);
+	if (func == ide_dma_check) {
 
-	return (int) ide_dma_on;
-}
+		short w80 = HWIF(drive)->udma_four;
 
-/*
- * Almost a library function.
- */
+		short speed = ide_find_best_mode(drive,
+			XFER_PIO | XFER_EPIO | XFER_SWDMA | XFER_MWDMA |
+			(via_config->flags & VIA_UDMA ? XFER_UDMA : 0) |
+			(w80 && (via_config->flags & VIA_UDMA) == VIA_UDMA_66 ? XFER_UDMA_66 : 0) |
+			(w80 && (via_config->flags & VIA_UDMA) == VIA_UDMA_100 ? XFER_UDMA_100 : 0));
 
-static int config_drive_xfer_rate(ide_drive_t *drive)
-{
-	struct hd_driveid *id = drive->id;
-	ide_dma_action_t dma_func = ide_dma_on;
+		func = ((speed & XFER_MODE) != XFER_PIO) ? ide_dma_on : ide_dma_off_quietly;
 
-	if (id && (id->capability & 1) && HWIF(drive)->autodma) {
-		/* Consult the list of known "bad" drives */
-		if (ide_dmaproc(ide_dma_bad_drive, drive)) {
-			dma_func = ide_dma_off;
-			goto fast_ata_pio;
-		}
-		dma_func = ide_dma_off_quietly;
-		if (id->field_valid & 4) {
-			if (id->dma_ultra & 0x002F) {
-				/* Force if Capable UltraDMA */
-				dma_func = config_chipset_for_dma(drive);
-				if ((id->field_valid & 2) &&
-				    (dma_func != ide_dma_on))
-					goto try_dma_modes;
-			}
-		} else if (id->field_valid & 2) {
-try_dma_modes:
-			if (id->dma_mword & 0x0007) {
-				/* Force if Capable regular DMA modes */
-				dma_func = config_chipset_for_dma(drive);
-				if (dma_func != ide_dma_on)
-					goto no_dma_set;
-			}
-		} else if (ide_dmaproc(ide_dma_good_drive, drive)) {
-			if (id->eide_dma_time > 150) {
-				goto no_dma_set;
-			}
-			/* Consult the list of known "good" drives */
-			dma_func = config_chipset_for_dma(drive);
-			if (dma_func != ide_dma_on)
-				goto no_dma_set;
-		} else {
-			goto fast_ata_pio;
-		}
-	} else if ((id->capability & 8) || (id->field_valid & 2)) {
-fast_ata_pio:
-		dma_func = ide_dma_off_quietly;
-no_dma_set:
-		config_chipset_for_pio(drive);
+		via_set_drive(drive, speed);
 	}
-	return HWIF(drive)->dmaproc(dma_func, drive);
-}
 
-
-int via82cxxx_dmaproc(ide_dma_action_t func, ide_drive_t *drive)
-{
-	if (func == ide_dma_check)
-			return config_drive_xfer_rate(drive);
 	return ide_dmaproc(func, drive);
 }
+
 #endif /* CONFIG_BLK_DEV_IDEDMA */
 
+/*
+ * The initialization callback. Here we determine the IDE chip type
+ * and initialize its drive independent registers.
+ */
+
 unsigned int __init pci_init_via82cxxx(struct pci_dev *dev, const char *name)
 {
 	struct pci_dev *isa = NULL;
-	unsigned char f, t, m;
-	unsigned int u, i;
+	unsigned char t, v;
+	unsigned int u;
+	int i;
 
 /*
- * Find ISA bridge to see how good the IDE is.
+ * Find the ISA bridge to see how good the IDE is.
  */
 
-	for (via_config = 0; via_isa_bridges[via_config].id; via_config++)
-		if ((isa = pci_find_device(PCI_VENDOR_ID_VIA, via_isa_bridges[via_config].id, NULL)))	
-			break;
-/*
- * Read revision.
- */
-
-	if (via_isa_bridges[via_config].id == PCI_DEVICE_ID_VIA_82C586_0) {
-		pci_read_config_byte(isa, PCI_REVISION_ID, &t);
-		if (t < 0x30) via_config++;			/* vt82c586a */
-		if (t < 0x20) via_config++;			/* vt82c586 */
-	}
+	for (via_config = via_isa_bridges; via_config->id; via_config++)
+		if ((isa = pci_find_device(PCI_VENDOR_ID_VIA, via_config->id, NULL))) {
+			pci_read_config_byte(isa, PCI_REVISION_ID, &t);
+			if (t >= via_config->rev_min && t <= via_config->rev_max)
+				break;
+		}
 
-	if (via_isa_bridges[via_config].id == PCI_DEVICE_ID_VIA_82C596) {
-		pci_read_config_byte(isa, PCI_REVISION_ID, &t);
-		if (t < 0x10) via_config++;			/* vt82c596a */
+	if (!via_config->id) {
+		printk(KERN_WARNING "VP_IDE: Unknown VIA SouthBridge, contact Vojtech Pavlik <vojtech@suse.cz>\n");
+		return -ENODEV;
 	}
 
 /*
- * Check UDMA66 mode set by BIOS.
+ * Check 80-wire cable presence and setup Clk66.
  */
 
-	pci_read_config_dword(dev, VIA_UDMA_TIMING, &u);
+	switch (via_config->flags & VIA_UDMA) {
 
-	for (i = 0; i < 4; i++) {
-		pci_read_config_byte(dev, VIA_UDMA_TIMING + (3 - i), &t);
-		if ((u & (0x80000 >> ((i >> 1) << 4))) && ((t & 7) < 2)) via_ata66 |= (1 << (i >> 1));
-	} 
-
-#ifdef DEBUG
-	printk(KERN_DEBUG "VP_IDE: BIOS enabled ATA66: primary: %s, secondary: %s\n",
-		via_ata66 & 1 ? "yes" : "no", via_ata66 & 2 ? "yes" : "no");
-#endif
+		case VIA_UDMA_100:
+
+			pci_read_config_dword(dev, VIA_UDMA_TIMING, &u);
+			for (i = 24; i >= 0; i -= 8)
+				if (((u >> i) & 0x10) || (((u >> i) & 0x20) && (((u >> i) & 7) < 3)))
+					via_80w |= (1 << (1 - (i >> 4)));	/* BIOS 80-wire bit or UDMA w/ < 50ns/cycle */
+			break;
+
+		case VIA_UDMA_66:
+
+			pci_read_config_dword(dev, VIA_UDMA_TIMING, &u);	/* Enable Clk66 */
+			pci_write_config_dword(dev, VIA_UDMA_TIMING, u | 0x80008);
+			for (i = 24; i >= 0; i -= 8)
+				if (((u >> (i & 16)) & 8) && ((u >> i) & 0x20) && (((u >> i) & 7) < 2))
+					via_80w |= (1 << (1 - (i >> 4)));	/* 2x PCI clock and UDMA w/ < 3T/cycle */
+			break;
+	}
+
+	if (via_config->flags & VIA_BAD_CLK66) {			/* Disable Clk66 */
+		pci_read_config_dword(dev, VIA_UDMA_TIMING, &u);	/* Would cause trouble on 596a */
+		pci_write_config_dword(dev, VIA_UDMA_TIMING, u & ~0x80008);
+	}
 
 /*
- * Set UDMA66 double clock bits.
+ * Check whether interfaces are enabled.
  */
-	if (via_isa_bridges[via_config].speed == XFER_UDMA_4)
-		pci_write_config_dword(dev, VIA_UDMA_TIMING, u | 0x80008);
+
+	pci_read_config_byte(dev, VIA_IDE_ENABLE, &v);
+	via_enabled = ((v & 1) ? 2 : 0) | ((v & 2) ? 1 : 0);
 
 /*
- * Set up FIFO, flush, prefetch and post-writes.
+ * Set up FIFO sizes and thresholds.
  */
 
-	pci_read_config_dword(dev, VIA_IDE_ENABLE, &u);
-	pci_read_config_byte(dev, VIA_FIFO_CONFIG, &f);
-	pci_read_config_byte(dev, VIA_IDE_CONFIG, &t);
-	pci_read_config_byte(dev, VIA_MISC_3, &m);
+	pci_read_config_byte(dev, VIA_FIFO_CONFIG, &t);
 
-	f &= 0x90; t &= 0x0f; m &= 0x0f;
+	if (via_config->flags & VIA_BAD_PREQ)				/* Disable PREQ# till DDACK# */
+		t &= 0x7f;						/* Would crash on 586b rev 41 */
 
-	switch (u & 3) {
-		case 2: via_enabled = 1; f |= 0x06; t |= 0xc0; m |= 0xa0; break;	/* primary only, 3/4 */
-		case 1: via_enabled = 2; f |= 0x69; t |= 0x30; m |= 0x50; break;	/* secondary only, 3/4 */
-		case 3: via_enabled = 3;
-		default:                 f |= 0x2a; t |= 0xf0; m |= 0xf0; break;	/* fifo evenly distributed */
+	if (via_config->flags & VIA_SET_FIFO) {				/* Fix FIFO split between channels */
+		t &= (t & 0x9f);
+		switch (via_enabled) {
+			case 1: t |= 0x00; break;			/* 16 on primary */
+			case 2: t |= 0x60; break;			/* 16 on secondary */
+			case 3: t |= 0x20; break;			/* 8 pri 8 sec */
+		}
 	}
 
-	via_write_config_byte(dev, VIA_FIFO_CONFIG, f);
-	via_write_config_byte(dev, VIA_IDE_CONFIG, t);
-	via_write_config_byte(dev, VIA_MISC_3, m);
+	if (via_config->flags & VIA_SET_THRESH)				/* 1/2 FIFO full to trigger xmit */
+		t = (t & 0xf0) | 0x0a;
+
+	pci_write_config_byte(dev, VIA_FIFO_CONFIG, t);
+
+/*
+ * Determine system bus clock.
+ */
+
+	via_clock = system_bus_clock();
+	if (via_clock < 20 || via_clock > 50) {
+		printk(KERN_WARNING "VP_IDE: User given PCI clock speed impossible (%d), using 33 MHz instead.\n", via_clock);
+		printk(KERN_WARNING "VP_IDE: Use ide0=ata66 if you want to force UDMA66/UDMA100.\n");
+		via_clock = 33;
+	}
 
 /*
  * Print the boot message.
  */
 
-	printk(KERN_INFO "VP_IDE: VIA %s IDE %s controller on pci%d:%d.%d\n",
-			via_isa_bridges[via_config].name,
-			via_isa_bridges[via_config].speed >= XFER_UDMA_4 ? "UDMA66" :
-			via_isa_bridges[via_config].speed >= XFER_UDMA_2 ? "UDMA33" : "MWDMA16",
-			dev->bus->number, PCI_SLOT(dev->devfn), PCI_FUNC(dev->devfn));
+	pci_read_config_byte(isa, PCI_REVISION_ID, &t);
+	printk(KERN_INFO "VP_IDE: VIA %s (rev %02x) IDE %s controller on pci%s\n",
+			via_config->name, t,
+			(via_config->flags & VIA_UDMA) == VIA_UDMA_100 ? "UDMA100" :
+			(via_config->flags & VIA_UDMA) == VIA_UDMA_66 ? "UDMA66" :
+			(via_config->flags & VIA_UDMA) == VIA_UDMA_33 ? "UDMA33" : "MWDMA16",
+			dev->slot_name);
+
 /*
- * Register /proc/ide/via entry
+ * Setup /proc/ide/via entry.
  */
 
-#if defined(CONFIG_PROC_FS)
+#ifdef CONFIG_PROC_FS
 	if (!via_proc) {
 		via_proc = 1;
+		via_base = pci_resource_start(dev, 4);
 		bmide_dev = dev;
 		isa_dev = isa;
 		via_display_info = &via_get_info;
@@ -579,26 +482,26 @@
 	return 0;
 }
 
-/*
- * Since we don't have a way to detect the 80-wire ribbon cable
- * we rely on the BIOS detection. We also check the IDENTIFY byte
- * 93 to check the drive's point of view. I think we could return
- * '1' here 
- */
-
 unsigned int __init ata66_via82cxxx(ide_hwif_t *hwif)
 {
-	return ((via_enabled & via_ata66) >> hwif->channel) & 1;
+	return ((via_enabled & via_80w) >> hwif->channel) & 1;
 }
 
 void __init ide_init_via82cxxx(ide_hwif_t *hwif)
 {
+	int i;
+
 	hwif->tuneproc = &via82cxxx_tune_drive;
-	hwif->speedproc = &via_set_speed;
-	hwif->drives[0].autotune = 1;
-	hwif->drives[1].autotune = 1;
+	hwif->speedproc = &via_set_drive;
 	hwif->autodma = 0;
 
+	for (i = 0; i < 2; i++) {
+		hwif->drives[i].io_32bit = 1;
+		hwif->drives[i].unmask = 1;
+		hwif->drives[i].autotune = 1;
+		hwif->drives[i].dn = hwif->channel * 2 + i;
+	}
+
 #ifdef CONFIG_BLK_DEV_IDEDMA
 	if (hwif->dma_base) {
 		hwif->dmaproc = &via82cxxx_dmaproc;
@@ -610,7 +513,7 @@
 }
 
 /*
- * We allow the BM-DMA driver only work on enabled interfaces.
+ * We allow the BM-DMA driver to only work on enabled interfaces.
  */
 
 void __init ide_dmacapable_via82cxxx(ide_hwif_t *hwif, unsigned long dmabase)

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)