Re: PROBLEM: DELL PERC/Megaraid RAID driver in Linux 2.2.18pre17 hang

[miquels@cistron.nl (Miquel van Smoorenburg)]

In article <E13pYpR-0005QZ-00@the-village.bc.nu>,
Alan Cox  <alan@lxorguk.ukuu.org.uk> wrote:
>Yep - known problem. AMI have one more pre patch to sort it our Im going back
>to the older driver

I've tried the AMI patch and it appears to work. I'm now running
2.2.18pre18 + fix to ideprobe.c + ami megaraid fix and it looks OK

Here's the patch.

--- linux-2.2.18pre11/drivers/scsi/megaraid.c	Fri Sep 29 15:29:31 2000
+++ megaraid/megaraid.c Wed Oct 25 11:40:51 2000
@@ -9,7 +9,7 @@
  *		as published by the Free Software Foundation; either version
  *		2 of the License, or (at your option) any later version.
  *
- * Version : 1b08b
+ * Version : v1.11a
  *
  * Description: Linux device driver for AMI MegaRAID controller
  *
@@ -179,7 +179,9 @@
  *	I)  Version number changed from 1.10c to 1.11
  *  II)	DCMD_WRITE_CONFIG(0x0D) command in the driver changed from
  *	scatter/gather list mode to direct pointer mode..
- *
+ *
+ * Version 1.11a
+ *	Initlization bug fixed
  * BUGS:
  *	Some older 2.1 kernels (eg. 2.1.90) have a bug in pci.c that
  *	fails to detect the controller as a pci device on the system.
@@ -194,7 +196,7 @@
 #define CRLFSTR "\n"
 #define IOCTL_CMD_NEW	0x81

-#define MEGARAID_VERSION "v1.11 (Aug 23, 2000)"
+#define MEGARAID_VERSION "v1.11a (Oct 24, 2000)"
 #define MEGARAID_IOCTL_VERSION 108

 #include <linux/config.h>
@@ -1842,8 +1844,8 @@
   while ((pdev = pci_find_device (pciVendor, pciDev, pdev))) {

 #ifdef DELL_MODIFICATION
-    if (pci_enable_device(pdev))
-	continue;
+    if (pci_enable_device(pdev))
+	continue;
 #endif
     pciBus = pdev->bus->number;
     pciDevFun = pdev->devfn;
@@ -1889,7 +1891,11 @@
				"megaraid: to protect your data, please upgrade your firmware to version\n"
				"megaraid: 3.10 or later, available from the Dell Technical Support web\n"
				"megaraid: site at\n"
+#ifdef DELL_MODIFICATION
				"http://support.dell.com/us/en/filelib/download/index.asp?fileid=2940\n");
+#else
+				"http://support.dell.com/us/en/filelib/download/index.asp?fileid=2489\n");
+#endif
			continue;
			}
		}
@@ -1914,16 +1920,32 @@
     megaIrq  = pdev->irq;
 #else

-    megaBase = pci_resource_start (pdev, 0);
+#ifdef DELL_MODIFICATION
+    megaBase = pci_resource_start (pdev, 0);
+#else
+    megaBase = pdev->resource[0].start;
+#endif
     megaIrq  = pdev->irq;
 #endif

     pciIdx++;

-    if (flag & BOARD_QUARTZ)
-	megaBase = (long) ioremap (megaBase, 128);
-    else
-	megaBase += 0x10;
+#ifdef DELL_MODIFICATION
+    if (flag & BOARD_QUARTZ)
+	megaBase = (long) ioremap (megaBase, 128);
+    else
+	megaBase += 0x10;
+#else
+    if (flag & BOARD_QUARTZ) {
+
+      megaBase &= PCI_BASE_ADDRESS_MEM_MASK;
+      megaBase = (long) ioremap (megaBase, 128);
+    }
+    else {
+      megaBase &= PCI_BASE_ADDRESS_IO_MASK;
+      megaBase += 0x10;
+    }
+#endif

     /* Initialize SCSI Host structure */
     host = scsi_register (pHostTmpl, sizeof (mega_host_config));
@@ -2087,8 +2109,7 @@
	  remove_proc_entry("config", megaCfg->controller_proc_dir_entry);
	  remove_proc_entry("mailbox", megaCfg->controller_proc_dir_entry);
	   for (i = 0; i < numCtlrs; i++) {
-		char buf[12];
-		memset(buf,0,12);
+		char buf[12] ={0};
		sprintf(buf,"%d",i);
		remove_proc_entry(buf,mega_proc_dir_entry);
	 }


Mike.
-- 
People get the operating system they deserve.
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
Please read the FAQ at http://www.tux.org/lkml/