From f81f39d5bb652d87f5239ff2dcc47dd9ae4ad4e8 Mon Sep 17 00:00:00 2001 From: Alex Williamson Date: Tue, 1 Apr 2008 10:24:41 -0600 Subject: [PATCH] [IA64] Other Intel IPF platforms use COM1 Signed-off-by: Anthony Xu --- xen/arch/ia64/linux-xen/setup.c | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/xen/arch/ia64/linux-xen/setup.c b/xen/arch/ia64/linux-xen/setup.c index 7b112d4523..a4696e9518 100644 --- a/xen/arch/ia64/linux-xen/setup.c +++ b/xen/arch/ia64/linux-xen/setup.c @@ -405,16 +405,21 @@ acpi_oem_console_setup(void) * Tiger 2: SR870BH2 * Tiger 4: SR870BN4 */ - if (strncmp(hdr->oem_id, "INTEL", 5) || - (!strncmp(hdr->oem_table_id, "SR870BH2", 8) && - !strncmp(hdr->oem_table_id, "SR870BN4", 8))) - return -ENODEV; - - ns16550_com1.baud = BAUD_AUTO; - ns16550_com1.io_base = 0x2f8; - ns16550_com1.irq = 3; - - return 0; + if (!strncmp(hdr->oem_id, "INTEL", 5)) { + if (!strncmp(hdr->oem_table_id, "SR870BH2", 8) || + !strncmp(hdr->oem_table_id, "SR870BN4", 8)) { + ns16550_com1.baud = BAUD_AUTO; + ns16550_com1.io_base = 0x2f8; + ns16550_com1.irq = 3; + return 0; + } else { + ns16550_com1.baud = BAUD_AUTO; + ns16550_com1.io_base = 0x3f8; + ns16550_com1.irq = ns16550_com1_gsi = 4; + return 0; + } + } + return -ENODEV; } #endif -- 2.39.5