X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=blobdiff_plain;f=target%2Flinux%2Far71xx%2Ffiles%2Farch%2Fmips%2Far71xx%2Fprom.c;h=c40dae319a3dbf5afe8ad560ad526363d31411fb;hp=d22c593e1afd9f4c694ea1782f08c0f160bc4f09;hb=c1e8a5560a250f85411438381a27b98af7c9c3d4;hpb=18077a9b1cf31571dc6c54fb6fd7e033fd6bdc7a diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/prom.c b/target/linux/ar71xx/files/arch/mips/ar71xx/prom.c index d22c593e1a..c40dae319a 100644 --- a/target/linux/ar71xx/files/arch/mips/ar71xx/prom.c +++ b/target/linux/ar71xx/files/arch/mips/ar71xx/prom.c @@ -1,7 +1,7 @@ /* * Atheros AR71xx SoC specific prom routines * - * Copyright (C) 2008 Gabor Juhos + * Copyright (C) 2008-2010 Gabor Juhos * Copyright (C) 2008 Imre Kaloz * * This program is free software; you can redistribute it and/or modify it @@ -12,83 +12,68 @@ #include #include #include -#include +#include #include #include #include #include -#include - -struct board_rec { - char *name; - unsigned long mach_type; -}; - -static int ar71xx_prom_argc __initdata; -static char **ar71xx_prom_argv __initdata; -static char **ar71xx_prom_envp __initdata; - -static struct board_rec boards[] __initdata = { - { - .name = "411", - .mach_type = MACH_AR71XX_RB_411, - }, { - .name = "433", - .mach_type = MACH_AR71XX_RB_433, - }, { - .name = "450", - .mach_type = MACH_AR71XX_RB_450, - } -}; -static __init char *ar71xx_prom_getargv(const char *name) +static inline int is_valid_ram_addr(void *addr) { - int len = strlen(name); - int i; - - if (!ar71xx_prom_argv) - return NULL; + if (((u32) addr > KSEG0) && + ((u32) addr < (KSEG0 + AR71XX_MEM_SIZE_MAX))) + return 1; - for (i = 0; i < ar71xx_prom_argc; i++) { - char *argv = ar71xx_prom_argv[i]; - if (strncmp(name, argv, len) == 0 && (argv)[len] == '=') - return argv + len + 1; - } + if (((u32) addr > KSEG1) && + ((u32) addr < (KSEG1 + AR71XX_MEM_SIZE_MAX))) + return 1; - return NULL; + return 0; } -static __init char *ar71xx_prom_getenv(const char *envname) +static void __init ar71xx_prom_append_cmdline(const char *name, + const char *value) { - int len = strlen(envname); - char **env; - - if (!ar71xx_prom_envp) - return NULL; - - for (env = ar71xx_prom_envp; *env != NULL; env++) - if (strncmp(envname, *env, len) == 0 && (*env)[len] == '=') - return *env + len + 1; + char buf[COMMAND_LINE_SIZE]; - return NULL; + snprintf(buf, sizeof(buf), " %s=%s", name, value); + strlcat(arcs_cmdline, buf, sizeof(arcs_cmdline)); } -static __init unsigned long find_board_byname(char *name) +static const char * __init ar71xx_prom_find_env(char **envp, const char *name) { - int i; + const char *ret = NULL; + int len; + char **p; - for (i = 0; i < ARRAY_SIZE(boards); i++) - if (strcmp(name, boards[i].name) == 0) - return boards[i].mach_type; + if (!is_valid_ram_addr(envp)) + return NULL; + + len = strlen(name); + for (p = envp; is_valid_ram_addr(*p); p++) { + if (strncmp(name, *p, len) == 0 && (*p)[len] == '=') { + ret = *p + len + 1; + break; + } + + /* RedBoot env comes in pointer pairs - key, value */ + if (strncmp(name, *p, len) == 0 && (*p)[len] == 0) + if (is_valid_ram_addr(*(++p))) { + ret = *p; + break; + } + } - return MACH_AR71XX_GENERIC; + return ret; } -static int ar71xx_prom_init_myloader(void) +static int __init ar71xx_prom_init_myloader(void) { struct myloader_info *mylo; + char mac_buf[32]; + char *mac; mylo = myloader_get_info(); if (!mylo) @@ -96,67 +81,109 @@ static int ar71xx_prom_init_myloader(void) switch (mylo->did) { case DEVID_COMPEX_WP543: - mips_machtype = MACH_AR71XX_WP543; + ar71xx_prom_append_cmdline("board", "WP543"); break; default: printk(KERN_WARNING "prom: unknown device id: %x\n", mylo->did); + return 0; } - ar71xx_set_mac_base(mylo->macs[0]); + + mac = mylo->macs[0]; + snprintf(mac_buf, sizeof(mac_buf), "%02x:%02x:%02x:%02x:%02x:%02x", + mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]); + + ar71xx_prom_append_cmdline("ethaddr", mac_buf); return 1; } -static void ar71xx_prom_init_generic(void) +#ifdef CONFIG_IMAGE_CMDLINE_HACK +extern char __image_cmdline[]; + +static int __init ar71xx_use__image_cmdline(void) { - char *p; - - ar71xx_prom_argc = fw_arg0; - ar71xx_prom_argv = (char **)fw_arg1; - ar71xx_prom_envp = (char **)fw_arg2; - - p = ar71xx_prom_getenv("board"); - if (!p) - p = ar71xx_prom_getargv("board"); - if (p) - mips_machtype = find_board_byname(p); - - p = ar71xx_prom_getenv("ethaddr"); - if (!p) - p = ar71xx_prom_getargv("kmac"); - if (p) - ar71xx_parse_mac_addr(p); + char *p = __image_cmdline; + int replace = 0; + + if (*p == '-') { + replace = 1; + p++; + } + + if (*p == '\0') + return 0; + + if (replace) { + strlcpy(arcs_cmdline, p, sizeof(arcs_cmdline)); + } else { + strlcat(arcs_cmdline, " ", sizeof(arcs_cmdline)); + strlcat(arcs_cmdline, p, sizeof(arcs_cmdline)); + } + + return 1; +} +#else +static inline int ar71xx_use__image_cmdline(void) { return 0; } +#endif + +static __init void ar71xx_prom_init_cmdline(int argc, char **argv) +{ + int i; + + if (ar71xx_use__image_cmdline()) + return; + + if (!is_valid_ram_addr(argv)) + return; + + for (i = 0; i < argc; i++) + if (is_valid_ram_addr(argv[i])) { + strlcat(arcs_cmdline, " ", sizeof(arcs_cmdline)); + strlcat(arcs_cmdline, argv[i], sizeof(arcs_cmdline)); + } } void __init prom_init(void) { + const char *env; + char **envp; + printk(KERN_DEBUG "prom: fw_arg0=%08x, fw_arg1=%08x, " "fw_arg2=%08x, fw_arg3=%08x\n", (unsigned int)fw_arg0, (unsigned int)fw_arg1, (unsigned int)fw_arg2, (unsigned int)fw_arg3); - mips_machtype = MACH_AR71XX_GENERIC; if (ar71xx_prom_init_myloader()) return; - ar71xx_prom_init_generic(); -} + ar71xx_prom_init_cmdline(fw_arg0, (char **)fw_arg1); -void __init prom_free_prom_memory(void) -{ - /* We do not have to prom memory to free */ -} + envp = (char **)fw_arg2; + if (!strstr(arcs_cmdline, "ethaddr=")) { + env = ar71xx_prom_find_env(envp, "ethaddr"); + if (env) + ar71xx_prom_append_cmdline("ethaddr", env); + } -#define UART_READ(r) \ - __raw_readl((void __iomem *)(KSEG1ADDR(AR71XX_UART_BASE) + 4 * (r))) + if (!strstr(arcs_cmdline, "board=")) { + env = ar71xx_prom_find_env(envp, "board"); + if (env) { + /* Workaround for buggy bootloaders */ + if (strcmp(env, "RouterStation") == 0 || + strcmp(env, "Ubiquiti AR71xx-based board") == 0) + env = "UBNT-RS"; -#define UART_WRITE(r, v) \ - __raw_writel((v), (void __iomem *)(KSEG1ADDR(AR71XX_UART_BASE) + 4*(r))) + if (strcmp(env, "RouterStation PRO") == 0) + env = "UBNT-RSPRO"; -void prom_putchar(unsigned char ch) + ar71xx_prom_append_cmdline("board", env); + } + } +} + +void __init prom_free_prom_memory(void) { - while (((UART_READ(UART_LSR)) & UART_LSR_THRE) == 0); - UART_WRITE(UART_TX, ch); - while (((UART_READ(UART_LSR)) & UART_LSR_THRE) == 0); + /* We do not have to prom memory to free */ }