domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

upgrade to 2.6.25.7, and refresh patches

Browse Source 
SVN-Revision: 11523
This commit is contained in:
Gabor Juhos
2008-06-17 12:57:04 +00:00
parent 3415b8c044
commit 4af6ac74fb
61 changed files with 435 additions and 683 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
target/linux/brcm47xx/Makefile
View File

@@ -11,7 +11,7 @@ BOARD:=brcm47xx
BOARDNAME:=Broadcom BCM947xx/953xx
FEATURES:=squashfs usb
LINUX_VERSION:=2.6.25.6
LINUX_VERSION:=2.6.25.7
include $(INCLUDE_DIR)/target.mk
DEFAULT_PACKAGES += kmod-switch kmod-diag

24
target/linux/brcm47xx/patches-2.6.25/100-board_support.patch
View File

@@ -1,8 +1,6 @@
Index: linux-2.6.25.4/arch/mips/Kconfig
===================================================================
--- linux-2.6.25.4.orig/arch/mips/Kconfig
+++ linux-2.6.25.4/arch/mips/Kconfig
@@ -50,8 +50,10 @@ config BCM47XX
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -50,8 +50,10 @@
select SYS_SUPPORTS_32BIT_KERNEL
select SYS_SUPPORTS_LITTLE_ENDIAN
select SSB
@@ -13,7 +11,7 @@ Index: linux-2.6.25.4/arch/mips/Kconfig
select SSB_PCICORE_HOSTMODE if PCI
select GENERIC_GPIO
select SYS_HAS_EARLY_PRINTK
@@ -790,6 +792,7 @@ config CSRC_SB1250
@@ -790,6 +792,7 @@
config CFE
bool
@@ -21,10 +19,8 @@ Index: linux-2.6.25.4/arch/mips/Kconfig
config DMA_COHERENT
bool
Index: linux-2.6.25.4/include/asm-mips/bootinfo.h
===================================================================
--- linux-2.6.25.4.orig/include/asm-mips/bootinfo.h
+++ linux-2.6.25.4/include/asm-mips/bootinfo.h
--- a/include/asm-mips/bootinfo.h
+++ b/include/asm-mips/bootinfo.h
@@ -94,6 +94,12 @@
#define MACH_MSP7120_FPGA 5 /* PMC-Sierra MSP7120 Emulation */
#define MACH_MSP_OTHER 255 /* PMC-Sierra unknown board type */
@@ -38,11 +34,9 @@ Index: linux-2.6.25.4/include/asm-mips/bootinfo.h
#define CL_SIZE COMMAND_LINE_SIZE
extern char *system_type;
Index: linux-2.6.25.4/include/linux/pci_ids.h
===================================================================
--- linux-2.6.25.4.orig/include/linux/pci_ids.h
+++ linux-2.6.25.4/include/linux/pci_ids.h
@@ -2000,6 +2000,7 @@
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -2001,6 +2001,7 @@
#define PCI_DEVICE_ID_TIGON3_5906M 0x1713
#define PCI_DEVICE_ID_BCM4401 0x4401
#define PCI_DEVICE_ID_BCM4401B0 0x4402

16
target/linux/brcm47xx/patches-2.6.25/110-flash_map.patch
View File

@@ -1,8 +1,6 @@
Index: linux-2.6.25.4/drivers/mtd/maps/Kconfig
===================================================================
--- linux-2.6.25.4.orig/drivers/mtd/maps/Kconfig
+++ linux-2.6.25.4/drivers/mtd/maps/Kconfig
@@ -337,6 +337,12 @@ config MTD_CFI_FLAGADM
--- a/drivers/mtd/maps/Kconfig
+++ b/drivers/mtd/maps/Kconfig
@@ -337,6 +337,12 @@
Mapping for the Flaga digital module. If you don't have one, ignore
this setting.
@@ -15,11 +13,9 @@ Index: linux-2.6.25.4/drivers/mtd/maps/Kconfig
config MTD_WALNUT
tristate "Flash device mapped on IBM 405GP Walnut"
depends on MTD_JEDECPROBE && WALNUT && !PPC_MERGE
Index: linux-2.6.25.4/drivers/mtd/maps/Makefile
===================================================================
--- linux-2.6.25.4.orig/drivers/mtd/maps/Makefile
+++ linux-2.6.25.4/drivers/mtd/maps/Makefile
@@ -31,6 +31,7 @@ obj-$(CONFIG_MTD_PMC_MSP_RAMROOT)+= pmcm
--- a/drivers/mtd/maps/Makefile
+++ b/drivers/mtd/maps/Makefile
@@ -31,6 +31,7 @@
obj-$(CONFIG_MTD_PCMCIA) += pcmciamtd.o
obj-$(CONFIG_MTD_RPXLITE) += rpxlite.o
obj-$(CONFIG_MTD_TQM8XXL) += tqm8xxl.o

36
target/linux/brcm47xx/patches-2.6.25/130-remove_scache.patch
View File

@@ -1,8 +1,6 @@
Index: linux-2.6.25.4/arch/mips/Kconfig
===================================================================
--- linux-2.6.25.4.orig/arch/mips/Kconfig
+++ linux-2.6.25.4/arch/mips/Kconfig
@@ -228,7 +228,6 @@ config MIPS_MALTA
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -228,7 +228,6 @@
select I8259
select MIPS_BOARDS_GEN
select MIPS_BONITO64
@@ -10,7 +8,7 @@ Index: linux-2.6.25.4/arch/mips/Kconfig
select PCI_GT64XXX_PCI0
select MIPS_MSC
select SWAP_IO_SPACE
@@ -1421,13 +1420,6 @@ config IP22_CPU_SCACHE
@@ -1421,13 +1420,6 @@
bool
select BOARD_SCACHE
@@ -24,11 +22,9 @@ Index: linux-2.6.25.4/arch/mips/Kconfig
config R5000_CPU_SCACHE
bool
select BOARD_SCACHE
Index: linux-2.6.25.4/arch/mips/kernel/cpu-probe.c
===================================================================
--- linux-2.6.25.4.orig/arch/mips/kernel/cpu-probe.c
+++ linux-2.6.25.4/arch/mips/kernel/cpu-probe.c
@@ -704,6 +704,8 @@ static inline void cpu_probe_mips(struct
--- a/arch/mips/kernel/cpu-probe.c
+++ b/arch/mips/kernel/cpu-probe.c
@@ -704,6 +704,8 @@
break;
case PRID_IMP_25KF:
c->cputype = CPU_25KF;
@@ -37,11 +33,9 @@ Index: linux-2.6.25.4/arch/mips/kernel/cpu-probe.c
break;
case PRID_IMP_34K:
c->cputype = CPU_34K;
Index: linux-2.6.25.4/arch/mips/mm/c-r4k.c
===================================================================
--- linux-2.6.25.4.orig/arch/mips/mm/c-r4k.c
+++ linux-2.6.25.4/arch/mips/mm/c-r4k.c
@@ -1103,7 +1103,6 @@ static void __init loongson2_sc_init(voi
--- a/arch/mips/mm/c-r4k.c
+++ b/arch/mips/mm/c-r4k.c
@@ -1103,7 +1103,6 @@
extern int r5k_sc_init(void);
extern int rm7k_sc_init(void);
@@ -49,7 +43,7 @@ Index: linux-2.6.25.4/arch/mips/mm/c-r4k.c
static void __cpuinit setup_scache(void)
{
@@ -1157,29 +1156,17 @@ static void __cpuinit setup_scache(void)
@@ -1157,29 +1156,17 @@
#endif
default:
@@ -84,11 +78,9 @@ Index: linux-2.6.25.4/arch/mips/mm/c-r4k.c
/* compute a couple of other cache variables */
c->scache.waysize = scache_size / c->scache.ways;
Index: linux-2.6.25.4/arch/mips/mm/Makefile
===================================================================
--- linux-2.6.25.4.orig/arch/mips/mm/Makefile
+++ linux-2.6.25.4/arch/mips/mm/Makefile
@@ -32,6 +32,5 @@ obj-$(CONFIG_CPU_VR41XX) += c-r4k.o cex-
--- a/arch/mips/mm/Makefile
+++ b/arch/mips/mm/Makefile
@@ -32,6 +32,5 @@
obj-$(CONFIG_IP22_CPU_SCACHE) += sc-ip22.o
obj-$(CONFIG_R5000_CPU_SCACHE) += sc-r5k.o
obj-$(CONFIG_RM7000_CPU_SCACHE) += sc-rm7k.o

72
target/linux/brcm47xx/patches-2.6.25/150-cpu_fixes.patch
View File

@@ -1,8 +1,6 @@
Index: linux-2.6.25.4/arch/mips/kernel/genex.S
===================================================================
--- linux-2.6.25.4.orig/arch/mips/kernel/genex.S
+++ linux-2.6.25.4/arch/mips/kernel/genex.S
@@ -51,6 +51,10 @@ NESTED(except_vec1_generic, 0, sp)
--- a/arch/mips/kernel/genex.S
+++ b/arch/mips/kernel/genex.S
@@ -51,6 +51,10 @@
NESTED(except_vec3_generic, 0, sp)
.set push
.set noat
@@ -13,10 +11,8 @@ Index: linux-2.6.25.4/arch/mips/kernel/genex.S
#if R5432_CP0_INTERRUPT_WAR
mfc0 k0, CP0_INDEX
#endif
Index: linux-2.6.25.4/arch/mips/mm/c-r4k.c
===================================================================
--- linux-2.6.25.4.orig/arch/mips/mm/c-r4k.c
+++ linux-2.6.25.4/arch/mips/mm/c-r4k.c
--- a/arch/mips/mm/c-r4k.c
+++ b/arch/mips/mm/c-r4k.c
@@ -33,6 +33,9 @@
#include <asm/cacheflush.h> /* for run_uncached() */
@@ -27,7 +23,7 @@ Index: linux-2.6.25.4/arch/mips/mm/c-r4k.c
/*
* Special Variant of smp_call_function for use by cache functions:
*
@@ -97,6 +100,9 @@ static void __cpuinit r4k_blast_dcache_p
@@ -97,6 +100,9 @@
{
unsigned long dc_lsize = cpu_dcache_line_size();
@@ -37,7 +33,7 @@ Index: linux-2.6.25.4/arch/mips/mm/c-r4k.c
if (dc_lsize == 0)
r4k_blast_dcache_page = (void *)cache_noop;
else if (dc_lsize == 16)
@@ -111,6 +117,9 @@ static void __cpuinit r4k_blast_dcache_p
@@ -111,6 +117,9 @@
{
unsigned long dc_lsize = cpu_dcache_line_size();
@@ -47,7 +43,7 @@ Index: linux-2.6.25.4/arch/mips/mm/c-r4k.c
if (dc_lsize == 0)
r4k_blast_dcache_page_indexed = (void *)cache_noop;
else if (dc_lsize == 16)
@@ -125,6 +134,9 @@ static void __cpuinit r4k_blast_dcache_s
@@ -125,6 +134,9 @@
{
unsigned long dc_lsize = cpu_dcache_line_size();
@@ -57,7 +53,7 @@ Index: linux-2.6.25.4/arch/mips/mm/c-r4k.c
if (dc_lsize == 0)
r4k_blast_dcache = (void *)cache_noop;
else if (dc_lsize == 16)
@@ -630,6 +642,8 @@ static void local_r4k_flush_cache_sigtra
@@ -630,6 +642,8 @@
unsigned long addr = (unsigned long) arg;
R4600_HIT_CACHEOP_WAR_IMPL;
@@ -66,7 +62,7 @@ Index: linux-2.6.25.4/arch/mips/mm/c-r4k.c
if (dc_lsize)
protected_writeback_dcache_line(addr & ~(dc_lsize - 1));
if (!cpu_icache_snoops_remote_store && scache_size)
@@ -1215,6 +1229,17 @@ static void __cpuinit coherency_setup(vo
@@ -1215,6 +1229,17 @@
* silly idea of putting something else there ...
*/
switch (current_cpu_type()) {
@@ -84,7 +80,7 @@ Index: linux-2.6.25.4/arch/mips/mm/c-r4k.c
case CPU_R4000PC:
case CPU_R4000SC:
case CPU_R4000MC:
@@ -1254,6 +1279,15 @@ void __cpuinit r4k_cache_init(void)
@@ -1254,6 +1279,15 @@
break;
}
@@ -100,7 +96,7 @@ Index: linux-2.6.25.4/arch/mips/mm/c-r4k.c
probe_pcache();
setup_scache();
@@ -1303,5 +1337,13 @@ void __cpuinit r4k_cache_init(void)
@@ -1303,5 +1337,13 @@
build_clear_page();
build_copy_page();
local_r4k___flush_cache_all(NULL);
@@ -114,11 +110,9 @@ Index: linux-2.6.25.4/arch/mips/mm/c-r4k.c
coherency_setup();
+#endif
}
Index: linux-2.6.25.4/arch/mips/mm/tlbex.c
===================================================================
--- linux-2.6.25.4.orig/arch/mips/mm/tlbex.c
+++ linux-2.6.25.4/arch/mips/mm/tlbex.c
@@ -677,6 +677,9 @@ static void __cpuinit build_r4000_tlb_re
--- a/arch/mips/mm/tlbex.c
+++ b/arch/mips/mm/tlbex.c
@@ -677,6 +677,9 @@
/* No need for uasm_i_nop */
}
@@ -128,7 +122,7 @@ Index: linux-2.6.25.4/arch/mips/mm/tlbex.c
#ifdef CONFIG_64BIT
build_get_pmde64(&p, &l, &r, K0, K1); /* get pmd in K1 */
#else
@@ -1084,6 +1087,9 @@ build_r4000_tlbchange_handler_head(u32 *
@@ -1084,6 +1087,9 @@
struct uasm_reloc **r, unsigned int pte,
unsigned int ptr)
{
@@ -138,10 +132,8 @@ Index: linux-2.6.25.4/arch/mips/mm/tlbex.c
#ifdef CONFIG_64BIT
build_get_pmde64(p, l, r, pte, ptr); /* get pmd in ptr */
#else
Index: linux-2.6.25.4/include/asm-mips/r4kcache.h
===================================================================
--- linux-2.6.25.4.orig/include/asm-mips/r4kcache.h
+++ linux-2.6.25.4/include/asm-mips/r4kcache.h
--- a/include/asm-mips/r4kcache.h
+++ b/include/asm-mips/r4kcache.h
@@ -17,6 +17,20 @@
#include <asm/cpu-features.h>
#include <asm/mipsmtregs.h>
@@ -163,7 +155,7 @@ Index: linux-2.6.25.4/include/asm-mips/r4kcache.h
/*
* This macro return a properly sign-extended address suitable as base address
* for indexed cache operations. Two issues here:
@@ -150,6 +164,7 @@ static inline void flush_icache_line_ind
@@ -150,6 +164,7 @@
static inline void flush_dcache_line_indexed(unsigned long addr)
{
__dflush_prologue
@@ -171,7 +163,7 @@ Index: linux-2.6.25.4/include/asm-mips/r4kcache.h
cache_op(Index_Writeback_Inv_D, addr);
__dflush_epilogue
}
@@ -169,6 +184,7 @@ static inline void flush_icache_line(uns
@@ -169,6 +184,7 @@
static inline void flush_dcache_line(unsigned long addr)
{
__dflush_prologue
@@ -179,7 +171,7 @@ Index: linux-2.6.25.4/include/asm-mips/r4kcache.h
cache_op(Hit_Writeback_Inv_D, addr);
__dflush_epilogue
}
@@ -176,6 +192,7 @@ static inline void flush_dcache_line(uns
@@ -176,6 +192,7 @@
static inline void invalidate_dcache_line(unsigned long addr)
{
__dflush_prologue
@@ -187,7 +179,7 @@ Index: linux-2.6.25.4/include/asm-mips/r4kcache.h
cache_op(Hit_Invalidate_D, addr);
__dflush_epilogue
}
@@ -208,6 +225,7 @@ static inline void flush_scache_line(uns
@@ -208,6 +225,7 @@
*/
static inline void protected_flush_icache_line(unsigned long addr)
{
@@ -195,7 +187,7 @@ Index: linux-2.6.25.4/include/asm-mips/r4kcache.h
protected_cache_op(Hit_Invalidate_I, addr);
}
@@ -219,6 +237,7 @@ static inline void protected_flush_icach
@@ -219,6 +237,7 @@
*/
static inline void protected_writeback_dcache_line(unsigned long addr)
{
@@ -203,7 +195,7 @@ Index: linux-2.6.25.4/include/asm-mips/r4kcache.h
protected_cache_op(Hit_Writeback_Inv_D, addr);
}
@@ -339,8 +358,52 @@ static inline void invalidate_tcache_pag
@@ -339,8 +358,52 @@
: "r" (base), \
"i" (op));
@@ -257,7 +249,7 @@ Index: linux-2.6.25.4/include/asm-mips/r4kcache.h
static inline void blast_##pfx##cache##lsize(void) \
{ \
unsigned long start = INDEX_BASE; \
@@ -352,6 +415,7 @@ static inline void blast_##pfx##cache##l
@@ -352,6 +415,7 @@
\
__##pfx##flush_prologue \
\
@@ -265,7 +257,7 @@ Index: linux-2.6.25.4/include/asm-mips/r4kcache.h
for (ws = 0; ws < ws_end; ws += ws_inc) \
for (addr = start; addr < end; addr += lsize * 32) \
cache##lsize##_unroll32(addr|ws, indexop); \
@@ -366,6 +430,7 @@ static inline void blast_##pfx##cache##l
@@ -366,6 +430,7 @@
\
__##pfx##flush_prologue \
\
@@ -273,7 +265,7 @@ Index: linux-2.6.25.4/include/asm-mips/r4kcache.h
do { \
cache##lsize##_unroll32(start, hitop); \
start += lsize * 32; \
@@ -384,6 +449,8 @@ static inline void blast_##pfx##cache##l
@@ -384,6 +449,8 @@
current_cpu_data.desc.waybit; \
unsigned long ws, addr; \
\
@@ -282,7 +274,7 @@ Index: linux-2.6.25.4/include/asm-mips/r4kcache.h
__##pfx##flush_prologue \
\
for (ws = 0; ws < ws_end; ws += ws_inc) \
@@ -393,35 +460,37 @@ static inline void blast_##pfx##cache##l
@@ -393,35 +460,37 @@
__##pfx##flush_epilogue \
}
@@ -337,7 +329,7 @@ Index: linux-2.6.25.4/include/asm-mips/r4kcache.h
prot##cache_op(hitop, addr); \
if (addr == aend) \
break; \
@@ -431,13 +500,13 @@ static inline void prot##blast_##pfx##ca
@@ -431,13 +500,13 @@
__##pfx##flush_epilogue \
}
@@ -358,10 +350,8 @@ Index: linux-2.6.25.4/include/asm-mips/r4kcache.h
+__BUILD_BLAST_CACHE_RANGE(inv_s, scache, Hit_Invalidate_SD,,, )
#endif /* _ASM_R4KCACHE_H */
Index: linux-2.6.25.4/include/asm-mips/stackframe.h
===================================================================
--- linux-2.6.25.4.orig/include/asm-mips/stackframe.h
+++ linux-2.6.25.4/include/asm-mips/stackframe.h
--- a/include/asm-mips/stackframe.h
+++ b/include/asm-mips/stackframe.h
@@ -359,6 +359,10 @@
.macro RESTORE_SP_AND_RET
LONG_L sp, PT_R29(sp)

32
target/linux/brcm47xx/patches-2.6.25/160-kmap_coherent.patch
View File

@@ -1,8 +1,6 @@
Index: linux-2.6.25.4/arch/mips/mm/init.c
===================================================================
--- linux-2.6.25.4.orig/arch/mips/mm/init.c
+++ linux-2.6.25.4/arch/mips/mm/init.c
@@ -211,7 +211,7 @@ void copy_user_highpage(struct page *to,
--- a/arch/mips/mm/init.c
+++ b/arch/mips/mm/init.c
@@ -211,7 +211,7 @@
void *vfrom, *vto;
vto = kmap_atomic(to, KM_USER1);
@@ -11,7 +9,7 @@ Index: linux-2.6.25.4/arch/mips/mm/init.c
page_mapped(from) && !Page_dcache_dirty(from)) {
vfrom = kmap_coherent(from, vaddr);
copy_page(vto, vfrom);
@@ -235,7 +235,7 @@ void copy_to_user_page(struct vm_area_st
@@ -235,7 +235,7 @@
struct page *page, unsigned long vaddr, void *dst, const void *src,
unsigned long len)
{
@@ -20,7 +18,7 @@ Index: linux-2.6.25.4/arch/mips/mm/init.c
page_mapped(page) && !Page_dcache_dirty(page)) {
void *vto = kmap_coherent(page, vaddr) + (vaddr & ~PAGE_MASK);
memcpy(vto, src, len);
@@ -255,7 +255,7 @@ void copy_from_user_page(struct vm_area_
@@ -255,7 +255,7 @@
struct page *page, unsigned long vaddr, void *dst, const void *src,
unsigned long len)
{
@@ -29,10 +27,8 @@ Index: linux-2.6.25.4/arch/mips/mm/init.c
page_mapped(page) && !Page_dcache_dirty(page)) {
void *vfrom = kmap_coherent(page, vaddr) + (vaddr & ~PAGE_MASK);
memcpy(dst, vfrom, len);
Index: linux-2.6.25.4/include/asm-mips/mach-bcm47xx/cpu-feature-overrides.h
===================================================================
--- /dev/null
+++ linux-2.6.25.4/include/asm-mips/mach-bcm47xx/cpu-feature-overrides.h
+++ b/include/asm-mips/mach-bcm47xx/cpu-feature-overrides.h
@@ -0,0 +1,13 @@
+/*
+ * This file is subject to the terms and conditions of the GNU General Public
@@ -47,10 +43,8 @@ Index: linux-2.6.25.4/include/asm-mips/mach-bcm47xx/cpu-feature-overrides.h
+#define cpu_use_kmap_coherent 0
+
+#endif /* __ASM_MACH_BCM47XX_CPU_FEATURE_OVERRIDES_H */
Index: linux-2.6.25.4/include/asm-mips/cpu-features.h
===================================================================
--- linux-2.6.25.4.orig/include/asm-mips/cpu-features.h
+++ linux-2.6.25.4/include/asm-mips/cpu-features.h
--- a/include/asm-mips/cpu-features.h
+++ b/include/asm-mips/cpu-features.h
@@ -101,6 +101,9 @@
#ifndef cpu_has_pindexed_dcache
#define cpu_has_pindexed_dcache (cpu_data[0].dcache.flags & MIPS_CACHE_PINDEX)
@@ -61,11 +55,9 @@ Index: linux-2.6.25.4/include/asm-mips/cpu-features.h
/*
* I-Cache snoops remote store. This only matters on SMP. Some multiprocessors
Index: linux-2.6.25.4/arch/mips/mm/c-r4k.c
===================================================================
--- linux-2.6.25.4.orig/arch/mips/mm/c-r4k.c
+++ linux-2.6.25.4/arch/mips/mm/c-r4k.c
@@ -484,7 +484,7 @@ static inline void local_r4k_flush_cache
--- a/arch/mips/mm/c-r4k.c
+++ b/arch/mips/mm/c-r4k.c
@@ -484,7 +484,7 @@
* Use kmap_coherent or kmap_atomic to do flushes for
* another ASID than the current one.
*/
@@ -74,7 +66,7 @@ Index: linux-2.6.25.4/arch/mips/mm/c-r4k.c
vaddr = kmap_coherent(page, addr);
else
vaddr = kmap_atomic(page, KM_USER0);
@@ -505,7 +505,7 @@ static inline void local_r4k_flush_cache
@@ -505,7 +505,7 @@
}
if (vaddr) {

26
target/linux/brcm47xx/patches-2.6.25/220-bcm5354.patch
View File

@@ -1,8 +1,6 @@
Index: linux-2.6.25.4/drivers/ssb/driver_chipcommon.c
===================================================================
--- linux-2.6.25.4.orig/drivers/ssb/driver_chipcommon.c
+++ linux-2.6.25.4/drivers/ssb/driver_chipcommon.c
@@ -270,6 +270,8 @@ void ssb_chipco_resume(struct ssb_chipco
--- a/drivers/ssb/driver_chipcommon.c
+++ b/drivers/ssb/driver_chipcommon.c
@@ -270,6 +270,8 @@
void ssb_chipco_get_clockcpu(struct ssb_chipcommon *cc,
u32 *plltype, u32 *n, u32 *m)
{
@@ -11,7 +9,7 @@ Index: linux-2.6.25.4/drivers/ssb/driver_chipcommon.c
*n = chipco_read32(cc, SSB_CHIPCO_CLOCK_N);
*plltype = (cc->capabilities & SSB_CHIPCO_CAP_PLLT);
switch (*plltype) {
@@ -293,6 +295,8 @@ void ssb_chipco_get_clockcpu(struct ssb_
@@ -293,6 +295,8 @@
void ssb_chipco_get_clockcontrol(struct ssb_chipcommon *cc,
u32 *plltype, u32 *n, u32 *m)
{
@@ -20,11 +18,9 @@ Index: linux-2.6.25.4/drivers/ssb/driver_chipcommon.c
*n = chipco_read32(cc, SSB_CHIPCO_CLOCK_N);
*plltype = (cc->capabilities & SSB_CHIPCO_CAP_PLLT);
switch (*plltype) {
Index: linux-2.6.25.4/drivers/ssb/driver_mipscore.c
===================================================================
--- linux-2.6.25.4.orig/drivers/ssb/driver_mipscore.c
+++ linux-2.6.25.4/drivers/ssb/driver_mipscore.c
@@ -161,6 +161,8 @@ u32 ssb_cpu_clock(struct ssb_mipscore *m
--- a/drivers/ssb/driver_mipscore.c
+++ b/drivers/ssb/driver_mipscore.c
@@ -161,6 +161,8 @@
if ((pll_type == SSB_PLLTYPE_5) || (bus->chip_id == 0x5365)) {
rate = 200000000;
@@ -33,11 +29,9 @@ Index: linux-2.6.25.4/drivers/ssb/driver_mipscore.c
} else {
rate = ssb_calc_clock_rate(pll_type, n, m);
}
Index: linux-2.6.25.4/drivers/ssb/main.c
===================================================================
--- linux-2.6.25.4.orig/drivers/ssb/main.c
+++ linux-2.6.25.4/drivers/ssb/main.c
@@ -867,6 +867,8 @@ u32 ssb_clockspeed(struct ssb_bus *bus)
--- a/drivers/ssb/main.c
+++ b/drivers/ssb/main.c
@@ -867,6 +867,8 @@
if (bus->chip_id == 0x5365) {
rate = 100000000;

10
target/linux/brcm47xx/patches-2.6.25/250-ohci-ssb-usb2.patch
View File

@@ -1,8 +1,6 @@
Index: linux-2.6.25.4/drivers/usb/host/ohci-ssb.c
===================================================================
--- linux-2.6.25.4.orig/drivers/usb/host/ohci-ssb.c
+++ linux-2.6.25.4/drivers/usb/host/ohci-ssb.c
@@ -142,10 +142,59 @@ static int ssb_ohci_attach(struct ssb_de
--- a/drivers/usb/host/ohci-ssb.c
+++ b/drivers/usb/host/ohci-ssb.c
@@ -142,10 +142,59 @@
int err = -ENOMEM;
u32 tmp, flags = 0;
@@ -64,7 +62,7 @@ Index: linux-2.6.25.4/drivers/usb/host/ohci-ssb.c
hcd = usb_create_hcd(&ssb_ohci_hc_driver, dev->dev,
dev->dev->bus_id);
@@ -236,6 +285,7 @@ static int ssb_ohci_resume(struct ssb_de
@@ -236,6 +285,7 @@
static const struct ssb_device_id ssb_ohci_table[] = {
SSB_DEVICE(SSB_VENDOR_BROADCOM, SSB_DEV_USB11_HOSTDEV, SSB_ANY_REV),
SSB_DEVICE(SSB_VENDOR_BROADCOM, SSB_DEV_USB11_HOST, SSB_ANY_REV),

8
target/linux/brcm47xx/patches-2.6.25/260-ohci-set-dma-mask.patch
View File

@@ -1,8 +1,6 @@
Index: linux-2.6.25.4/drivers/usb/host/ohci-ssb.c
===================================================================
--- linux-2.6.25.4.orig/drivers/usb/host/ohci-ssb.c
+++ linux-2.6.25.4/drivers/usb/host/ohci-ssb.c
@@ -195,6 +195,11 @@ static int ssb_ohci_attach(struct ssb_de
--- a/drivers/usb/host/ohci-ssb.c
+++ b/drivers/usb/host/ohci-ssb.c
@@ -195,6 +195,11 @@
else
ssb_device_enable(dev, 0);

6
target/linux/brcm47xx/patches-2.6.25/300-fork_cacheflush.patch
View File

@@ -1,7 +1,5 @@
Index: linux-2.6.25.4/include/asm-mips/cacheflush.h
===================================================================
--- linux-2.6.25.4.orig/include/asm-mips/cacheflush.h
+++ linux-2.6.25.4/include/asm-mips/cacheflush.h
--- a/include/asm-mips/cacheflush.h
+++ b/include/asm-mips/cacheflush.h
@@ -32,7 +32,7 @@
extern void (*flush_cache_all)(void);
extern void (*__flush_cache_all)(void);

16
target/linux/brcm47xx/patches-2.6.25/310-no_highpage.patch
View File

@@ -1,8 +1,6 @@
Index: linux-2.6.25.4/arch/mips/mm/init.c
===================================================================
--- linux-2.6.25.4.orig/arch/mips/mm/init.c
+++ linux-2.6.25.4/arch/mips/mm/init.c
@@ -205,32 +205,6 @@ void kunmap_coherent(void)
--- a/arch/mips/mm/init.c
+++ b/arch/mips/mm/init.c
@@ -205,32 +205,6 @@
preempt_check_resched();
}
@@ -35,10 +33,8 @@ Index: linux-2.6.25.4/arch/mips/mm/init.c
void copy_to_user_page(struct vm_area_struct *vma,
struct page *page, unsigned long vaddr, void *dst, const void *src,
unsigned long len)
Index: linux-2.6.25.4/include/asm-mips/page.h
===================================================================
--- linux-2.6.25.4.orig/include/asm-mips/page.h
+++ linux-2.6.25.4/include/asm-mips/page.h
--- a/include/asm-mips/page.h
+++ b/include/asm-mips/page.h
@@ -32,6 +32,7 @@
#ifndef __ASSEMBLY__
@@ -47,7 +43,7 @@ Index: linux-2.6.25.4/include/asm-mips/page.h
#include <asm/io.h>
/*
@@ -64,13 +65,16 @@ static inline void clear_user_page(void
@@ -64,13 +65,16 @@
flush_data_cache_page((unsigned long)addr);
}

46
target/linux/brcm47xx/patches-2.6.25/400-arch-bcm47xx.patch
View File

@@ -1,7 +1,5 @@
Index: linux-2.6.25.4/arch/mips/bcm47xx/irq.c
===================================================================
--- linux-2.6.25.4.orig/arch/mips/bcm47xx/irq.c
+++ linux-2.6.25.4/arch/mips/bcm47xx/irq.c
--- a/arch/mips/bcm47xx/irq.c
+++ b/arch/mips/bcm47xx/irq.c
@@ -1,5 +1,6 @@
/*
* Copyright (C) 2004 Florian Schirmer <jolt@tuxbox.org>
@@ -29,7 +27,7 @@ Index: linux-2.6.25.4/arch/mips/bcm47xx/irq.c
void plat_irq_dispatch(void)
{
u32 cause;
@@ -53,3 +63,19 @@ void __init arch_init_irq(void)
@@ -53,3 +63,19 @@
{
mips_cpu_irq_init();
}
@@ -49,10 +47,8 @@ Index: linux-2.6.25.4/arch/mips/bcm47xx/irq.c
+
+ return res;
+}
Index: linux-2.6.25.4/arch/mips/bcm47xx/setup.c
===================================================================
--- linux-2.6.25.4.orig/arch/mips/bcm47xx/setup.c
+++ linux-2.6.25.4/arch/mips/bcm47xx/setup.c
--- a/arch/mips/bcm47xx/setup.c
+++ b/arch/mips/bcm47xx/setup.c
@@ -2,7 +2,7 @@
* Copyright (C) 2004 Florian Schirmer <jolt@tuxbox.org>
* Copyright (C) 2005 Waldemar Brodkorb <wbx@openwrt.org>
@@ -119,7 +115,7 @@ Index: linux-2.6.25.4/arch/mips/bcm47xx/setup.c
while (1)
cpu_relax();
}
@@ -50,12 +79,13 @@ static void bcm47xx_machine_halt(void)
@@ -50,12 +79,13 @@
{
/* Disable interrupts and watchdog and spin forever */
local_irq_disable();
@@ -135,7 +131,7 @@ Index: linux-2.6.25.4/arch/mips/bcm47xx/setup.c
{
int i = 0;
@@ -72,52 +102,141 @@ static void str2eaddr(char *str, char *d
@@ -72,52 +102,141 @@
}
}
@@ -310,10 +306,8 @@ Index: linux-2.6.25.4/arch/mips/bcm47xx/setup.c
+ return 0;
+}
+device_initcall(bcm47xx_register_gpiodev);
Index: linux-2.6.25.4/arch/mips/bcm47xx/time.c
===================================================================
--- linux-2.6.25.4.orig/arch/mips/bcm47xx/time.c
+++ linux-2.6.25.4/arch/mips/bcm47xx/time.c
--- a/arch/mips/bcm47xx/time.c
+++ b/arch/mips/bcm47xx/time.c
@@ -22,11 +22,17 @@
* 675 Mass Ave, Cambridge, MA 02139, USA.
*/
@@ -334,10 +328,8 @@ Index: linux-2.6.25.4/arch/mips/bcm47xx/time.c
void __init plat_time_init(void)
{
Index: linux-2.6.25.4/arch/mips/bcm47xx/nvram.c
===================================================================
--- linux-2.6.25.4.orig/arch/mips/bcm47xx/nvram.c
+++ linux-2.6.25.4/arch/mips/bcm47xx/nvram.c
--- a/arch/mips/bcm47xx/nvram.c
+++ b/arch/mips/bcm47xx/nvram.c
@@ -24,10 +24,10 @@
#include <asm/io.h>
#include <asm/uaccess.h>
@@ -351,7 +343,7 @@ Index: linux-2.6.25.4/arch/mips/bcm47xx/nvram.c
static char nvram_buf[NVRAM_SPACE];
static int cfe_env;
@@ -36,7 +36,7 @@ extern char *cfe_env_get(char *nv_buf, c
@@ -36,7 +36,7 @@
/* Probe for NVRAM header */
static void __init early_nvram_init(void)
{
@@ -360,21 +352,17 @@ Index: linux-2.6.25.4/arch/mips/bcm47xx/nvram.c
struct nvram_header *header;
int i;
u32 base, lim, off;
Index: linux-2.6.25.4/arch/mips/bcm47xx/Makefile
===================================================================
--- linux-2.6.25.4.orig/arch/mips/bcm47xx/Makefile
+++ linux-2.6.25.4/arch/mips/bcm47xx/Makefile
--- a/arch/mips/bcm47xx/Makefile
+++ b/arch/mips/bcm47xx/Makefile
@@ -3,4 +3,4 @@
# under Linux.
#
-obj-y := gpio.o irq.o prom.o serial.o setup.o time.o wgt634u.o
+obj-y := cfe_env.o gpio.o irq.o nvram.o prom.o serial.o setup.o time.o wgt634u.o
Index: linux-2.6.25.4/arch/mips/Kconfig
===================================================================
--- linux-2.6.25.4.orig/arch/mips/Kconfig
+++ linux-2.6.25.4/arch/mips/Kconfig
@@ -54,6 +54,7 @@ config BCM47XX
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -54,6 +54,7 @@
select SSB_DRIVER_MIPS
select SSB_DRIVER_EXTIF
select SSB_DRIVER_PCICORE

18
target/linux/brcm47xx/patches-2.6.25/500-lzma_initramfs.patch
View File

@@ -1,8 +1,6 @@
Index: linux-2.6.25.4/scripts/gen_initramfs_list.sh
===================================================================
--- linux-2.6.25.4.orig/scripts/gen_initramfs_list.sh
+++ linux-2.6.25.4/scripts/gen_initramfs_list.sh
@@ -287,7 +287,7 @@ if [ ! -z ${output_file} ]; then
--- a/scripts/gen_initramfs_list.sh
+++ b/scripts/gen_initramfs_list.sh
@@ -287,7 +287,7 @@
if [ "${is_cpio_compressed}" = "compressed" ]; then
cat ${cpio_tfile} > ${output_file}
else
@@ -11,11 +9,9 @@ Index: linux-2.6.25.4/scripts/gen_initramfs_list.sh
fi
[ -z ${cpio_file} ] && rm ${cpio_tfile}
fi
Index: linux-2.6.25.4/init/initramfs.c
===================================================================
--- linux-2.6.25.4.orig/init/initramfs.c
+++ linux-2.6.25.4/init/initramfs.c
@@ -441,6 +441,69 @@ static void __init flush_window(void)
--- a/init/initramfs.c
+++ b/init/initramfs.c
@@ -441,6 +441,69 @@
outcnt = 0;
}
@@ -85,7 +81,7 @@ Index: linux-2.6.25.4/init/initramfs.c
static char * __init unpack_to_rootfs(char *buf, unsigned len, int check_only)
{
int written;
@@ -475,12 +538,28 @@ static char * __init unpack_to_rootfs(ch
@@ -475,12 +538,28 @@
inptr = 0;
outcnt = 0; /* bytes in output buffer */
bytes_out = 0;

8
target/linux/brcm47xx/patches-2.6.25/601-mips-remove-pci-collision-check.patch
View File

@@ -2,11 +2,9 @@ The SSB pcicore driver does create some MMIO resource collisions.
However, the pcicore PCI-fixup routine fixes these collisions afterwards.
Remove this sanity check for now until we find a better solution.
--mb
Index: linux-2.6.25.4/arch/mips/pci/pci.c
===================================================================
--- linux-2.6.25.4.orig/arch/mips/pci/pci.c
+++ linux-2.6.25.4/arch/mips/pci/pci.c
@@ -182,12 +182,10 @@ static int pcibios_enable_resources(stru
--- a/arch/mips/pci/pci.c
+++ b/arch/mips/pci/pci.c
@@ -182,12 +182,10 @@
if ((idx == PCI_ROM_RESOURCE) &&
(!(r->flags & IORESOURCE_ROM_ENABLE)))
continue;

8
target/linux/brcm47xx/patches-2.6.25/620-ssb-modinit-fix.patch
View File

@@ -1,8 +1,6 @@
Index: linux-2.6.25.4/drivers/ssb/main.c
===================================================================
--- linux-2.6.25.4.orig/drivers/ssb/main.c
+++ linux-2.6.25.4/drivers/ssb/main.c
@@ -1173,7 +1173,9 @@ static int __init ssb_modinit(void)
--- a/drivers/ssb/main.c
+++ b/drivers/ssb/main.c
@@ -1173,7 +1173,9 @@
/* ssb must be initialized after PCI but before the ssb drivers.
* That means we must use some initcall between subsys_initcall
* and device_initcall. */

48
target/linux/brcm47xx/patches-2.6.25/680-ssb-support-8bit-writes.patch
View File

@@ -1,9 +1,7 @@
Add support for 8bit reads/writes to SSB.
Index: linux-2.6.25.4/drivers/ssb/main.c
===================================================================
--- linux-2.6.25.4.orig/drivers/ssb/main.c
+++ linux-2.6.25.4/drivers/ssb/main.c
@@ -508,6 +508,14 @@ error:
--- a/drivers/ssb/main.c
+++ b/drivers/ssb/main.c
@@ -508,6 +508,14 @@
return err;
}
@@ -18,7 +16,7 @@ Index: linux-2.6.25.4/drivers/ssb/main.c
static u16 ssb_ssb_read16(struct ssb_device *dev, u16 offset)
{
struct ssb_bus *bus = dev->bus;
@@ -524,6 +532,14 @@ static u32 ssb_ssb_read32(struct ssb_dev
@@ -524,6 +532,14 @@
return readl(bus->mmio + offset);
}
@@ -33,7 +31,7 @@ Index: linux-2.6.25.4/drivers/ssb/main.c
static void ssb_ssb_write16(struct ssb_device *dev, u16 offset, u16 value)
{
struct ssb_bus *bus = dev->bus;
@@ -542,8 +558,10 @@ static void ssb_ssb_write32(struct ssb_d
@@ -542,8 +558,10 @@
/* Ops for the plain SSB bus without a host-device (no PCI or PCMCIA). */
static const struct ssb_bus_ops ssb_ssb_ops = {
@@ -44,11 +42,9 @@ Index: linux-2.6.25.4/drivers/ssb/main.c
.write16 = ssb_ssb_write16,
.write32 = ssb_ssb_write32,
};
Index: linux-2.6.25.4/drivers/ssb/pci.c
===================================================================
--- linux-2.6.25.4.orig/drivers/ssb/pci.c
+++ linux-2.6.25.4/drivers/ssb/pci.c
@@ -577,6 +577,19 @@ static inline int ssb_pci_assert_buspowe
--- a/drivers/ssb/pci.c
+++ b/drivers/ssb/pci.c
@@ -577,6 +577,19 @@
}
#endif /* DEBUG */
@@ -68,7 +64,7 @@ Index: linux-2.6.25.4/drivers/ssb/pci.c
static u16 ssb_pci_read16(struct ssb_device *dev, u16 offset)
{
struct ssb_bus *bus = dev->bus;
@@ -603,6 +616,19 @@ static u32 ssb_pci_read32(struct ssb_dev
@@ -603,6 +616,19 @@
return ioread32(bus->mmio + offset);
}
@@ -88,7 +84,7 @@ Index: linux-2.6.25.4/drivers/ssb/pci.c
static void ssb_pci_write16(struct ssb_device *dev, u16 offset, u16 value)
{
struct ssb_bus *bus = dev->bus;
@@ -631,8 +657,10 @@ static void ssb_pci_write32(struct ssb_d
@@ -631,8 +657,10 @@
/* Not "static", as it's used in main.c */
const struct ssb_bus_ops ssb_pci_ops = {
@@ -99,11 +95,9 @@ Index: linux-2.6.25.4/drivers/ssb/pci.c
.write16 = ssb_pci_write16,
.write32 = ssb_pci_write32,
};
Index: linux-2.6.25.4/drivers/ssb/pcmcia.c
===================================================================
--- linux-2.6.25.4.orig/drivers/ssb/pcmcia.c
+++ linux-2.6.25.4/drivers/ssb/pcmcia.c
@@ -172,6 +172,22 @@ static int select_core_and_segment(struc
--- a/drivers/ssb/pcmcia.c
+++ b/drivers/ssb/pcmcia.c
@@ -172,6 +172,22 @@
return 0;
}
@@ -126,7 +120,7 @@ Index: linux-2.6.25.4/drivers/ssb/pcmcia.c
static u16 ssb_pcmcia_read16(struct ssb_device *dev, u16 offset)
{
struct ssb_bus *bus = dev->bus;
@@ -206,6 +222,20 @@ static u32 ssb_pcmcia_read32(struct ssb_
@@ -206,6 +222,20 @@
return (lo | (hi << 16));
}
@@ -147,7 +141,7 @@ Index: linux-2.6.25.4/drivers/ssb/pcmcia.c
static void ssb_pcmcia_write16(struct ssb_device *dev, u16 offset, u16 value)
{
struct ssb_bus *bus = dev->bus;
@@ -238,8 +268,10 @@ static void ssb_pcmcia_write32(struct ss
@@ -238,8 +268,10 @@
/* Not "static", as it's used in main.c */
const struct ssb_bus_ops ssb_pcmcia_ops = {
@@ -158,11 +152,9 @@ Index: linux-2.6.25.4/drivers/ssb/pcmcia.c
.write16 = ssb_pcmcia_write16,
.write32 = ssb_pcmcia_write32,
};
Index: linux-2.6.25.4/include/linux/ssb/ssb.h
===================================================================
--- linux-2.6.25.4.orig/include/linux/ssb/ssb.h
+++ linux-2.6.25.4/include/linux/ssb/ssb.h
@@ -72,8 +72,10 @@ struct ssb_device;
--- a/include/linux/ssb/ssb.h
+++ b/include/linux/ssb/ssb.h
@@ -72,8 +72,10 @@
/* Lowlevel read/write operations on the device MMIO.
* Internal, don't use that outside of ssb. */
struct ssb_bus_ops {
@@ -173,7 +165,7 @@ Index: linux-2.6.25.4/include/linux/ssb/ssb.h
void (*write16)(struct ssb_device *dev, u16 offset, u16 value);
void (*write32)(struct ssb_device *dev, u16 offset, u32 value);
};
@@ -348,6 +350,10 @@ void ssb_device_disable(struct ssb_devic
@@ -348,6 +350,10 @@
/* Device MMIO register read/write functions. */
@@ -184,7 +176,7 @@ Index: linux-2.6.25.4/include/linux/ssb/ssb.h
static inline u16 ssb_read16(struct ssb_device *dev, u16 offset)
{
return dev->ops->read16(dev, offset);
@@ -356,6 +362,10 @@ static inline u32 ssb_read32(struct ssb_
@@ -356,6 +362,10 @@
{
return dev->ops->read32(dev, offset);
}

22
target/linux/brcm47xx/patches-2.6.25/690-mips-allow-pciregister-after-boot.patch
View File

@@ -1,10 +1,8 @@
Allow registering PCI devices after early boot.
This is an ugly hack and needs to be rewritten before going upstream.
Index: linux-2.6.25.4/arch/mips/pci/pci.c
===================================================================
--- linux-2.6.25.4.orig/arch/mips/pci/pci.c
+++ linux-2.6.25.4/arch/mips/pci/pci.c
--- a/arch/mips/pci/pci.c
+++ b/arch/mips/pci/pci.c
@@ -21,6 +21,17 @@
*/
int pci_probe_only;
@@ -23,7 +21,7 @@ Index: linux-2.6.25.4/arch/mips/pci/pci.c
#define PCI_ASSIGN_ALL_BUSSES 1
unsigned int pci_probe = PCI_ASSIGN_ALL_BUSSES;
@@ -75,8 +86,32 @@ pcibios_align_resource(void *data, struc
@@ -75,8 +86,32 @@
res->start = start;
}
@@ -57,7 +55,7 @@ Index: linux-2.6.25.4/arch/mips/pci/pci.c
if (request_resource(&iomem_resource, hose->mem_resource) < 0)
goto out;
if (request_resource(&ioport_resource, hose->io_resource) < 0) {
@@ -84,9 +119,6 @@ void __devinit register_pci_controller(s
@@ -84,9 +119,6 @@
goto out;
}
@@ -67,7 +65,7 @@ Index: linux-2.6.25.4/arch/mips/pci/pci.c
/*
* Do not panic here but later - this might hapen before console init.
*/
@@ -94,41 +126,47 @@ void __devinit register_pci_controller(s
@@ -94,41 +126,47 @@
printk(KERN_WARNING
"registering PCI controller with io_map_base unset\n");
}
@@ -138,7 +136,7 @@ Index: linux-2.6.25.4/arch/mips/pci/pci.c
/* Scan all of the recorded PCI controllers. */
for (next_busno = 0, hose = hose_head; hose; hose = hose->next) {
@@ -157,6 +195,7 @@ static int __init pcibios_init(void)
@@ -157,6 +195,7 @@
if (!pci_probe_only)
pci_assign_unassigned_resources();
pci_fixup_irqs(common_swizzle, pcibios_map_irq);
@@ -146,11 +144,9 @@ Index: linux-2.6.25.4/arch/mips/pci/pci.c
return 0;
}
Index: linux-2.6.25.4/drivers/ssb/main.c
===================================================================
--- linux-2.6.25.4.orig/drivers/ssb/main.c
+++ linux-2.6.25.4/drivers/ssb/main.c
@@ -1191,9 +1191,7 @@ static int __init ssb_modinit(void)
--- a/drivers/ssb/main.c
+++ b/drivers/ssb/main.c
@@ -1191,9 +1191,7 @@
/* ssb must be initialized after PCI but before the ssb drivers.
* That means we must use some initcall between subsys_initcall
* and device_initcall. */

154
target/linux/brcm47xx/patches-2.6.25/700-ssb-gigabit-ethernet-driver.patch
View File

@@ -1,8 +1,6 @@
Index: linux-2.6.25.4/drivers/ssb/Kconfig
===================================================================
--- linux-2.6.25.4.orig/drivers/ssb/Kconfig
+++ linux-2.6.25.4/drivers/ssb/Kconfig
@@ -125,4 +125,13 @@ config SSB_DRIVER_EXTIF
--- a/drivers/ssb/Kconfig
+++ b/drivers/ssb/Kconfig
@@ -125,4 +125,13 @@
If unsure, say N
@@ -16,11 +14,9 @@ Index: linux-2.6.25.4/drivers/ssb/Kconfig
+ If unsure, say N
+
endmenu
Index: linux-2.6.25.4/drivers/ssb/Makefile
===================================================================
--- linux-2.6.25.4.orig/drivers/ssb/Makefile
+++ linux-2.6.25.4/drivers/ssb/Makefile
@@ -11,6 +11,7 @@ ssb-y += driver_chipcommon.o
--- a/drivers/ssb/Makefile
+++ b/drivers/ssb/Makefile
@@ -11,6 +11,7 @@
ssb-$(CONFIG_SSB_DRIVER_MIPS) += driver_mipscore.o
ssb-$(CONFIG_SSB_DRIVER_EXTIF) += driver_extif.o
ssb-$(CONFIG_SSB_DRIVER_PCICORE) += driver_pcicore.o
@@ -28,10 +24,8 @@ Index: linux-2.6.25.4/drivers/ssb/Makefile
# b43 pci-ssb-bridge driver
# Not strictly a part of SSB, but kept here for convenience
Index: linux-2.6.25.4/drivers/ssb/driver_gige.c
===================================================================
--- /dev/null
+++ linux-2.6.25.4/drivers/ssb/driver_gige.c
+++ b/drivers/ssb/driver_gige.c
@@ -0,0 +1,294 @@
+/*
+ * Sonics Silicon Backplane
@@ -327,10 +321,8 @@ Index: linux-2.6.25.4/drivers/ssb/driver_gige.c
+{
+ return ssb_driver_register(&ssb_gige_driver);
+}
Index: linux-2.6.25.4/include/linux/ssb/ssb_driver_gige.h
===================================================================
--- /dev/null
+++ linux-2.6.25.4/include/linux/ssb/ssb_driver_gige.h
+++ b/include/linux/ssb/ssb_driver_gige.h
@@ -0,0 +1,174 @@
+#ifndef LINUX_SSB_DRIVER_GIGE_H_
+#define LINUX_SSB_DRIVER_GIGE_H_
@@ -506,11 +498,9 @@ Index: linux-2.6.25.4/include/linux/ssb/ssb_driver_gige.h
+
+#endif /* CONFIG_SSB_DRIVER_GIGE */
+#endif /* LINUX_SSB_DRIVER_GIGE_H_ */
Index: linux-2.6.25.4/drivers/ssb/driver_pcicore.c
===================================================================
--- linux-2.6.25.4.orig/drivers/ssb/driver_pcicore.c
+++ linux-2.6.25.4/drivers/ssb/driver_pcicore.c
@@ -60,78 +60,6 @@ static DEFINE_SPINLOCK(cfgspace_lock);
--- a/drivers/ssb/driver_pcicore.c
+++ b/drivers/ssb/driver_pcicore.c
@@ -60,78 +60,6 @@
/* Core to access the external PCI config space. Can only have one. */
static struct ssb_pcicore *extpci_core;
@@ -589,7 +579,7 @@ Index: linux-2.6.25.4/drivers/ssb/driver_pcicore.c
static u32 get_cfgspace_addr(struct ssb_pcicore *pc,
unsigned int bus, unsigned int dev,
unsigned int func, unsigned int off)
@@ -320,6 +248,95 @@ static struct pci_controller ssb_pcicore
@@ -320,6 +248,95 @@
.mem_offset = 0x24000000,
};
@@ -685,10 +675,8 @@ Index: linux-2.6.25.4/drivers/ssb/driver_pcicore.c
static void ssb_pcicore_init_hostmode(struct ssb_pcicore *pc)
{
u32 val;
Index: linux-2.6.25.4/drivers/ssb/embedded.c
===================================================================
--- linux-2.6.25.4.orig/drivers/ssb/embedded.c
+++ linux-2.6.25.4/drivers/ssb/embedded.c
--- a/drivers/ssb/embedded.c
+++ b/drivers/ssb/embedded.c
@@ -10,6 +10,9 @@
#include <linux/ssb/ssb.h>
@@ -699,7 +687,7 @@ Index: linux-2.6.25.4/drivers/ssb/embedded.c
#include "ssb_private.h"
@@ -130,3 +133,90 @@ u32 ssb_gpio_polarity(struct ssb_bus *bu
@@ -130,3 +133,90 @@
return res;
}
EXPORT_SYMBOL(ssb_gpio_polarity);
@@ -790,11 +778,9 @@ Index: linux-2.6.25.4/drivers/ssb/embedded.c
+
+ return -ENODEV;
+}
Index: linux-2.6.25.4/include/linux/ssb/ssb.h
===================================================================
--- linux-2.6.25.4.orig/include/linux/ssb/ssb.h
+++ linux-2.6.25.4/include/linux/ssb/ssb.h
@@ -426,5 +426,12 @@ extern int ssb_bus_powerup(struct ssb_bu
--- a/include/linux/ssb/ssb.h
+++ b/include/linux/ssb/ssb.h
@@ -426,5 +426,12 @@
extern u32 ssb_admatch_base(u32 adm);
extern u32 ssb_admatch_size(u32 adm);
@@ -807,10 +793,8 @@ Index: linux-2.6.25.4/include/linux/ssb/ssb.h
+#endif /* CONFIG_SSB_EMBEDDED */
#endif /* LINUX_SSB_H_ */
Index: linux-2.6.25.4/include/linux/ssb/ssb_driver_pci.h
===================================================================
--- linux-2.6.25.4.orig/include/linux/ssb/ssb_driver_pci.h
+++ linux-2.6.25.4/include/linux/ssb/ssb_driver_pci.h
--- a/include/linux/ssb/ssb_driver_pci.h
+++ b/include/linux/ssb/ssb_driver_pci.h
@@ -1,6 +1,11 @@
#ifndef LINUX_SSB_PCICORE_H_
#define LINUX_SSB_PCICORE_H_
@@ -823,7 +807,7 @@ Index: linux-2.6.25.4/include/linux/ssb/ssb_driver_pci.h
#ifdef CONFIG_SSB_DRIVER_PCICORE
/* PCI core registers. */
@@ -88,6 +93,9 @@ extern void ssb_pcicore_init(struct ssb_
@@ -88,6 +93,9 @@
extern int ssb_pcicore_dev_irqvecs_enable(struct ssb_pcicore *pc,
struct ssb_device *dev);
@@ -833,7 +817,7 @@ Index: linux-2.6.25.4/include/linux/ssb/ssb_driver_pci.h
#else /* CONFIG_SSB_DRIVER_PCICORE */
@@ -107,5 +115,16 @@ int ssb_pcicore_dev_irqvecs_enable(struc
@@ -107,5 +115,16 @@
return 0;
}
@@ -850,10 +834,8 @@ Index: linux-2.6.25.4/include/linux/ssb/ssb_driver_pci.h
+
#endif /* CONFIG_SSB_DRIVER_PCICORE */
#endif /* LINUX_SSB_PCICORE_H_ */
Index: linux-2.6.25.4/drivers/ssb/main.c
===================================================================
--- linux-2.6.25.4.orig/drivers/ssb/main.c
+++ linux-2.6.25.4/drivers/ssb/main.c
--- a/drivers/ssb/main.c
+++ b/drivers/ssb/main.c
@@ -14,6 +14,7 @@
#include <linux/io.h>
#include <linux/ssb/ssb.h>
@@ -862,7 +844,7 @@ Index: linux-2.6.25.4/drivers/ssb/main.c
#include <linux/dma-mapping.h>
#include <linux/pci.h>
@@ -68,6 +69,25 @@ found:
@@ -68,6 +69,25 @@
}
#endif /* CONFIG_SSB_PCIHOST */
@@ -888,7 +870,7 @@ Index: linux-2.6.25.4/drivers/ssb/main.c
static struct ssb_device *ssb_device_get(struct ssb_device *dev)
{
if (dev)
@@ -1181,7 +1201,14 @@ static int __init ssb_modinit(void)
@@ -1181,7 +1201,14 @@
err = b43_pci_ssb_bridge_init();
if (err) {
ssb_printk(KERN_ERR "Broadcom 43xx PCI-SSB-bridge "
@@ -904,7 +886,7 @@ Index: linux-2.6.25.4/drivers/ssb/main.c
/* don't fail SSB init because of this */
err = 0;
}
@@ -1195,6 +1222,7 @@ fs_initcall(ssb_modinit);
@@ -1195,6 +1222,7 @@
static void __exit ssb_modexit(void)
{
@@ -912,11 +894,9 @@ Index: linux-2.6.25.4/drivers/ssb/main.c
b43_pci_ssb_bridge_exit();
bus_unregister(&ssb_bustype);
}
Index: linux-2.6.25.4/drivers/ssb/ssb_private.h
===================================================================
--- linux-2.6.25.4.orig/drivers/ssb/ssb_private.h
+++ linux-2.6.25.4/drivers/ssb/ssb_private.h
@@ -118,6 +118,8 @@ extern u32 ssb_calc_clock_rate(u32 pllty
--- a/drivers/ssb/ssb_private.h
+++ b/drivers/ssb/ssb_private.h
@@ -118,6 +118,8 @@
extern int ssb_devices_freeze(struct ssb_bus *bus);
extern int ssb_devices_thaw(struct ssb_bus *bus);
extern struct ssb_bus *ssb_pci_dev_to_bus(struct pci_dev *pdev);
@@ -925,10 +905,8 @@ Index: linux-2.6.25.4/drivers/ssb/ssb_private.h
/* b43_pci_bridge.c */
#ifdef CONFIG_SSB_B43_PCI_BRIDGE
Index: linux-2.6.25.4/drivers/net/tg3.c
===================================================================
--- linux-2.6.25.4.orig/drivers/net/tg3.c
+++ linux-2.6.25.4/drivers/net/tg3.c
--- a/drivers/net/tg3.c
+++ b/drivers/net/tg3.c
@@ -38,6 +38,7 @@
#include <linux/workqueue.h>
#include <linux/prefetch.h>
@@ -937,7 +915,7 @@ Index: linux-2.6.25.4/drivers/net/tg3.c
#include <net/checksum.h>
#include <net/ip.h>
@@ -425,8 +426,9 @@ static void _tw32_flush(struct tg3 *tp,
@@ -425,8 +426,9 @@
static inline void tw32_mailbox_flush(struct tg3 *tp, u32 off, u32 val)
{
tp->write32_mbox(tp, off, val);
@@ -949,7 +927,7 @@ Index: linux-2.6.25.4/drivers/net/tg3.c
tp->read32_mbox(tp, off);
}
@@ -706,7 +708,7 @@ static void tg3_switch_clocks(struct tg3
@@ -706,7 +708,7 @@
#define PHY_BUSY_LOOPS 5000
@@ -958,7 +936,7 @@ Index: linux-2.6.25.4/drivers/net/tg3.c
{
u32 frame_val;
unsigned int loops;
@@ -720,7 +722,7 @@ static int tg3_readphy(struct tg3 *tp, i
@@ -720,7 +722,7 @@
*val = 0x0;
@@ -967,7 +945,7 @@ Index: linux-2.6.25.4/drivers/net/tg3.c
MI_COM_PHY_ADDR_MASK);
frame_val |= ((reg << MI_COM_REG_ADDR_SHIFT) &
MI_COM_REG_ADDR_MASK);
@@ -755,7 +757,12 @@ static int tg3_readphy(struct tg3 *tp, i
@@ -755,7 +757,12 @@
return ret;
}
@@ -981,7 +959,7 @@ Index: linux-2.6.25.4/drivers/net/tg3.c
{
u32 frame_val;
unsigned int loops;
@@ -771,7 +778,7 @@ static int tg3_writephy(struct tg3 *tp,
@@ -771,7 +778,7 @@
udelay(80);
}
@@ -990,7 +968,7 @@ Index: linux-2.6.25.4/drivers/net/tg3.c
MI_COM_PHY_ADDR_MASK);
frame_val |= ((reg << MI_COM_REG_ADDR_SHIFT) &
MI_COM_REG_ADDR_MASK);
@@ -804,6 +811,11 @@ static int tg3_writephy(struct tg3 *tp,
@@ -804,6 +811,11 @@
return ret;
}
@@ -1002,7 +980,7 @@ Index: linux-2.6.25.4/drivers/net/tg3.c
static void tg3_phydsp_write(struct tg3 *tp, u32 reg, u32 val)
{
tg3_writephy(tp, MII_TG3_DSP_ADDRESS, reg);
@@ -2250,6 +2262,14 @@ static int tg3_setup_copper_phy(struct t
@@ -2250,6 +2262,14 @@
}
}
@@ -1017,7 +995,7 @@ Index: linux-2.6.25.4/drivers/net/tg3.c
if (current_link_up == 1 &&
tp->link_config.active_duplex == DUPLEX_FULL)
tg3_setup_flow_control(tp, lcl_adv, rmt_adv);
@@ -5197,6 +5217,11 @@ static int tg3_poll_fw(struct tg3 *tp)
@@ -5197,6 +5217,11 @@
int i;
u32 val;
@@ -1029,7 +1007,7 @@ Index: linux-2.6.25.4/drivers/net/tg3.c
if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5906) {
/* Wait up to 20ms for init done. */
for (i = 0; i < 200; i++) {
@@ -5435,6 +5460,14 @@ static int tg3_chip_reset(struct tg3 *tp
@@ -5435,6 +5460,14 @@
tw32(0x5000, 0x400);
}
@@ -1044,7 +1022,7 @@ Index: linux-2.6.25.4/drivers/net/tg3.c
tw32(GRC_MODE, tp->grc_mode);
if (tp->pci_chip_rev_id == CHIPREV_ID_5705_A0) {
@@ -5704,9 +5737,12 @@ static int tg3_halt_cpu(struct tg3 *tp,
@@ -5704,9 +5737,12 @@
return -ENODEV;
}
@@ -1060,7 +1038,7 @@ Index: linux-2.6.25.4/drivers/net/tg3.c
return 0;
}
@@ -5787,6 +5823,11 @@ static int tg3_load_5701_a0_firmware_fix
@@ -5787,6 +5823,11 @@
struct fw_info info;
int err, i;
@@ -1072,7 +1050,7 @@ Index: linux-2.6.25.4/drivers/net/tg3.c
info.text_base = TG3_FW_TEXT_ADDR;
info.text_len = TG3_FW_TEXT_LEN;
info.text_data = &tg3FwText[0];
@@ -6345,6 +6386,11 @@ static int tg3_load_tso_firmware(struct
@@ -6345,6 +6386,11 @@
unsigned long cpu_base, cpu_scratch_base, cpu_scratch_size;
int err, i;
@@ -1084,7 +1062,7 @@ Index: linux-2.6.25.4/drivers/net/tg3.c
if (tp->tg3_flags2 & TG3_FLG2_HW_TSO)
return 0;
@@ -7306,6 +7352,11 @@ static void tg3_timer(unsigned long __op
@@ -7306,6 +7352,11 @@
spin_lock(&tp->lock);
@@ -1096,7 +1074,7 @@ Index: linux-2.6.25.4/drivers/net/tg3.c
if (!(tp->tg3_flags & TG3_FLAG_TAGGED_STATUS)) {
/* All of this garbage is because when using non-tagged
* IRQ status the mailbox/status_block protocol the chip
@@ -8906,6 +8957,11 @@ static int tg3_test_nvram(struct tg3 *tp
@@ -8906,6 +8957,11 @@
__le32 *buf;
int i, j, k, err = 0, size;
@@ -1108,7 +1086,7 @@ Index: linux-2.6.25.4/drivers/net/tg3.c
if (tg3_nvram_read_swab(tp, 0, &magic) != 0)
return -EIO;
@@ -9689,7 +9745,7 @@ static int tg3_ioctl(struct net_device *
@@ -9689,7 +9745,7 @@
return -EAGAIN;
spin_lock_bh(&tp->lock);
@@ -1117,7 +1095,7 @@ Index: linux-2.6.25.4/drivers/net/tg3.c
spin_unlock_bh(&tp->lock);
data->val_out = mii_regval;
@@ -9708,7 +9764,7 @@ static int tg3_ioctl(struct net_device *
@@ -9708,7 +9764,7 @@
return -EAGAIN;
spin_lock_bh(&tp->lock);
@@ -1126,7 +1104,7 @@ Index: linux-2.6.25.4/drivers/net/tg3.c
spin_unlock_bh(&tp->lock);
return err;
@@ -10177,6 +10233,12 @@ static void __devinit tg3_get_5906_nvram
@@ -10177,6 +10233,12 @@
/* Chips other than 5700/5701 use the NVRAM for fetching info. */
static void __devinit tg3_nvram_init(struct tg3 *tp)
{
@@ -1139,7 +1117,7 @@ Index: linux-2.6.25.4/drivers/net/tg3.c
tw32_f(GRC_EEPROM_ADDR,
(EEPROM_ADDR_FSM_RESET |
(EEPROM_DEFAULT_CLOCK_PERIOD <<
@@ -10317,6 +10379,9 @@ static int tg3_nvram_read(struct tg3 *tp
@@ -10317,6 +10379,9 @@
{
int ret;
@@ -1149,7 +1127,7 @@ Index: linux-2.6.25.4/drivers/net/tg3.c
if (!(tp->tg3_flags & TG3_FLAG_NVRAM))
return tg3_nvram_read_using_eeprom(tp, offset, val);
@@ -10563,6 +10628,9 @@ static int tg3_nvram_write_block(struct
@@ -10563,6 +10628,9 @@
{
int ret;
@@ -1159,7 +1137,7 @@ Index: linux-2.6.25.4/drivers/net/tg3.c
if (tp->tg3_flags & TG3_FLAG_EEPROM_WRITE_PROT) {
tw32_f(GRC_LOCAL_CTRL, tp->grc_local_ctrl &
~GRC_LCLCTRL_GPIO_OUTPUT1);
@@ -11610,7 +11678,6 @@ static int __devinit tg3_get_invariants(
@@ -11610,7 +11678,6 @@
tp->write32 = tg3_write_flush_reg32;
}
@@ -1167,7 +1145,7 @@ Index: linux-2.6.25.4/drivers/net/tg3.c
if ((tp->tg3_flags & TG3_FLAG_TXD_MBOX_HWBUG) ||
(tp->tg3_flags & TG3_FLAG_MBOX_WRITE_REORDER)) {
tp->write32_tx_mbox = tg3_write32_tx_mbox;
@@ -11646,6 +11713,11 @@ static int __devinit tg3_get_invariants(
@@ -11646,6 +11713,11 @@
GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5701)))
tp->tg3_flags |= TG3_FLAG_SRAM_USE_CONFIG;
@@ -1179,7 +1157,7 @@ Index: linux-2.6.25.4/drivers/net/tg3.c
/* Get eeprom hw config before calling tg3_set_power_state().
* In particular, the TG3_FLG2_IS_NIC flag must be
* determined before calling tg3_set_power_state() so that
@@ -12017,6 +12089,10 @@ static int __devinit tg3_get_device_addr
@@ -12017,6 +12089,10 @@
}
if (!is_valid_ether_addr(&dev->dev_addr[0])) {
@@ -1190,7 +1168,7 @@ Index: linux-2.6.25.4/drivers/net/tg3.c
#ifdef CONFIG_SPARC
if (!tg3_get_default_macaddr_sparc(tp))
return 0;
@@ -12508,6 +12584,7 @@ static char * __devinit tg3_phy_string(s
@@ -12508,6 +12584,7 @@
case PHY_ID_BCM5704: return "5704";
case PHY_ID_BCM5705: return "5705";
case PHY_ID_BCM5750: return "5750";
@@ -1198,7 +1176,7 @@ Index: linux-2.6.25.4/drivers/net/tg3.c
case PHY_ID_BCM5752: return "5752";
case PHY_ID_BCM5714: return "5714";
case PHY_ID_BCM5780: return "5780";
@@ -12695,6 +12772,13 @@ static int __devinit tg3_init_one(struct
@@ -12695,6 +12772,13 @@
tp->msg_enable = tg3_debug;
else
tp->msg_enable = TG3_DEF_MSG_ENABLE;
@@ -1212,11 +1190,9 @@ Index: linux-2.6.25.4/drivers/net/tg3.c
/* The word/byte swap controls here control register access byte
* swapping. DMA data byte swapping is controlled in the GRC_MODE
Index: linux-2.6.25.4/drivers/net/tg3.h
===================================================================
--- linux-2.6.25.4.orig/drivers/net/tg3.h
+++ linux-2.6.25.4/drivers/net/tg3.h
@@ -2477,6 +2477,9 @@ struct tg3 {
--- a/drivers/net/tg3.h
+++ b/drivers/net/tg3.h
@@ -2477,6 +2477,9 @@
#define TG3_FLG3_ENABLE_APE 0x00000002
#define TG3_FLG3_5761_5784_AX_FIXES 0x00000004
#define TG3_FLG3_5701_DMA_BUG 0x00000008
@@ -1226,7 +1202,7 @@ Index: linux-2.6.25.4/drivers/net/tg3.h
struct timer_list timer;
u16 timer_counter;
@@ -2532,6 +2535,7 @@ struct tg3 {
@@ -2532,6 +2535,7 @@
#define PHY_ID_BCM5714 0x60008340
#define PHY_ID_BCM5780 0x60008350
#define PHY_ID_BCM5755 0xbc050cc0
@@ -1234,7 +1210,7 @@ Index: linux-2.6.25.4/drivers/net/tg3.h
#define PHY_ID_BCM5787 0xbc050ce0
#define PHY_ID_BCM5756 0xbc050ed0
#define PHY_ID_BCM5784 0xbc050fa0
@@ -2568,7 +2572,7 @@ struct tg3 {
@@ -2568,7 +2572,7 @@
(X) == PHY_ID_BCM5780 || (X) == PHY_ID_BCM5787 || \
(X) == PHY_ID_BCM5755 || (X) == PHY_ID_BCM5756 || \
(X) == PHY_ID_BCM5906 || (X) == PHY_ID_BCM5761 || \
@@ -1243,11 +1219,9 @@ Index: linux-2.6.25.4/drivers/net/tg3.h
struct tg3_hw_stats *hw_stats;
dma_addr_t stats_mapping;
Index: linux-2.6.25.4/drivers/ssb/driver_mipscore.c
===================================================================
--- linux-2.6.25.4.orig/drivers/ssb/driver_mipscore.c
+++ linux-2.6.25.4/drivers/ssb/driver_mipscore.c
@@ -212,6 +212,7 @@ void ssb_mipscore_init(struct ssb_mipsco
--- a/drivers/ssb/driver_mipscore.c
+++ b/drivers/ssb/driver_mipscore.c
@@ -212,6 +212,7 @@
/* fallthrough */
case SSB_DEV_PCI:
case SSB_DEV_ETHERNET: