Upgrade to 2.1.73.

1 files changed, 34 insertions, 9 deletions

diff --git a/drivers/block/rz1000.c b/drivers/block/rz1000.c
index b7270c559..670fe3e58 100644
--- a/drivers/block/rz1000.c
+++ b/drivers/block/rz1000.c
@@ -1,7 +1,7 @@
 /*
- *  linux/drivers/block/rz1000.c	Version 0.03  Mar 20, 1996
+ *  linux/drivers/block/rz1000.c	Version 0.05  December 8, 1997
  *
- *  Copyright (C) 1995-1996  Linus Torvalds & author (see below)
+ *  Copyright (C) 1995-1998  Linus Torvalds & author (see below)
  */
 
 /*
@@ -9,6 +9,8 @@
  *
  *  This file provides support for disabling the buggy read-ahead
  *  mode of the RZ1000 IDE chipset, commonly used on Intel motherboards.
+ *
+ *  Dunno if this fixes both ports, or only the primary port (?).
  */
 
 #undef REALLY_SLOW_IO		/* most systems can safely undef this */
@@ -26,21 +28,40 @@
 #include <linux/pci.h>
 #include "ide.h"
 
-static void init_rz1000 (byte bus, byte fn, const char *name)
+#ifdef CONFIG_BLK_DEV_IDEPCI
+
+__initfunc(void ide_init_rz1000 (ide_hwif_t *hwif))	/* called from ide-pci.c */
+{
+	unsigned short reg;
+
+	hwif->chipset = ide_rz1000;
+	if (!pcibios_read_config_word (hwif->pci_bus, hwif->pci_fn, 0x40, &reg)
+	 && !pcibios_write_config_word(hwif->pci_bus, hwif->pci_fn, 0x40, reg & 0xdfff))
+	{
+		printk("%s: disabled chipset read-ahead (buggy RZ1000/RZ1001)\n", hwif->name);
+	} else {
+		hwif->serialized = 1;
+		hwif->drives[0].no_unmask = 1;
+		hwif->drives[1].no_unmask = 1;
+		printk("%s: serialized, disabled unmasking (buggy RZ1000/RZ1001)\n", hwif->name);
+	}
+}
+
+#else
+
+__initfunc(static void init_rz1000 (byte bus, byte fn, const char *name))
 {
 	unsigned short reg, h;
 
-	printk("%s: buggy IDE controller: ", name);
 	if (!pcibios_read_config_word (bus, fn, PCI_COMMAND, &reg) && !(reg & 1)) {
-		printk("disabled (BIOS)\n");
+		printk("%s: buggy IDE controller disabled (BIOS)\n", name);
 		return;
 	}
 	if (!pcibios_read_config_word (bus, fn, 0x40, &reg)
 	 && !pcibios_write_config_word(bus, fn, 0x40, reg & 0xdfff))
 	{
-		printk("disabled read-ahead\n");
+		printk("IDE: disabled chipset read-ahead (buggy %s)\n", name);
 	} else {
-		printk("\n");
 		for (h = 0; h < MAX_HWIFS; ++h) {
 			ide_hwif_t *hwif = &ide_hwifs[h];
 			if ((hwif->io_ports[IDE_DATA_OFFSET] == 0x1f0 || hwif->io_ports[IDE_DATA_OFFSET] == 0x170)
@@ -50,13 +71,15 @@ static void init_rz1000 (byte bus, byte fn, const char *name)
 				hwif->serialized = 1;
 				hwif->drives[0].no_unmask = 1;
 				hwif->drives[1].no_unmask = 1;
-				printk("  %s: serialized, disabled unmasking\n", hwif->name);
+				if (hwif->io_ports[IDE_DATA_OFFSET] == 0x170)
+					hwif->channel = 1;
+				printk("%s: serialized, disabled unmasking (buggy %s)\n", hwif->name, name);
 			}
 		}
 	}
 }
 
-void ide_probe_for_rz100x (void)
+__initfunc(void ide_probe_for_rz100x (void))	/* called from ide.c */
 {
 	byte index, bus, fn;
 
@@ -65,3 +88,5 @@ void ide_probe_for_rz100x (void)
 	for (index = 0; !pcibios_find_device (PCI_VENDOR_ID_PCTECH, PCI_DEVICE_ID_PCTECH_RZ1001, index, &bus, &fn); ++index)
 		init_rz1000 (bus, fn, "RZ1001");
 }
+
+#endif CONFIG_BLK_DEV_IDEPCI