Skip to contentSkip to conversation

ppc32: Fix via IDE driver for pegasos

PATCH New Benjamin Herrenschmidt 1 participant 1 message Jan 27, 2005 libata

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ppc32: Fix via IDE driver for pegasos

Hi Andrew !

The Pegasos machines have the VIA IDE controller configured in a strange way by the firmware. It claims to be fully native, but is actually routed to legacy irqs 14 and 15.

This patch works around that in the driver. In the future, I'll try to do an ifdef-less patch by detecting that setup from the chip, and using the new pci_get_legacy_ide_irq() in that case, but I don't have proper HW infos. This patch is good enough in the meantime, I'll come up with a better one later eventually.

drivers/ide/pci/via82cxxx.c renamed from drivers/ide/pci/via82cxxx.c.orig +11 -0
@@ -36,6 +36,10 @@
 #include <linux/ide.h>
 #include <asm/io.h>
 
+#ifdef CONFIG_PPC_MULTIPLATFORM
+#include <asm/processor.h>
+#endif
+
 #include "ide-timing.h"
 
 #define DISPLAY_VIA_TIMINGS
@@ -584,6 +588,13 @@
 	hwif->tuneproc = &via82cxxx_tune_drive;
 	hwif->speedproc = &via_set_drive;
 
+
+#ifdef CONFIG_PPC_MULTIPLATFORM
+	if(_machine == _MACH_chrp && _chrp_type == _CHRP_Pegasos) {
+		hwif->irq = hwif->channel ? 15 : 14;
+	}
+#endif
+
 	for (i = 0; i < 2; i++) {
 		hwif->drives[i].io_32bit = 1;
 		hwif->drives[i].unmask = (via_config->flags & VIA_NO_UNMASK) ? 0 : 1;