qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-11-24 04:26:16 +02:00
Code

[brcm47xx]: use memcmp in mem size detection as suggested by blogic

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@33619 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
hauke 2012-10-04 15:42:12 +00:00
parent e10dff6c2e
commit 351a9e7953
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
target/linux/brcm47xx/patches-3.3/192-MIPS-BCM47XX-improve-memory-size-detection.patch
View File

@ -12,19 +12,16 @@
{ {
unsigned long mem; unsigned long mem;
unsigned long max; unsigned long max;
+ unsigned long off, data, off1, data1; + unsigned long off;
struct cpuinfo_mips *c = &current_cpu_data; struct cpuinfo_mips *c = &current_cpu_data;
/* Figure out memory size by finding aliases. /* Figure out memory size by finding aliases.
@@ -77,15 +79,19 @@ static __init void prom_init_mem(void) @@ -77,15 +79,15 @@ static __init void prom_init_mem(void)
* max contains the biggest possible address supported by the platform. * max contains the biggest possible address supported by the platform.
* If the method wants to try something above we assume 128MB ram. * If the method wants to try something above we assume 128MB ram.
*/ */
- max = ((unsigned long)(prom_init) | ((128 << 20) - 1)); - max = ((unsigned long)(prom_init) | ((128 << 20) - 1));
+ off = (unsigned long)prom_init; + off = (unsigned long)prom_init;
+ data = *(unsigned long *)prom_init;
+ off1 = off + 4;
+ data1 = *(unsigned long *)off1;
+ max = off | ((128 << 20) - 1); + max = off | ((128 << 20) - 1);
for (mem = (1 << 20); mem < (128 << 20); mem += (1 << 20)) { for (mem = (1 << 20); mem < (128 << 20); mem += (1 << 20)) {
- if (((unsigned long)(prom_init) + mem) > max) { - if (((unsigned long)(prom_init) + mem) > max) {
@ -35,8 +32,7 @@
} }
- if (*(unsigned long *)((unsigned long)(prom_init) + mem) == - if (*(unsigned long *)((unsigned long)(prom_init) + mem) ==
- *(unsigned long *)(prom_init)) - *(unsigned long *)(prom_init))
+ if ((*(unsigned long *)(off + mem) == data) && + if (!memcmp(prom_init, prom_init + mem, 32))
+ (*(unsigned long *)(off1 + mem) == data1))
break; break;
} }