MIPS: Alchemy: prom_putchar is board dependent
PATCH 1/1 MIPS: Alchemy: prom_putchar is board dependent
This patch replaces the general alchemy prom_putchar() implementation in favor of board-specific versions: The UART where the output of prom_putchar is directed to really depends on the board, the current implementation hardcodes this on a per-SoC basis which is just wrong.
So a generic uart tx function is provided in the alchemy headers, and the boards can provide their own prom_putchar with custom destination uart, and all in-kernel alchemy boards support early printk.
---
I kept the original implementation of prom_putchar with all the slowdowns, I don't know why it was there, probably to fix issues in the early socs.
Boots fine on the DB1200.
arch/mips/alchemy/Kconfig | 14 ++++++ arch/mips/alchemy/common/Makefile | 2 +- arch/mips/alchemy/common/puts.c | 68 ---------------------------- arch/mips/alchemy/devboards/prom.c | 5 ++ arch/mips/alchemy/mtx-1/init.c | 6 +++ arch/mips/alchemy/xxs1500/init.c | 6 +++ arch/mips/include/asm/mach-au1x00/au1000.h | 19 ++++++++ 7 files changed, 51 insertions(+), 69 deletions(-) delete mode 100644 arch/mips/alchemy/common/puts.c
arch/mips/alchemy/Kconfig +14 -0
@@ -20,12 +20,14 @@ config MIPS_MTX1 select HW_HAS_PCI select SOC_AU1500 select SYS_SUPPORTS_LITTLE_ENDIAN + select SYS_HAS_EARLY_PRINTK config MIPS_BOSPORUS bool "Alchemy Bosporus board" select SOC_AU1500 select DMA_NONCOHERENT select SYS_SUPPORTS_LITTLE_ENDIAN + select SYS_HAS_EARLY_PRINTK config MIPS_DB1000 bool "Alchemy DB1000 board"
@@ -33,12 +35,14 @@ config MIPS_DB1000 select DMA_NONCOHERENT select HW_HAS_PCI select SYS_SUPPORTS_LITTLE_ENDIAN + select SYS_HAS_EARLY_PRINTK config MIPS_DB1100 bool "Alchemy DB1100 board" select SOC_AU1100 select DMA_NONCOHERENT select SYS_SUPPORTS_LITTLE_ENDIAN + select SYS_HAS_EARLY_PRINTK config MIPS_DB1200 bool "Alchemy DB1200 board"
@@ -46,6 +50,7 @@ config MIPS_DB1200 select DMA_COHERENT select MIPS_DISABLE_OBSOLETE_IDE select SYS_SUPPORTS_LITTLE_ENDIAN + select SYS_HAS_EARLY_PRINTK config MIPS_DB1500 bool "Alchemy DB1500 board"
@@ -55,6 +60,7 @@ config MIPS_DB1500 select MIPS_DISABLE_OBSOLETE_IDE select SYS_SUPPORTS_BIG_ENDIAN select SYS_SUPPORTS_LITTLE_ENDIAN + select SYS_HAS_EARLY_PRINTK config MIPS_DB1550 bool "Alchemy DB1550 board"
@@ -63,12 +69,14 @@ config MIPS_DB1550 select DMA_NONCOHERENT select MIPS_DISABLE_OBSOLETE_IDE select SYS_SUPPORTS_LITTLE_ENDIAN + select SYS_HAS_EARLY_PRINTK config MIPS_MIRAGE bool "Alchemy Mirage board" select DMA_NONCOHERENT select SOC_AU1500 select SYS_SUPPORTS_LITTLE_ENDIAN + select SYS_HAS_EARLY_PRINTK config MIPS_PB1000 bool "Alchemy PB1000 board"
@@ -77,6 +85,7 @@ config MIPS_PB1000 select HW_HAS_PCI select SWAP_IO_SPACE select SYS_SUPPORTS_LITTLE_ENDIAN + select SYS_HAS_EARLY_PRINTK config MIPS_PB1100 bool "Alchemy PB1100 board"
@@ -85,6 +94,7 @@ config MIPS_PB1100 select HW_HAS_PCI select SWAP_IO_SPACE select SYS_SUPPORTS_LITTLE_ENDIAN + select SYS_HAS_EARLY_PRINTK config MIPS_PB1200 bool "Alchemy PB1200 board"
@@ -92,6 +102,7 @@ config MIPS_PB1200 select DMA_NONCOHERENT select MIPS_DISABLE_OBSOLETE_IDE select SYS_SUPPORTS_LITTLE_ENDIAN + select SYS_HAS_EARLY_PRINTK config MIPS_PB1500 bool "Alchemy PB1500 board"
@@ -99,6 +110,7 @@ config MIPS_PB1500 select DMA_NONCOHERENT select HW_HAS_PCI select SYS_SUPPORTS_LITTLE_ENDIAN + select SYS_HAS_EARLY_PRINTK config MIPS_PB1550 bool "Alchemy PB1550 board"
@@ -107,12 +119,14 @@ config MIPS_PB1550 select HW_HAS_PCI select MIPS_DISABLE_OBSOLETE_IDE select SYS_SUPPORTS_LITTLE_ENDIAN + select SYS_HAS_EARLY_PRINTK config MIPS_XXS1500 bool "MyCable XXS1500 board" select DMA_NONCOHERENT select SOC_AU1500 select SYS_SUPPORTS_LITTLE_ENDIAN + select SYS_HAS_EARLY_PRINTK endchoice
arch/mips/alchemy/common/Makefile +1 -1
@@ -5,7 +5,7 @@ # Makefile for the Alchemy Au1xx0 CPUs, generic files. # -obj-y += prom.o irq.o puts.o time.o reset.o \ +obj-y += prom.o irq.o time.o reset.o \ clocks.o platform.o power.o setup.o \ sleeper.o dma.o dbdma.o
arch/mips/alchemy/common/puts.c deleted +0 -68
68 lines not on this page · raw message
arch/mips/alchemy/devboards/prom.c +5 -0
@@ -60,3 +60,8 @@ void __init prom_init(void)strict_strtoul (memsize_str,0 , &memsize);add_memory_region (0 , memsize,BOOT_MEM_RAM ); } + +void prom_putchar (unsigned char c) +{ +alchemy_uart_putchar (UART0_PHYS_ADDR , c); +}
arch/mips/alchemy/mtx-1/init.c +6 -0
@@ -32,6 +32,7 @@#include <linux/init.h> #include <asm/bootinfo.h> +#include <asm/mach-au1x00/au1000.h> #include <prom.h>
@@ -58,3 +59,8 @@ void __init prom_init(void)strict_strtoul (memsize_str,0 , &memsize);add_memory_region (0 , memsize,BOOT_MEM_RAM ); } + +void prom_putchar (unsigned char c) +{ +alchemy_uart_putchar (UART0_PHYS_ADDR , c); +}
arch/mips/alchemy/xxs1500/init.c +6 -0
@@ -30,6 +30,7 @@#include <linux/kernel.h> #include <asm/bootinfo.h> +#include <asm/mach-au1x00/au1000.h> #include <prom.h>
@@ -56,3 +57,8 @@ void __init prom_init(void)strict_strtoul (memsize_str,0 , &memsize);add_memory_region (0 , memsize,BOOT_MEM_RAM ); } + +void prom_putchar (unsigned char c) +{ +alchemy_uart_putchar (UART0_PHYS_ADDR , c); +}
arch/mips/include/asm/mach-au1x00/au1000.h +19 -0
@@ -160,6 +160,25 @@ static inline int alchemy_get_cputype(void)return ALCHEMY_CPU_UNKNOWN ; } +static inline void alchemy_uart_putchar (u32 uart_phys,u8 c) +{ +void __iomem *base = (void __iomem *)KSEG1ADDR (uart_phys); +int timeout, i; + +/* check LSR TX_EMPTY bit */ + timeout =0xffffff ; +do { +if (__raw_readl (base +0x1c ) &0x20 ) +break ; +/* slow down */ +for (i =10000 ; i; i--) + asmvolatile ("nop" ); + }while (--timeout); + +__raw_writel (c, base +0x04 );/* tx */ +wmb (); +} +/* arch/mips/au1000/common/clocks.c */ extern void set_au1x00_speed (unsigned int new_freq);extern unsigned int get_au1x00_speed (void );
Signature · 1 line
1.6.5.rc2
On Thu, Oct 15, 2009 at 06:49:27PM +0200, Manuel Lauss wrote:
Queued for 2.6.33,
Ralf