* [PATCH 1/2] MIPS: add 8250/16550 serial early printk driver
@ 2010-02-05 14:28 Yoichi Yuasa
2010-02-05 14:30 ` [PATCH 2/2] MIPS: Cobalt move to " Yoichi Yuasa
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Yoichi Yuasa @ 2010-02-05 14:28 UTC (permalink / raw)
To: Ralf Baechle; +Cc: yuasa, linux-mips
Signed-off-by: Yoichi Yuasa <yuasa@linux-mips.org>
---
arch/mips/Kconfig.debug | 8 ++++
arch/mips/include/asm/setup.h | 9 ++++
arch/mips/kernel/Makefile | 1 +
arch/mips/kernel/early_printk_8250.c | 68 ++++++++++++++++++++++++++++++++++
4 files changed, 86 insertions(+), 0 deletions(-)
create mode 100644 arch/mips/kernel/early_printk_8250.c
diff --git a/arch/mips/Kconfig.debug b/arch/mips/Kconfig.debug
index 32a010d..f5d739c 100644
--- a/arch/mips/Kconfig.debug
+++ b/arch/mips/Kconfig.debug
@@ -20,6 +20,14 @@ config EARLY_PRINTK
doesn't cooperate with an X server. You should normally say N here,
unless you want to debug such a crash.
+config EARLY_PRINTK_8250
+ bool "8250/16550 and compatible serial early printk driver"
+ depends on EARLY_PRINTK
+ default n
+ help
+ If you say Y here, it will be possible to use a 8250/16550 serial
+ port as the boot console.
+
config CMDLINE_BOOL
bool "Built-in kernel command line"
default n
diff --git a/arch/mips/include/asm/setup.h b/arch/mips/include/asm/setup.h
index 50511aa..7395b7f 100644
--- a/arch/mips/include/asm/setup.h
+++ b/arch/mips/include/asm/setup.h
@@ -5,6 +5,15 @@
#ifdef __KERNEL__
extern void setup_early_printk(void);
+
+#ifdef CONFIG_EARLY_PRINTK_8250
+extern void setup_8250_early_printk_port(unsigned long base,
+ unsigned int reg_shift, unsigned int timeout);
+#else
+static inline void setup_8250_early_printk_port(unsigned long base,
+ unsigned int reg_shift, unsigned int timeout) {}
+#endif
+
#endif /* __KERNEL__ */
#endif /* __SETUP_H */
diff --git a/arch/mips/kernel/Makefile b/arch/mips/kernel/Makefile
index 9326af5..03fc037 100644
--- a/arch/mips/kernel/Makefile
+++ b/arch/mips/kernel/Makefile
@@ -93,6 +93,7 @@ obj-$(CONFIG_GPIO_TXX9) += gpio_txx9.o
obj-$(CONFIG_KEXEC) += machine_kexec.o relocate_kernel.o
obj-$(CONFIG_EARLY_PRINTK) += early_printk.o
+obj-$(CONFIG_EARLY_PRINTK_8250) += early_printk_8250.o
CFLAGS_cpu-bugs64.o = $(shell if $(CC) $(KBUILD_CFLAGS) -Wa,-mdaddi -c -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-DHAVE_AS_SET_DADDI"; fi)
diff --git a/arch/mips/kernel/early_printk_8250.c b/arch/mips/kernel/early_printk_8250.c
new file mode 100644
index 0000000..6faf8fd
--- /dev/null
+++ b/arch/mips/kernel/early_printk_8250.c
@@ -0,0 +1,68 @@
+/*
+ * 8250/16550-type serial ports prom_putchar()
+ *
+ * Copyright (C) 2010 Yoichi Yuasa <yuasa@linux-mips.org>
+ *
+ * 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
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+#include <linux/io.h>
+#include <linux/serial_core.h>
+#include <linux/serial_reg.h>
+
+static unsigned long serial8250_base;
+static unsigned int serial8250_reg_shift;
+static unsigned int serial8250_tx_timeout;
+
+void setup_8250_early_printk_port(unsigned long base, unsigned int reg_shift,
+ unsigned int timeout)
+{
+ serial8250_base = base;
+ serial8250_reg_shift = reg_shift;
+ serial8250_tx_timeout = timeout;
+}
+
+static inline u8 serial_in(int offset)
+{
+ return readb((void __iomem *)serial8250_base +
+ (offset << serial8250_reg_shift));
+}
+
+static inline void serial_out(int offset, char value)
+{
+ writeb(value, (void __iomem *)serial8250_base +
+ (offset << serial8250_reg_shift));
+}
+
+void prom_putchar(char c)
+{
+ unsigned int timeout;
+ int status, bits;
+
+ if (!serial8250_base)
+ return;
+
+ timeout = serial8250_tx_timeout;
+ bits = UART_LSR_TEMT | UART_LSR_THRE;
+
+ do {
+ status = serial_in(UART_LSR);
+
+ if (--timeout == 0)
+ break;
+ } while ((status & bits) != bits);
+
+ if (timeout)
+ serial_out(UART_TX, c);
+}
--
1.6.6.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 2/2] MIPS: Cobalt move to 8250/16550 serial early printk driver
2010-02-05 14:28 [PATCH 1/2] MIPS: add 8250/16550 serial early printk driver Yoichi Yuasa
@ 2010-02-05 14:30 ` Yoichi Yuasa
2010-02-06 12:16 ` [PATCH 1/2] MIPS: add " Thomas Bogendoerfer
2010-02-08 9:58 ` Sergei Shtylyov
2 siblings, 0 replies; 6+ messages in thread
From: Yoichi Yuasa @ 2010-02-05 14:30 UTC (permalink / raw)
To: Ralf Baechle; +Cc: yuasa, linux-mips
Signed-off-by: Yoichi Yuasa <yuasa@linux-mips.org>
---
arch/mips/Kconfig | 1 +
arch/mips/cobalt/Makefile | 1 -
arch/mips/cobalt/console.c | 20 --------------------
arch/mips/cobalt/setup.c | 3 +++
4 files changed, 4 insertions(+), 21 deletions(-)
delete mode 100644 arch/mips/cobalt/console.c
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index 591ca0c..b848512 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -90,6 +90,7 @@ config MIPS_COBALT
select CSRC_R4K
select CEVT_GT641XX
select DMA_NONCOHERENT
+ select EARLY_PRINTK_8250 if EARLY_PRINTK
select HW_HAS_PCI
select I8253
select I8259
diff --git a/arch/mips/cobalt/Makefile b/arch/mips/cobalt/Makefile
index 2379262..5cfe90f 100644
--- a/arch/mips/cobalt/Makefile
+++ b/arch/mips/cobalt/Makefile
@@ -5,7 +5,6 @@
obj-y := buttons.o irq.o lcd.o led.o reset.o rtc.o serial.o setup.o time.o
obj-$(CONFIG_PCI) += pci.o
-obj-$(CONFIG_EARLY_PRINTK) += console.o
obj-$(CONFIG_MTD_PHYSMAP) += mtd.o
EXTRA_CFLAGS += -Werror
diff --git a/arch/mips/cobalt/console.c b/arch/mips/cobalt/console.c
deleted file mode 100644
index d1ba701..0000000
--- a/arch/mips/cobalt/console.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * (C) P. Horton 2006
- */
-#include <linux/io.h>
-#include <linux/serial_reg.h>
-
-#include <cobalt.h>
-
-#define UART_BASE ((void __iomem *)CKSEG1ADDR(0x1c800000))
-
-void prom_putchar(char c)
-{
- if (cobalt_board_id <= COBALT_BRD_ID_QUBE1)
- return;
-
- while (!(readb(UART_BASE + UART_LSR) & UART_LSR_THRE))
- ;
-
- writeb(c, UART_BASE + UART_TX);
-}
diff --git a/arch/mips/cobalt/setup.c b/arch/mips/cobalt/setup.c
index ec3b2c4..9a8c2fe 100644
--- a/arch/mips/cobalt/setup.c
+++ b/arch/mips/cobalt/setup.c
@@ -17,6 +17,7 @@
#include <asm/bootinfo.h>
#include <asm/reboot.h>
+#include <asm/setup.h>
#include <asm/gt64120.h>
#include <cobalt.h>
@@ -112,6 +113,8 @@ void __init prom_init(void)
}
add_memory_region(0x0, memsz, BOOT_MEM_RAM);
+
+ setup_8250_early_printk_port(CKSEG1ADDR(0x1c800000), 0, 0);
}
void __init prom_free_prom_memory(void)
--
1.6.6.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH 1/2] MIPS: add 8250/16550 serial early printk driver
2010-02-05 14:28 [PATCH 1/2] MIPS: add 8250/16550 serial early printk driver Yoichi Yuasa
2010-02-05 14:30 ` [PATCH 2/2] MIPS: Cobalt move to " Yoichi Yuasa
@ 2010-02-06 12:16 ` Thomas Bogendoerfer
2010-02-07 23:52 ` Yoichi Yuasa
2010-02-08 9:58 ` Sergei Shtylyov
2 siblings, 1 reply; 6+ messages in thread
From: Thomas Bogendoerfer @ 2010-02-06 12:16 UTC (permalink / raw)
To: Yoichi Yuasa; +Cc: Ralf Baechle, linux-mips
On Fri, Feb 05, 2010 at 11:28:57PM +0900, Yoichi Yuasa wrote:
> Signed-off-by: Yoichi Yuasa <yuasa@linux-mips.org>
> ---
> arch/mips/Kconfig.debug | 8 ++++
> arch/mips/include/asm/setup.h | 9 ++++
> arch/mips/kernel/Makefile | 1 +
> arch/mips/kernel/early_printk_8250.c | 68 ++++++++++++++++++++++++++++++++++
> 4 files changed, 86 insertions(+), 0 deletions(-)
> create mode 100644 arch/mips/kernel/early_printk_8250.c
>
> diff --git a/arch/mips/Kconfig.debug b/arch/mips/Kconfig.debug
> index 32a010d..f5d739c 100644
> --- a/arch/mips/Kconfig.debug
> +++ b/arch/mips/Kconfig.debug
> @@ -20,6 +20,14 @@ config EARLY_PRINTK
> doesn't cooperate with an X server. You should normally say N here,
> unless you want to debug such a crash.
>
> +config EARLY_PRINTK_8250
> [..]
have you looked at drivers/serial/8250_early.c ? It looks like it
was invented for some sort of early console on 8250 devices...
Thomas.
--
Crap can work. Given enough thrust pigs will fly, but it's not necessary a
good idea. [ RFC1925, 2.3 ]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 1/2] MIPS: add 8250/16550 serial early printk driver
2010-02-06 12:16 ` [PATCH 1/2] MIPS: add " Thomas Bogendoerfer
@ 2010-02-07 23:52 ` Yoichi Yuasa
0 siblings, 0 replies; 6+ messages in thread
From: Yoichi Yuasa @ 2010-02-07 23:52 UTC (permalink / raw)
To: Thomas Bogendoerfer; +Cc: yuasa, Ralf Baechle, linux-mips
On Sat, 6 Feb 2010 13:16:22 +0100
Thomas Bogendoerfer <tsbogend@alpha.franken.de> wrote:
> On Fri, Feb 05, 2010 at 11:28:57PM +0900, Yoichi Yuasa wrote:
> > Signed-off-by: Yoichi Yuasa <yuasa@linux-mips.org>
> > ---
> > arch/mips/Kconfig.debug | 8 ++++
> > arch/mips/include/asm/setup.h | 9 ++++
> > arch/mips/kernel/Makefile | 1 +
> > arch/mips/kernel/early_printk_8250.c | 68 ++++++++++++++++++++++++++++++++++
> > 4 files changed, 86 insertions(+), 0 deletions(-)
> > create mode 100644 arch/mips/kernel/early_printk_8250.c
> >
> > diff --git a/arch/mips/Kconfig.debug b/arch/mips/Kconfig.debug
> > index 32a010d..f5d739c 100644
> > --- a/arch/mips/Kconfig.debug
> > +++ b/arch/mips/Kconfig.debug
> > @@ -20,6 +20,14 @@ config EARLY_PRINTK
> > doesn't cooperate with an X server. You should normally say N here,
> > unless you want to debug such a crash.
> >
> > +config EARLY_PRINTK_8250
> > [..]
>
> have you looked at drivers/serial/8250_early.c ?
Yes, I have.
> It looks like it
> was invented for some sort of early console on 8250 devices...
The early printk is registered at the early boot stage(in setup_arch()).
Yoichi
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 1/2] MIPS: add 8250/16550 serial early printk driver
2010-02-05 14:28 [PATCH 1/2] MIPS: add 8250/16550 serial early printk driver Yoichi Yuasa
2010-02-05 14:30 ` [PATCH 2/2] MIPS: Cobalt move to " Yoichi Yuasa
2010-02-06 12:16 ` [PATCH 1/2] MIPS: add " Thomas Bogendoerfer
@ 2010-02-08 9:58 ` Sergei Shtylyov
2010-02-08 11:54 ` Yoichi Yuasa
2 siblings, 1 reply; 6+ messages in thread
From: Sergei Shtylyov @ 2010-02-08 9:58 UTC (permalink / raw)
To: Yoichi Yuasa; +Cc: Ralf Baechle, linux-mips
Hello.
Yoichi Yuasa wrote:
> Signed-off-by: Yoichi Yuasa <yuasa@linux-mips.org>
>
[...]
> diff --git a/arch/mips/Kconfig.debug b/arch/mips/Kconfig.debug
> index 32a010d..f5d739c 100644
> --- a/arch/mips/Kconfig.debug
> +++ b/arch/mips/Kconfig.debug
> @@ -20,6 +20,14 @@ config EARLY_PRINTK
> doesn't cooperate with an X server. You should normally say N here,
> unless you want to debug such a crash.
>
> +config EARLY_PRINTK_8250
> + bool "8250/16550 and compatible serial early printk driver"
> + depends on EARLY_PRINTK
> + default n
> + help
> + If you say Y here, it will be possible to use a 8250/16550 serial
> + port as the boot console.
> +
>
Tab not needed here.
> diff --git a/arch/mips/include/asm/setup.h b/arch/mips/include/asm/setup.h
> index 50511aa..7395b7f 100644
> --- a/arch/mips/include/asm/setup.h
> +++ b/arch/mips/include/asm/setup.h
> @@ -5,6 +5,15 @@
>
> #ifdef __KERNEL__
> extern void setup_early_printk(void);
> +
> +#ifdef CONFIG_EARLY_PRINTK_8250
> +extern void setup_8250_early_printk_port(unsigned long base,
> + unsigned int reg_shift, unsigned int timeout);
> +#else
> +static inline void setup_8250_early_printk_port(unsigned long base,
> + unsigned int reg_shift, unsigned int timeout) {}
> +#endif
> +
> #endif /* __KERNEL__ */
>
> #endif /* __SETUP_H */
> diff --git a/arch/mips/kernel/Makefile b/arch/mips/kernel/Makefile
> index 9326af5..03fc037 100644
> --- a/arch/mips/kernel/Makefile
> +++ b/arch/mips/kernel/Makefile
> @@ -93,6 +93,7 @@ obj-$(CONFIG_GPIO_TXX9) += gpio_txx9.o
>
> obj-$(CONFIG_KEXEC) += machine_kexec.o relocate_kernel.o
> obj-$(CONFIG_EARLY_PRINTK) += early_printk.o
> +obj-$(CONFIG_EARLY_PRINTK_8250) += early_printk_8250.o
>
> CFLAGS_cpu-bugs64.o = $(shell if $(CC) $(KBUILD_CFLAGS) -Wa,-mdaddi -c -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-DHAVE_AS_SET_DADDI"; fi)
>
> diff --git a/arch/mips/kernel/early_printk_8250.c b/arch/mips/kernel/early_printk_8250.c
> new file mode 100644
> index 0000000..6faf8fd
> --- /dev/null
> +++ b/arch/mips/kernel/early_printk_8250.c
> @@ -0,0 +1,68 @@
> +/*
> + * 8250/16550-type serial ports prom_putchar()
> + *
> + * Copyright (C) 2010 Yoichi Yuasa <yuasa@linux-mips.org>
> + *
> + * 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
> + * (at your option) any later version.
> + *
> + * This program is distributed in the hope that it will be useful,
> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
> + * GNU General Public License for more details.
> + *
> + * You should have received a copy of the GNU General Public License
> + * along with this program; if not, write to the Free Software
> + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
> + */
> +#include <linux/io.h>
> +#include <linux/serial_core.h>
> +#include <linux/serial_reg.h>
> +
> +static unsigned long serial8250_base;
> +static unsigned int serial8250_reg_shift;
> +static unsigned int serial8250_tx_timeout;
> +
> +void setup_8250_early_printk_port(unsigned long base, unsigned int reg_shift,
> + unsigned int timeout)
> +{
> + serial8250_base = base;
>
Why not declare 'serial8250_base' as 'void __iomem *' and only cast
once, here?
WBR, Sergei
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 1/2] MIPS: add 8250/16550 serial early printk driver
2010-02-08 9:58 ` Sergei Shtylyov
@ 2010-02-08 11:54 ` Yoichi Yuasa
0 siblings, 0 replies; 6+ messages in thread
From: Yoichi Yuasa @ 2010-02-08 11:54 UTC (permalink / raw)
To: Sergei Shtylyov; +Cc: yuasa, Ralf Baechle, linux-mips
Hello Sergei,
On Mon, 08 Feb 2010 12:58:08 +0300
Sergei Shtylyov <sshtylyov@mvista.com> wrote:
> Hello.
>
> Yoichi Yuasa wrote:
>
> > Signed-off-by: Yoichi Yuasa <yuasa@linux-mips.org>
> >
> [...]
> > +config EARLY_PRINTK_8250
> > + bool "8250/16550 and compatible serial early printk driver"
> > + depends on EARLY_PRINTK
> > + default n
> > + help
> > + If you say Y here, it will be possible to use a 8250/16550 serial
> > + port as the boot console.
> > +
> >
>
> Tab not needed here.
thanks
> > diff --git a/arch/mips/kernel/early_printk_8250.c b/arch/mips/kernel/early_printk_8250.c
> > new file mode 100644
> > index 0000000..6faf8fd
> > --- /dev/null
> > +++ b/arch/mips/kernel/early_printk_8250.c
[...]
> > +static unsigned long serial8250_base;
> > +static unsigned int serial8250_reg_shift;
> > +static unsigned int serial8250_tx_timeout;
> > +
> > +void setup_8250_early_printk_port(unsigned long base, unsigned int reg_shift,
> > + unsigned int timeout)
> > +{
> > + serial8250_base = base;
> >
>
> Why not declare 'serial8250_base' as 'void __iomem *' and only cast
> once, here?
You're right. I'll update it.
Thanks,
Yoichi
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2010-02-08 11:54 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-02-05 14:28 [PATCH 1/2] MIPS: add 8250/16550 serial early printk driver Yoichi Yuasa
2010-02-05 14:30 ` [PATCH 2/2] MIPS: Cobalt move to " Yoichi Yuasa
2010-02-06 12:16 ` [PATCH 1/2] MIPS: add " Thomas Bogendoerfer
2010-02-07 23:52 ` Yoichi Yuasa
2010-02-08 9:58 ` Sergei Shtylyov
2010-02-08 11:54 ` Yoichi Yuasa
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.