mirror of
https://github.com/torvalds/linux.git
synced 2024-11-18 01:51:53 +00:00
b2c99e3c70
Almost all users of the table addresses from the EFI system table want physical addresses. So rather than doing the pa->va->pa conversion, just keep physical addresses in struct efi. This fixes a DMI bug: the efi structure contained the physical SMBIOS address on x86 but the virtual address on ia64, so dmi_scan_machine() used ioremap() on a virtual address on ia64. This is essentially the same as an earlier patch by Matt Tolentino: http://marc.theaimsgroup.com/?l=linux-kernel&m=112130292316281&w=2 except that this changes all table addresses, not just ACPI addresses. Matt's original patch was backed out because it caused MCAs on HP sx1000 systems. That problem is resolved by the ioremap() attribute checking added for ia64. Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com> Cc: Matt Domsch <Matt_Domsch@dell.com> Cc: "Tolentino, Matthew E" <matthew.e.tolentino@intel.com> Cc: "Brown, Len" <len.brown@intel.com> Cc: Andi Kleen <ak@muc.de> Acked-by: "Luck, Tony" <tony.luck@intel.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
136 lines
3.2 KiB
C
136 lines
3.2 KiB
C
/*
|
|
* Parse the EFI PCDP table to locate the console device.
|
|
*
|
|
* (c) Copyright 2002, 2003, 2004 Hewlett-Packard Development Company, L.P.
|
|
* Khalid Aziz <khalid.aziz@hp.com>
|
|
* Alex Williamson <alex.williamson@hp.com>
|
|
* Bjorn Helgaas <bjorn.helgaas@hp.com>
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License version 2 as
|
|
* published by the Free Software Foundation.
|
|
*/
|
|
|
|
#include <linux/config.h>
|
|
#include <linux/acpi.h>
|
|
#include <linux/console.h>
|
|
#include <linux/efi.h>
|
|
#include <linux/serial.h>
|
|
#include <asm/vga.h>
|
|
#include "pcdp.h"
|
|
|
|
static int __init
|
|
setup_serial_console(struct pcdp_uart *uart)
|
|
{
|
|
#ifdef CONFIG_SERIAL_8250_CONSOLE
|
|
int mmio;
|
|
static char options[64], *p = options;
|
|
char parity;
|
|
|
|
mmio = (uart->addr.address_space_id == ACPI_ADR_SPACE_SYSTEM_MEMORY);
|
|
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
|
|
return -ENODEV;
|
|
#endif
|
|
}
|
|
|
|
static int __init
|
|
setup_vga_console(struct pcdp_device *dev)
|
|
{
|
|
#if defined(CONFIG_VT) && defined(CONFIG_VGA_CONSOLE)
|
|
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;
|
|
}
|
|
|
|
conswitchp = &vga_con;
|
|
printk(KERN_INFO "PCDP: VGA console\n");
|
|
return 0;
|
|
#else
|
|
return -ENODEV;
|
|
#endif
|
|
}
|
|
|
|
int __init
|
|
efi_setup_pcdp_console(char *cmdline)
|
|
{
|
|
struct pcdp *pcdp;
|
|
struct pcdp_uart *uart;
|
|
struct pcdp_device *dev, *end;
|
|
int i, serial = 0;
|
|
int rc = -ENODEV;
|
|
|
|
if (efi.hcdp == EFI_INVALID_TABLE_ADDR)
|
|
return -ENODEV;
|
|
|
|
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");
|
|
goto out;
|
|
}
|
|
|
|
if (pcdp->rev < 3 && efi_uart_console_only())
|
|
serial = 1;
|
|
|
|
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) {
|
|
rc = setup_serial_console(uart);
|
|
goto out;
|
|
}
|
|
}
|
|
}
|
|
|
|
end = (struct pcdp_device *) ((u8 *) pcdp + pcdp->length);
|
|
for (dev = (struct pcdp_device *) (pcdp->uart + pcdp->num_uarts);
|
|
dev < end;
|
|
dev = (struct pcdp_device *) ((u8 *) dev + dev->length)) {
|
|
if (dev->flags & PCDP_PRIMARY_CONSOLE) {
|
|
if (dev->type == PCDP_CONSOLE_VGA) {
|
|
rc = setup_vga_console(dev);
|
|
goto out;
|
|
}
|
|
}
|
|
}
|
|
|
|
out:
|
|
iounmap(pcdp);
|
|
return rc;
|
|
}
|