5 files changed, 211 insertions, 131 deletions

diff --git a/arch/mips/bcm47xx/bcm47xx_private.h b/arch/mips/bcm47xx/bcm47xx_private.h
index f1cc9d0495d8..ea909a56a3ee 100644
--- a/arch/mips/bcm47xx/bcm47xx_private.h
+++ b/arch/mips/bcm47xx/bcm47xx_private.h
@@ -6,12 +6,18 @@
 /* prom.c */
 void __init bcm47xx_prom_highmem_init(void);
 
+/* sprom.c */
+void bcm47xx_sprom_register_fallbacks(void);
+
 /* buttons.c */
 int __init bcm47xx_buttons_register(void);
 
 /* leds.c */
 void __init bcm47xx_leds_register(void);
 
+/* setup.c */
+void __init bcm47xx_bus_setup(void);
+
 /* workarounds.c */
 void __init bcm47xx_workarounds(void);
 
diff --git a/arch/mips/bcm47xx/irq.c b/arch/mips/bcm47xx/irq.c
index e0585b76ec19..21b4497f09be 100644
--- a/arch/mips/bcm47xx/irq.c
+++ b/arch/mips/bcm47xx/irq.c
@@ -22,6 +22,8 @@
  *  675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
+#include "bcm47xx_private.h"
+
 #include <linux/types.h>
 #include <linux/interrupt.h>
 #include <linux/irq.h>
@@ -65,6 +67,12 @@ DEFINE_HWx_IRQDISPATCH(7)
 
 void __init arch_init_irq(void)
 {
+        /*
+         * This is the first arch callback after mm_init (we can use kmalloc),
+         * so let's finish bus initialization now.
+         */
+        bcm47xx_bus_setup();
+
 #ifdef CONFIG_BCM47XX_BCMA
         if (bcm47xx_bus_type == BCM47XX_BUS_TYPE_BCMA) {
                 bcma_write32(bcm47xx_bus.bcma.bus.drv_mips.core,
diff --git a/arch/mips/bcm47xx/nvram.c b/arch/mips/bcm47xx/nvram.c
index 2bed73a684ae..c5c381c43f17 100644
--- a/arch/mips/bcm47xx/nvram.c
+++ b/arch/mips/bcm47xx/nvram.c
@@ -13,24 +13,35 @@
 
 #include <linux/types.h>
 #include <linux/module.h>
-#include <linux/ssb/ssb.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
-#include <asm/addrspace.h>
+#include <linux/mtd/mtd.h>
 #include <bcm47xx_nvram.h>
-#include <asm/mach-bcm47xx/bcm47xx.h>
+
+#define NVRAM_MAGIC             0x48534C46      /* 'FLSH' */
+#define NVRAM_SPACE             0x8000
+
+#define FLASH_MIN               0x00020000      /* Minimum flash size */
+
+struct nvram_header {
+        u32 magic;
+        u32 len;
+        u32 crc_ver_init;       /* 0:7 crc, 8:15 ver, 16:31 sdram_init */
+        u32 config_refresh;     /* 0:15 sdram_config, 16:31 sdram_refresh */
+        u32 config_ncdl;        /* ncdl values for memc */
+};
 
 static char nvram_buf[NVRAM_SPACE];
 static const u32 nvram_sizes[] = {0x8000, 0xF000, 0x10000};
 
-static u32 find_nvram_size(u32 end)
+static u32 find_nvram_size(void __iomem *end)
 {
-        struct nvram_header *header;
+        struct nvram_header __iomem *header;
         int i;
 
         for (i = 0; i < ARRAY_SIZE(nvram_sizes); i++) {
-                header = (struct nvram_header *)KSEG1ADDR(end - nvram_sizes[i]);
-                if (header->magic == NVRAM_HEADER)
+                header = (struct nvram_header *)(end - nvram_sizes[i]);
+                if (header->magic == NVRAM_MAGIC)
                         return nvram_sizes[i];
         }
 
@@ -38,36 +49,40 @@ static u32 find_nvram_size(u32 end)
 }
 
 /* Probe for NVRAM header */
-static int nvram_find_and_copy(u32 base, u32 lim)
+static int nvram_find_and_copy(void __iomem *iobase, u32 lim)
 {
-        struct nvram_header *header;
+        struct nvram_header __iomem *header;
         int i;
         u32 off;
         u32 *src, *dst;
         u32 size;
 
+        if (nvram_buf[0]) {
+                pr_warn("nvram already initialized\n");
+                return -EEXIST;
+        }
+
         /* TODO: when nvram is on nand flash check for bad blocks first. */
         off = FLASH_MIN;
         while (off <= lim) {
                 /* Windowed flash access */
-                size = find_nvram_size(base + off);
+                size = find_nvram_size(iobase + off);
                 if (size) {
-                        header = (struct nvram_header *)KSEG1ADDR(base + off -
-                                                                  size);
+                        header = (struct nvram_header *)(iobase + off - size);
                         goto found;
                 }
                 off <<= 1;
         }
 
         /* Try embedded NVRAM at 4 KB and 1 KB as last resorts */
-        header = (struct nvram_header *) KSEG1ADDR(base + 4096);
-        if (header->magic == NVRAM_HEADER) {
+        header = (struct nvram_header *)(iobase + 4096);
+        if (header->magic == NVRAM_MAGIC) {
                 size = NVRAM_SPACE;
                 goto found;
         }
 
-        header = (struct nvram_header *) KSEG1ADDR(base + 1024);
-        if (header->magic == NVRAM_HEADER) {
+        header = (struct nvram_header *)(iobase + 1024);
+        if (header->magic == NVRAM_MAGIC) {
                 size = NVRAM_SPACE;
                 goto found;
         }
@@ -94,71 +109,73 @@ found:
         return 0;
 }
 
-#ifdef CONFIG_BCM47XX_SSB
-static int nvram_init_ssb(void)
+/*
+ * On bcm47xx we need access to the NVRAM very early, so we can't use mtd
+ * subsystem to access flash. We can't even use platform device / driver to
+ * store memory offset.
+ * To handle this we provide following symbol. It's supposed to be called as
+ * soon as we get info about flash device, before any NVRAM entry is needed.
+ */
+int bcm47xx_nvram_init_from_mem(u32 base, u32 lim)
 {
-        struct ssb_mipscore *mcore = &bcm47xx_bus.ssb.mipscore;
-        u32 base;
-        u32 lim;
-
-        if (mcore->pflash.present) {
-                base = mcore->pflash.window;
-                lim = mcore->pflash.window_size;
-        } else {
-                pr_err("Couldn't find supported flash memory\n");
-                return -ENXIO;
-        }
+        void __iomem *iobase;
+        int err;
 
-        return nvram_find_and_copy(base, lim);
-}
-#endif
+        iobase = ioremap_nocache(base, lim);
+        if (!iobase)
+                return -ENOMEM;
 
-#ifdef CONFIG_BCM47XX_BCMA
-static int nvram_init_bcma(void)
-{
-        struct bcma_drv_cc *cc = &bcm47xx_bus.bcma.bus.drv_cc;
-        u32 base;
-        u32 lim;
-
-#ifdef CONFIG_BCMA_NFLASH
-        if (cc->nflash.boot) {
-                base = BCMA_SOC_FLASH1;
-                lim = BCMA_SOC_FLASH1_SZ;
-        } else
-#endif
-        if (cc->pflash.present) {
-                base = cc->pflash.window;
-                lim = cc->pflash.window_size;
-#ifdef CONFIG_BCMA_SFLASH
-        } else if (cc->sflash.present) {
-                base = cc->sflash.window;
-                lim = cc->sflash.size;
-#endif
-        } else {
-                pr_err("Couldn't find supported flash memory\n");
-                return -ENXIO;
-        }
+        err = nvram_find_and_copy(iobase, lim);
+
+        iounmap(iobase);
 
-        return nvram_find_and_copy(base, lim);
+        return err;
 }
-#endif
 
 static int nvram_init(void)
 {
-        switch (bcm47xx_bus_type) {
-#ifdef CONFIG_BCM47XX_SSB
-        case BCM47XX_BUS_TYPE_SSB:
-                return nvram_init_ssb();
-#endif
-#ifdef CONFIG_BCM47XX_BCMA
-        case BCM47XX_BUS_TYPE_BCMA:
-                return nvram_init_bcma();
-#endif
+#ifdef CONFIG_MTD
+        struct mtd_info *mtd;
+        struct nvram_header header;
+        size_t bytes_read;
+        int err, i;
+
+        mtd = get_mtd_device_nm("nvram");
+        if (IS_ERR(mtd))
+                return -ENODEV;
+
+        for (i = 0; i < ARRAY_SIZE(nvram_sizes); i++) {
+                loff_t from = mtd->size - nvram_sizes[i];
+
+                if (from < 0)
+                        continue;
+
+                err = mtd_read(mtd, from, sizeof(header), &bytes_read,
+                               (uint8_t *)&header);
+                if (!err && header.magic == NVRAM_MAGIC) {
+                        u8 *dst = (uint8_t *)nvram_buf;
+                        size_t len = header.len;
+
+                        if (header.len > NVRAM_SPACE) {
+                                pr_err("nvram on flash (%i bytes) is bigger than the reserved space in memory, will just copy the first %i bytes\n",
+                                       header.len, NVRAM_SPACE);
+                                len = NVRAM_SPACE;
+                        }
+
+                        err = mtd_read(mtd, from, len, &bytes_read, dst);
+                        if (err)
+                                return err;
+                        memset(dst + bytes_read, 0x0, NVRAM_SPACE - bytes_read);
+
+                        return 0;
+                }
         }
+#endif
+
         return -ENXIO;
 }
 
-int bcm47xx_nvram_getenv(char *name, char *val, size_t val_len)
+int bcm47xx_nvram_getenv(const char *name, char *val, size_t val_len)
 {
         char *var, *value, *end, *eq;
         int err;
diff --git a/arch/mips/bcm47xx/setup.c b/arch/mips/bcm47xx/setup.c
index c00585d915bc..e43b5046cb30 100644
--- a/arch/mips/bcm47xx/setup.c
+++ b/arch/mips/bcm47xx/setup.c
@@ -102,23 +102,6 @@ static void bcm47xx_machine_halt(void)
 }
 
 #ifdef CONFIG_BCM47XX_SSB
-static int bcm47xx_get_sprom_ssb(struct ssb_bus *bus, struct ssb_sprom *out)
-{
-        char prefix[10];
-
-        if (bus->bustype == SSB_BUSTYPE_PCI) {
-                memset(out, 0, sizeof(struct ssb_sprom));
-                snprintf(prefix, sizeof(prefix), "pci/%u/%u/",
-                         bus->host_pci->bus->number + 1,
-                         PCI_SLOT(bus->host_pci->devfn));
-                bcm47xx_fill_sprom(out, prefix, false);
-                return 0;
-        } else {
-                printk(KERN_WARNING "bcm47xx: unable to fill SPROM for given bustype.\n");
-                return -EINVAL;
-        }
-}
-
 static int bcm47xx_get_invariants(struct ssb_bus *bus,
                                   struct ssb_init_invariants *iv)
 {
@@ -144,11 +127,6 @@ static void __init bcm47xx_register_ssb(void)
         char buf[100];
         struct ssb_mipscore *mcore;
 
-        err = ssb_arch_register_fallback_sprom(&bcm47xx_get_sprom_ssb);
-        if (err)
-                printk(KERN_WARNING "bcm47xx: someone else already registered"
-                        " a ssb SPROM callback handler (err %d)\n", err);
-
         err = ssb_bus_ssbbus_register(&(bcm47xx_bus.ssb), SSB_ENUM_BASE,
                                       bcm47xx_get_invariants);
         if (err)
@@ -171,56 +149,21 @@ static void __init bcm47xx_register_ssb(void)
 #endif
 
 #ifdef CONFIG_BCM47XX_BCMA
-static int bcm47xx_get_sprom_bcma(struct bcma_bus *bus, struct ssb_sprom *out)
-{
-        char prefix[10];
-        struct bcma_device *core;
-
-        switch (bus->hosttype) {
-        case BCMA_HOSTTYPE_PCI:
-                memset(out, 0, sizeof(struct ssb_sprom));
-                snprintf(prefix, sizeof(prefix), "pci/%u/%u/",
-                         bus->host_pci->bus->number + 1,
-                         PCI_SLOT(bus->host_pci->devfn));
-                bcm47xx_fill_sprom(out, prefix, false);
-                return 0;
-        case BCMA_HOSTTYPE_SOC:
-                memset(out, 0, sizeof(struct ssb_sprom));
-                core = bcma_find_core(bus, BCMA_CORE_80211);
-                if (core) {
-                        snprintf(prefix, sizeof(prefix), "sb/%u/",
-                                 core->core_index);
-                        bcm47xx_fill_sprom(out, prefix, true);
-                } else {
-                        bcm47xx_fill_sprom(out, NULL, false);
-                }
-                return 0;
-        default:
-                pr_warn("bcm47xx: unable to fill SPROM for given bustype.\n");
-                return -EINVAL;
-        }
-}
-
 static void __init bcm47xx_register_bcma(void)
 {
         int err;
 
-        err = bcma_arch_register_fallback_sprom(&bcm47xx_get_sprom_bcma);
-        if (err)
-                pr_warn("bcm47xx: someone else already registered a bcma SPROM callback handler (err %d)\n", err);
-
         err = bcma_host_soc_register(&bcm47xx_bus.bcma);
         if (err)
                 panic("Failed to register BCMA bus (err %d)", err);
-
-        err = bcma_host_soc_init(&bcm47xx_bus.bcma);
-        if (err)
-                panic("Failed to initialize BCMA bus (err %d)", err);
-
-        bcm47xx_fill_bcma_boardinfo(&bcm47xx_bus.bcma.bus.boardinfo, NULL);
 }
 #endif
 
+/*
+ * Memory setup is done in the early part of MIPS's arch_mem_init. It's supposed
+ * to detect memory and record it with add_memory_region.
+ * Any extra initializaion performed here must not use kmalloc or bootmem.
+ */
 void __init plat_mem_setup(void)
 {
         struct cpuinfo_mips *c = &current_cpu_data;
@@ -229,6 +172,7 @@ void __init plat_mem_setup(void)
                 printk(KERN_INFO "bcm47xx: using bcma bus\n");
 #ifdef CONFIG_BCM47XX_BCMA
                 bcm47xx_bus_type = BCM47XX_BUS_TYPE_BCMA;
+                bcm47xx_sprom_register_fallbacks();
                 bcm47xx_register_bcma();
                 bcm47xx_set_system_type(bcm47xx_bus.bcma.bus.chipinfo.id);
 #ifdef CONFIG_HIGHMEM
@@ -239,6 +183,7 @@ void __init plat_mem_setup(void)
                 printk(KERN_INFO "bcm47xx: using ssb bus\n");
 #ifdef CONFIG_BCM47XX_SSB
                 bcm47xx_bus_type = BCM47XX_BUS_TYPE_SSB;
+                bcm47xx_sprom_register_fallbacks();
                 bcm47xx_register_ssb();
                 bcm47xx_set_system_type(bcm47xx_bus.ssb.chip_id);
 #endif
@@ -247,6 +192,28 @@ void __init plat_mem_setup(void)
         _machine_restart = bcm47xx_machine_restart;
         _machine_halt = bcm47xx_machine_halt;
         pm_power_off = bcm47xx_machine_halt;
+}
+
+/*
+ * This finishes bus initialization doing things that were not possible without
+ * kmalloc. Make sure to call it late enough (after mm_init).
+ */
+void __init bcm47xx_bus_setup(void)
+{
+#ifdef CONFIG_BCM47XX_BCMA
+        if (bcm47xx_bus_type == BCM47XX_BUS_TYPE_BCMA) {
+                int err;
+
+                err = bcma_host_soc_init(&bcm47xx_bus.bcma);
+                if (err)
+                        panic("Failed to initialize BCMA bus (err %d)", err);
+
+                bcm47xx_fill_bcma_boardinfo(&bcm47xx_bus.bcma.bus.boardinfo,
+                                            NULL);
+        }
+#endif
+
+        /* With bus initialized we can access NVRAM and detect the board */
         bcm47xx_board_detect();
         mips_set_machine_name(bcm47xx_board_get_name());
 }
diff --git a/arch/mips/bcm47xx/sprom.c b/arch/mips/bcm47xx/sprom.c
index 41226b68de3d..2eff7fe99c6b 100644
--- a/arch/mips/bcm47xx/sprom.c
+++ b/arch/mips/bcm47xx/sprom.c
@@ -136,6 +136,20 @@ static void nvram_read_leddc(const char *prefix, const char *name,
         *leddc_off_time = (val >> 16) & 0xff;
 }
 
+static void bcm47xx_nvram_parse_macaddr(char *buf, u8 macaddr[6])
+{
+        if (strchr(buf, ':'))
+                sscanf(buf, "%hhx:%hhx:%hhx:%hhx:%hhx:%hhx", &macaddr[0],
+                        &macaddr[1], &macaddr[2], &macaddr[3], &macaddr[4],
+                        &macaddr[5]);
+        else if (strchr(buf, '-'))
+                sscanf(buf, "%hhx-%hhx-%hhx-%hhx-%hhx-%hhx", &macaddr[0],
+                        &macaddr[1], &macaddr[2], &macaddr[3], &macaddr[4],
+                        &macaddr[5]);
+        else
+                pr_warn("Can not parse mac address: %s\n", buf);
+}
+
 static void nvram_read_macaddr(const char *prefix, const char *name,
                                u8 val[6], bool fallback)
 {
@@ -801,3 +815,71 @@ void bcm47xx_fill_bcma_boardinfo(struct bcma_boardinfo *boardinfo,
         nvram_read_u16(prefix, NULL, "boardtype", &boardinfo->type, 0, true);
 }
 #endif
+
+#if defined(CONFIG_BCM47XX_SSB)
+static int bcm47xx_get_sprom_ssb(struct ssb_bus *bus, struct ssb_sprom *out)
+{
+        char prefix[10];
+
+        if (bus->bustype == SSB_BUSTYPE_PCI) {
+                memset(out, 0, sizeof(struct ssb_sprom));
+                snprintf(prefix, sizeof(prefix), "pci/%u/%u/",
+                         bus->host_pci->bus->number + 1,
+                         PCI_SLOT(bus->host_pci->devfn));
+                bcm47xx_fill_sprom(out, prefix, false);
+                return 0;
+        } else {
+                pr_warn("bcm47xx: unable to fill SPROM for given bustype.\n");
+                return -EINVAL;
+        }
+}
+#endif
+
+#if defined(CONFIG_BCM47XX_BCMA)
+static int bcm47xx_get_sprom_bcma(struct bcma_bus *bus, struct ssb_sprom *out)
+{
+        char prefix[10];
+        struct bcma_device *core;
+
+        switch (bus->hosttype) {
+        case BCMA_HOSTTYPE_PCI:
+                memset(out, 0, sizeof(struct ssb_sprom));
+                snprintf(prefix, sizeof(prefix), "pci/%u/%u/",
+                         bus->host_pci->bus->number + 1,
+                         PCI_SLOT(bus->host_pci->devfn));
+                bcm47xx_fill_sprom(out, prefix, false);
+                return 0;
+        case BCMA_HOSTTYPE_SOC:
+                memset(out, 0, sizeof(struct ssb_sprom));
+                core = bcma_find_core(bus, BCMA_CORE_80211);
+                if (core) {
+                        snprintf(prefix, sizeof(prefix), "sb/%u/",
+                                 core->core_index);
+                        bcm47xx_fill_sprom(out, prefix, true);
+                } else {
+                        bcm47xx_fill_sprom(out, NULL, false);
+                }
+                return 0;
+        default:
+                pr_warn("bcm47xx: unable to fill SPROM for given bustype.\n");
+                return -EINVAL;
+        }
+}
+#endif
+
+/*
+ * On bcm47xx we need to register SPROM fallback handler very early, so we can't
+ * use anything like platform device / driver for this.
+ */
+void bcm47xx_sprom_register_fallbacks(void)
+{
+#if defined(CONFIG_BCM47XX_SSB)
+        if (ssb_arch_register_fallback_sprom(&bcm47xx_get_sprom_ssb))
+                pr_warn("Failed to registered ssb SPROM handler\n");
+#endif
+
+#if defined(CONFIG_BCM47XX_BCMA)
+        if (bcma_arch_register_fallback_sprom(&bcm47xx_get_sprom_bcma))
+                pr_warn("Failed to registered bcma SPROM handler\n");
+#endif
+}