brcm47xx: fix commit r18413 "128MB ram problem"

The patch commited in r18413 was wrong.
This patch prevents prom_init_mem from scanning over 128MB ram.
This is from #6765 and #3177

Refresh all patches


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

3 files changed, 32 insertions, 22 deletions

diff --git a/target/linux/brcm47xx/patches-2.6.32/170-128MB_ram_bugfix.patch b/target/linux/brcm47xx/patches-2.6.32/170-128MB_ram_bugfix.patch
index e54e3de40..93f4b1f10 100644
--- a/target/linux/brcm47xx/patches-2.6.32/170-128MB_ram_bugfix.patch
+++ b/target/linux/brcm47xx/patches-2.6.32/170-128MB_ram_bugfix.patch
@@ -1,17 +1,32 @@
 --- a/arch/mips/bcm47xx/prom.c
 +++ b/arch/mips/bcm47xx/prom.c
-@@ -141,6 +141,14 @@ static __init void prom_init_mem(void)
- 			break;
- 	}
- 
-+	/* Ignoring the last page when ddr size is 128M. Cached
-+	 * accesses to last page is causing the processor to prefetch
-+	 * using address above 128M stepping out of the ddr address
-+	 * space.
-+	 */
-+	if (mem == 0x8000000)
-+		mem -= 0x1000;
-+
- 	add_memory_region(0, mem, BOOT_MEM_RAM);
- }
+@@ -126,6 +126,7 @@ static __init void prom_init_cmdline(voi
+ static __init void prom_init_mem(void)
+ {
+ 	unsigned long mem;
++	unsigned long max;
  
+ 	/* Figure out memory size by finding aliases.
+ 	 *
+@@ -134,8 +135,21 @@ static __init void prom_init_mem(void)
+ 	 * want to reuse the memory used by CFE (around 4MB). That means cfe_*
+ 	 * functions stop to work at some point during the boot, we should only
+ 	 * call them at the beginning of the boot.
++	 * 
++	 * BCM47XX uses 128MB for addressing the ram, if the system contains
++	 * less that that amount of ram it remaps the ram more often into the
++	 * available space.
++	 * Accessing memory after 128MB will cause an exception.
++	 * max contains the biggest possible address supported by the platform.
++	 * If the method wants to try something above we assume 128MB ram.
+ 	 */
++	max = ((unsigned long)(prom_init) | ((128 << 20) - 1));
+ 	for (mem = (1 << 20); mem < (128 << 20); mem += (1 << 20)) {
++		if (((unsigned long)(prom_init) + mem) > max) {
++			mem = (128 << 20);
++			printk("assume 128MB RAM\n");
++			break;
++		}
+ 		if (*(unsigned long *)((unsigned long)(prom_init) + mem) ==
+ 		    *(unsigned long *)(prom_init))
+ 			break;
diff --git a/target/linux/brcm47xx/patches-2.6.32/180-ssb_extif_interrupt.patch b/target/linux/brcm47xx/patches-2.6.32/180-ssb_extif_interrupt.patch
index eb583c523..d89531cda 100644
--- a/target/linux/brcm47xx/patches-2.6.32/180-ssb_extif_interrupt.patch
+++ b/target/linux/brcm47xx/patches-2.6.32/180-ssb_extif_interrupt.patch
@@ -13,11 +13,9 @@ Signed-off-by: John W. Linville <linville@tuxdriver.com>
  drivers/ssb/driver_mipscore.c |    5 ++++-
  1 files changed, 4 insertions(+), 1 deletions(-)
 
-diff --git a/drivers/ssb/driver_mipscore.c b/drivers/ssb/driver_mipscore.c
-index 3c6feed..97efce1 100644
 --- a/drivers/ssb/driver_mipscore.c
 +++ b/drivers/ssb/driver_mipscore.c
-@@ -270,7 +270,6 @@ void ssb_mipscore_init(struct ssb_mipscore *mcore)
+@@ -270,7 +270,6 @@ void ssb_mipscore_init(struct ssb_mipsco
  				set_irq(dev, irq++);
  			}
  			break;
@@ -25,7 +23,7 @@ index 3c6feed..97efce1 100644
  		case SSB_DEV_PCI:
  		case SSB_DEV_ETHERNET:
  		case SSB_DEV_ETHERNET_GBIT:
-@@ -281,6 +280,10 @@ void ssb_mipscore_init(struct ssb_mipscore *mcore)
+@@ -281,6 +280,10 @@ void ssb_mipscore_init(struct ssb_mipsco
  				set_irq(dev, irq++);
  				break;
  			}
@@ -36,6 +34,3 @@ index 3c6feed..97efce1 100644
  		}
  	}
  	ssb_dprintk(KERN_INFO PFX "after irq reconfiguration\n");
--- 
-1.7.0
-
diff --git a/target/linux/brcm47xx/patches-2.6.32/800-fix_cfe_detection.patch b/target/linux/brcm47xx/patches-2.6.32/800-fix_cfe_detection.patch
index a8a14105e..a9dc7c46b 100644
--- a/target/linux/brcm47xx/patches-2.6.32/800-fix_cfe_detection.patch
+++ b/target/linux/brcm47xx/patches-2.6.32/800-fix_cfe_detection.patch
@@ -90,7 +90,7 @@
  {
  	static char buf[CL_SIZE] __initdata;
  
-@@ -154,9 +130,12 @@ static __init void prom_init_mem(void)
+@@ -160,9 +136,12 @@ static __init void prom_init_mem(void)
  
  void __init prom_init(void)
  {