target/linux/brcm47xx/patches-2.6.34/011-MIPS-BCM47xx-Really-fix-128MB-RAM-problem.patch

   1 From f65eb52ea6c0ec939fd44e74b6b873e0b549e3c9 Mon Sep 17 00:00:00 2001
   2 From: Hauke Mehrtens <hauke@hauke-m.de>
   3 Date: Sun, 18 Jul 2010 12:49:41 +0200
   4 Subject: [PATCH 1/6] MIPS: BCM47xx: Really fix 128MB RAM problem
   5
   6 The previews patch 84a6fcb368a080620d12fc4d79e07902dbee7335 was wrong,
   7 I got wrong success reports.
   8
   9 The bcm47xx architecture maps the ram into a 128MB address space. It
  10 will be paced there as often as goes into the 128MB. The detection
  11 tries to find the position where the same memory is found. When reading
  12 over 128MB the processor will throw an exception. If 128MB ram is
  13 installed, it will not find the same memory because it tries to read
  14 over the 128MB boarder. Now it just assumes 128MB installed ram if it
  15 can not find that the ram is repeating.
  16
  17 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
  18 ---
  19  arch/mips/bcm47xx/prom.c |   22 ++++++++++++++--------
  20  1 files changed, 14 insertions(+), 8 deletions(-)
  21
  22 --- a/arch/mips/bcm47xx/prom.c
  23 +++ b/arch/mips/bcm47xx/prom.c
  24 @@ -126,6 +126,7 @@ static __init void prom_init_cmdline(voi
  25  static __init void prom_init_mem(void)
  26  {
  27         unsigned long mem;
  28 +       unsigned long max;
  29
  30         /* Figure out memory size by finding aliases.
  31          *
  32 @@ -134,21 +135,26 @@ static __init void prom_init_mem(void)
  33          * want to reuse the memory used by CFE (around 4MB). That means cfe_*
  34          * functions stop to work at some point during the boot, we should only
  35          * call them at the beginning of the boot.
  36 +        *
  37 +        * BCM47XX uses 128MB for addressing the ram, if the system contains
  38 +        * less that that amount of ram it remaps the ram more often into the
  39 +        * available space.
  40 +        * Accessing memory after 128MB will cause an exception.
  41 +        * max contains the biggest possible address supported by the platform.
  42 +        * If the method wants to try something above we assume 128MB ram.
  43          */
  44 +       max = ((unsigned long)(prom_init) | ((128 << 20) - 1));
  45         for (mem = (1 << 20); mem < (128 << 20); mem += (1 << 20)) {
  46 +               if (((unsigned long)(prom_init) + mem) > max) {
  47 +                       mem = (128 << 20);
  48 +                       printk(KERN_DEBUG "assume 128MB RAM\n");
  49 +                       break;
  50 +               }
  51                 if (*(unsigned long *)((unsigned long)(prom_init) + mem) ==
  52                     *(unsigned long *)(prom_init))
  53                         break;
  54         }
  55
  56 -       /* Ignoring the last page when ddr size is 128M. Cached
  57 -        * accesses to last page is causing the processor to prefetch
  58 -        * using address above 128M stepping out of the ddr address
  59 -        * space.
  60 -        */
  61 -       if (mem == 0x8000000)
  62 -               mem -= 0x1000;
  63 -
  64         add_memory_region(0, mem, BOOT_MEM_RAM);
  65  }
  66