mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-12-27 08:07:42 +02:00
2c2e1ade7c
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
33 lines
1.2 KiB
Diff
33 lines
1.2 KiB
Diff
--- 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,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;
|