x86,earlyptink: use macros which are already defined
cover x86,earlyptink: use macros which are already defined
It's better to use macros which already defined. <linux/serial_reg.h> already contains macros for initialization and work with serial port, but with another names.
Alexander Kuleshov (2):
x86/boot/early_serial: use macros which are already defined x86/kernel/early_printk: use macros which are already defined
arch/x86/boot/boot.h | 1 + arch/x86/boot/compressed/misc.c | 9 +++----- arch/x86/boot/compressed/misc.h | 1 + arch/x86/boot/early_serial_console.c | 44 ++++++++++++------------------------ arch/x86/boot/tty.c | 10 +++----- arch/x86/kernel/early_printk.c | 40 +++++++++++--------------------- 6 files changed, 35 insertions(+), 70 deletions(-)
--
2.3.0.rc1.275.g028c360
PATCH 1/2 x86/boot/earlyprintk: use macros which are already defined
Use macros which are already defined at <linux/serial_reg.h> for early initialization of serial port and work with it.
--- arch/x86/boot/boot.h | 1 + arch/x86/boot/compressed/misc.c | 9 +++----- arch/x86/boot/compressed/misc.h | 1 + arch/x86/boot/early_serial_console.c | 44 ++++++++++++------------------------ arch/x86/boot/tty.c | 10 +++----- 5 files changed, 22 insertions(+), 43 deletions(-)
arch/x86/boot/boot.h +1 -0
@@ -23,6 +23,7 @@#include <stdarg.h> #include <linux/types.h> #include <linux/edd.h> +#include <linux/serial_reg.h> #include <asm/boot.h> #include <asm/setup.h> #include "bitops.h"
arch/x86/boot/compressed/misc.c +3 -6
@@ -156,18 +156,15 @@ static void scroll(void) vidmem[i] =' ' ; } -#define XMTRDY 0x20 - -#define TXR 0/* Transmit register (WRITE) */ -#define LSR 5/* Line Status */ static void serial_putchar (int ch) {unsigned timeout =0xffff ; -while ((inb (early_serial_base +LSR ) &XMTRDY ) ==0 && --timeout) +while ((inb (early_serial_base +UART_LSR ) &UART_LSR_THRE ) ==0 && + --timeout)cpu_relax (); -outb (ch, early_serial_base +TXR ); +outb (ch, early_serial_base +UART_TX ); }void __putstr (const char *s)
arch/x86/boot/compressed/misc.h +1 -0
@@ -15,6 +15,7 @@#include <linux/screen_info.h> #include <linux/elf.h> #include <linux/io.h> +#include <linux/serial_reg.h> #include <asm/page.h> #include <asm/boot.h> #include <asm/bootparam.h>
arch/x86/boot/early_serial_console.c +14 -30
64 lines not on this page · raw message
arch/x86/boot/tty.c +3 -7
@@ -17,11 +17,6 @@int early_serial_base; -#define XMTRDY 0x20 - -#define TXR 0/* Transmit register (WRITE) */ -#define LSR 5/* Line Status */ -/* * These functions are in .inittext so they can be used to signal * error during initialization.
@@ -31,10 +26,11 @@ static void __attribute__((section(".inittext"))) serial_putchar(int ch) {unsigned timeout =0xffff ; -while ((inb (early_serial_base +LSR ) &XMTRDY ) ==0 && --timeout) +while ((inb (early_serial_base +UART_LSR ) &UART_LSR_THRE ) ==0 && + --timeout)cpu_relax (); -outb (ch, early_serial_base +TXR ); +outb (ch, early_serial_base +UART_TX ); }static void __attribute__((section (".inittext" )))bios_putchar (int ch)
--
2.3.0.rc1.275.g028c360
PATCH 2/2 x86/kernel/earlyprintk: use macros which are already defined
In reply to Alexander KuleshovUse macros which are already defined at <linux/serial_reg.h> for earlyprintk.
--- arch/x86/kernel/early_printk.c | 40 +++++++++++++--------------------------- 1 file changed, 13 insertions(+), 27 deletions(-)
arch/x86/kernel/early_printk.c +13 -27
@@ -7,6 +7,7 @@#include <linux/pci_regs.h> #include <linux/pci_ids.h> #include <linux/errno.h> +#include <linux/serial_reg.h> #include <asm/io.h> #include <asm/processor.h> #include <asm/fcntl.h>
@@ -78,29 +79,14 @@ static struct console early_vga_console = {static int early_serial_base =0x3f8 ;/* ttyS0 */ -#define XMTRDY 0x20 - -#define DLAB 0x80 - -#define TXR 0/* Transmit register (WRITE) */ -#define RXR 0/* Receive register (READ) */ -#define IER 1/* Interrupt Enable */ -#define IIR 2/* Interrupt ID */ -#define FCR 2/* FIFO control */ -#define LCR 3/* Line control */ -#define MCR 4/* Modem control */ -#define LSR 5/* Line Status */ -#define MSR 6/* Modem Status */ -#define DLL 0/* Divisor Latch Low */ -#define DLH 1/* Divisor latch High */ -static int early_serial_putc (unsigned char ch) {unsigned timeout =0xffff ; -while ((inb (early_serial_base +LSR ) &XMTRDY ) ==0 && --timeout) +while ((inb (early_serial_base +UART_LSR ) &UART_LSR_THRE ) ==0 && + --timeout)cpu_relax (); -outb (ch, early_serial_base +TXR ); +outb (ch, early_serial_base +UART_TX );return timeout ?0 :-1 ; }
@@ -145,10 +131,10 @@ static __init void early_serial_init(char *s) s++; } -outb (0x3 , early_serial_base +LCR );/* 8n1 */ -outb (0 , early_serial_base +IER );/* no interrupt */ -outb (0 , early_serial_base +FCR );/* no fifo */ -outb (0x3 , early_serial_base +MCR );/* DTR + RTS */ +outb (0x3 , early_serial_base +UART_LCR );/* 8n1 */ +outb (0 , early_serial_base +UART_IER );/* no interrupt */ +outb (0 , early_serial_base +UART_FCR );/* no fifo */ +outb (0x3 , early_serial_base +UART_MCR );/* DTR + RTS */ if (*s) { baud =simple_strtoul (s, &e,0 );
@@ -157,11 +143,11 @@ static __init void early_serial_init(char *s) } divisor =115200 / baud; - c =inb (early_serial_base +LCR ); -outb (c |DLAB , early_serial_base +LCR ); -outb (divisor &0xff , early_serial_base +DLL ); -outb ((divisor >>8 ) &0xff , early_serial_base +DLH ); -outb (c & ~DLAB , early_serial_base +LCR ); + c =inb (early_serial_base +UART_LCR ); +outb (c |UART_LCR_DLAB , early_serial_base +UART_LCR ); +outb (divisor &0xff , early_serial_base +UART_DLL ); +outb ((divisor >>8 ) &0xff , early_serial_base +UART_DLM ); +outb (c & ~UART_LCR_DLAB , early_serial_base +UART_LCR ); }static struct console early_serial_console = {
--
2.3.0.rc1.275.g028c360