[atheros] add .25 patches (kernel boots fine on LS2, LS5, FON2200 and on WRT55AG v2)

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@11016 3c298f89-4303-0410-b956-a3cf2f4a3e73

7 files changed, 270 insertions, 0 deletions

diff --git a/target/linux/atheros/patches-2.6.25/100-board.patch b/target/linux/atheros/patches-2.6.25/100-board.patch
new file mode 100644
index 0000000000..30f001acde
--- /dev/null
+++ b/target/linux/atheros/patches-2.6.25/100-board.patch
@@ -0,0 +1,72 @@
+Index: linux-2.6.25.1/arch/mips/Kconfig
+===================================================================
+--- linux-2.6.25.1.orig/arch/mips/Kconfig
++++ linux-2.6.25.1/arch/mips/Kconfig
+@@ -59,6 +59,18 @@ config BCM47XX
+ 	help
+ 	 Support for BCM47XX based boards
+ 
++config ATHEROS
++	bool "Atheros SoC support (EXPERIMENTAL)"
++	depends on EXPERIMENTAL
++	select DMA_NONCOHERENT
++	select CEVT_R4K
++	select CSRC_R4K
++	select IRQ_CPU
++	select SYS_HAS_CPU_MIPS32_R1
++	select SYS_SUPPORTS_BIG_ENDIAN
++	select SYS_SUPPORTS_32BIT_KERNEL
++	select GENERIC_GPIO
++
+ config MIPS_COBALT
+ 	bool "Cobalt Server"
+ 	select CEVT_R4K
+@@ -683,6 +695,7 @@ config WR_PPMC
+ 
+ endchoice
+ 
++source "arch/mips/atheros/Kconfig"
+ source "arch/mips/au1000/Kconfig"
+ source "arch/mips/basler/excite/Kconfig"
+ source "arch/mips/jazz/Kconfig"
+Index: linux-2.6.25.1/arch/mips/Makefile
+===================================================================
+--- linux-2.6.25.1.orig/arch/mips/Makefile
++++ linux-2.6.25.1/arch/mips/Makefile
+@@ -276,6 +276,13 @@ libs-$(CONFIG_MIPS_XXS1500)	+= arch/mips
+ load-$(CONFIG_MIPS_XXS1500)	+= 0xffffffff80100000
+ 
+ #
++# Atheros AR5312/AR2312 WiSoC
++#
++core-$(CONFIG_ATHEROS)		+= arch/mips/atheros/
++cflags-$(CONFIG_ATHEROS)	+= -Iinclude/asm-mips/mach-atheros
++load-$(CONFIG_ATHEROS)		+= 0xffffffff80041000
++
++#
+ # Cobalt Server
+ #
+ core-$(CONFIG_MIPS_COBALT)	+= arch/mips/cobalt/
+Index: linux-2.6.25.1/include/asm-mips/bootinfo.h
+===================================================================
+--- linux-2.6.25.1.orig/include/asm-mips/bootinfo.h
++++ linux-2.6.25.1/include/asm-mips/bootinfo.h
+@@ -94,6 +94,18 @@
+ #define MACH_MSP7120_FPGA       5	/* PMC-Sierra MSP7120 Emulation */
+ #define MACH_MSP_OTHER        255	/* PMC-Sierra unknown board type */
+ 
++/*
++ * Valid machtype for group ATHEROS
++ */
++#define MACH_GROUP_ATHEROS	26
++#define MACH_ATHEROS_AR5312	0
++#define MACH_ATHEROS_AR2312	1
++#define MACH_ATHEROS_AR2313	2
++#define MACH_ATHEROS_AR2315	3
++#define MACH_ATHEROS_AR2316	4
++#define MACH_ATHEROS_AR2317	5
++#define MACH_ATHEROS_AR2318	6
++
+ #define CL_SIZE			COMMAND_LINE_SIZE
+ 
+ extern char *system_type;
diff --git a/target/linux/atheros/patches-2.6.25/110-spiflash.patch b/target/linux/atheros/patches-2.6.25/110-spiflash.patch
new file mode 100644
index 0000000000..bb66f02fb5
--- /dev/null
+++ b/target/linux/atheros/patches-2.6.25/110-spiflash.patch
@@ -0,0 +1,24 @@
+Index: linux-2.6.25.1/drivers/mtd/devices/Kconfig
+===================================================================
+--- linux-2.6.25.1.orig/drivers/mtd/devices/Kconfig
++++ linux-2.6.25.1/drivers/mtd/devices/Kconfig
+@@ -77,6 +77,10 @@ config MTD_M25P80
+ 	  if you want to specify device partitioning or to use a device which
+ 	  doesn't support the JEDEC ID instruction.
+ 
++config MTD_SPIFLASH
++	tristate "Atheros AR2315/6/7 SPI Flash support"
++	depends on ATHEROS_AR5315
++
+ config MTD_SLRAM
+ 	tristate "Uncached system RAM"
+ 	help
+Index: linux-2.6.25.1/drivers/mtd/devices/Makefile
+===================================================================
+--- linux-2.6.25.1.orig/drivers/mtd/devices/Makefile
++++ linux-2.6.25.1/drivers/mtd/devices/Makefile
+@@ -17,3 +17,4 @@ obj-$(CONFIG_MTD_LART)		+= lart.o
+ obj-$(CONFIG_MTD_BLOCK2MTD)	+= block2mtd.o
+ obj-$(CONFIG_MTD_DATAFLASH)	+= mtd_dataflash.o
+ obj-$(CONFIG_MTD_M25P80)	+= m25p80.o
++obj-$(CONFIG_MTD_SPIFLASH)	+= spiflash.o
diff --git a/target/linux/atheros/patches-2.6.25/130-ar2313_ethernet.patch b/target/linux/atheros/patches-2.6.25/130-ar2313_ethernet.patch
new file mode 100644
index 0000000000..2d2ce45599
--- /dev/null
+++ b/target/linux/atheros/patches-2.6.25/130-ar2313_ethernet.patch
@@ -0,0 +1,29 @@
+Index: linux-2.6.25.1/drivers/net/Kconfig
+===================================================================
+--- linux-2.6.25.1.orig/drivers/net/Kconfig
++++ linux-2.6.25.1/drivers/net/Kconfig
+@@ -367,6 +367,12 @@ config AX88796_93CX6
+ 	help
+ 	  Select this if your platform comes with an external 93CX6 eeprom.
+ 
++config AR2313
++	tristate "AR2313 Ethernet support"
++	depends on NET_ETHERNET && ATHEROS
++	help
++	  Support for the AR231x/531x ethernet controller
++
+ config MACE
+ 	tristate "MACE (Power Mac ethernet) support"
+ 	depends on PPC_PMAC && PPC32
+Index: linux-2.6.25.1/drivers/net/Makefile
+===================================================================
+--- linux-2.6.25.1.orig/drivers/net/Makefile
++++ linux-2.6.25.1/drivers/net/Makefile
+@@ -194,6 +194,7 @@ obj-$(CONFIG_MVME147_NET) += mvme147.o 7
+ obj-$(CONFIG_EQUALIZER) += eql.o
+ obj-$(CONFIG_MIPS_JAZZ_SONIC) += jazzsonic.o
+ obj-$(CONFIG_MIPS_AU1X00_ENET) += au1000_eth.o
++obj-$(CONFIG_AR2313) += ar2313/
+ obj-$(CONFIG_MIPS_SIM_NET) += mipsnet.o
+ obj-$(CONFIG_SGI_IOC3_ETH) += ioc3-eth.o
+ obj-$(CONFIG_DECLANCE) += declance.o
diff --git a/target/linux/atheros/patches-2.6.25/140-redboot_partition_scan.patch b/target/linux/atheros/patches-2.6.25/140-redboot_partition_scan.patch
new file mode 100644
index 0000000000..467fcada2e
--- /dev/null
+++ b/target/linux/atheros/patches-2.6.25/140-redboot_partition_scan.patch
@@ -0,0 +1,56 @@
+Index: linux-2.6.25.1/drivers/mtd/redboot.c
+===================================================================
+--- linux-2.6.25.1.orig/drivers/mtd/redboot.c
++++ linux-2.6.25.1/drivers/mtd/redboot.c
+@@ -59,31 +59,32 @@ static int parse_redboot_partitions(stru
+ 	static char nullstring[] = "unallocated";
+ #endif
+ 
++	buf = vmalloc(master->erasesize);
++	if (!buf)
++		return -ENOMEM;
++
++ restart:
+ 	if ( directory < 0 ) {
+ 		offset = master->size + directory * master->erasesize;
+-		while (master->block_isbad && 
++		while (master->block_isbad &&
+ 		       master->block_isbad(master, offset)) {
+ 			if (!offset) {
+ 			nogood:
+ 				printk(KERN_NOTICE "Failed to find a non-bad block to check for RedBoot partition table\n");
++				vfree(buf);
+ 				return -EIO;
+ 			}
+ 			offset -= master->erasesize;
+ 		}
+ 	} else {
+ 		offset = directory * master->erasesize;
+-		while (master->block_isbad && 
++		while (master->block_isbad &&
+ 		       master->block_isbad(master, offset)) {
+ 			offset += master->erasesize;
+ 			if (offset == master->size)
+ 				goto nogood;
+ 		}
+ 	}
+-	buf = vmalloc(master->erasesize);
+-
+-	if (!buf)
+-		return -ENOMEM;
+-
+ 	printk(KERN_NOTICE "Searching for RedBoot partition table in %s at offset 0x%lx\n",
+ 	       master->name, offset);
+ 
+@@ -155,6 +156,11 @@ static int parse_redboot_partitions(stru
+ 	}
+ 	if (i == numslots) {
+ 		/* Didn't find it */
++		if (offset + master->erasesize < master->size) {
++			/* not at the end of the flash yet, maybe next block :) */
++			directory++;
++			goto restart;
++		}
+ 		printk(KERN_NOTICE "No RedBoot partition table detected in %s\n",
+ 		       master->name);
+ 		ret = 0;
diff --git a/target/linux/atheros/patches-2.6.25/150-bridge-printk.patch b/target/linux/atheros/patches-2.6.25/150-bridge-printk.patch
new file mode 100644
index 0000000000..ffff0cd34c
--- /dev/null
+++ b/target/linux/atheros/patches-2.6.25/150-bridge-printk.patch
@@ -0,0 +1,28 @@
+Index: linux-2.6.25.1/net/core/dev.c
+===================================================================
+--- linux-2.6.25.1.orig/net/core/dev.c
++++ linux-2.6.25.1/net/core/dev.c
+@@ -3755,8 +3755,8 @@ int register_netdevice(struct net_device
+ 	/* Fix illegal SG+CSUM combinations. */
+ 	if ((dev->features & NETIF_F_SG) &&
+ 	    !(dev->features & NETIF_F_ALL_CSUM)) {
+-		printk(KERN_NOTICE "%s: Dropping NETIF_F_SG since no checksum feature.\n",
+-		       dev->name);
++		//printk(KERN_NOTICE "%s: Dropping NETIF_F_SG since no checksum feature.\n",
++		//       dev->name);
+ 		dev->features &= ~NETIF_F_SG;
+ 	}
+ 
+@@ -3769,9 +3769,9 @@ int register_netdevice(struct net_device
+ 	}
+ 	if (dev->features & NETIF_F_UFO) {
+ 		if (!(dev->features & NETIF_F_HW_CSUM)) {
+-			printk(KERN_ERR "%s: Dropping NETIF_F_UFO since no "
+-					"NETIF_F_HW_CSUM feature.\n",
+-							dev->name);
++			//printk(KERN_ERR "%s: Dropping NETIF_F_UFO since no "
++			//		"NETIF_F_HW_CSUM feature.\n",
++			//				dev->name);
+ 			dev->features &= ~NETIF_F_UFO;
+ 		}
+ 		if (!(dev->features & NETIF_F_SG)) {
diff --git a/target/linux/atheros/patches-2.6.25/900-cevt_r4k_irq_disable_hazard.patch b/target/linux/atheros/patches-2.6.25/900-cevt_r4k_irq_disable_hazard.patch
new file mode 100644
index 0000000000..3b72a9e273
--- /dev/null
+++ b/target/linux/atheros/patches-2.6.25/900-cevt_r4k_irq_disable_hazard.patch
@@ -0,0 +1,12 @@
+Index: linux-2.6.25.1/arch/mips/kernel/cevt-r4k.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/mips/kernel/cevt-r4k.c
++++ linux-2.6.25.1/arch/mips/kernel/cevt-r4k.c
+@@ -205,6 +205,7 @@ static int c0_compare_int_usable(void)
+ 	while ((int)(read_c0_count() - cnt) <= 0)
+ 		;	/* Wait for expiry  */
+ 
++	irq_disable_hazard();
+ 	if (!c0_compare_int_pending())
+ 		return 0;
+ 
diff --git a/target/linux/atheros/patches-2.6.25/901-get_c0_compare_irq_function.patch b/target/linux/atheros/patches-2.6.25/901-get_c0_compare_irq_function.patch
new file mode 100644
index 0000000000..1e548c8f00
--- /dev/null
+++ b/target/linux/atheros/patches-2.6.25/901-get_c0_compare_irq_function.patch
@@ -0,0 +1,49 @@
+Index: linux-2.6.25.1/arch/mips/kernel/traps.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/mips/kernel/traps.c
++++ linux-2.6.25.1/arch/mips/kernel/traps.c
+@@ -42,6 +42,7 @@
+ #include <asm/mmu_context.h>
+ #include <asm/types.h>
+ #include <asm/stacktrace.h>
++#include <asm/time.h>
+ 
+ extern asmlinkage void handle_int(void);
+ extern asmlinkage void handle_tlbm(void);
+@@ -1379,6 +1380,8 @@ void __cpuinit per_cpu_trap_init(void)
+ 	 */
+ 	if (cpu_has_mips_r2) {
+ 		cp0_compare_irq = (read_c0_intctl() >> 29) & 7;
++		if (get_c0_compare_irq)
++			cp0_compare_irq = get_c0_compare_irq();
+ 		cp0_perfcount_irq = (read_c0_intctl() >> 26) & 7;
+ 		if (cp0_perfcount_irq == cp0_compare_irq)
+ 			cp0_perfcount_irq = -1;
+Index: linux-2.6.25.1/include/asm-mips/time.h
+===================================================================
+--- linux-2.6.25.1.orig/include/asm-mips/time.h
++++ linux-2.6.25.1/include/asm-mips/time.h
+@@ -53,6 +53,7 @@ extern int (*perf_irq)(void);
+ #ifdef CONFIG_CEVT_R4K
+ extern int mips_clockevent_init(void);
+ extern unsigned int __weak get_c0_compare_int(void);
++extern unsigned int __weak get_c0_compare_irq(void);
+ #else
+ static inline int mips_clockevent_init(void)
+ {
+Index: linux-2.6.25.1/arch/mips/atheros/board.c
+===================================================================
+--- linux-2.6.25.1.orig/arch/mips/atheros/board.c
++++ linux-2.6.25.1/arch/mips/atheros/board.c
+@@ -205,6 +205,11 @@ void (*board_time_init)(void);
+ void __init plat_time_init(void) {
+     board_time_init();
+ }
++
++unsigned int __init get_c0_compare_irq(void)
++{
++	return CP0_LEGACY_COMPARE_IRQ;
++}
+ #endif
+ 
+ void __init arch_init_irq(void)