X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=target%2Flinux%2Fifxmips%2Ffiles%2Farch%2Fmips%2Fifxmips%2Fprom.c;h=efd472fb0eb314cfc0526de2b68fa0b3c806df1f;hb=a668d3bec510e3c1311a08502c582b797c11b589;hp=41e111c6919de850fc0b8ca9bda2166b109bb10b;hpb=6c341d3e514e069fd81fffdb3a0f3872901647e9;p=openwrt%2Fsvn-archive%2Farchive.git diff --git a/target/linux/ifxmips/files/arch/mips/ifxmips/prom.c b/target/linux/ifxmips/files/arch/mips/ifxmips/prom.c index 41e111c691..efd472fb0e 100644 --- a/target/linux/ifxmips/files/arch/mips/ifxmips/prom.c +++ b/target/linux/ifxmips/files/arch/mips/ifxmips/prom.c @@ -1,6 +1,4 @@ /* - * arch/mips/ifxmips/prom.c - * * 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 Free Software Foundation; either version 2 of the License, or @@ -16,41 +14,59 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. * * Copyright (C) 2005 Wu Qi Ming infineon - * - * Rewrite of Infineon IFXMips code, thanks to infineon for the support, - * software and hardware - * - * Copyright (C) 2007 John Crispin - * + * Copyright (C) 2007 John Crispin */ #include +#include #include #include #include +static char buf[1024]; /* for prom_printf() */ + +/* for voice cpu (MIPS24K) */ +unsigned int *prom_cp1_base; +unsigned int prom_cp1_size; + +/* for Multithreading (APRP) on MIPS34K */ +unsigned long physical_memsize; + +#ifdef CONFIG_IFXMIPS_PROM_ASC0 +#define IFXMIPS_ASC_DIFF 0 +#else +#define IFXMIPS_ASC_DIFF IFXMIPS_ASC_BASE_DIFF +#endif + +static inline u32 asc_r32(unsigned long r) +{ + return ifxmips_r32((u32 *)(IFXMIPS_ASC_BASE_ADDR + IFXMIPS_ASC_DIFF + r)); +} -static char buf[1024]; -u32 *prom_cp1_base = NULL; -u32 prom_cp1_size = 0; +static inline void asc_w32(u32 v, unsigned long r) +{ + ifxmips_w32(v, (u32 *)(IFXMIPS_ASC_BASE_ADDR + IFXMIPS_ASC_DIFF + r)); +} -void -prom_free_prom_memory(void) +void prom_free_prom_memory(void) { } -void -prom_putchar(char c) +void prom_putchar(char c) { - while((ifxmips_r32(IFXMIPS_ASC1_FSTAT) & ASCFSTAT_TXFFLMASK) >> ASCFSTAT_TXFFLOFF); + unsigned long flags; + + local_irq_save(flags); + while ((asc_r32(IFXMIPS_ASC_FSTAT) & ASCFSTAT_TXFFLMASK) >> ASCFSTAT_TXFFLOFF) + ; - if(c == '\n') - ifxmips_w32('\r', IFXMIPS_ASC1_TBUF); - ifxmips_w32(c, IFXMIPS_ASC1_TBUF); + if (c == '\n') + asc_w32('\r', IFXMIPS_ASC_TBUF); + asc_w32(c, IFXMIPS_ASC_TBUF); + local_irq_restore(flags); } -void -prom_printf(const char * fmt, ...) +void prom_printf(const char *fmt, ...) { va_list args; int l; @@ -61,69 +77,78 @@ prom_printf(const char * fmt, ...) va_end(args); buf_end = buf + l; - for(p = buf; p < buf_end; p++) - { + for (p = buf; p < buf_end; p++) prom_putchar(*p); - } } -u32 *prom_get_cp1_base(void) +unsigned int *prom_get_cp1_base(void) { return prom_cp1_base; } +EXPORT_SYMBOL(prom_get_cp1_base); -u32 prom_get_cp1_size(void) +unsigned int prom_get_cp1_size(void) { - return prom_cp1_size; + /* return size im MB */ + return prom_cp1_size>>20; } +EXPORT_SYMBOL(prom_get_cp1_size); -void __init -prom_init(void) +void __init prom_init(void) { int argc = fw_arg0; char **argv = (char **) fw_arg1; char **envp = (char **) fw_arg2; - int memsize = 16; + int memsize = 16; /* assume 16M as default */ int i; mips_machtype = MACH_INFINEON_IFXMIPS; - argv = (char**)KSEG1ADDR((unsigned long)argv); - arcs_cmdline[0] = '\0'; - for(i = 1; i < argc; i++) - { - char *a = (char*)KSEG1ADDR(argv[i]); - if(!a) - continue; - if(strlen(arcs_cmdline) + strlen(a + 1) >= sizeof(arcs_cmdline)) - break; - strcat(arcs_cmdline, a); - strcat(arcs_cmdline, " "); + if (argc) { + argv = (char **)KSEG1ADDR((unsigned long)argv); + arcs_cmdline[0] = '\0'; + for (i = 1; i < argc; i++) { + char *a = (char *)KSEG1ADDR(argv[i]); + if (!argv[i]) + continue; + /* for voice cpu on Twinpass/Danube */ + if (cpu_data[0].cputype == CPU_24K) + if (!strncmp(a, "cp1_size=", 9)) { + prom_cp1_size = memparse(a + 9, &a); + continue; + } + if (strlen(arcs_cmdline) + strlen(a + 1) >= sizeof(arcs_cmdline)) { + prom_printf("cmdline overflow, skipping: %s\n", a); + break; + } + strcat(arcs_cmdline, a); + strcat(arcs_cmdline, " "); + } + if (!*arcs_cmdline) + strcpy(&(arcs_cmdline[0]), + "console=ttyS0,115200 rootfstype=squashfs,jffs2"); } + envp = (char **)KSEG1ADDR((unsigned long)envp); + while (*envp) { + char *e = (char *)KSEG1ADDR(*envp); - envp = (char**)KSEG1ADDR((unsigned long)envp); - while(*envp) - { - char *e = (char*)KSEG1ADDR(*envp); - - if(!strncmp(e, "memsize=", 8)) - { + if (!strncmp(e, "memsize=", 8)) { e += 8; memsize = simple_strtoul(e, NULL, 10); } envp++; } - - prom_cp1_size = 2; - memsize -= prom_cp1_size; - prom_cp1_base = (u32*)(0xA0000000 + (memsize * 1024 * 1024)); - - prom_printf(KERN_INFO "Using %dMB Ram and reserving %dMB for cp1\n", memsize, prom_cp1_size); memsize *= 1024 * 1024; - if(!*arcs_cmdline) - strcpy(&(arcs_cmdline[0]), "console=ttyS0,115200 rootfstype=squashfs,jffs2 init=/etc/preinit"); + /* only on Twinpass/Danube a second CPU is used for Voice */ + if ((cpu_data[0].cputype == CPU_24K) && (prom_cp1_size)) { + memsize -= prom_cp1_size; + prom_cp1_base = (unsigned int *)KSEG1ADDR(memsize); + + prom_printf("Using %dMB Ram and reserving %dMB for cp1\n", + memsize>>20, prom_cp1_size>>20); + } add_memory_region(0x00000000, memsize, BOOT_MEM_RAM); }