[tty:tty-testing 22/24] earlycon.c:undefined reference to `screen_info'

[tty:tty-testing 22/24] earlycon.c:undefined reference to `screen_info'

[kernel test robot]

tree:   https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git tty-testing
head:   6271f1e8c4cb9a46273ae01ff9cb86a022063f75
commit: 934d62223da320b3ec012c85b63a6c250f507096 [22/24] efi: move screen_info into efi init code
config: loongarch-randconfig-002-20231017 (https://download.01.org/0day-ci/archive/20231017/202310170938.xHIu2lFB-lkp@intel.com/config)
compiler: loongarch64-linux-gcc (GCC) 13.2.0
reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20231017/202310170938.xHIu2lFB-lkp@intel.com/reproduce)

If you fix the issue in a separate patch/commit (i.e. not just a new version of
the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <lkp@intel.com>
| Closes: https://lore.kernel.org/oe-kbuild-all/202310170938.xHIu2lFB-lkp@intel.com/

All errors (new ones prefixed by >>):

   loongarch64-linux-ld: arch/loongarch/kernel/efi.o: in function `efi_init':
   efi.c:(.init.text+0x158): undefined reference to `screen_info'
   loongarch64-linux-ld: efi.c:(.init.text+0x15c): undefined reference to `screen_info'
   loongarch64-linux-ld: drivers/firmware/efi/earlycon.o: in function `.L24':
>> earlycon.c:(.text+0x80): undefined reference to `screen_info'
>> loongarch64-linux-ld: earlycon.c:(.text+0x84): undefined reference to `screen_info'
   loongarch64-linux-ld: drivers/firmware/efi/earlycon.o: in function `efi_earlycon_write':
   earlycon.c:(.text+0x18c): undefined reference to `screen_info'
   loongarch64-linux-ld: drivers/firmware/efi/earlycon.o:earlycon.c:(.text+0x190): more undefined references to `screen_info' follow

-- 
0-DAY CI Kernel Test Service
https://github.com/intel/lkp-tests/wiki

Re: [tty:tty-testing 22/24] earlycon.c:undefined reference to `screen_info'

[Greg Kroah-Hartman]

On Tue, Oct 17, 2023 at 09:44:58AM +0800, kernel test robot wrote:
> tree:   https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git tty-testing
> head:   6271f1e8c4cb9a46273ae01ff9cb86a022063f75
> commit: 934d62223da320b3ec012c85b63a6c250f507096 [22/24] efi: move screen_info into efi init code
> config: loongarch-randconfig-002-20231017 (https://download.01.org/0day-ci/archive/20231017/202310170938.xHIu2lFB-lkp@intel.com/config)
> compiler: loongarch64-linux-gcc (GCC) 13.2.0
> reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20231017/202310170938.xHIu2lFB-lkp@intel.com/reproduce)
> 
> If you fix the issue in a separate patch/commit (i.e. not just a new version of
> the same patch/commit), kindly add following tags
> | Reported-by: kernel test robot <lkp@intel.com>
> | Closes: https://lore.kernel.org/oe-kbuild-all/202310170938.xHIu2lFB-lkp@intel.com/

Arnd, I'll drop this commit from my tree now, if you want to fix it up
and resend just it, I'll be glad to apply it.

thanks,

greg k-h

Re: [tty:tty-testing 22/24] earlycon.c:undefined reference to `screen_info'

[Arnd Bergmann]

On Tue, Oct 17, 2023, at 10:18, Greg Kroah-Hartman wrote:
> On Tue, Oct 17, 2023 at 09:44:58AM +0800, kernel test robot wrote:
>> tree:   https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git tty-testing
>> head:   6271f1e8c4cb9a46273ae01ff9cb86a022063f75
>> commit: 934d62223da320b3ec012c85b63a6c250f507096 [22/24] efi: move screen_info into efi init code
>> config: loongarch-randconfig-002-20231017 (https://download.01.org/0day-ci/archive/20231017/202310170938.xHIu2lFB-lkp@intel.com/config)
>> compiler: loongarch64-linux-gcc (GCC) 13.2.0
>> reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20231017/202310170938.xHIu2lFB-lkp@intel.com/reproduce)
>> 
>> If you fix the issue in a separate patch/commit (i.e. not just a new version of
>> the same patch/commit), kindly add following tags
>> | Reported-by: kernel test robot <lkp@intel.com>
>> | Closes: https://lore.kernel.org/oe-kbuild-all/202310170938.xHIu2lFB-lkp@intel.com/
>
> Arnd, I'll drop this commit from my tree now, if you want to fix it up
> and resend just it, I'll be glad to apply it.

Ok, I was about to send the fixup below, but I'll just send the
combined patch instead then. I'm still looking at another build
regression from the same series that I'll fix up as well.

    Arnd

----
From 8f8bebf0be1e61fdb38f73e71f05066caebf64e4 Mon Sep 17 00:00:00 2001
From: Arnd Bergmann <arnd@arndb.de>
Date: Tue, 17 Oct 2023 08:11:35 +0200
Subject: [PATCH] efi: move screen_info for loongarch as well

I had intended to move the screen_info definition next to the global
init_screen_info() function that is shared between all architectures,
but as it turns out, loongarch does not actually use this file and
instead has its own copy and is now missing the structure:

   loongarch64-linux-ld: arch/loongarch/kernel/efi.o: in function `efi_init':
   efi.c:(.init.text+0x158): undefined reference to `screen_info'

Add another copy next to the loongarch specific function, the same
way that x86 already has a special case for this.

Reported-by: kernel test robot <lkp@intel.com>
Closes: https://lore.kernel.org/oe-kbuild-all/202310171049.aNxOKhUY-lkp@intel.com/
Closes: https://lore.kernel.org/oe-kbuild-all/202310170938.xHIu2lFB-lkp@intel.com/
Fixes: 934d62223da320 ("efi: move screen_info into efi init code")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

diff --git a/arch/loongarch/kernel/efi.c b/arch/loongarch/kernel/efi.c
index df7db34024e61..acb5d3385675c 100644
--- a/arch/loongarch/kernel/efi.c
+++ b/arch/loongarch/kernel/efi.c
@@ -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;