vgacon: rework screen_info #ifdef checks
Subsystems (6)
PATCH 1/3 vgacon: rework screen_info #ifdef checks
From: Arnd Bergmann <[email protected]>
On non-x86 architectures, the screen_info variable is generally only used for the VGA console where supported, and in some cases the EFI framebuffer or vga16fb.
Now that we have a definite list of which architectures actually use it for what, use consistent #ifdef checks so the global variable is only defined when it is actually used on those architectures.
On powerpc, there is no support for vgacon, but there is support for vga16fb. Loongarch and riscv have no support for vgacon or vga16fb, but they support EFI firmware, so only that needs to be checked, and the initialization can be removed because that is handled by EFI. IA64 has both vgacon and EFI.
--- arch/alpha/kernel/setup.c | 2 ++ arch/alpha/kernel/sys_sio.c | 2 ++ arch/ia64/kernel/setup.c | 4 ++++ arch/loongarch/kernel/setup.c | 2 ++ arch/mips/jazz/setup.c | 2 +- arch/mips/kernel/setup.c | 2 +- arch/mips/sibyte/swarm/setup.c | 2 +- arch/mips/sni/setup.c | 2 +- arch/powerpc/kernel/setup-common.c | 2 +- arch/riscv/kernel/setup.c | 11 ++--------- 10 files changed, 17 insertions(+), 14 deletions(-)
arch/alpha/kernel/setup.c +2 -0
@@ -131,6 +131,7 @@ static void determine_cpu_caches (unsigned int);static char __initdata command_line[COMMAND_LINE_SIZE ]; +#ifdef CONFIG_VGA_CONSOLE /* * The format of "screen_info" is strange, and due to early * i386-setup code. This is just enough to make the console
@@ -147,6 +148,7 @@ struct screen_info screen_info = { };EXPORT_SYMBOL (screen_info); +#endif /* * The direct map I/O window, if any. This should be the same
arch/alpha/kernel/sys_sio.c +2 -0
@@ -57,11 +57,13 @@ sio_init_irq(void)static inline void __init alphabook1_init_arch (void ) { +#ifdef CONFIG_VGA_CONSOLE /* The AlphaBook1 has LCD video fixed at 800x600, 37 rows and 100 cols. */ screen_info.orig_y =37 ; screen_info.orig_video_cols =100 ; screen_info.orig_video_lines =37 ; +#endif lca_init_arch (); }
arch/ia64/kernel/setup.c +4 -0
@@ -86,9 +86,11 @@ EXPORT_SYMBOL(local_per_cpu_offset);#endif unsigned long ia64_cycles_per_usec;struct ia64_boot_param *ia64_boot_param; +#if defined(CONFIG_VGA_CONSOLE ) || defined(CONFIG_EFI )struct screen_info screen_info;unsigned long vga_console_iobase;unsigned long vga_console_membase; +#endif static struct resource data_resource = { .name ="Kernel data" ,
@@ -497,6 +499,7 @@ early_console_setup (char *cmdline)static void __init screen_info_setup (void ) { +#ifdef CONFIG_VGA_CONSOLE unsigned int orig_x, orig_y, num_cols, num_rows, font_height;memset (&screen_info,0 ,sizeof (screen_info));
@@ -525,6 +528,7 @@ screen_info_setup(void) screen_info.orig_video_mode =3 ;/* XXX fake */ screen_info.orig_video_isVGA =1 ;/* XXX fake */ screen_info.orig_video_ega_bx =3 ;/* XXX fake */ +#endif } static inline void
arch/loongarch/kernel/setup.c +2 -0
@@ -57,7 +57,9 @@#define SMBIOS_CORE_PACKAGE_OFFSET 0x23#define LOONGSON_EFI_ENABLE (1 << 3) +#ifdef CONFIG_EFI struct screen_info screen_info __section(".data"); +#endif unsigned long fw_arg0, fw_arg1, fw_arg2; DEFINE_PER_CPU(unsigned long, kernelsp);
arch/mips/jazz/setup.c +1 -1
@@ -76,7 +76,7 @@ void __init plat_mem_setup(void) _machine_restart = jazz_machine_restart; -#ifdef CONFIG_VT +#ifdef CONFIG_VGA_CONSOLE screen_info = (struct screen_info ) { .orig_video_cols =160 , .orig_video_lines = 64,
arch/mips/kernel/setup.c +1 -1
@@ -54,7 +54,7 @@ struct cpuinfo_mips cpu_data[NR_CPUS] __read_mostly;EXPORT_SYMBOL (cpu_data); -#ifdef CONFIG_VT +#ifdef CONFIG_VGA_CONSOLE struct screen_info screen_info;#endif
arch/mips/sibyte/swarm/setup.c +1 -1
@@ -129,7 +129,7 @@ void __init plat_mem_setup(void)if (m41t81_probe ()) swarm_rtc_type =RTC_M41T81 ; -#ifdef CONFIG_VT +#ifdef CONFIG_VGA_CONSOLE screen_info = (struct screen_info ) { .orig_video_page =52 , .orig_video_mode = 3,
arch/mips/sni/setup.c +1 -1
@@ -38,7 +38,7 @@ extern void sni_machine_power_off(void);static void __init sni_display_setup (void ) { -#if defined(CONFIG_VT ) && defined(CONFIG_VGA_CONSOLE ) && defined(CONFIG_FW_ARC ) +#if defined(CONFIG_VGA_CONSOLE ) && defined(CONFIG_FW_ARC )struct screen_info *si = &screen_info;DISPLAY_STATUS *di;
arch/powerpc/kernel/setup-common.c +1 -1
@@ -98,6 +98,7 @@ int boot_cpu_hwid = -1;int dcache_bsize;int icache_bsize; +#if IS_ENABLED (CONFIG_FB_VGA16 )/* * This still seems to be needed... -- paulus */
@@ -109,7 +110,6 @@ struct screen_info screen_info = { .orig_video_isVGA = 1, .orig_video_points =16 }; -#if defined(CONFIG_FB_VGA16_MODULE )EXPORT_SYMBOL (screen_info);#endif
arch/riscv/kernel/setup.c +2 -9
@@ -39,15 +39,8 @@#include "head.h" -#if defined(CONFIG_DUMMY_CONSOLE ) || defined(CONFIG_EFI ) -struct screen_info screen_info __section(".data") = { - .orig_video_lines = 30, - .orig_video_cols = 80, - .orig_video_mode = 0, - .orig_video_ega_bx = 0, - .orig_video_isVGA = 1, - .orig_video_points =8 -}; +#if defined(CONFIG_EFI ) +struct screen_info screen_info __section(".data");#endif /*
Signature · 1 line
2.39.2
Quoted 6 lines · Arnd Bergmann
From: Arnd Bergmann <[email protected]>
On non-x86 architectures, the
screen_infovariable is generally only used for the VGA console where supported, and in some cases the EFI framebuffer or vga16fb.
This should have been patch 2/4, not 1/3, please ignore this one and look at the new version.
Arnd