1
0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-12-24 07:01:44 +02:00

[brcm47xx]: improve the check for the memory size

This will hopefully fix bug #9360 and #9097 in trunk.


git-svn-id: svn://svn.openwrt.org/openwrt/trunk@33596 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
hauke 2012-09-30 11:42:16 +00:00
parent 8400082eca
commit bdb7b30f11

View File

@ -0,0 +1,42 @@
--- a/arch/mips/bcm47xx/prom.c
+++ b/arch/mips/bcm47xx/prom.c
@@ -1,6 +1,7 @@
/*
* Copyright (C) 2004 Florian Schirmer <jolt@tuxbox.org>
* Copyright (C) 2007 Aurelien Jarno <aurelien@aurel32.net>
+ * Copyright (C) 2010-2012 Hauke Mehrtens <hauke@hauke-m.de>
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -60,6 +61,7 @@ static __init void prom_init_mem(void)
{
unsigned long mem;
unsigned long max;
+ unsigned long off, data, off1, data1;
struct cpuinfo_mips *c = &current_cpu_data;
/* Figure out memory size by finding aliases.
@@ -77,15 +79,19 @@ static __init void prom_init_mem(void)
* 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));
+ off = (unsigned long)prom_init;
+ data = *(unsigned long *)prom_init;
+ off1 = off + 4;
+ data1 = *(unsigned long *)off1;
+ max = off | ((128 << 20) - 1);
for (mem = (1 << 20); mem < (128 << 20); mem += (1 << 20)) {
- if (((unsigned long)(prom_init) + mem) > max) {
+ if ((off + mem) > max) {
mem = (128 << 20);
printk(KERN_DEBUG "assume 128MB RAM\n");
break;
}
- if (*(unsigned long *)((unsigned long)(prom_init) + mem) ==
- *(unsigned long *)(prom_init))
+ if ((*(unsigned long *)(off + mem) == data) &&
+ (*(unsigned long *)(off1 + mem) == data1))
break;
}