Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

[linux-2.6.git] / drivers / firmware / pcdp.c

diff --git a/drivers/firmware/pcdp.c b/drivers/firmware/pcdp.c
index df1b721..c37baf9 100644 (file)
--- a/drivers/firmware/pcdp.c
+++ b/drivers/firmware/pcdp.c
@@ -16,6 +16,7 @@
 #include <linux/console.h>
 #include <linux/efi.h>
 #include <linux/serial.h>
+#include <asm/vga.h>
 #include "pcdp.h"
 
 static int __init
@@ -23,12 +24,23 @@ setup_serial_console(struct pcdp_uart *uart)
 {
 #ifdef CONFIG_SERIAL_8250_CONSOLE
        int mmio;
-       static char options[64];
+       static char options[64], *p = options;
+       char parity;
 
        mmio = (uart->addr.address_space_id == ACPI_ADR_SPACE_SYSTEM_MEMORY);
-       snprintf(options, sizeof(options), "console=uart,%s,0x%lx,%lun%d",
-               mmio ? "mmio" : "io", uart->addr.address, uart->baud,
-               uart->bits ? uart->bits : 8);
+       p += sprintf(p, "console=uart,%s,0x%lx",
+               mmio ? "mmio" : "io", uart->addr.address);
+       if (uart->baud) {
+               p += sprintf(p, ",%lu", uart->baud);
+               if (uart->bits) {
+                       switch (uart->parity) {
+                           case 0x2: parity = 'e'; break;
+                           case 0x3: parity = 'o'; break;
+                           default:  parity = 'n';
+                       }
+                       p += sprintf(p, "%c%d", parity, uart->bits);
+               }
+       }
 
        return early_serial_console_init(options);
 #else
@@ -37,10 +49,27 @@ setup_serial_console(struct pcdp_uart *uart)
 }
 
 static int __init
-setup_vga_console(struct pcdp_vga *vga)
+setup_vga_console(struct pcdp_device *dev)
 {
 #if defined(CONFIG_VT) && defined(CONFIG_VGA_CONSOLE)
-       if (efi_mem_type(0xA0000) == EFI_CONVENTIONAL_MEMORY) {
+       u8 *if_ptr;
+
+       if_ptr = ((u8 *)dev + sizeof(struct pcdp_device));
+       if (if_ptr[0] == PCDP_IF_PCI) {
+               struct pcdp_if_pci if_pci;
+
+               /* struct copy since ifptr might not be correctly aligned */
+
+               memcpy(&if_pci, if_ptr, sizeof(if_pci));
+
+               if (if_pci.trans & PCDP_PCI_TRANS_IOPORT)
+                       vga_console_iobase = if_pci.ioport_tra;
+
+               if (if_pci.trans & PCDP_PCI_TRANS_MMIO)
+                       vga_console_membase = if_pci.mmio_tra;
+       }
+
+       if (efi_mem_type(vga_console_membase + 0xA0000) == EFI_CONVENTIONAL_MEMORY) {
                printk(KERN_ERR "PCDP: VGA selected, but frame buffer is not MMIO!\n");
                return -ENODEV;
        }
@@ -60,19 +89,20 @@ efi_setup_pcdp_console(char *cmdline)
        struct pcdp_uart *uart;
        struct pcdp_device *dev, *end;
        int i, serial = 0;
+       int rc = -ENODEV;
 
-       pcdp = efi.hcdp;
-       if (!pcdp)
+       if (efi.hcdp == EFI_INVALID_TABLE_ADDR)
                return -ENODEV;
 
-       printk(KERN_INFO "PCDP: v%d at 0x%lx\n", pcdp->rev, __pa(pcdp));
+       pcdp = ioremap(efi.hcdp, 4096);
+       printk(KERN_INFO "PCDP: v%d at 0x%lx\n", pcdp->rev, efi.hcdp);
 
        if (strstr(cmdline, "console=hcdp")) {
                if (pcdp->rev < 3)
                        serial = 1;
        } else if (strstr(cmdline, "console=")) {
                printk(KERN_INFO "Explicit \"console=\"; ignoring PCDP\n");
-               return -ENODEV;
+               goto out;
        }
 
        if (pcdp->rev < 3 && efi_uart_console_only())
@@ -81,7 +111,8 @@ efi_setup_pcdp_console(char *cmdline)
        for (i = 0, uart = pcdp->uart; i < pcdp->num_uarts; i++, uart++) {
                if (uart->flags & PCDP_UART_PRIMARY_CONSOLE || serial) {
                        if (uart->type == PCDP_CONSOLE_UART) {
-                               return setup_serial_console(uart);
+                               rc = setup_serial_console(uart);
+                               goto out;
                        }
                }
        }
@@ -92,10 +123,13 @@ efi_setup_pcdp_console(char *cmdline)
             dev = (struct pcdp_device *) ((u8 *) dev + dev->length)) {
                if (dev->flags & PCDP_PRIMARY_CONSOLE) {
                        if (dev->type == PCDP_CONSOLE_VGA) {
-                               return setup_vga_console((struct pcdp_vga *) dev);
+                               rc = setup_vga_console(dev);
+                               goto out;
                        }
                }
        }
 
-       return -ENODEV;
+out:
+       iounmap(pcdp);
+       return rc;
 }