[Xen-changelog] [xen-unstable] [IA64] Auto setup serial console on PRIMEQUEST

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Alex Williamson <alex.williamson@xxxxxx>
# Date 1175785996 21600
# Node ID 770c465344d3d2a476a6e31f2511bfab353b0786
# Parent  f378c424e0ced4cbc584e5c6125d065f1cc05d0c
[IA64] Auto setup serial console on PRIMEQUEST

Signed-off-by: Akio Takebe <takebe_akio@xxxxxxxxxxxxxx>
---
 xen/arch/ia64/linux-xen/setup.c |   15 ++++++++++++---
 1 files changed, 12 insertions(+), 3 deletions(-)

diff -r f378c424e0ce -r 770c465344d3 xen/arch/ia64/linux-xen/setup.c
--- a/xen/arch/ia64/linux-xen/setup.c   Tue Apr 03 13:04:51 2007 -0600
+++ b/xen/arch/ia64/linux-xen/setup.c   Thu Apr 05 09:13:16 2007 -0600
@@ -316,7 +316,7 @@ io_port_init (void)
 
 #ifdef XEN
 static int __init
-intel_tiger_console_setup(void)
+acpi_oem_console_setup(void)
 {
        extern struct ns16550_defaults ns16550_com1;
        efi_system_table_t *systab;
@@ -353,8 +353,17 @@ intel_tiger_console_setup(void)
        if (strncmp(hdr->signature, XSDT_SIG, sizeof(XSDT_SIG) - 1))
                return -ENODEV;
 
+       /* Looking for Fujitsu PRIMEQUEST systems */
+       if (!strncmp(hdr->oem_id, "FUJITSPQ", 8) &&
+           (!strncmp(hdr->oem_table_id, "PQ", 2))){
+               ns16550_com1.baud = BAUD_AUTO;
+               ns16550_com1.io_base =  0x3f8;
+               ns16550_com1.irq = 48;
+               return 0;
+       }
+
        /*
-        * Only looking for Intel Tiger systems
+        * Looking for Intel Tiger systems
         * Tiger 2: SR870BH2
         * Tiger 4: SR870BN4
         */
@@ -402,7 +411,7 @@ early_console_setup (char *cmdline)
 #endif
 
 #ifdef XEN
-       if (!intel_tiger_console_setup())
+       if (!acpi_oem_console_setup())
                earlycons++;
 #endif
        return (earlycons) ? 0 : -1;

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog