qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-12-26 01:33:20 +02:00
Code

ssb: Workaround: Need subsys_initcall to be able to register a PCI bus.

Browse Source 
This needs a different fix, but use this workaround for now.



git-svn-id: svn://svn.openwrt.org/openwrt/trunk@10491 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
mb 2008-02-19 01:32:06 +00:00
parent e6b6adc799
commit e6a5f54f74
2 changed files with 32 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
target/linux/brcm47xx/patches-2.6.23/610-ssb-watchdog-fix.patch
View File

@ -1,7 +1,9 @@
--- a/drivers/ssb/driver_mipscore.c 2007-12-06 08:07:00.000000000 +0100 Index: linux-2.6.23.16/drivers/ssb/driver_mipscore.c
+++ b/drivers/ssb/driver_mipscore.c 2007-12-06 10:27:43.000000000 +0100 ===================================================================
@@ -31,6 +31,19 @@ --- linux-2.6.23.16.orig/drivers/ssb/driver_mipscore.c 2008-02-19 02:13:15.000000000 +0100
ssb_write32(extif->dev, offset, value); +++ linux-2.6.23.16/drivers/ssb/driver_mipscore.c 2008-02-19 02:13:17.000000000 +0100
@@ -31,6 +31,19 @@ static inline void mips_write32(struct s
ssb_write32(mcore->dev, offset, value);
} }
+/* Set chip watchdog reset timer to fire in 'ticks' backplane cycles */ +/* Set chip watchdog reset timer to fire in 'ticks' backplane cycles */
@ -20,9 +22,11 @@
static const u32 ipsflag_irq_mask[] = { static const u32 ipsflag_irq_mask[] = {
0, 0,
SSB_IPSFLAG_IRQ1, SSB_IPSFLAG_IRQ1,
--- a/include/linux/ssb/ssb_driver_mips.h 2007-12-06 08:07:00.000000000 +0100 Index: linux-2.6.23.16/include/linux/ssb/ssb_driver_mips.h
+++ b/include/linux/ssb/ssb_driver_mips.h 2007-12-06 10:32:36.000000000 +0100 ===================================================================
@@ -30,6 +30,8 @@ --- linux-2.6.23.16.orig/include/linux/ssb/ssb_driver_mips.h 2008-02-19 02:13:15.000000000 +0100
+++ linux-2.6.23.16/include/linux/ssb/ssb_driver_mips.h 2008-02-19 02:13:17.000000000 +0100
@@ -30,6 +30,8 @@ extern u32 ssb_cpu_clock(struct ssb_mips
extern unsigned int ssb_mips_irq(struct ssb_device *dev); extern unsigned int ssb_mips_irq(struct ssb_device *dev);
@ -31,9 +35,11 @@
#else /* CONFIG_SSB_DRIVER_MIPS */ #else /* CONFIG_SSB_DRIVER_MIPS */
--- a/arch/mips/bcm947xx/setup.c 2007-12-06 08:07:00.000000000 +0100 Index: linux-2.6.23.16/arch/mips/bcm947xx/setup.c
+++ b/arch/mips/bcm947xx/setup.c 2007-12-06 10:33:39.000000000 +0100 ===================================================================
@@ -55,7 +55,7 @@ --- linux-2.6.23.16.orig/arch/mips/bcm947xx/setup.c 2008-02-19 02:13:15.000000000 +0100
+++ linux-2.6.23.16/arch/mips/bcm947xx/setup.c 2008-02-19 02:13:17.000000000 +0100
@@ -55,7 +55,7 @@ static void bcm47xx_machine_restart(char
*/ */
/* Set the watchdog timer to reset immediately */ /* Set the watchdog timer to reset immediately */
@ -42,7 +48,7 @@
while (1) while (1)
cpu_relax(); cpu_relax();
} }
@@ -64,7 +64,7 @@ @@ -64,7 +64,7 @@ static void bcm47xx_machine_halt(void)
{ {
/* Disable interrupts and watchdog and spin forever */ /* Disable interrupts and watchdog and spin forever */
local_irq_disable(); local_irq_disable();

15
target/linux/brcm47xx/patches-2.6.23/620-ssb-modinit-fix.patch Normal file
View File

@ -0,0 +1,15 @@
Index: linux-2.6.23.16/drivers/ssb/main.c
===================================================================
--- linux-2.6.23.16.orig/drivers/ssb/main.c 2008-02-19 02:24:48.000000000 +0100
+++ linux-2.6.23.16/drivers/ssb/main.c 2008-02-19 02:27:59.000000000 +0100
@@ -1164,7 +1164,9 @@ static int __init ssb_modinit(void)
/* ssb must be initialized after PCI but before the ssb drivers.
* That means we must use some initcall between subsys_initcall
* and device_initcall. */
-fs_initcall(ssb_modinit);
+//FIXME on embedded we need to be early to make sure we can register
+// a new PCI bus, if needed.
+subsys_initcall(ssb_modinit);
static void __exit ssb_modexit(void)
{