diff options
Diffstat (limited to 'target/linux/brcm47xx/patches-2.6.23')
| -rw-r--r-- | target/linux/brcm47xx/patches-2.6.23/610-ssb-watchdog-fix.patch | 168 | ||||
| -rw-r--r-- | target/linux/brcm47xx/patches-2.6.23/620-ssb-modinit-fix.patch | 6 |
2 files changed, 124 insertions, 50 deletions
diff --git a/target/linux/brcm47xx/patches-2.6.23/610-ssb-watchdog-fix.patch b/target/linux/brcm47xx/patches-2.6.23/610-ssb-watchdog-fix.patch index ece1b17223..93cd6b0806 100644 --- a/target/linux/brcm47xx/patches-2.6.23/610-ssb-watchdog-fix.patch +++ b/target/linux/brcm47xx/patches-2.6.23/610-ssb-watchdog-fix.patch @@ -1,59 +1,133 @@ -Index: linux-2.6.23.16/drivers/ssb/driver_mipscore.c +Index: linux-2.6.23.16/drivers/ssb/Kconfig =================================================================== ---- linux-2.6.23.16.orig/drivers/ssb/driver_mipscore.c 2008-02-19 02:13:15.000000000 +0100 -+++ 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); +--- linux-2.6.23.16.orig/drivers/ssb/Kconfig 2008-02-19 12:38:31.000000000 +0100 ++++ linux-2.6.23.16/drivers/ssb/Kconfig 2008-02-19 12:43:58.000000000 +0100 +@@ -105,6 +105,12 @@ config SSB_DRIVER_MIPS + + If unsure, say N + ++# Assumption: We are on embedded, if we compile the MIPS core. ++config SSB_EMBEDDED ++ bool ++ depends on SSB_DRIVER_MIPS ++ default y ++ + config SSB_DRIVER_EXTIF + bool "SSB Broadcom EXTIF core driver (EXPERIMENTAL)" + depends on SSB_DRIVER_MIPS && EXPERIMENTAL +Index: linux-2.6.23.16/drivers/ssb/Makefile +=================================================================== +--- linux-2.6.23.16.orig/drivers/ssb/Makefile 2008-02-19 12:38:31.000000000 +0100 ++++ linux-2.6.23.16/drivers/ssb/Makefile 2008-02-19 12:43:58.000000000 +0100 +@@ -1,5 +1,6 @@ + # core + ssb-y += main.o scan.o ++ssb-$(CONFIG_SSB_EMBEDDED) += embedded.o + + # host support + ssb-$(CONFIG_SSB_PCIHOST) += pci.o pcihost_wrapper.o +Index: linux-2.6.23.16/drivers/ssb/driver_extif.c +=================================================================== +--- linux-2.6.23.16.orig/drivers/ssb/driver_extif.c 2008-02-19 12:38:34.000000000 +0100 ++++ linux-2.6.23.16/drivers/ssb/driver_extif.c 2008-02-19 12:45:13.000000000 +0100 +@@ -35,6 +35,12 @@ static inline void extif_write32_masked( + extif_write32(extif, offset, value); } -+/* Set chip watchdog reset timer to fire in 'ticks' backplane cycles */ -+int -+ssb_watchdog(struct ssb_bus *bus, uint ticks) ++void ssb_extif_watchdog_timer_set(struct ssb_extif *extif, ++ u32 ticks) +{ -+ /* instant NMI */ -+ if (bus->chipco.dev) -+ ssb_write32(bus->chipco.dev, SSB_CHIPCO_WATCHDOG, ticks); -+ else if (bus->extif.dev) -+ ssb_write32(bus->extif.dev, SSB_EXTIF_WATCHDOG, ticks); -+ return 0; ++ extif_write32(extif, SSB_EXTIF_WATCHDOG, ticks); +} -+EXPORT_SYMBOL(ssb_watchdog); + - static const u32 ipsflag_irq_mask[] = { - 0, - SSB_IPSFLAG_IRQ1, -Index: linux-2.6.23.16/include/linux/ssb/ssb_driver_mips.h + #ifdef CONFIG_SSB_SERIAL + static bool serial_exists(u8 *regs) + { +Index: linux-2.6.23.16/drivers/ssb/embedded.c =================================================================== ---- 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); - -+/* Set watchdog reset timer to fire in 'ticks' backplane cycles */ -+extern int ssb_watchdog(struct ssb_bus *bus, uint ticks); +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ linux-2.6.23.16/drivers/ssb/embedded.c 2008-02-19 12:43:58.000000000 +0100 +@@ -0,0 +1,26 @@ ++/* ++ * Sonics Silicon Backplane ++ * Embedded systems support code ++ * ++ * Copyright 2005-2008, Broadcom Corporation ++ * Copyright 2006-2008, Michael Buesch <mb@bu3sch.de> ++ * ++ * Licensed under the GNU/GPL. See COPYING for details. ++ */ ++ ++#include <linux/ssb/ssb.h> ++#include <linux/ssb/ssb_embedded.h> ++ ++ ++int ssb_watchdog_timer_set(struct ssb_bus *bus, u32 ticks) ++{ ++ if (ssb_chipco_available(&bus->chipco)) { ++ ssb_chipco_watchdog_timer_set(&bus->chipco, ticks); ++ return 0; ++ } ++ if (ssb_extif_available(&bus->extif)) { ++ ssb_extif_watchdog_timer_set(&bus->extif, ticks); ++ return 0; ++ } ++ return -ENODEV; ++} +Index: linux-2.6.23.16/include/linux/ssb/ssb_driver_chipcommon.h +=================================================================== +--- linux-2.6.23.16.orig/include/linux/ssb/ssb_driver_chipcommon.h 2008-02-19 12:38:34.000000000 +0100 ++++ linux-2.6.23.16/include/linux/ssb/ssb_driver_chipcommon.h 2008-02-19 12:43:58.000000000 +0100 +@@ -360,6 +360,11 @@ struct ssb_chipcommon { + u16 fast_pwrup_delay; + }; - #else /* CONFIG_SSB_DRIVER_MIPS */ ++static inline bool ssb_chipco_available(struct ssb_chipcommon *cc) ++{ ++ return (cc->dev != NULL); ++} ++ + extern void ssb_chipcommon_init(struct ssb_chipcommon *cc); -Index: linux-2.6.23.16/arch/mips/bcm947xx/setup.c + #include <linux/pm.h> +Index: linux-2.6.23.16/include/linux/ssb/ssb_driver_extif.h =================================================================== ---- 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 */ -- ssb_chipco_watchdog_timer_set(&ssb.chipco, 1); -+ ssb_watchdog(&ssb, 1); - while (1) - cpu_relax(); - } -@@ -64,7 +64,7 @@ static void bcm47xx_machine_halt(void) +--- linux-2.6.23.16.orig/include/linux/ssb/ssb_driver_extif.h 2008-02-19 12:38:34.000000000 +0100 ++++ linux-2.6.23.16/include/linux/ssb/ssb_driver_extif.h 2008-02-19 12:47:03.000000000 +0100 +@@ -170,6 +170,9 @@ extern void ssb_extif_get_clockcontrol(s + extern void ssb_extif_timing_init(struct ssb_extif *extif, + unsigned long ns); + ++extern void ssb_extif_watchdog_timer_set(struct ssb_extif *extif, ++ u32 ticks); ++ + #ifdef CONFIG_SSB_SERIAL + extern int ssb_extif_serial_init(struct ssb_extif *extif, + struct ssb_serial_port *ports); +@@ -224,5 +227,11 @@ void ssb_extif_get_clockcontrol(struct s { - /* Disable interrupts and watchdog and spin forever */ - local_irq_disable(); -- ssb_chipco_watchdog_timer_set(&ssb.chipco, 0); -+ ssb_watchdog(&ssb, 0); - while (1) - cpu_relax(); } + ++static inline ++void ssb_extif_watchdog_timer_set(struct ssb_extif *extif, ++ u32 ticks) ++{ ++} ++ + #endif /* CONFIG_SSB_DRIVER_EXTIF */ + #endif /* LINUX_SSB_EXTIFCORE_H_ */ +Index: linux-2.6.23.16/include/linux/ssb/ssb_embedded.h +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ linux-2.6.23.16/include/linux/ssb/ssb_embedded.h 2008-02-19 12:43:58.000000000 +0100 +@@ -0,0 +1,10 @@ ++#ifndef LINUX_SSB_EMBEDDED_H_ ++#define LINUX_SSB_EMBEDDED_H_ ++ ++#include <linux/types.h> ++#include <linux/ssb/ssb.h> ++ ++ ++extern int ssb_watchdog_timer_set(struct ssb_bus *bus, u32 ticks); ++ ++#endif /* LINUX_SSB_EMBEDDED_H_ */ diff --git a/target/linux/brcm47xx/patches-2.6.23/620-ssb-modinit-fix.patch b/target/linux/brcm47xx/patches-2.6.23/620-ssb-modinit-fix.patch index 0fb00f1036..a36c046018 100644 --- a/target/linux/brcm47xx/patches-2.6.23/620-ssb-modinit-fix.patch +++ b/target/linux/brcm47xx/patches-2.6.23/620-ssb-modinit-fix.patch @@ -1,8 +1,8 @@ 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) +--- linux-2.6.23.16.orig/drivers/ssb/main.c 2008-02-19 12:38:34.000000000 +0100 ++++ linux-2.6.23.16/drivers/ssb/main.c 2008-02-19 12:48:25.000000000 +0100 +@@ -1163,7 +1163,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. */ |