diff options
| author | John Keller <jpk@sgi.com> | 2007-03-20 13:50:10 -0500 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2007-03-20 13:49:53 -0700 |
| commit | 0bdfc1900705dadef6286d69de7da0feef841734 (patch) | |
| tree | 01e9d1a2424e022d5cde6da1b314a77ccd191929 | |
| parent | 60b548dfe4ad178dbf0fa8c2a50e36aaa42d603a (diff) | |
| download | blackbird-op-linux-0bdfc1900705dadef6286d69de7da0feef841734.tar.gz blackbird-op-linux-0bdfc1900705dadef6286d69de7da0feef841734.zip | |
[IA64] Altix: ioremap vga_console_iobase
When booting an SN system without specifing a console
(i.e., no "console=" on boot line), the system will hang during
boot at the point where /sbin/init is run.
The problem is that vga_console_iobase is not converted to a
virtual address before storing in io_space[0].mmio_base.
The conversion was happening in sn_scan_pcdp(), but not in
setup_vga_console().
Signed-off-by: John Keller <jpk@sgi.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>
| -rw-r--r-- | arch/ia64/sn/kernel/setup.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/ia64/sn/kernel/setup.c b/arch/ia64/sn/kernel/setup.c index bd5373d593e1..a9bed5ca2ed8 100644 --- a/arch/ia64/sn/kernel/setup.c +++ b/arch/ia64/sn/kernel/setup.c @@ -348,8 +348,7 @@ sn_scan_pcdp(void) continue; /* not PCI interconnect */ if (if_pci.translation & PCDP_PCI_TRANS_IOPORT) - vga_console_iobase = - if_pci.ioport_tra | __IA64_UNCACHED_OFFSET; + vga_console_iobase = if_pci.ioport_tra; if (if_pci.translation & PCDP_PCI_TRANS_MMIO) vga_console_membase = @@ -429,7 +428,8 @@ void __init sn_setup(char **cmdline_p) * bus containing the VGA console. */ if (vga_console_iobase) { - io_space[0].mmio_base = vga_console_iobase; + io_space[0].mmio_base = + (unsigned long) ioremap(vga_console_iobase, 0); io_space[0].sparse = 0; } |
