Skip to contentSkip to conversation

Cobalt IDE fix, take 2

PATCH In review Peter Horton 2 participants 2 messages Jan 23, 2006 MIPS

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Cobalt IDE fix, take 2

Fix long boot delay on Cobalt scanning non-existent IDE interfaces.

P.

include/asm-mips/mach-cobalt/ide.h new file +8 -0
Index: linux.git/include/asm-mips/mach-cobalt/ide.h
===================================================================
@@ -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
include/asm-mips/mach-generic/ide.h +5 -1
Index: linux.git/include/asm-mips/mach-generic/ide.h
===================================================================
@@ -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;
#1 lore raw
Quoted 1 line · Peter Horton

Fix long boot delay on Cobalt scanning non-existent IDE interfaces.

NAK again, please just fix this properly. If you just copy the logic from the x86 platform it will all work without #defines and other hacks on the already wrong core code.

Alan