[Xen-changelog] [xen-unstable] [IA64] Only one serial console port on Tiger2

classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

[Xen-changelog] [xen-unstable] [IA64] Only one serial console port on Tiger2

Xen patchbot-unstable
# HG changeset patch
# User [hidden email]
# Date 1171560699 25200
# Node ID eb6c19ed6e67fb7dc1266b33333ea5a3b8dc54d4
# Parent  2b3dd681dbce7a598784b526d232c3c199f46437
[IA64] Only one serial console port on Tiger2

Tiger2 also only has one serial port at 0x2f8, so consolidate
com port setup w/ Tiger4.

Signed-off-by: Simon Horman <[hidden email]>
---
 xen/arch/ia64/linux-xen/setup.c |   39 ++++++++++++++-------------------------
 1 files changed, 14 insertions(+), 25 deletions(-)

diff -r 2b3dd681dbce -r eb6c19ed6e67 xen/arch/ia64/linux-xen/setup.c
--- a/xen/arch/ia64/linux-xen/setup.c Thu Feb 15 10:25:33 2007 -0700
+++ b/xen/arch/ia64/linux-xen/setup.c Thu Feb 15 10:31:39 2007 -0700
@@ -318,7 +318,7 @@ static int __init
 static int __init
 intel_tiger_console_setup(void)
 {
- extern struct ns16550_defaults ns16550_com1, ns16550_com2;
+ extern struct ns16550_defaults ns16550_com1;
  efi_system_table_t *systab;
  efi_config_table_t *tables;
  struct acpi20_table_rsdp *rsdp = NULL;
@@ -353,32 +353,21 @@ intel_tiger_console_setup(void)
  if (strncmp(hdr->signature, XSDT_SIG, sizeof(XSDT_SIG) - 1))
  return -ENODEV;
 
- /* Only looking for Intel systems */
- if (strncmp(hdr->oem_id, "INTEL", 5))
+ /*
+ * Only looking for Intel Tiger systems
+ * 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;
 
- if (!strncmp(hdr->oem_table_id, "SR870BH2", 8)) {
- /* Tiger 2 */
- ns16550_com1.baud = BAUD_AUTO;
- ns16550_com1.io_base = 0x3f8;
- ns16550_com1.irq = 4;
-
- ns16550_com2.baud = BAUD_AUTO;
- ns16550_com2.io_base = 0x2f8;
- ns16550_com2.irq = 3;
-
- return 0;
-
- } else if (!strncmp(hdr->oem_table_id, "SR870BN4", 8)) {
- /* Tiger 4 */
- ns16550_com1.baud = BAUD_AUTO;
- ns16550_com1.io_base = 0x2f8;
- ns16550_com1.irq = 3;
-
- return 0;
- }
-
- return -ENODEV;
+ ns16550_com1.baud = BAUD_AUTO;
+ ns16550_com1.io_base = 0x2f8;
+ ns16550_com1.irq = 3;
+
+ return 0;
 }
 #endif
 

_______________________________________________
Xen-changelog mailing list
[hidden email]
http://lists.xensource.com/xen-changelog