[Xen-changelog] [xen-unstable] [IA64] Don't assume legacy com2

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

# HG changeset patch
# User awilliam@xxxxxxxxxxxx
# Date 1170800426 25200
# Node ID 7efb3a06c56abbe60eb5588e1f8421052b4962ca
# Parent  5b99d19906a7782c20ce489e8e8e0573d52bea51
[IA64] Don't assume legacy com2

If com1 isn't at a legacy I/O port address, don't assume legacy com2 exists.

Signed-off-by: Alex Williamson <alex.williamson@xxxxxx>
---
 xen/arch/ia64/xen/xensetup.c |   15 +++++++++------
 1 files changed, 9 insertions(+), 6 deletions(-)

diff -r 5b99d19906a7 -r 7efb3a06c56a xen/arch/ia64/xen/xensetup.c
--- a/xen/arch/ia64/xen/xensetup.c      Tue Feb 06 15:08:09 2007 -0700
+++ b/xen/arch/ia64/xen/xensetup.c      Tue Feb 06 15:20:26 2007 -0700
@@ -267,13 +267,16 @@ void start_kernel(void)
     early_setup_arch(&cmdline);
 
     /* We initialise the serial devices very early so we can get debugging. */
-    if (running_on_sim) hpsim_serial_init();
+    if (running_on_sim)
+        hpsim_serial_init();
     else {
-       ns16550_init(0, &ns16550_com1);
-       /* Also init com2 for Tiger4. */
-       ns16550_com2.io_base = 0x2f8;
-       ns16550_com2.irq     = 3;
-       ns16550_init(1, &ns16550_com2);
+        ns16550_init(0, &ns16550_com1);
+        if (ns16550_com1.io_base == 0x3f8) {
+            /* Also init com2 for Tiger4. */
+            ns16550_com2.io_base = 0x2f8;
+            ns16550_com2.irq     = 3;
+            ns16550_init(1, &ns16550_com2);
+        }
     }
     serial_init_preirq();
 

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