efi: move screen_info into efi init code
Subsystems (7)
PATCH v2 1/2 efi: move screen_info into efi init code
From: Arnd Bergmann <[email protected]>
After the vga console no longer relies on global screen_info, there are only two remaining use cases:
- on the x86 architecture, it is used for multiple boot methods (bzImage, EFI, Xen, kexec) to commucate the initial VGA or framebuffer settings to a number of device drivers.
- on other architectures, it is only used as part of the EFI stub, and only for the three sysfb framebuffers (simpledrm, simplefb, efifb).
Remove the duplicate data structure definitions by moving it into the efi-init.c file that sets it up initially for the EFI case, leaving x86 as an exception that retains its own definition for non-EFI boots.
The added #ifdefs here are optional, I added them to further limit the reach of screen_info to configurations that have at least one of the users enabled.
---
v2: fix up loongarch code, which has a separate copy of the efi-init.c file.
--- arch/arm/kernel/setup.c | 4 ---- arch/arm64/kernel/efi.c | 4 ---- arch/arm64/kernel/image-vars.h | 2 ++ arch/loongarch/kernel/efi.c | 8 +++++++- arch/loongarch/kernel/image-vars.h | 2 ++ arch/loongarch/kernel/setup.c | 5 ----- arch/riscv/kernel/image-vars.h | 2 ++ arch/riscv/kernel/setup.c | 5 ----- drivers/firmware/efi/efi-init.c | 14 +++++++++++++- drivers/firmware/efi/libstub/efi-stub-entry.c | 8 +++++++- 10 files changed, 33 insertions(+), 21 deletions(-)
arch/arm/kernel/setup.c +0 -4
@@ -939,10 +939,6 @@ static struct screen_info vgacon_screen_info = { };#endif -#if defined(CONFIG_EFI ) -struct screen_info screen_info; -#endif -static int __init customize_machine (void ) {/*
arch/arm64/kernel/efi.c +0 -4
@@ -71,10 +71,6 @@ static __init pteval_t create_mapping_protection(efi_memory_desc_t *md)return pgprot_val (PAGE_KERNEL_EXEC ); } -/* we will fill this structure from the stub, so don't put it in .bss */ -struct screen_info screen_info __section(".data"); -EXPORT_SYMBOL (screen_info); -int __init efi_create_mapping (struct mm_struct *mm,efi_memory_desc_t *md) {pteval_t prot_val =create_mapping_protection (md);
arch/arm64/kernel/image-vars.h +2 -0
@@ -27,7 +27,9 @@ PROVIDE(__efistub__text = _text);PROVIDE (__efistub__end = _end);PROVIDE (__efistub___inittext_end = __inittext_end);PROVIDE (__efistub__edata = _edata); +#if defined(CONFIG_EFI_EARLYCON ) || defined(CONFIG_SYSFB )PROVIDE (__efistub_screen_info = screen_info); +#endif PROVIDE (__efistub__ctype = _ctype);PROVIDE (__pi___memcpy = __pi_memcpy);
arch/loongarch/kernel/efi.c +7 -1
@@ -68,6 +68,11 @@ void __init efi_runtime_init(void)unsigned long __initdata screen_info_table =EFI_INVALID_TABLE_ADDR ; +#if defined(CONFIG_SYSFB ) || defined(CONFIG_EFI_EARLYCON ) +struct screen_info screen_info __section(".data"); +EXPORT_SYMBOL_GPL (screen_info); +#endif +static void __init init_screen_info (void ) {struct screen_info *si;
@@ -115,7 +120,8 @@ void __init efi_init(void)set_bit (EFI_CONFIG_TABLES , &efi.flags); -init_screen_info (); +if (IS_ENABLED (CONFIG_EFI_EARLYCON ) ||IS_ENABLED (CONFIG_SYSFB )) +init_screen_info ();if (boot_memmap ==EFI_INVALID_TABLE_ADDR )return ;
arch/loongarch/kernel/image-vars.h +2 -0
@@ -12,7 +12,9 @@ __efistub_kernel_entry = kernel_entry; __efistub_kernel_asize = kernel_asize; __efistub_kernel_fsize = kernel_fsize; __efistub_kernel_offset = kernel_offset; +#if defined(CONFIG_EFI_EARLYCON ) || defined(CONFIG_SYSFB ) __efistub_screen_info = screen_info; +#endif #endif
arch/loongarch/kernel/setup.c +0 -5
@@ -16,7 +16,6 @@#include <linux/dmi.h> #include <linux/efi.h> #include <linux/export.h> -#include <linux/screen_info.h> #include <linux/memblock.h> #include <linux/initrd.h> #include <linux/ioport.h>
@@ -57,10 +56,6 @@#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);struct cpuinfo_loongarch cpu_data[NR_CPUS ]__read_mostly ;
arch/riscv/kernel/image-vars.h +2 -0
@@ -28,7 +28,9 @@ __efistub__start_kernel = _start_kernel; __efistub__end = _end; __efistub__edata = _edata; __efistub___init_text_end = __init_text_end; +#if defined(CONFIG_EFI_EARLYCON ) || defined(CONFIG_SYSFB ) __efistub_screen_info = screen_info; +#endif #endif
arch/riscv/kernel/setup.c +0 -5
@@ -15,7 +15,6 @@#include <linux/memblock.h> #include <linux/sched.h> #include <linux/console.h> -#include <linux/screen_info.h> #include <linux/of_fdt.h> #include <linux/sched/task.h> #include <linux/smp.h>
@@ -40,10 +39,6 @@#include "head.h" -#if defined(CONFIG_EFI ) -struct screen_info screen_info __section(".data"); -#endif -/* * The lucky hart to first increment this variable will boot the other cores. * This is used before the kernel initializes the BSS so it can't be in the
drivers/firmware/efi/efi-init.c +13 -1
@@ -55,6 +55,15 @@ static phys_addr_t __init efi_to_phys(unsigned long addr)extern __weak const efi_config_table_type_t efi_arch_tables[]; +/* +* x86 defines its own screen_info and uses it even without EFI, +* everything else can get it from here. +*/ +#if !defined(CONFIG_X86 ) && (defined(CONFIG_SYSFB ) || defined(CONFIG_EFI_EARLYCON )) +struct screen_info screen_info __section(".data"); +EXPORT_SYMBOL_GPL (screen_info); +#endif +static void __init init_screen_info (void ) {struct screen_info *si;
@@ -240,5 +249,8 @@ void __init efi_init(void)memblock_reserve (data.phys_map &PAGE_MASK ,PAGE_ALIGN (data.size + (data.phys_map & ~PAGE_MASK ))); -init_screen_info (); +if (IS_ENABLED (CONFIG_X86 ) || +IS_ENABLED (CONFIG_SYSFB ) || +IS_ENABLED (CONFIG_EFI_EARLYCON )) +init_screen_info (); }
drivers/firmware/efi/libstub/efi-stub-entry.c +7 -1
@@ -13,7 +13,13 @@ struct screen_info *alloc_screen_info(void) {if (IS_ENABLED (CONFIG_ARM ))return __alloc_screen_info (); -return (void *)&screen_info + screen_info_offset; + +if (IS_ENABLED (CONFIG_X86 ) || +IS_ENABLED (CONFIG_EFI_EARLYCON ) || +IS_ENABLED (CONFIG_SYSFB )) +return (void *)&screen_info + screen_info_offset; + +return NULL ; }/*
Signature · 1 line
2.39.2
PATCH 2/2 console: fix up ARM screen_info reference
From: Arnd Bergmann <[email protected]>
Separating the VGA console screen_info from the EFI one unfortunately caused a build failure for footbridge that I had never caught with randconfig builds:
arch/arm/kernel/setup.c:932:27: error: static declaration of 'vgacon_screen_info' follows non-static declaration
932 | static struct screen_info vgacon_screen_info = {
| ^~~~~~~~~~~~~~~~~~
In file included from arch/arm/kernel/setup.c:44:
arch/arm/include/asm/setup.h:40:27: note: previous declaration of 'vgacon_screen_info' with type 'struct screen_info'
40 | extern struct screen_info vgacon_screen_info;
| ^~~~~~~~~~~~~~~~~~arm-linux-gnueabi-ld: drivers/video/console/dummycon.o: in function `dummycon_init':
dummycon.c:(.text+0xe4): undefined reference to `screen_info'
Make sure the variable is global to avoid the conflict with the extern declaration, and make it work in dummycon.c
---
Greg, this was caused by patch "vgacon: clean up global screen_info instances" in tty-testing. You can either apply this patch on top or fold it into that, or I can just resend the fixed series if you prefer.
--- arch/arm/include/asm/vga.h | 1 + arch/arm/kernel/setup.c | 2 +- drivers/video/console/dummycon.c | 5 +++-- 3 files changed, 5 insertions(+), 3 deletions(-)
arch/arm/include/asm/vga.h +1 -0
@@ -5,6 +5,7 @@#include <linux/io.h> extern unsigned long vga_base; +extern struct screen_info vgacon_screen_info;#define VGA_MAP_MEM (x,s) (vga_base + (x))
arch/arm/kernel/setup.c +1 -1
@@ -929,7 +929,7 @@ static void __init request_standard_resources(const struct machine_desc *mdesc) }#if defined(CONFIG_VGA_CONSOLE ) -static struct screen_info vgacon_screen_info = { +struct screen_info vgacon_screen_info = { .orig_video_lines =30 , .orig_video_cols =80 , .orig_video_mode = 0,
drivers/video/console/dummycon.c +3 -2
@@ -19,8 +19,9 @@*/ #if defined(CONFIG_ARCH_FOOTBRIDGE ) && defined(CONFIG_VGA_CONSOLE ) -#define DUMMY_COLUMNS screen_info.orig_video_cols -#define DUMMY_ROWS screen_info.orig_video_lines +#include <asm/vga.h> +#define DUMMY_COLUMNS vgacon_screen_info.orig_video_cols +#define DUMMY_ROWS vgacon_screen_info.orig_video_lines#else /* set by Kconfig. Use 80x25 for 640x480 and 160x64 for 1280x1024 */ #define DUMMY_COLUMNS CONFIG_DUMMY_CONSOLE_COLUMNS
Signature · 1 line
2.39.2