2 files changed, 159 insertions, 5 deletions

diff --git a/arch/mips/bcm47xx/prom.c b/arch/mips/bcm47xx/prom.c
index 41ac9dd88bde..079e33d52783 100644
--- a/arch/mips/bcm47xx/prom.c
+++ b/arch/mips/bcm47xx/prom.c
@@ -1,5 +1,6 @@
 /*
  *  Copyright (C) 2004 Florian Schirmer <jolt@tuxbox.org>
+ *  Copyright (C) 2007 Aurelien Jarno <aurelien@aurel32.net>
  *
  *  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
@@ -23,18 +24,117 @@
  */
 
 #include <linux/init.h>
+#include <linux/types.h>
+#include <linux/kernel.h>
+#include <linux/spinlock.h>
 #include <asm/bootinfo.h>
+#include <asm/fw/cfe/cfe_api.h>
+#include <asm/fw/cfe/cfe_error.h>
+
+static int cfe_cons_handle;
 
 const char *get_system_type(void)
 {
         return "Broadcom BCM47XX";
 }
 
-void __init prom_init(void)
+void prom_putchar(char c)
+{
+        while (cfe_write(cfe_cons_handle, &c, 1) == 0)
+                ;
+}
+
+static __init void prom_init_cfe(void)
+{
+        uint32_t cfe_ept;
+        uint32_t cfe_handle;
+        uint32_t cfe_eptseal;
+        int argc = fw_arg0;
+        char **envp = (char **) fw_arg2;
+        int *prom_vec = (int *) fw_arg3;
+
+        /*
+         * Check if a loader was used; if NOT, the 4 arguments are
+         * what CFE gives us (handle, 0, EPT and EPTSEAL)
+         */
+        if (argc < 0) {
+                cfe_handle = (uint32_t)argc;
+                cfe_ept = (uint32_t)envp;
+                cfe_eptseal = (uint32_t)prom_vec;
+        } else {
+                if ((int)prom_vec < 0) {
+                        /*
+                         * Old loader; all it gives us is the handle,
+                         * so use the "known" entrypoint and assume
+                         * the seal.
+                         */
+                        cfe_handle = (uint32_t)prom_vec;
+                        cfe_ept = 0xBFC00500;
+                        cfe_eptseal = CFE_EPTSEAL;
+                } else {
+                        /*
+                         * Newer loaders bundle the handle/ept/eptseal
+                         * Note: prom_vec is in the loader's useg
+                         * which is still alive in the TLB.
+                         */
+                        cfe_handle = prom_vec[0];
+                        cfe_ept = prom_vec[2];
+                        cfe_eptseal = prom_vec[3];
+                }
+        }
+
+        if (cfe_eptseal != CFE_EPTSEAL) {
+                /* too early for panic to do any good */
+                printk(KERN_ERR "CFE's entrypoint seal doesn't match.");
+                while (1) ;
+        }
+
+        cfe_init(cfe_handle, cfe_ept);
+}
+
+static __init void prom_init_console(void)
+{
+        /* Initialize CFE console */
+        cfe_cons_handle = cfe_getstdhandle(CFE_STDHANDLE_CONSOLE);
+}
+
+static __init void prom_init_cmdline(void)
+{
+        char buf[CL_SIZE];
+
+        /* Get the kernel command line from CFE */
+        if (cfe_getenv("LINUX_CMDLINE", buf, CL_SIZE) >= 0) {
+                buf[CL_SIZE-1] = 0;
+                strcpy(arcs_cmdline, buf);
+        }
+
+        /* Force a console handover by adding a console= argument if needed,
+         * as CFE is not available anymore later in the boot process. */
+        if ((strstr(arcs_cmdline, "console=")) == NULL) {
+                /* Try to read the default serial port used by CFE */
+                if ((cfe_getenv("BOOT_CONSOLE", buf, CL_SIZE) < 0)
+                    || (strncmp("uart", buf, 4)))
+                        /* Default to uart0 */
+                        strcpy(buf, "uart0");
+
+                /* Compute the new command line */
+                snprintf(arcs_cmdline, CL_SIZE, "%s console=ttyS%c,115200",
+                         arcs_cmdline, buf[4]);
+        }
+}
+
+static __init void prom_init_mem(void)
 {
         unsigned long mem;
 
-        /* Figure out memory size by finding aliases */
+        /* Figure out memory size by finding aliases.
+         *
+         * We should theoretically use the mapping from CFE using cfe_enummem().
+         * However as the BCM47XX is mostly used on low-memory systems, we
+         * 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.
+         */
         for (mem = (1 << 20); mem < (128 << 20); mem += (1 << 20)) {
                 if (*(unsigned long *)((unsigned long)(prom_init) + mem) ==
                     *(unsigned long *)(prom_init))
@@ -44,6 +144,15 @@ void __init prom_init(void)
         add_memory_region(0, mem, BOOT_MEM_RAM);
 }
 
+void __init prom_init(void)
+{
+        prom_init_cfe();
+        prom_init_console();
+        prom_init_cmdline();
+        prom_init_mem();
+}
+
 void __init prom_free_prom_memory(void)
 {
 }
+
diff --git a/arch/mips/bcm47xx/setup.c b/arch/mips/bcm47xx/setup.c
index dfc580aae958..f48aa5aa9bf0 100644
--- a/arch/mips/bcm47xx/setup.c
+++ b/arch/mips/bcm47xx/setup.c
@@ -27,9 +27,11 @@
 
 #include <linux/types.h>
 #include <linux/ssb/ssb.h>
+#include <asm/bootinfo.h>
 #include <asm/reboot.h>
 #include <asm/time.h>
 #include <bcm47xx.h>
+#include <asm/fw/cfe/cfe_api.h>
 
 struct ssb_bus ssb_bcm47xx;
 EXPORT_SYMBOL(ssb_bcm47xx);
@@ -53,12 +55,55 @@ static void bcm47xx_machine_halt(void)
                 cpu_relax();
 }
 
+static void str2eaddr(char *str, char *dest)
+{
+        int i = 0;
+
+        if (str == NULL) {
+                memset(dest, 0, 6);
+                return;
+        }
+
+        for (;;) {
+                dest[i++] = (char) simple_strtoul(str, NULL, 16);
+                str += 2;
+                if (!*str++ || i == 6)
+                        break;
+        }
+}
+
 static int bcm47xx_get_invariants(struct ssb_bus *bus,
                                    struct ssb_init_invariants *iv)
 {
-        /* TODO: fill ssb_init_invariants using boardtype/boardrev
-         * CFE environment variables.
-         */
+        char buf[100];
+
+        /* Fill boardinfo structure */
+        memset(&(iv->boardinfo), 0 , sizeof(struct ssb_boardinfo));
+
+        if (cfe_getenv("boardvendor", buf, sizeof(buf)) >= 0)
+                iv->boardinfo.type = (u16)simple_strtoul(buf, NULL, 0);
+        if (cfe_getenv("boardtype", buf, sizeof(buf)) >= 0)
+                iv->boardinfo.type = (u16)simple_strtoul(buf, NULL, 0);
+        if (cfe_getenv("boardrev", buf, sizeof(buf)) >= 0)
+                iv->boardinfo.rev = (u16)simple_strtoul(buf, NULL, 0);
+
+        /* Fill sprom structure */
+        memset(&(iv->sprom), 0, sizeof(struct ssb_sprom));
+        iv->sprom.revision = 3;
+
+        if (cfe_getenv("et0macaddr", buf, sizeof(buf)) >= 0)
+                str2eaddr(buf, iv->sprom.r1.et0mac);
+        if (cfe_getenv("et1macaddr", buf, sizeof(buf)) >= 0)
+                str2eaddr(buf, iv->sprom.r1.et1mac);
+        if (cfe_getenv("et0phyaddr", buf, sizeof(buf)) >= 0)
+                iv->sprom.r1.et0phyaddr = simple_strtoul(buf, NULL, 10);
+        if (cfe_getenv("et1phyaddr", buf, sizeof(buf)) >= 0)
+                iv->sprom.r1.et1phyaddr = simple_strtoul(buf, NULL, 10);
+        if (cfe_getenv("et0mdcport", buf, sizeof(buf)) >= 0)
+                iv->sprom.r1.et0mdcport = simple_strtoul(buf, NULL, 10);
+        if (cfe_getenv("et1mdcport", buf, sizeof(buf)) >= 0)
+                iv->sprom.r1.et1mdcport = simple_strtoul(buf, NULL, 10);
+
         return 0;
 }