linux-mips
[Top] [All Lists]

[RFC][PATCH 2/2] MIPS: BCM47XX: Detect more then 128 MiB of RAM (HIGHMEM

To: linux-mips@linux-mips.org, Ralf Baechle <ralf@linux-mips.org>
Subject: [RFC][PATCH 2/2] MIPS: BCM47XX: Detect more then 128 MiB of RAM (HIGHMEM support)
From: Rafał Miłecki <zajec5@gmail.com>
Date: Wed, 25 Jun 2014 09:47:01 +0200
Cc: Hauke Mehrtens <hauke@hauke-m.de>, Rafał Miłecki <zajec5@gmail.com>
Dkim-signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-type:content-transfer-encoding; bh=/mKE+RoYaR11SPRvVXpjZoatM3nFQL0AXyUdjJvNkTw=; b=ux4Dw/p9FIDlBwDF2YDsBh6Uj7OOnqVUdJC2ooV6reGK2O0Wj47l77P8n+Ac/KGVN0 nFebS8ZOcazXZjbvI/Y3dhBOhxlLXLXJCqFv5aLmmZcN/QUZPWbiJroAYK/NGW9RxXEF RJnysEulavTHKJYHrTA+kCpGkeLghXkL1gjuETmCLTlHtChhAFVE9fuYJXQcyrXZBwXH Af9L3BUpHMqlcKYO1tJsynXyMe1TZoXmKTb8qF4cRzJxL4Dlhb/XVOcguW7iIK0ywkn2 9goACQkWXFC3U5aeA+3wNW2XOQuhv4bM3g1lfdihFYyo1cAJx/D1rSmIBf/XPhHUwToD JbmQ==
In-reply-to: <1403682421-13297-1-git-send-email-zajec5@gmail.com>
List-archive: <http://www.linux-mips.org/archives/linux-mips/>
List-help: <mailto:ecartis@linux-mips.org?Subject=help>
List-id: linux-mips <linux-mips.eddie.linux-mips.org>
List-owner: <mailto:ralf@linux-mips.org>
List-post: <mailto:linux-mips@linux-mips.org>
List-software: Ecartis version 1.0.0
List-subscribe: <mailto:ecartis@linux-mips.org?subject=subscribe%20linux-mips>
List-unsubscribe: <mailto:ecartis@linux-mips.org?subject=unsubscribe%20linux-mips>
Original-recipient: rfc822;linux-mips@linux-mips.org
References: <1403682421-13297-1-git-send-email-zajec5@gmail.com>
Sender: linux-mips-bounce@linux-mips.org
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
---
 arch/mips/bcm47xx/bcm47xx_private.h |  3 ++
 arch/mips/bcm47xx/prom.c            | 64 ++++++++++++++++++++++++++++++++++++-
 arch/mips/bcm47xx/setup.c           |  3 ++
 arch/mips/mm/tlb-r4k.c              |  2 +-
 4 files changed, 70 insertions(+), 2 deletions(-)

diff --git a/arch/mips/bcm47xx/bcm47xx_private.h 
b/arch/mips/bcm47xx/bcm47xx_private.h
index 0194c3b..f1cc9d0 100644
--- a/arch/mips/bcm47xx/bcm47xx_private.h
+++ b/arch/mips/bcm47xx/bcm47xx_private.h
@@ -3,6 +3,9 @@
 
 #include <linux/kernel.h>
 
+/* prom.c */
+void __init bcm47xx_prom_highmem_init(void);
+
 /* buttons.c */
 int __init bcm47xx_buttons_register(void);
 
diff --git a/arch/mips/bcm47xx/prom.c b/arch/mips/bcm47xx/prom.c
index 1a03a2f..4493ad8 100644
--- a/arch/mips/bcm47xx/prom.c
+++ b/arch/mips/bcm47xx/prom.c
@@ -51,6 +51,8 @@ __init void bcm47xx_set_system_type(u16 chip_id)
                 chip_id);
 }
 
+static unsigned long lowmem __initdata;
+
 static __init void prom_init_mem(void)
 {
        unsigned long mem;
@@ -87,6 +89,7 @@ static __init void prom_init_mem(void)
                if (!memcmp(prom_init, prom_init + mem, 32))
                        break;
        }
+       lowmem = mem;
 
        /* Ignoring the last page when ddr size is 128M. Cached
         * accesses to last page is causing the processor to prefetch
@@ -95,7 +98,6 @@ static __init void prom_init_mem(void)
         */
        if (c->cputype == CPU_74K && (mem == (128  << 20)))
                mem -= 0x1000;
-
        add_memory_region(0, mem, BOOT_MEM_RAM);
 }
 
@@ -114,3 +116,63 @@ void __init prom_init(void)
 void __init prom_free_prom_memory(void)
 {
 }
+
+#if defined(CONFIG_BCM47XX_BCMA) && defined(CONFIG_HIGHMEM)
+
+#define EXTVBASE       0xc0000000
+#define ENTRYLO(x)     ((pte_val(pfn_pte((x) >> _PFN_SHIFT, 
PAGE_KERNEL_UNCACHED)) >> 6) | 1)
+
+#include <asm/tlbflush.h>
+
+extern int temp_tlb_entry;
+/* Stripped version of tlb_init, with the call to build_tlb_refill_handler
+ * dropped. Calling it at this stage causes a hang.
+ */
+void __cpuinit early_tlb_init(void)
+{
+       write_c0_pagemask(PM_DEFAULT_MASK);
+       write_c0_wired(0);
+       temp_tlb_entry = current_cpu_data.tlbsize - 1;
+       local_flush_tlb_all();
+}
+
+extern int add_temporary_entry(unsigned long entrylo0, unsigned long entrylo1,
+                              unsigned long entryhi, unsigned long pagemask);
+void __init bcm47xx_prom_highmem_init(void)
+{
+       unsigned long off = (unsigned long)prom_init;
+       unsigned long extmem = 0;
+       bool highmem_region = false;
+
+       BUG_ON(bcm47xx_bus_type != BCM47XX_BUS_TYPE_BCMA);
+
+       if (bcm47xx_bus.bcma.bus.chipinfo.id == BCMA_CHIP_ID_BCM4706)
+               highmem_region = true;
+
+       if (lowmem != 128 << 20 || !highmem_region)
+               return;
+
+       early_tlb_init();
+
+       /* Add one temporary TLB entry to map SDRAM Region 2.
+        *      Physical        Virtual
+        *      0x80000000      0xc0000000      (1st: 256MB)
+        *      0x90000000      0xd0000000      (2nd: 256MB)
+        */
+       add_temporary_entry(ENTRYLO(0x80000000),
+                           ENTRYLO(0x80000000 + (256 << 20)),
+                           EXTVBASE, PM_256M);
+
+       off = EXTVBASE + __pa(off);
+       for (extmem = 128 << 20; extmem < 512 << 20; extmem <<= 1) {
+               if (!memcmp(prom_init, (void *)(off + extmem), 16))
+                       break;
+       }
+       extmem -= lowmem;
+       pr_debug("Found: %lu MiB of extra memory (over lowmem 128 MiB)\n",
+                extmem >> 20);
+
+       early_tlb_init();
+}
+
+#endif /* defined(CONFIG_BCM47XX_BCMA) && defined(CONFIG_HIGHMEM) */
diff --git a/arch/mips/bcm47xx/setup.c b/arch/mips/bcm47xx/setup.c
index 63a4b0e..8c8e7cd 100644
--- a/arch/mips/bcm47xx/setup.c
+++ b/arch/mips/bcm47xx/setup.c
@@ -218,6 +218,9 @@ void __init plat_mem_setup(void)
                bcm47xx_bus_type = BCM47XX_BUS_TYPE_BCMA;
                bcm47xx_register_bcma();
                bcm47xx_set_system_type(bcm47xx_bus.bcma.bus.chipinfo.id);
+#ifdef CONFIG_HIGHMEM
+               bcm47xx_prom_highmem_init();
+#endif
 #endif
        } else {
                printk(KERN_INFO "bcm47xx: using ssb bus\n");
diff --git a/arch/mips/mm/tlb-r4k.c b/arch/mips/mm/tlb-r4k.c
index 04feeb5..92c9efdb 100644
--- a/arch/mips/mm/tlb-r4k.c
+++ b/arch/mips/mm/tlb-r4k.c
@@ -397,7 +397,7 @@ int __init has_transparent_hugepage(void)
  * lifetime of the system
  */
 
-static int temp_tlb_entry __cpuinitdata;
+int temp_tlb_entry __cpuinitdata;
 
 __init int add_temporary_entry(unsigned long entrylo0, unsigned long entrylo1,
                               unsigned long entryhi, unsigned long pagemask)
-- 
1.8.4.5


<Prev in Thread] Current Thread [Next in Thread>