Allow libpayload to use an OXPCIe 952 card on systems without

onboard serial port

Signed-off-by: Stefan Reinauer <reinauer@google.com>
Acked-by:  Marc Jones <marcj303@gmail.com>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@6508 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

diff --git a/payloads/libpayload/drivers/serial.c b/payloads/libpayload/drivers/serial.c
index 9fd7acf6be2d2d8b701ceca275e25aaeddc118cd..0674ec8c38804ac226bb558ded3a02753771c199 100644 (file)
--- a/payloads/libpayload/drivers/serial.c
+++ b/payloads/libpayload/drivers/serial.c
@@ -32,9 +32,11 @@
 #include <libpayload.h>
 
 #define IOBASE lib_sysinfo.ser_ioport
+#define MEMBASE (phys_to_virt(lib_sysinfo.ser_base))
 #define DIVISOR(x) (115200 / x)
 
-void serial_hardware_init(int port, int speed, int word_bits, int parity, int stop_bits)
+#ifdef CONFIG_SERIAL_SET_SPEED
+static void serial_io_hardware_init(int port, int speed, int word_bits, int parity, int stop_bits)
 {
        unsigned char reg;
 
@@ -58,6 +60,31 @@ void serial_hardware_init(int port, int speed, int word_bits, int parity, int st
        outb(reg & ~0x80, port + 0x03);
 }
 
+static void serial_mem_hardware_init(int port, int speed, int word_bits, int parity, int stop_bits)
+{
+       unsigned char reg;
+
+       /* We will assume 8n1 for now. Does anyone use anything else these days? */
+
+       /* Disable interrupts. */
+       writeb(0, MEMBASE + 0x01);
+
+       /* Assert RTS and DTR. */
+       writeb(3, MEMBASE + 0x04);
+
+       /* Set the divisor latch. */
+       reg = readb(MEMBASE + 0x03);
+       writeb(reg | 0x80, MEMBASE + 0x03);
+
+       /* Write the divisor. */
+       writeb(DIVISOR(speed) & 0xFF, MEMBASE);
+       writeb(DIVISOR(speed) >> 8 & 0xFF, MEMBASE + 1);
+
+       /* Restore the previous value of the divisor. */
+       writeb(reg & ~0x80, MEMBASE + 0x03);
+}
+#endif
+
 static struct console_input_driver consin = {
        .havekey = serial_havechar,
        .getchar = serial_getchar
@@ -69,31 +96,84 @@ static struct console_output_driver consout = {
 
 void serial_init(void)
 {
+       pcidev_t oxpcie_dev;
+       if (pci_find_device(0x1415, 0xc158, &oxpcie_dev)) {
+               lib_sysinfo.ser_base = pci_read_resource(oxpcie_dev, 0) + 0x1000;
+       } else {
+               lib_sysinfo.ser_base = 0;
+       }
+
 #ifdef CONFIG_SERIAL_SET_SPEED
-       serial_hardware_init(IOBASE, CONFIG_SERIAL_BAUD_RATE, 8, 0, 1);
+       if (lib_sysinfo.ser_base)
+               serial_mem_hardware_init(IOBASE, CONFIG_SERIAL_BAUD_RATE, 8, 0, 1);
+       else
+               serial_io_hardware_init(IOBASE, CONFIG_SERIAL_BAUD_RATE, 8, 0, 1);
 #endif
        console_add_input_driver(&consin);
        console_add_output_driver(&consout);
 }
 
-void serial_putchar(unsigned int c)
+static void serial_io_putchar(unsigned int c)
 {
        c &= 0xff;
        while ((inb(IOBASE + 0x05) & 0x20) == 0) ;
        outb(c, IOBASE);
 }
 
-int serial_havechar(void)
+static int serial_io_havechar(void)
 {
        return inb(IOBASE + 0x05) & 0x01;
 }
 
-int serial_getchar(void)
+static int serial_io_getchar(void)
 {
-       while (!serial_havechar()) ;
+       while (!serial_io_havechar()) ;
        return (int)inb(IOBASE);
 }
 
+static void serial_mem_putchar(unsigned int c)
+{
+       c &= 0xff;
+       while ((readb(MEMBASE + 0x05) & 0x20) == 0) ;
+       writeb(c, MEMBASE);
+}
+
+static int serial_mem_havechar(void)
+{
+       return readb(MEMBASE + 0x05) & 0x01;
+}
+
+static int serial_mem_getchar(void)
+{
+       while (!serial_mem_havechar()) ;
+       return (int)readb(MEMBASE);
+}
+
+
+void serial_putchar(unsigned int c)
+{
+       if (lib_sysinfo.ser_base)
+               serial_mem_putchar(c);
+       else
+               serial_io_putchar(c);
+}
+
+int serial_havechar(void)
+{
+       if (lib_sysinfo.ser_base)
+               return serial_mem_havechar();
+       else
+               return serial_io_havechar();
+}
+
+int serial_getchar(void)
+{
+       if (lib_sysinfo.ser_base)
+               return serial_mem_getchar();
+       else
+               return serial_io_getchar();
+}
+
 /*  These are thinly veiled vt100 functions used by curses */
 
 #define VT100_CLEAR       "\e[H\e[J"

diff --git a/payloads/libpayload/include/libpayload.h b/payloads/libpayload/include/libpayload.h
index 43e138fd7d59a4b807ea7000dd4745476730258e..74fb79a4ae7a23e1417ddb8487a61f608c5d03ff 100644 (file)
--- a/payloads/libpayload/include/libpayload.h
+++ b/payloads/libpayload/include/libpayload.h
@@ -153,7 +153,6 @@ int keyboard_set_layout(char *country);
  * @{
  */
 void serial_init(void);
-void serial_hardware_init(int port, int speed, int word_bits, int parity, int stop_bits);
 void serial_putchar(unsigned int c);
 int serial_havechar(void);
 int serial_getchar(void);

diff --git a/payloads/libpayload/include/sysinfo.h b/payloads/libpayload/include/sysinfo.h
index 518f021ce369056466137da03a6b838e5ce3f4bb..e357704995d2430d7986227a1638707323266628 100644 (file)
--- a/payloads/libpayload/include/sysinfo.h
+++ b/payloads/libpayload/include/sysinfo.h
@@ -36,6 +36,7 @@
 struct sysinfo_t {
        unsigned int cpu_khz;
        unsigned short ser_ioport;
+       unsigned long ser_base; // for mmapped serial
 
        int n_memranges;