X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=target%2Flinux%2Far71xx%2Ffiles%2Farch%2Fmips%2Far71xx%2Fprom.c;h=b38b48ba3bd102e304a1d87a4c218e837e624dad;hb=cace9f45660a8bf2ec8a67e33ea5f563ff19abb1;hp=d22c593e1afd9f4c694ea1782f08c0f160bc4f09;hpb=219ec2a41982aa2e49ca06958fa66ef585be0b60;p=openwrt%2Fstaging%2Fflorian.git diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/prom.c b/target/linux/ar71xx/files/arch/mips/ar71xx/prom.c index d22c593e1a..b38b48ba3b 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-2009 Gabor Juhos * Copyright (C) 2008 Imre Kaloz * * This program is free software; you can redistribute it and/or modify it @@ -12,83 +12,205 @@ #include #include #include -#include +#include #include #include #include #include -#include + +#include "devices.h" struct board_rec { - char *name; - unsigned long mach_type; + char *name; + enum ar71xx_mach_type 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, + .mach_type = AR71XX_MACH_RB_411, + }, { + .name = "411U", + .mach_type = AR71XX_MACH_RB_411U, }, { .name = "433", - .mach_type = MACH_AR71XX_RB_433, + .mach_type = AR71XX_MACH_RB_433, + }, { + .name = "433U", + .mach_type = AR71XX_MACH_RB_433U, }, { .name = "450", - .mach_type = MACH_AR71XX_RB_450, + .mach_type = AR71XX_MACH_RB_450, + }, { + .name = "450G", + .mach_type = AR71XX_MACH_RB_450G, + }, { + .name = "493", + .mach_type = AR71XX_MACH_RB_493, + }, { + .name = "AP81", + .mach_type = AR71XX_MACH_AP81, + }, { + .name = "AP83", + .mach_type = AR71XX_MACH_AP83, + }, { + .name = "AW-NR580", + .mach_type = AR71XX_MACH_AW_NR580, + }, { + .name = "DIR-825-B1", + .mach_type = AR71XX_MACH_DIR_825_B1, + }, { + .name = "TEW-632BRP", + .mach_type = AR71XX_MACH_TEW_632BRP, + }, { + .name = "DIR-615-C1", + .mach_type = AR71XX_MACH_DIR_615_C1, + }, { + .name = "TL-WR741ND", + .mach_type = AR71XX_MACH_TL_WR741ND, + }, { + .name = "TL-WR841N-v1.5", + .mach_type = AR71XX_MACH_TL_WR841N_V1, + }, { + .name = "TL-WR941ND", + .mach_type = AR71XX_MACH_TL_WR941ND, + }, { + .name = "TL-WR1043ND", + .mach_type = AR71XX_MACH_TL_WR1043ND, + }, { + .name = "UBNT-RS", + .mach_type = AR71XX_MACH_UBNT_RS, + }, { + .name = "UBNT-RSPRO", + .mach_type = AR71XX_MACH_UBNT_RSPRO, + }, { + .name = "Ubiquiti AR71xx-based board", + .mach_type = AR71XX_MACH_UBNT_RS, + }, { + .name = "UBNT-LS-SR71", + .mach_type = AR71XX_MACH_UBNT_LSSR71, + }, { + .name = "UBNT-LSX", + .mach_type = AR71XX_MACH_UBNT_LSX, + }, { + .name = "UBNT-BM", + .mach_type = AR71XX_MACH_UBNT_BULLET_M, + }, { + .name = "UBNT-RM", + .mach_type = AR71XX_MACH_UBNT_ROCKET_M, + }, { + .name = "UBNT-NM", + .mach_type = AR71XX_MACH_UBNT_NANO_M, + }, { + .name = "WNDR3700", + .mach_type = AR71XX_MACH_WNDR3700, + }, { + .name = "WNR2000", + .mach_type = AR71XX_MACH_WNR2000, + }, { + .name = "WRT160NL", + .mach_type = AR71XX_MACH_WRT160NL, + }, { + .name = "WP543", + .mach_type = AR71XX_MACH_WP543, + }, { + .name = "WRT400N", + .mach_type = AR71XX_MACH_WRT400N, + }, { + .name = "PB42", + .mach_type = AR71XX_MACH_PB42, + }, { + .name = "PB44", + .mach_type = AR71XX_MACH_PB44, + }, { + .name = "MZK-W300NH", + .mach_type = AR71XX_MACH_MZK_W300NH, + }, { + .name = "MZK-W04NU", + .mach_type = AR71XX_MACH_MZK_W04NU, } }; -static __init char *ar71xx_prom_getargv(const char *name) +static int __init ar71xx_board_setup(char *name) { - int len = strlen(name); int i; - if (!ar71xx_prom_argv) - return NULL; + for (i = 0; i < ARRAY_SIZE(boards); i++) + if (strcmp(name, boards[i].name) == 0) { + ar71xx_mach = boards[i].mach_type; + break; + } - 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; - } + return 1; +} +__setup("board=", ar71xx_board_setup); - return NULL; +static int __init ar71xx_ethaddr_setup(char *str) +{ + ar71xx_parse_mac_addr(str); + return 1; } +__setup("ethaddr=", ar71xx_ethaddr_setup); -static __init char *ar71xx_prom_getenv(const char *envname) +static int __init ar71xx_kmac_setup(char *str) { - int len = strlen(envname); - char **env; + ar71xx_parse_mac_addr(str); + return 1; +} +__setup("kmac=", ar71xx_kmac_setup); - if (!ar71xx_prom_envp) - return NULL; +static inline int is_valid_ram_addr(void *addr) +{ + if (((u32) addr > KSEG0) && + ((u32) addr < (KSEG0 + AR71XX_MEM_SIZE_MAX))) + return 1; - for (env = ar71xx_prom_envp; *env != NULL; env++) - if (strncmp(envname, *env, len) == 0 && (*env)[len] == '=') - return *env + len + 1; + if (((u32) addr > KSEG1) && + ((u32) addr < (KSEG1 + AR71XX_MEM_SIZE_MAX))) + return 1; - return NULL; + return 0; } -static __init unsigned long find_board_byname(char *name) +static void __init ar71xx_prom_append_cmdline(const char *name, + const char *value) { - int i; + char buf[CL_SIZE]; - for (i = 0; i < ARRAY_SIZE(boards); i++) - if (strcmp(name, boards[i].name) == 0) - return boards[i].mach_type; + snprintf(buf, sizeof(buf), " %s=%s", name, value); + strlcat(arcs_cmdline, buf, sizeof(arcs_cmdline)); +} + +static void __init ar71xx_prom_find_env(char **envp, const char *name) +{ + int len = strlen(name); + char **p; + + if (!is_valid_ram_addr(envp)) + return; - return MACH_AR71XX_GENERIC; + for (p = envp; is_valid_ram_addr(*p); p++) { + if (strncmp(name, *p, len) == 0 && (*p)[len] == '=') { + ar71xx_prom_append_cmdline(name, *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))) { + ar71xx_prom_append_cmdline(name, *p); + break; + } + } } -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 +218,92 @@ 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; + } + + 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; +} + +#ifdef CONFIG_IMAGE_CMDLINE_HACK +extern char __image_cmdline[]; + +static int __init ar71xx_use__image_cmdline(void) +{ + 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)); } - ar71xx_set_mac_base(mylo->macs[0]); return 1; } +#else +static int inline ar71xx_use__image_cmdline(void) { return 0; } +#endif -static void ar71xx_prom_init_generic(void) +static __init void ar71xx_prom_init_cmdline(int argc, char **argv) { - 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); + 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) { + 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; + + ar71xx_mach = AR71XX_MACH_GENERIC; if (ar71xx_prom_init_myloader()) return; - ar71xx_prom_init_generic(); + ar71xx_prom_init_cmdline(fw_arg0, (char **)fw_arg1); + + envp = (char **)fw_arg2; + ar71xx_prom_find_env(envp, "board"); + ar71xx_prom_find_env(envp, "ethaddr"); } void __init prom_free_prom_memory(void) { /* We do not have to prom memory to free */ } - -#define UART_READ(r) \ - __raw_readl((void __iomem *)(KSEG1ADDR(AR71XX_UART_BASE) + 4 * (r))) - -#define UART_WRITE(r, v) \ - __raw_writel((v), (void __iomem *)(KSEG1ADDR(AR71XX_UART_BASE) + 4*(r))) - -void prom_putchar(unsigned char ch) -{ - while (((UART_READ(UART_LSR)) & UART_LSR_THRE) == 0); - UART_WRITE(UART_TX, ch); - while (((UART_READ(UART_LSR)) & UART_LSR_THRE) == 0); -}