ia64/xen-unstable

changeset 14709:770c465344d3

[IA64] Auto setup serial console on PRIMEQUEST

Signed-off-by: Akio Takebe <takebe_akio@jp.fujitsu.com>
author Alex Williamson <alex.williamson@hp.com>
date Thu Apr 05 09:13:16 2007 -0600 (2007-04-05)
parents f378c424e0ce
children 3c8039aa5004
files xen/arch/ia64/linux-xen/setup.c
line diff
     1.1 --- a/xen/arch/ia64/linux-xen/setup.c	Tue Apr 03 13:04:51 2007 -0600
     1.2 +++ b/xen/arch/ia64/linux-xen/setup.c	Thu Apr 05 09:13:16 2007 -0600
     1.3 @@ -316,7 +316,7 @@ io_port_init (void)
     1.4  
     1.5  #ifdef XEN
     1.6  static int __init
     1.7 -intel_tiger_console_setup(void)
     1.8 +acpi_oem_console_setup(void)
     1.9  {
    1.10  	extern struct ns16550_defaults ns16550_com1;
    1.11  	efi_system_table_t *systab;
    1.12 @@ -353,8 +353,17 @@ intel_tiger_console_setup(void)
    1.13  	if (strncmp(hdr->signature, XSDT_SIG, sizeof(XSDT_SIG) - 1))
    1.14  		return -ENODEV;
    1.15  
    1.16 +	/* Looking for Fujitsu PRIMEQUEST systems */
    1.17 +	if (!strncmp(hdr->oem_id, "FUJITSPQ", 8) &&
    1.18 +	    (!strncmp(hdr->oem_table_id, "PQ", 2))){
    1.19 +		ns16550_com1.baud = BAUD_AUTO;
    1.20 +		ns16550_com1.io_base =	0x3f8;
    1.21 +		ns16550_com1.irq = 48;
    1.22 +		return 0;
    1.23 +	}
    1.24 +
    1.25  	/*
    1.26 -	 * Only looking for Intel Tiger systems
    1.27 +	 * Looking for Intel Tiger systems
    1.28  	 * Tiger 2: SR870BH2
    1.29  	 * Tiger 4: SR870BN4
    1.30  	 */
    1.31 @@ -402,7 +411,7 @@ early_console_setup (char *cmdline)
    1.32  #endif
    1.33  
    1.34  #ifdef XEN
    1.35 -	if (!intel_tiger_console_setup())
    1.36 +	if (!acpi_oem_console_setup())
    1.37  		earlycons++;
    1.38  #endif
    1.39  	return (earlycons) ? 0 : -1;