linux-mips
[Top] [All Lists]

[PATCH 2.6.x] Cobalt IDE fix, take 2

To: linux-mips@linux-mips.org
Subject: [PATCH 2.6.x] Cobalt IDE fix, take 2
From: Peter Horton <pdh@colonel-panic.org>
Date: Mon, 23 Jan 2006 22:33:54 +0000
Cc: ralf@linux-mips.org
Original-recipient: rfc822;linux-mips@linux-mips.org
Sender: linux-mips-bounce@linux-mips.org
User-agent: Mutt/1.5.9i
Fix long boot delay on Cobalt scanning non-existent IDE interfaces.

P.

Index: linux.git/include/asm-mips/mach-cobalt/ide.h
===================================================================
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
+++ linux.git/include/asm-mips/mach-cobalt/ide.h        2006-01-23 
22:04:15.000000000 +0000
@@ -0,0 +1,8 @@
+#ifndef __ASM_COBALT_IDE_H
+#define __ASM_COBALT_IDE_H
+
+#define MAX_LEGACY_HWIFS       2
+
+#include <asm/mach-generic/ide.h>
+
+#endif
Index: linux.git/include/asm-mips/mach-generic/ide.h
===================================================================
--- linux.git.orig/include/asm-mips/mach-generic/ide.h  2006-01-23 
22:04:10.000000000 +0000
+++ linux.git/include/asm-mips/mach-generic/ide.h       2006-01-23 
22:30:38.000000000 +0000
@@ -28,6 +28,10 @@
 # endif
 #endif
 
+#ifndef MAX_LEGACY_HWIFS
+# define MAX_LEGACY_HWIFS      6
+#endif
+
 #define IDE_ARCH_OBSOLETE_DEFAULTS
 
 static __inline__ int ide_probe_legacy(void)
@@ -73,7 +77,7 @@
 
 static __inline__ unsigned long ide_default_io_base(int index)
 {
-       if (ide_probe_legacy())
+       if (index < MAX_LEGACY_HWIFS && ide_probe_legacy())
                switch (index) {
                case 0:
                        return 0x1f0;

<Prev in Thread] Current Thread [Next in Thread>