diff options
author | Mark Maule <maule@sgi.com> | 2005-04-25 16:51:00 -0400 |
---|---|---|
committer | Tony Luck <tony.luck@intel.com> | 2005-06-28 12:09:06 -0400 |
commit | 66b7f8a30437b8639e798f7db8e9be1da5711efa (patch) | |
tree | 288703e10bab793bc399961059ad485604539955 /arch/ia64/kernel/setup.c | |
parent | 54522b6613a03807f057fd567794a31267ef85cb (diff) |
[IA64-SGI] pcdp: add PCDP pci interface support
Resend 2 with changes per Bjorn Helgaas comments. Changes from original:
+ Change globals to vga_console_iobase/vga_console_membase and make them
unconditional.
+ Address style-related comments.
Patch to extend the PCDP vga setup code to support PCI io/mem translations
for the legacy vga ioport and ram spaces on architectures (e.g. altix) which
need them.
Summary of the changes:
drivers/firmware/pcdp.c
drivers/firmware/pcdp.h
-----------------------
+ add declaration for the spec-defined PCI interface struct (pcdp_if_pci)
as well as support macros.
+ extend setup_vga_console() to know about pcdp_if_pci and add a couple of
globals to hold the io and mem translation offsets if present.
arch/ia64/kernel/setup.c
------------------------
+ tweek early_console_setup() to allow multiple early console setup routines
to be called.
include/asm-ia64/vga.h
----------------------
+ make VGA_MAP_MEM vga_console_membase aware
Signed-off-by: Mark Maule <maule@sgi.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>
Diffstat (limited to 'arch/ia64/kernel/setup.c')
-rw-r--r-- | arch/ia64/kernel/setup.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/arch/ia64/kernel/setup.c b/arch/ia64/kernel/setup.c index d14692e0920a..2693e1522d7c 100644 --- a/arch/ia64/kernel/setup.c +++ b/arch/ia64/kernel/setup.c | |||
@@ -72,6 +72,8 @@ DEFINE_PER_CPU(unsigned long, ia64_phys_stacked_size_p8); | |||
72 | unsigned long ia64_cycles_per_usec; | 72 | unsigned long ia64_cycles_per_usec; |
73 | struct ia64_boot_param *ia64_boot_param; | 73 | struct ia64_boot_param *ia64_boot_param; |
74 | struct screen_info screen_info; | 74 | struct screen_info screen_info; |
75 | unsigned long vga_console_iobase; | ||
76 | unsigned long vga_console_membase; | ||
75 | 77 | ||
76 | unsigned long ia64_max_cacheline_size; | 78 | unsigned long ia64_max_cacheline_size; |
77 | unsigned long ia64_iobase; /* virtual address for I/O accesses */ | 79 | unsigned long ia64_iobase; /* virtual address for I/O accesses */ |
@@ -273,23 +275,25 @@ io_port_init (void) | |||
273 | static inline int __init | 275 | static inline int __init |
274 | early_console_setup (char *cmdline) | 276 | early_console_setup (char *cmdline) |
275 | { | 277 | { |
278 | int earlycons = 0; | ||
279 | |||
276 | #ifdef CONFIG_SERIAL_SGI_L1_CONSOLE | 280 | #ifdef CONFIG_SERIAL_SGI_L1_CONSOLE |
277 | { | 281 | { |
278 | extern int sn_serial_console_early_setup(void); | 282 | extern int sn_serial_console_early_setup(void); |
279 | if (!sn_serial_console_early_setup()) | 283 | if (!sn_serial_console_early_setup()) |
280 | return 0; | 284 | earlycons++; |
281 | } | 285 | } |
282 | #endif | 286 | #endif |
283 | #ifdef CONFIG_EFI_PCDP | 287 | #ifdef CONFIG_EFI_PCDP |
284 | if (!efi_setup_pcdp_console(cmdline)) | 288 | if (!efi_setup_pcdp_console(cmdline)) |
285 | return 0; | 289 | earlycons++; |
286 | #endif | 290 | #endif |
287 | #ifdef CONFIG_SERIAL_8250_CONSOLE | 291 | #ifdef CONFIG_SERIAL_8250_CONSOLE |
288 | if (!early_serial_console_init(cmdline)) | 292 | if (!early_serial_console_init(cmdline)) |
289 | return 0; | 293 | earlycons++; |
290 | #endif | 294 | #endif |
291 | 295 | ||
292 | return -1; | 296 | return (earlycons) ? 0 : -1; |
293 | } | 297 | } |
294 | 298 | ||
295 | static inline void | 299 | static inline void |