From: Hauke Mehrtens Date: Mon, 8 Mar 2010 22:03:00 +0000 (+0000) Subject: brcm47xx: fix commit r18413 "128MB ram problem" X-Git-Tag: reboot~20752 X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=3f0dc5c30fa136abfd5356c11d629030fdf23807;p=openwrt%2Fopenwrt.git 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 SVN-Revision: 20072 --- diff --git a/target/linux/brcm47xx/patches-2.6.30/170-128MB_ram_bugfix.patch b/target/linux/brcm47xx/patches-2.6.30/170-128MB_ram_bugfix.patch index e54e3de409..93f4b1f101 100644 --- a/target/linux/brcm47xx/patches-2.6.30/170-128MB_ram_bugfix.patch +++ b/target/linux/brcm47xx/patches-2.6.30/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.30/700-ssb-gigabit-ethernet-driver.patch b/target/linux/brcm47xx/patches-2.6.30/700-ssb-gigabit-ethernet-driver.patch index f56ae8e71c..ec40bd8fca 100644 --- a/target/linux/brcm47xx/patches-2.6.30/700-ssb-gigabit-ethernet-driver.patch +++ b/target/linux/brcm47xx/patches-2.6.30/700-ssb-gigabit-ethernet-driver.patch @@ -252,7 +252,7 @@ if (tp->tg3_flags & TG3_FLAG_EEPROM_WRITE_PROT) { tw32_f(GRC_LOCAL_CTRL, tp->grc_local_ctrl & ~GRC_LCLCTRL_GPIO_OUTPUT1); -@@ -12099,6 +12168,11 @@ static int __devinit tg3_get_invariants( +@@ -12099,6 +12169,11 @@ static int __devinit tg3_get_invariants( GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5701))) tp->tg3_flags |= TG3_FLAG_SRAM_USE_CONFIG; @@ -264,7 +264,7 @@ /* 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 -@@ -12474,6 +12548,10 @@ static int __devinit tg3_get_device_addr +@@ -12474,6 +12549,10 @@ static int __devinit tg3_get_device_addr } if (!is_valid_ether_addr(&dev->dev_addr[0])) { @@ -275,7 +275,7 @@ #ifdef CONFIG_SPARC if (!tg3_get_default_macaddr_sparc(tp)) return 0; -@@ -12965,6 +13043,7 @@ static char * __devinit tg3_phy_string(s +@@ -12965,6 +13044,7 @@ static char * __devinit tg3_phy_string(s case PHY_ID_BCM5704: return "5704"; case PHY_ID_BCM5705: return "5705"; case PHY_ID_BCM5750: return "5750"; @@ -283,7 +283,7 @@ case PHY_ID_BCM5752: return "5752"; case PHY_ID_BCM5714: return "5714"; case PHY_ID_BCM5780: return "5780"; -@@ -13175,6 +13254,13 @@ static int __devinit tg3_init_one(struct +@@ -13175,6 +13255,13 @@ static int __devinit tg3_init_one(struct tp->msg_enable = tg3_debug; else tp->msg_enable = TG3_DEF_MSG_ENABLE; diff --git a/target/linux/brcm47xx/patches-2.6.30/800-fix_cfe_detection.patch b/target/linux/brcm47xx/patches-2.6.30/800-fix_cfe_detection.patch index c3a8a5738a..50f911437c 100644 --- a/target/linux/brcm47xx/patches-2.6.30/800-fix_cfe_detection.patch +++ b/target/linux/brcm47xx/patches-2.6.30/800-fix_cfe_detection.patch @@ -90,7 +90,7 @@ { char buf[CL_SIZE]; -@@ -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) { diff --git a/target/linux/brcm47xx/patches-2.6.31/170-128MB_ram_bugfix.patch b/target/linux/brcm47xx/patches-2.6.31/170-128MB_ram_bugfix.patch index e54e3de409..93f4b1f101 100644 --- a/target/linux/brcm47xx/patches-2.6.31/170-128MB_ram_bugfix.patch +++ b/target/linux/brcm47xx/patches-2.6.31/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.31/700-ssb-gigabit-ethernet-driver.patch b/target/linux/brcm47xx/patches-2.6.31/700-ssb-gigabit-ethernet-driver.patch index 0273343885..f09eb4f509 100644 --- a/target/linux/brcm47xx/patches-2.6.31/700-ssb-gigabit-ethernet-driver.patch +++ b/target/linux/brcm47xx/patches-2.6.31/700-ssb-gigabit-ethernet-driver.patch @@ -252,7 +252,7 @@ if (tp->tg3_flags & TG3_FLAG_EEPROM_WRITE_PROT) { tw32_f(GRC_LOCAL_CTRL, tp->grc_local_ctrl & ~GRC_LCLCTRL_GPIO_OUTPUT1); -@@ -12136,6 +12205,11 @@ static int __devinit tg3_get_invariants( +@@ -12136,6 +12206,11 @@ static int __devinit tg3_get_invariants( GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5701))) tp->tg3_flags |= TG3_FLAG_SRAM_USE_CONFIG; @@ -264,7 +264,7 @@ /* 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 -@@ -12513,6 +12587,10 @@ static int __devinit tg3_get_device_addr +@@ -12513,6 +12588,10 @@ static int __devinit tg3_get_device_addr } if (!is_valid_ether_addr(&dev->dev_addr[0])) { @@ -275,7 +275,7 @@ #ifdef CONFIG_SPARC if (!tg3_get_default_macaddr_sparc(tp)) return 0; -@@ -13004,6 +13082,7 @@ static char * __devinit tg3_phy_string(s +@@ -13004,6 +13083,7 @@ static char * __devinit tg3_phy_string(s case PHY_ID_BCM5704: return "5704"; case PHY_ID_BCM5705: return "5705"; case PHY_ID_BCM5750: return "5750"; @@ -283,7 +283,7 @@ case PHY_ID_BCM5752: return "5752"; case PHY_ID_BCM5714: return "5714"; case PHY_ID_BCM5780: return "5780"; -@@ -13214,6 +13293,13 @@ static int __devinit tg3_init_one(struct +@@ -13214,6 +13294,13 @@ static int __devinit tg3_init_one(struct tp->msg_enable = tg3_debug; else tp->msg_enable = TG3_DEF_MSG_ENABLE; diff --git a/target/linux/brcm47xx/patches-2.6.31/800-fix_cfe_detection.patch b/target/linux/brcm47xx/patches-2.6.31/800-fix_cfe_detection.patch index c3a8a5738a..50f911437c 100644 --- a/target/linux/brcm47xx/patches-2.6.31/800-fix_cfe_detection.patch +++ b/target/linux/brcm47xx/patches-2.6.31/800-fix_cfe_detection.patch @@ -90,7 +90,7 @@ { char buf[CL_SIZE]; -@@ -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) { 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 e54e3de409..93f4b1f101 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 eb583c523a..d89531cda1 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 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 a8a14105e7..a9dc7c46bb 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) { diff --git a/target/linux/brcm47xx/patches-2.6.33/170-128MB_ram_bugfix.patch b/target/linux/brcm47xx/patches-2.6.33/170-128MB_ram_bugfix.patch new file mode 100644 index 0000000000..9819ad7115 --- /dev/null +++ b/target/linux/brcm47xx/patches-2.6.33/170-128MB_ram_bugfix.patch @@ -0,0 +1,45 @@ +--- a/arch/mips/bcm47xx/prom.c ++++ b/arch/mips/bcm47xx/prom.c +@@ -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,21 +135,26 @@ 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; + } + +- /* 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); + } + diff --git a/target/linux/brcm47xx/patches-2.6.33/800-fix_cfe_detection.patch b/target/linux/brcm47xx/patches-2.6.33/800-fix_cfe_detection.patch index b828a25173..a298055708 100644 --- a/target/linux/brcm47xx/patches-2.6.33/800-fix_cfe_detection.patch +++ b/target/linux/brcm47xx/patches-2.6.33/800-fix_cfe_detection.patch @@ -90,7 +90,7 @@ { static char buf[COMMAND_LINE_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) {