x86: Add implementations of setjmp() and longjmp()

These are missing in some functions. Add them to keep things consistent.

Signed-off-by Simon Glass <[email protected]>

---

 cmd/bootefi.c                 |  7 +++++--
 include/efi_loader.h          |  2 +-
 lib/efi_loader/efi_boottime.c |  5 +++--
 lib/efi_loader/efi_disk.c     | 13 +++++++------
 lib/efi_loader/efi_net.c      |  4 ++--
 5 files changed, 18 insertions(+), 13 deletions(-)

These are missing in some functions. Add them to keep things consistent.

Signed-off-by Simon Glass <[email protected]>

Quoted 4 lines · Simon Glass

These are missing in some functions. Add them to keep things consistent.

Signed-off-by Simon Glass <[email protected]>

Is there any way to change the EFIAPI definition so that we get build warnings for non matching function types on aarch64 as well?

Reviewed-by Alexander Graf <[email protected]>

It is useful to have a basic sanity check for EFI loader support. Add a 'bootefi hello' command which loads HelloWord.efi and runs it under U-Boot.

Signed-off-by Simon Glass <[email protected]>

---

 arch/arm/lib/HelloWorld32.efi  | Bin 0 -> 11712 bytes
 arch/arm/lib/Makefile          |   6 ++++++
 cmd/Kconfig                    |  10 ++++++++++
 cmd/bootefi.c                  |  26 ++++++++++++++++++++------
 include/asm-generic/sections.h |   2 ++
 scripts/Makefile.lib           |  19 +++++++++++++++++++
 6 files changed, 57 insertions(+), 6 deletions(-)
 create mode 100644 arch/arm/lib/HelloWorld32.efi

arch/arm/lib/Makefile +4 -0

+obj-$(CONFIG_CMD_BOOTEFI_HELLO) += HelloWorld64.o
+else
+obj-$(CONFIG_CMD_BOOTEFI_HELLO) += HelloWorld32.o
+endif
 obj-$(CONFIG_USE_ARCH_MEMSET) += memset.o
 obj-$(CONFIG_USE_ARCH_MEMCPY) += memcpy.o
 else

cmd/Kconfig +0 -0

index d69b817..8df80b6 100644
@@ -172,6 +172,16 @@ config CMD_BOOTEFI
        help

cmd/Kconfig +2 -0

+         up EFI support on a new architecture.
+
 config CMD_ELF
        bool "bootelf, bootvx"
        default y

cmd/bootefi.c +14 -5

index 0536b63..ecf9968 100644
@@ -229,13 +229,22 @@ static int do_bootefi(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 
        if (argc < 2)
                return 1;
-       saddr = argv[1];
+#ifdef CONFIG_CMD_BOOTEFI_HELLO
+       if (!strcmp(argv[1], "hello")) {
+               addr = CONFIG_SYS_LOAD_ADDR;
+               memcpy((char *)addr, __efi_hello_world_begin,
+                      __efi_hello_world_end - __efi_hello_world_begin);
+       } else
+#endif
+       {
+               saddr = argv[1];
 
-       addr = simple_strtoul(saddr, NULL, 16);
+               addr = simple_strtoul(saddr, NULL, 16);
 
-       if (argc > 2) {
-               sfdt = argv[2];
-               fdt_addr = simple_strtoul(sfdt, NULL, 16);
+               if (argc > 2) {
+                       sfdt = argv[2];
+                       fdt_addr = simple_strtoul(sfdt, NULL, 16);
+               }
        }
 
        printf("## Starting EFI application at 0x%08lx ...\n", addr);

cmd/bootefi.c +2 -0

+#endif
+       ;
 #endif
 
 U_BOOT_CMD(

include/asm-generic/sections.h +2 -0

index 328bc62..54ccac9 100644
@@ -22,6 +22,8 @@ extern char __kprobes_text_start[], __kprobes_text_end[];
 extern char __entry_text_start[], __entry_text_end[];
 extern char __initdata_begin[], __initdata_end[];
 extern char __start_rodata[], __end_rodata[];
+extern char __efi_hello_world_begin[];
+extern char __efi_hello_world_end[];
 
 /* Start and end of .ctors section - used for constructor calls. */
 extern char __ctors_start[], __ctors_end[];

scripts/Makefile.lib +0 -0

index e720562..07469f0 100644
@@ -321,6 +321,25 @@ cmd_S_ttf=                                         \
 $(obj)/%.S: $(src)/%.ttf
        $(call cmd,S_ttf)
 

Hi Simon,

Quoted 15 lines · Simon Glass

It is useful to have a basic sanity check for EFI loader support. Add a 'bootefi hello' command which loads HelloWord.efi and runs it under U-Boot.

Signed-off-by Simon Glass <[email protected]>

---

 arch/arm/lib/HelloWorld32.efi  | Bin 0 -> 11712 bytes
 arch/arm/lib/Makefile          |   6 ++++++
 cmd/Kconfig                    |  10 ++++++++++
 cmd/bootefi.c                  |  26 ++++++++++++++++++++------
 include/asm-generic/sections.h |   2 ++
 scripts/Makefile.lib           |  19 +++++++++++++++++++
 6 files changed, 57 insertions(+), 6 deletions(-)
 create mode 100644 arch/arm/lib/HelloWorld32.efi

[snip]

arch/arm/lib/Makefile obj-$(CONFIG_OF_LIBFDT) += bootm-fdt.o · line 33

Quoted 10 lines

arch/arm/lib/Makefile +2 -0

index a8d1557..0f3ea0c 100644
@@ -29,6 +29,12 @@ obj-$(CONFIG_OF_LIBFDT) += bootm-fdt.o
 obj-$(CONFIG_CMD_BOOTM) += bootm.o
 obj-$(CONFIG_CMD_BOOTM) += zimage.o
 obj-$(CONFIG_SYS_L2_PL310) += cache-pl310.o
+ifdef CONFIG_ARM64
+# This option does not work for arm64, as there is no binary.

If so, can we just remove this for arm64?

arch/arm/lib/Makefile obj-$(CONFIG_OF_LIBFDT) += bootm-fdt.o · line 40

Quoted 8 lines

arch/arm/lib/Makefile +4 -0

+obj-$(CONFIG_CMD_BOOTEFI_HELLO) += HelloWorld64.o
+else
+obj-$(CONFIG_CMD_BOOTEFI_HELLO) += HelloWorld32.o
+endif
 obj-$(CONFIG_USE_ARCH_MEMSET) += memset.o
 obj-$(CONFIG_USE_ARCH_MEMCPY) += memcpy.o
 else

Am 09.08.2016 um 20:16 schrieb Simon Glass <[email protected]>:

Hi Bin,

Quoted 21 lines · Bin Meng

Hi Simon,

Quoted 15 lines · Simon Glass

It is useful to have a basic sanity check for EFI loader support. Add a 'bootefi hello' command which loads HelloWord.efi and runs it under U-Boot.

Signed-off-by Simon Glass <[email protected]>

---

arch/arm/lib/HelloWorld32.efi  | Bin 0 -> 11712 bytes
arch/arm/lib/Makefile          |   6 ++++++
cmd/Kconfig                    |  10 ++++++++++
cmd/bootefi.c                  |  26 ++++++++++++++++++++------
include/asm-generic/sections.h |   2 ++
scripts/Makefile.lib           |  19 +++++++++++++++++++
6 files changed, 57 insertions(+), 6 deletions(-)

create mode 100644 arch/arm/lib/HelloWorld32.efi

[snip]

Quoted 12 lines

arch/arm/lib/Makefile obj-$(CONFIG_OF_LIBFDT) += bootm-fdt.o · line 33

Quoted 10 lines

arch/arm/lib/Makefile +0 -0

index a8d1557..0f3ea0c 100644
@@ -29,6 +29,12 @@ obj-$(CONFIG_OF_LIBFDT) += bootm-fdt.o

obj-$(CONFIG_CMD_BOOTM) += bootm.o
obj-$(CONFIG_CMD_BOOTM) += zimage.o
obj-$(CONFIG_SYS_L2_PL310) += cache-pl310.o

arch/arm/lib/Makefile +2 -0

+ifdef CONFIG_ARM64
+# This option does not work for arm64, as there is no binary.

If so, can we just remove this for arm64?

Actually I was hoping that Alexander might have a suitable arm64 HelloWorld.efi lying around. When I tried building UEFI for arm64, for some reason it did not create it.

Quoted 40 lines

Am 09.08.2016 um 20:16 schrieb Simon Glass <[email protected]>:

Hi Bin,

Quoted 33 lines · Bin Meng

Hi Simon,

Quoted 15 lines · Simon Glass

It is useful to have a basic sanity check for EFI loader support. Add a 'bootefi hello' command which loads HelloWord.efi and runs it under U-Boot.

Signed-off-by Simon Glass <[email protected]>

---

arch/arm/lib/HelloWorld32.efi  | Bin 0 -> 11712 bytes
arch/arm/lib/Makefile          |   6 ++++++
cmd/Kconfig                    |  10 ++++++++++
cmd/bootefi.c                  |  26 ++++++++++++++++++++------
include/asm-generic/sections.h |   2 ++
scripts/Makefile.lib           |  19 +++++++++++++++++++
6 files changed, 57 insertions(+), 6 deletions(-)

create mode 100644 arch/arm/lib/HelloWorld32.efi

[snip]

arch/arm/lib/Makefile obj-$(CONFIG_OF_LIBFDT) += bootm-fdt.o · line 33

Quoted 10 lines

arch/arm/lib/Makefile +0 -0

index a8d1557..0f3ea0c 100644
@@ -29,6 +29,12 @@ obj-$(CONFIG_OF_LIBFDT) += bootm-fdt.o

obj-$(CONFIG_CMD_BOOTM) += bootm.o
obj-$(CONFIG_CMD_BOOTM) += zimage.o
obj-$(CONFIG_SYS_L2_PL310) += cache-pl310.o

arch/arm/lib/Makefile +2 -0

+ifdef CONFIG_ARM64
+# This option does not work for arm64, as there is no binary.

If so, can we just remove this for arm64?

Quoted 3 lines

Actually I was hoping that Alexander might have a suitable arm64 HelloWorld.efi lying around. When I tried building UEFI for arm64, for some reason it did not create it.

Is it part of edk2? If so, Leif (CC'ed) might have one :). I usually use grub as my hello world application.

Quoted 40 lines · Alexander Graf

Quoted 40 lines

Am 09.08.2016 um 20:16 schrieb Simon Glass <[email protected]>:

Hi Bin,

Quoted 33 lines · Bin Meng

Hi Simon,

Quoted 15 lines · Simon Glass

It is useful to have a basic sanity check for EFI loader support. Add a 'bootefi hello' command which loads HelloWord.efi and runs it under U-Boot.

Signed-off-by Simon Glass <[email protected]>

---

arch/arm/lib/HelloWorld32.efi  | Bin 0 -> 11712 bytes
arch/arm/lib/Makefile          |   6 ++++++
cmd/Kconfig                    |  10 ++++++++++
cmd/bootefi.c                  |  26 ++++++++++++++++++++------
include/asm-generic/sections.h |   2 ++
scripts/Makefile.lib           |  19 +++++++++++++++++++
6 files changed, 57 insertions(+), 6 deletions(-)

create mode 100644 arch/arm/lib/HelloWorld32.efi

[snip]

arch/arm/lib/Makefile obj-$(CONFIG_OF_LIBFDT) += bootm-fdt.o · line 33

Quoted 10 lines

arch/arm/lib/Makefile +0 -0

index a8d1557..0f3ea0c 100644
@@ -29,6 +29,12 @@ obj-$(CONFIG_OF_LIBFDT) += bootm-fdt.o

obj-$(CONFIG_CMD_BOOTM) += bootm.o
obj-$(CONFIG_CMD_BOOTM) += zimage.o
obj-$(CONFIG_SYS_L2_PL310) += cache-pl310.o

arch/arm/lib/Makefile +2 -0

+ifdef CONFIG_ARM64
+# This option does not work for arm64, as there is no binary.

If so, can we just remove this for arm64?

Quoted 6 lines

Quoted 3 lines

Actually I was hoping that Alexander might have a suitable arm64 HelloWorld.efi lying around. When I tried building UEFI for arm64, for some reason it did not create it.

Is it part of edk2? If so, Leif (CC'ed) might have one :). I usually use grub as my hello world application.

There is a hello world application in EDK2, but it does not get built as part of a normal platform build.
Currently it also fails to build for ARM* on its own :| See
http://patchew.org/EDK2/1471021908-3509-1-git-send-email-leif.lindholm%40linaro.org/
for a hack of how to build one before upstream is resolved.

If cross compiling, prepend GCC5_AARCH64_PREFIX=aarch64-linux-gnu- to build command line.

/
Leif

Quoted 16 lines

Quoted 8 lines

Quoted 5 lines

Quoted 1 line

If so, can we just remove this for arm64?

Actually I was hoping that Alexander might have a suitable arm64 HelloWorld.efi lying around. When I tried building UEFI for arm64, for some reason it did not create it.

Is it part of edk2? If so, Leif (CC'ed) might have one :). I usually use grub as my hello world application.

There is a hello world application in EDK2, but it does not get built as part of a normal platform build.
Currently it also fails to build for ARM* on its own :| See
http://patchew.org/EDK2/1471021908-3509-1-git-send-email-leif.lindholm%40linaro.org/
for a hack of how to build one before upstream is resolved.

Quoted 2 lines

If cross compiling, prepend GCC5_AARCH64_PREFIX=aarch64-linux-gnu- to build command line.

Thanks for the pointer. Unfortunately that patch appears to make no differences for me. Are you able to build and send me a 64-bit HelloWorld.efi please?

Quoted 16 lines · Simon Glass

Quoted 16 lines

Quoted 8 lines

Quoted 5 lines

Quoted 1 line

If so, can we just remove this for arm64?

Actually I was hoping that Alexander might have a suitable arm64 HelloWorld.efi lying around. When I tried building UEFI for arm64, for some reason it did not create it.

Is it part of edk2? If so, Leif (CC'ed) might have one :). I usually use grub as my hello world application.

There is a hello world application in EDK2, but it does not get built as part of a normal platform build.
Currently it also fails to build for ARM* on its own :| See
http://patchew.org/EDK2/1471021908-3509-1-git-send-email-leif.lindholm%40linaro.org/
for a hack of how to build one before upstream is resolved.

Quoted 6 lines

Quoted 2 lines

If cross compiling, prepend GCC5_AARCH64_PREFIX=aarch64-linux-gnu- to build command line.

Thanks for the pointer. Unfortunately that patch appears to make no differences for me. Are you able to build and send me a 64-bit HelloWorld.efi please?

So, I probably could, but if that isn't working for you, I'd quite like to know why.

To make that a little less painful though, I've added support for building the helloworld app to my set of scripts:
https://git.linaro.org/uefi/uefi-tools.git

This still depends on this (updated) patch.
https://lists.01.org/pipermail/edk2-devel/2016-September/002112.html

But with a current edk2, and a uefi-tools placed in the same directory as the edk2 clone, could you try executing:

../uefi-tools/uefi-build.sh -A AARCH64 hello

If the build fails and creates messy output due to being parallel, could you stick a -1 on that command line and send me the output (or pastebin)?

Hi Leif,

Quoted 19 lines · Leif Lindholm

Quoted 3 lines

Thanks for the pointer. Unfortunately that patch appears to make no differences for me. Are you able to build and send me a 64-bit HelloWorld.efi please?

So, I probably could, but if that isn't working for you, I'd quite like to know why.

To make that a little less painful though, I've added support for building the helloworld app to my set of scripts:
https://git.linaro.org/uefi/uefi-tools.git

This still depends on this (updated) patch.
https://lists.01.org/pipermail/edk2-devel/2016-September/002112.html

But with a current edk2, and a uefi-tools placed in the same directory as the edk2 clone, could you try executing:

../uefi-tools/uefi-build.sh -A AARCH64 hello

Quoted 3 lines

If the build fails and creates messy output due to being parallel, could you stick a -1 on that command line and send me the output (or pastebin)?

OK thanks. Please see:

http://pastebin.com/DmixdA4C

Quoted 22 lines · Simon Glass

Hi Leif,

Quoted 19 lines · Leif Lindholm

Quoted 3 lines

Thanks for the pointer. Unfortunately that patch appears to make no differences for me. Are you able to build and send me a 64-bit HelloWorld.efi please?

So, I probably could, but if that isn't working for you, I'd quite like to know why.

To make that a little less painful though, I've added support for building the helloworld app to my set of scripts:
https://git.linaro.org/uefi/uefi-tools.git

This still depends on this (updated) patch.
https://lists.01.org/pipermail/edk2-devel/2016-September/002112.html

But with a current edk2, and a uefi-tools placed in the same directory as the edk2 clone, could you try executing:

../uefi-tools/uefi-build.sh -A AARCH64 hello

Quoted 7 lines

Quoted 3 lines

If the build fails and creates messy output due to being parallel, could you stick a -1 on that command line and send me the output (or pastebin)?

OK thanks. Please see:

http://pastebin.com/DmixdA4C

Right ... so your terminal appears to be discarding stderr, but I'm guessing with that enabled it would look like:
---
Processing meta-data ..

build.py...
/work/git/edk2/MdeModulePkg/MdeModulePkg.dsc(...): error 4000: Instance of library class [ArmMmuLib] is not found
in [/work/git/edk2/MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf] [AARCH64]
consumed by module [/work/git/edk2/MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf]

- Failed -
Build end time: 16:51:18, Oct.19 2016
Build total time: 00:00:03
---

Which is what it looks without the aforementioned patch applied.

Quoted 42 lines · Leif Lindholm

Quoted 22 lines · Simon Glass

Hi Leif,

Quoted 19 lines · Leif Lindholm

Quoted 3 lines

Thanks for the pointer. Unfortunately that patch appears to make no differences for me. Are you able to build and send me a 64-bit HelloWorld.efi please?

So, I probably could, but if that isn't working for you, I'd quite like to know why.

To make that a little less painful though, I've added support for building the helloworld app to my set of scripts:
https://git.linaro.org/uefi/uefi-tools.git

This still depends on this (updated) patch.
https://lists.01.org/pipermail/edk2-devel/2016-September/002112.html

But with a current edk2, and a uefi-tools placed in the same directory as the edk2 clone, could you try executing:

../uefi-tools/uefi-build.sh -A AARCH64 hello

Quoted 7 lines

Quoted 3 lines

If the build fails and creates messy output due to being parallel, could you stick a -1 on that command line and send me the output (or pastebin)?

OK thanks. Please see:

http://pastebin.com/DmixdA4C

Right ... so your terminal appears to be discarding stderr, but I'm guessing with that enabled it would look like:
---
Processing meta-data ..

build.py...
/work/git/edk2/MdeModulePkg/MdeModulePkg.dsc(...): error 4000: Instance of library class [ArmMmuLib] is not found
in [/work/git/edk2/MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf] [AARCH64]
consumed by module [/work/git/edk2/MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf]

Quoted 6 lines

- Failed -
Build end time: 16:51:18, Oct.19 2016
Build total time: 00:00:03
---

Which is what it looks without the aforementioned patch applied.

As a follow-up: I have now pushed the required patch to edk2, so with a fresh pull it should work without any manually added patches.

Add the required pieces to support the EFI loader on x86.

Since U-Boot only builds for 32-bit on x86, only a 32-bit EFI application is supported. If a 64-bit kernel must be booted, U-Boot supports this directly using FIT (see doc/uImage.FIT/kernel.its). U-Boot can act as a payload for both 32-bit and 64-bit EFI.

Signed-off-by Simon Glass <[email protected]>

---

 arch/x86/cpu/u-boot.lds       | 36 +++++++++++++++++++++++++++++++++++-
 arch/x86/lib/Makefile         |  1 +
 arch/x86/lib/sections.c       | 12 ++++++++++++
 include/efi.h                 |  3 ++-
 lib/efi_loader/efi_boottime.c |  9 +++++++++
 lib/efi_loader/efi_runtime.c  |  4 ++++
 6 files changed, 63 insertions(+), 2 deletions(-)
 create mode 100644 arch/x86/lib/sections.c

Add the required pieces to support the EFI loader on x86.

Since U-Boot only builds for 32-bit on x86, only a 32-bit EFI application is supported. If a 64-bit kernel must be booted, U-Boot supports this directly using FIT (see doc/uImage.FIT/kernel.its). U-Boot can act as a payload for both 32-bit and 64-bit EFI.

Signed-off-by Simon Glass <[email protected]>

---

  arch/x86/cpu/u-boot.lds       | 36 +++++++++++++++++++++++++++++++++++-
  arch/x86/lib/Makefile         |  1 +
  arch/x86/lib/sections.c       | 12 ++++++++++++
  include/efi.h                 |  3 ++-
  lib/efi_loader/efi_boottime.c |  9 +++++++++
  lib/efi_loader/efi_runtime.c  |  4 ++++
  6 files changed, 63 insertions(+), 2 deletions(-)

create mode 100644 arch/x86/lib/sections.c

arch/x86/cpu/u-boot.lds +35 -1

index 36f59ea..cca536b 100644
@@ -28,7 +28,10 @@ SECTIONS
  	}
 
  	. = ALIGN(4);
-	.rodata : { *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*))) }
+	.rodata : {
+		*(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*)))
+		KEEP(*(.rodata.efi.init));
+	}
 
  	. = ALIGN(4);
  	.data : { *(.data*) }

@@ -40,6 +43,37 @@ SECTIONS
  	.got : { *(.got*) }
 
  	. = ALIGN(4);
+
+	.__efi_runtime_start : {
+		*(.__efi_runtime_start)
+	}
+
+	.efi_runtime : {
+		*(efi_runtime_text)
+		*(efi_runtime_data)
+	}
+
+	.__efi_runtime_stop : {
+		*(.__efi_runtime_stop)
+	}
+
+	.efi_runtime_rel_start :
+	{
+		*(.__efi_runtime_rel_start)
+	}
+
+	.efi_runtime_rel : {
+		*(.relefi_runtime_text)
+		*(.relefi_runtime_data)
+	}
+
+	.efi_runtime_rel_stop :
+	{
+		*(.__efi_runtime_rel_stop)
+	}
+
+	. = ALIGN(4);
+
  	__data_end = .;
  	__init_end = .;
 

arch/x86/lib/Makefile +1 -0

index e17f0bb..e46e7f1 100644
@@ -28,6 +28,7 @@ obj-y	+= pirq_routing.o
  obj-y	+= relocate.o
  obj-y += physmem.o
  obj-$(CONFIG_X86_RAMTEST) += ramtest.o
+obj-y	+= sections.o
  obj-y += sfi.o
  obj-$(CONFIG_GENERATE_SMBIOS_TABLE) += smbios.o
  obj-y	+= string.o

arch/x86/lib/sections.c new file +12 -0

new file mode 100644
index 0000000..6455e0f
@@ -0,0 +1,12 @@
+/*
+ * Copyright 2013 Albert ARIBAUD <[email protected]>
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
+ */
+
+char __efi_runtime_start[0] __attribute__((section(".__efi_runtime_start")));
+char __efi_runtime_stop[0] __attribute__((section(".__efi_runtime_stop")));
+char __efi_runtime_rel_start[0]
+		__attribute__((section(".__efi_runtime_rel_start")));
+char __efi_runtime_rel_stop[0]
+		__attribute__((section(".__efi_runtime_rel_stop")));

include/efi.h +1 -0

index 1dbc3b7..47b351f 100644
@@ -15,6 +15,7 @@
  #ifndef _EFI_H
  #define _EFI_H
 
+#include <linux/linkage.h>
  #include <linux/string.h>
  #include <linux/types.h>
 

include/efi.h +0 -0

  #endif
 
  struct efi_device_path;

lib/efi_loader/efi_boottime.c +1 -0

index 798b566..e027bd3 100644
@@ -39,6 +39,7 @@ static bool efi_is_direct_boot = true;
   */
  static struct efi_configuration_table EFI_RUNTIME_DATA efi_conf_table[1];
 
+#ifdef CONFIG_ARM
  /*
   * The "gd" pointer lives in a register on ARM and AArch64 that we declare
   * fixed when compiling U-Boot. However, the payload does not know about that

Quoted 116 lines · Simon Glass

Add the required pieces to support the EFI loader on x86.

Since U-Boot only builds for 32-bit on x86, only a 32-bit EFI application is supported. If a 64-bit kernel must be booted, U-Boot supports this directly using FIT (see doc/uImage.FIT/kernel.its). U-Boot can act as a payload for both 32-bit and 64-bit EFI.

Signed-off-by Simon Glass <[email protected]>

---

  arch/x86/cpu/u-boot.lds       | 36 +++++++++++++++++++++++++++++++++++-
  arch/x86/lib/Makefile         |  1 +
  arch/x86/lib/sections.c       | 12 ++++++++++++
  include/efi.h                 |  3 ++-
  lib/efi_loader/efi_boottime.c |  9 +++++++++
  lib/efi_loader/efi_runtime.c  |  4 ++++
  6 files changed, 63 insertions(+), 2 deletions(-)

create mode 100644 arch/x86/lib/sections.c

arch/x86/cpu/u-boot.lds +35 -1

index 36f59ea..cca536b 100644
@@ -28,7 +28,10 @@ SECTIONS
        }
        . = ALIGN(4);
-       .rodata : { *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*))) }
+       .rodata : {
+               *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*)))
+               KEEP(*(.rodata.efi.init));
+       }
        . = ALIGN(4);
        .data : { *(.data*) }

@@ -40,6 +43,37 @@ SECTIONS
        .got : { *(.got*) }
        . = ALIGN(4);
+
+       .__efi_runtime_start : {
+               *(.__efi_runtime_start)
+       }
+
+       .efi_runtime : {
+               *(efi_runtime_text)
+               *(efi_runtime_data)
+       }
+
+       .__efi_runtime_stop : {
+               *(.__efi_runtime_stop)
+       }
+
+       .efi_runtime_rel_start :
+       {
+               *(.__efi_runtime_rel_start)
+       }
+
+       .efi_runtime_rel : {
+               *(.relefi_runtime_text)
+               *(.relefi_runtime_data)
+       }
+
+       .efi_runtime_rel_stop :
+       {
+               *(.__efi_runtime_rel_stop)
+       }
+
+       . = ALIGN(4);
+
        __data_end = .;
        __init_end = .;
  diff --git a/arch/x86/lib/Makefile b/arch/x86/lib/Makefile

index e17f0bb..e46e7f1 100644

arch/x86/lib/Makefile +1 -0

@@ -28,6 +28,7 @@ obj-y += pirq_routing.o
  obj-y += relocate.o
  obj-y += physmem.o
  obj-$(CONFIG_X86_RAMTEST) += ramtest.o
+obj-y  += sections.o
  obj-y += sfi.o
  obj-$(CONFIG_GENERATE_SMBIOS_TABLE) += smbios.o
  obj-y += string.o

arch/x86/lib/sections.c new file +7 -0

new file mode 100644
index 0000000..6455e0f
@@ -0,0 +1,12 @@
+/*
+ * Copyright 2013 Albert ARIBAUD <[email protected]>
+ *
+ * SPDX-License-Identifier:    GPL-2.0+
+ */
+
+char __efi_runtime_start[0]

__attribute__((section(".__efi_runtime_start")));
+char __efi_runtime_stop[0]
__attribute__((section(".__efi_runtime_stop")));

arch/x86/lib/sections.c new file +4 -0

+char __efi_runtime_rel_start[0]
+               __attribute__((section(".__efi_runtime_rel_start")));
+char __efi_runtime_rel_stop[0]
+               __attribute__((section(".__efi_runtime_rel_stop")));

include/efi.h +0 -0

index 1dbc3b7..47b351f 100644
@@ -15,6 +15,7 @@
  #ifndef _EFI_H
  #define _EFI_H
  +#include <linux/linkage.h>
  #include <linux/string.h>
  #include <linux/types.h>
  @@ -22,7 +23,7 @@
  /* EFI uses the Microsoft ABI which is not the default for GCC */
  #define EFIAPI __attribute__((ms_abi))
  #else

include/efi.h line 26

Quoted 2 lines

include/efi.h +1 -1

-#define EFIAPI
+#define EFIAPI asmlinkage

Ah, this should trigger what I mentioned in my previous email. Since linkage.h is now included in efi.h, we no longer have to include the header in bootefi.c explicitly. How about you just move this part of the patch between patches 1/6 and 2/6?

Quoted 19 lines

  #endif
    struct efi_device_path;

lib/efi_loader/efi_boottime.c +0 -0

index 798b566..e027bd3 100644
@@ -39,6 +39,7 @@ static bool efi_is_direct_boot = true;
   */
  static struct efi_configuration_table EFI_RUNTIME_DATA
 efi_conf_table[1];
  +#ifdef CONFIG_ARM
  /*
   * The "gd" pointer lives in a register on ARM and AArch64 that we

declare
* fixed when compiling U-Boot. However, the payload does not know about
that

lib/efi_loader/efi_boottime.c +0 -0

@@ -46,16 +47,20 @@ static struct efi_configuration_table EFI_RUNTIME_DATA

lib/efi_loader/efi_boottime.c static struct efi_configuration_table EFI_RUNTIME_DATA efi_conf_table[1]; · line 50

Quoted 5 lines

lib/efi_loader/efi_boottime.c +1 -0

 efi_conf_table[1];
   * EFI callback entry/exit.
   */
  static volatile void *efi_gd, *app_gd;
+#endif

So is fs reserved for firmware use on x86?

Alex

Hi Alex,

Quoted 115 lines · Alexander Graf

Quoted 114 lines · Simon Glass

Add the required pieces to support the EFI loader on x86.

Since U-Boot only builds for 32-bit on x86, only a 32-bit EFI application is supported. If a 64-bit kernel must be booted, U-Boot supports this directly using FIT (see doc/uImage.FIT/kernel.its). U-Boot can act as a payload for both 32-bit and 64-bit EFI.

Signed-off-by Simon Glass <[email protected]>

---

   arch/x86/cpu/u-boot.lds       | 36 +++++++++++++++++++++++++++++++++++-
   arch/x86/lib/Makefile         |  1 +
   arch/x86/lib/sections.c       | 12 ++++++++++++
   include/efi.h                 |  3 ++-
   lib/efi_loader/efi_boottime.c |  9 +++++++++
   lib/efi_loader/efi_runtime.c  |  4 ++++
   6 files changed, 63 insertions(+), 2 deletions(-)

create mode 100644 arch/x86/lib/sections.c

arch/x86/cpu/u-boot.lds +35 -1

index 36f59ea..cca536b 100644
@@ -28,7 +28,10 @@ SECTIONS
         }
         . = ALIGN(4);
-       .rodata : { *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*))) }
+       .rodata : {
+               *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*)))
+               KEEP(*(.rodata.efi.init));
+       }
         . = ALIGN(4);
         .data : { *(.data*) }

@@ -40,6 +43,37 @@ SECTIONS
         .got : { *(.got*) }
         . = ALIGN(4);
+
+       .__efi_runtime_start : {
+               *(.__efi_runtime_start)
+       }
+
+       .efi_runtime : {
+               *(efi_runtime_text)
+               *(efi_runtime_data)
+       }
+
+       .__efi_runtime_stop : {
+               *(.__efi_runtime_stop)
+       }
+
+       .efi_runtime_rel_start :
+       {
+               *(.__efi_runtime_rel_start)
+       }
+
+       .efi_runtime_rel : {
+               *(.relefi_runtime_text)
+               *(.relefi_runtime_data)
+       }
+
+       .efi_runtime_rel_stop :
+       {
+               *(.__efi_runtime_rel_stop)
+       }
+
+       . = ALIGN(4);
+
         __data_end = .;
         __init_end = .;
   diff --git a/arch/x86/lib/Makefile b/arch/x86/lib/Makefile

index e17f0bb..e46e7f1 100644

arch/x86/lib/Makefile +1 -0

@@ -28,6 +28,7 @@ obj-y += pirq_routing.o
   obj-y += relocate.o
   obj-y += physmem.o
   obj-$(CONFIG_X86_RAMTEST) += ramtest.o
+obj-y  += sections.o
   obj-y += sfi.o
   obj-$(CONFIG_GENERATE_SMBIOS_TABLE) += smbios.o
   obj-y += string.o

arch/x86/lib/sections.c new file +7 -0

new file mode 100644
index 0000000..6455e0f
@@ -0,0 +1,12 @@
+/*
+ * Copyright 2013 Albert ARIBAUD <[email protected]>
+ *
+ * SPDX-License-Identifier:    GPL-2.0+
+ */
+
+char __efi_runtime_start[0]

__attribute__((section(".__efi_runtime_start")));
+char __efi_runtime_stop[0]
__attribute__((section(".__efi_runtime_stop")));

arch/x86/lib/sections.c new file +4 -0

+char __efi_runtime_rel_start[0]
+               __attribute__((section(".__efi_runtime_rel_start")));
+char __efi_runtime_rel_stop[0]
+               __attribute__((section(".__efi_runtime_rel_stop")));

include/efi.h +0 -0

index 1dbc3b7..47b351f 100644
@@ -15,6 +15,7 @@
   #ifndef _EFI_H
   #define _EFI_H
   +#include <linux/linkage.h>
   #include <linux/string.h>
   #include <linux/types.h>
   @@ -22,7 +23,7 @@
   /* EFI uses the Microsoft ABI which is not the default for GCC */
   #define EFIAPI __attribute__((ms_abi))

Quoted 8 lines

include/efi.h line 26

Quoted 3 lines

   #else

include/efi.h +1 -1

-#define EFIAPI
+#define EFIAPI asmlinkage

Ah, this should trigger what I mentioned in my previous email. Since linkage.h is now included in efi.h, we no longer have to include the header in bootefi.c explicitly. How about you just move this part of the patch between patches 1/6 and 2/6?

OK will take a look.

Quoted 17 lines

Quoted 17 lines

   #endif
     struct efi_device_path;

lib/efi_loader/efi_boottime.c +0 -0

index 798b566..e027bd3 100644
@@ -39,6 +39,7 @@ static bool efi_is_direct_boot = true;
    */
   static struct efi_configuration_table EFI_RUNTIME_DATA
 efi_conf_table[1];
   +#ifdef CONFIG_ARM
   /*
    * The "gd" pointer lives in a register on ARM and AArch64 that we

declare
* fixed when compiling U-Boot. However, the payload does not know about
that

Quoted 8 lines

lib/efi_loader/efi_boottime.c static struct efi_configuration_table EFI_RUNTIME_DATA · line 51

Quoted 6 lines

lib/efi_loader/efi_boottime.c +1 -0

@@ -46,16 +47,20 @@ static struct efi_configuration_table EFI_RUNTIME_DATA
 efi_conf_table[1];
    * EFI callback entry/exit.
    */
   static volatile void *efi_gd, *app_gd;
+#endif

So is fs reserved for firmware use on x86?

No I don't think so. The correct approach would be to save and restore the FS register, but it seems to work this way, so I haven't taken it any further.

This series was just an attempt to get the EFI loader working on x86. Since we have the 32/64-bit limitation on x86 and U-Boot runs in 32-bit at present, it's not going to be very useful yet IMO. But it is a start.

Hi Alex,

Quoted 117 lines · Alexander Graf

Quoted 116 lines · Simon Glass

Add the required pieces to support the EFI loader on x86.

Since U-Boot only builds for 32-bit on x86, only a 32-bit EFI application is supported. If a 64-bit kernel must be booted, U-Boot supports this directly using FIT (see doc/uImage.FIT/kernel.its). U-Boot can act as a payload for both 32-bit and 64-bit EFI.

Signed-off-by Simon Glass <[email protected]>

---

  arch/x86/cpu/u-boot.lds       | 36 +++++++++++++++++++++++++++++++++++-
  arch/x86/lib/Makefile         |  1 +
  arch/x86/lib/sections.c       | 12 ++++++++++++
  include/efi.h                 |  3 ++-
  lib/efi_loader/efi_boottime.c |  9 +++++++++
  lib/efi_loader/efi_runtime.c  |  4 ++++
  6 files changed, 63 insertions(+), 2 deletions(-)

create mode 100644 arch/x86/lib/sections.c

arch/x86/cpu/u-boot.lds +35 -1

index 36f59ea..cca536b 100644
@@ -28,7 +28,10 @@ SECTIONS
        }
        . = ALIGN(4);
-       .rodata : { *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*))) }
+       .rodata : {
+               *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*)))
+               KEEP(*(.rodata.efi.init));
+       }
        . = ALIGN(4);
        .data : { *(.data*) }

@@ -40,6 +43,37 @@ SECTIONS
        .got : { *(.got*) }
        . = ALIGN(4);
+
+       .__efi_runtime_start : {
+               *(.__efi_runtime_start)
+       }
+
+       .efi_runtime : {
+               *(efi_runtime_text)
+               *(efi_runtime_data)
+       }
+
+       .__efi_runtime_stop : {
+               *(.__efi_runtime_stop)
+       }
+
+       .efi_runtime_rel_start :
+       {
+               *(.__efi_runtime_rel_start)
+       }
+
+       .efi_runtime_rel : {
+               *(.relefi_runtime_text)
+               *(.relefi_runtime_data)
+       }
+
+       .efi_runtime_rel_stop :
+       {
+               *(.__efi_runtime_rel_stop)
+       }
+
+       . = ALIGN(4);
+
        __data_end = .;
        __init_end = .;
  diff --git a/arch/x86/lib/Makefile b/arch/x86/lib/Makefile

index e17f0bb..e46e7f1 100644

arch/x86/lib/Makefile +1 -0

@@ -28,6 +28,7 @@ obj-y += pirq_routing.o
  obj-y += relocate.o
  obj-y += physmem.o
  obj-$(CONFIG_X86_RAMTEST) += ramtest.o
+obj-y  += sections.o
  obj-y += sfi.o
  obj-$(CONFIG_GENERATE_SMBIOS_TABLE) += smbios.o
  obj-y += string.o

arch/x86/lib/sections.c new file +7 -0

new file mode 100644
index 0000000..6455e0f
@@ -0,0 +1,12 @@
+/*
+ * Copyright 2013 Albert ARIBAUD <[email protected]>
+ *
+ * SPDX-License-Identifier:    GPL-2.0+
+ */
+
+char __efi_runtime_start[0]

__attribute__((section(".__efi_runtime_start")));
+char __efi_runtime_stop[0]
__attribute__((section(".__efi_runtime_stop")));

arch/x86/lib/sections.c new file +4 -0

+char __efi_runtime_rel_start[0]
+               __attribute__((section(".__efi_runtime_rel_start")));
+char __efi_runtime_rel_stop[0]
+               __attribute__((section(".__efi_runtime_rel_stop")));

include/efi.h +0 -0

index 1dbc3b7..47b351f 100644
@@ -15,6 +15,7 @@
  #ifndef _EFI_H
  #define _EFI_H
  +#include <linux/linkage.h>
  #include <linux/string.h>
  #include <linux/types.h>
  @@ -22,7 +23,7 @@
  /* EFI uses the Microsoft ABI which is not the default for GCC */
  #define EFIAPI __attribute__((ms_abi))
  #else

Quoted 8 lines

include/efi.h line 26

Quoted 2 lines

include/efi.h +1 -1

-#define EFIAPI
+#define EFIAPI asmlinkage

Ah, this should trigger what I mentioned in my previous email. Since linkage.h is now included in efi.h, we no longer have to include the header in bootefi.c explicitly. How about you just move this part of the patch between patches 1/6 and 2/6?

OK will take a look.

Quoted 19 lines

Quoted 19 lines

  #endif
    struct efi_device_path;

lib/efi_loader/efi_boottime.c +0 -0

index 798b566..e027bd3 100644
@@ -39,6 +39,7 @@ static bool efi_is_direct_boot = true;
   */
  static struct efi_configuration_table EFI_RUNTIME_DATA
 efi_conf_table[1];
  +#ifdef CONFIG_ARM
  /*
   * The "gd" pointer lives in a register on ARM and AArch64 that we

declare
* fixed when compiling U-Boot. However, the payload does not know about
that

lib/efi_loader/efi_boottime.c +0 -0

@@ -46,16 +47,20 @@ static struct efi_configuration_table EFI_RUNTIME_DATA

Quoted 8 lines

lib/efi_loader/efi_boottime.c static struct efi_configuration_table EFI_RUNTIME_DATA efi_conf_table[1]; · line 50

Quoted 5 lines

lib/efi_loader/efi_boottime.c +1 -0

 efi_conf_table[1];
   * EFI callback entry/exit.
   */
  static volatile void *efi_gd, *app_gd;
+#endif

So is fs reserved for firmware use on x86?

No I don't think so. The correct approach would be to save and restore the FS register, but it seems to work this way, so I haven't taken it any further.

This series was just an attempt to get the EFI loader working on x86.

Since we have the 32/64-bit limitation on x86 and U-Boot runs in 32-bit at present, it's not going to be very useful yet IMO. But it is a start.

Quoted 2 lines · Simon Glass

Hi Alex,

Quoted 26 lines

Quoted 25 lines

Quoted 17 lines

  #endif
    struct efi_device_path;

lib/efi_loader/efi_boottime.c +0 -0

index 798b566..e027bd3 100644
@@ -39,6 +39,7 @@ static bool efi_is_direct_boot = true;
   */
  static struct efi_configuration_table EFI_RUNTIME_DATA
 efi_conf_table[1];
  +#ifdef CONFIG_ARM
  /*
   * The "gd" pointer lives in a register on ARM and AArch64 that we

declare
* fixed when compiling U-Boot. However, the payload does not know about
that

lib/efi_loader/efi_boottime.c static struct efi_configuration_table EFI_RUNTIME_DATA · line 51

Quoted 5 lines

lib/efi_loader/efi_boottime.c +1 -0

@@ -46,16 +47,20 @@ static struct efi_configuration_table EFI_RUNTIME_DATA
 efi_conf_table[1];
   * EFI callback entry/exit.
   */
  static volatile void *efi_gd, *app_gd;
+#endif

So is fs reserved for firmware use on x86?

Quoted 3 lines

No I don't think so. The correct approach would be to save and restore the FS register, but it seems to work this way, so I haven't taken it any further.

Can you make sure you save/restore %fs on x86 in the next round then? Finding bugs like these is very hard once the code is in.

Quoted 2 lines

This series was just an attempt to get the EFI loader working on x86.

Yes, and it's very very very much appreciated :).

Quoted 3 lines

Since we have the 32/64-bit limitation on x86 and U-Boot runs in 32-bit at present, it's not going to be very useful yet IMO. But it is a start.

I agree. It's a really good start.

It is useful to have a basic sanity check for EFI loader support. Add a 'bootefi hello' command which loads HelloWord.efi and runs it under U-Boot.

Signed-off-by Simon Glass <[email protected]>

---

 arch/x86/lib/HelloWorld.efi | Bin 0 -> 11168 bytes
 arch/x86/lib/Makefile       |   1 +
 2 files changed, 1 insertion(+)
 create mode 100644 arch/x86/lib/HelloWorld.efi

Enable this so that EFI applications (notably grub) can be run under U-Boot on x86 platforms.

Signed-off-by Simon Glass <[email protected]>

---

 lib/efi_loader/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

lib/efi_loader/Kconfig +0 -0

index 37a0dd6..8e7e8a5 100644

Bring in these functions from Linux v4.4. They will be needed for EFI loader support.

Signed-off-by Simon Glass <[email protected]>

---

 arch/x86/cpu/Makefile         |  2 +-
 arch/x86/cpu/setjmp.S         | 71 +++++++++++++++++++++++++++++++++++++++++++
 arch/x86/include/asm/setjmp.h | 24 +++++++++++++++
 3 files changed, 96 insertions(+), 1 deletion(-)
 create mode 100644 arch/x86/cpu/setjmp.S
 create mode 100644 arch/x86/include/asm/setjmp.h

arch/x86/cpu/Makefile +1 -1

index 2667e0b..f5b8c9e 100644
@@ -10,7 +10,7 @@
 
 extra-y        = start.o
 obj-$(CONFIG_X86_RESET_VECTOR) += resetvec.o start16.o
-obj-y  += interrupts.o cpu.o cpu_x86.o call64.o
+obj-y  += interrupts.o cpu.o cpu_x86.o call64.o setjmp.o
 
 AFLAGS_REMOVE_call32.o := -mregparm=3 \
        $(if $(CONFIG_EFI_STUB_64BIT),-march=i386 -m32)

arch/x86/cpu/setjmp.S new file +19 -0

new file mode 100644
index 0000000..24e7d8a
@@ -0,0 +1,71 @@
+/*
+ * Written by H. Peter Anvin <[email protected]>
+ * Brought in from Linux v4.4 and modified for U-Boot
+ * From Linux arch/um/sys-i386/setjmp.S
+ *
+ * SPDX-License-Identifier:    GPL-2.0
+ */
+
+#include <asm/global_data.h>
+#include <asm/msr-index.h>
+#include <asm/processor-flags.h>
+
+#define _REGPARM
+
+/*
+ * The jmp_buf is assumed to contain the following, in order:
+ *     %ebx
+ *     %esp
+ *     %ebp

arch/x86/cpu/setjmp.S new file +18 -0

+       .align 4
+       .globl longjmp
+       .type longjmp, @function
+longjmp:
+#ifdef _REGPARM
+       xchgl %eax,%edx
+#else
+       movl 4(%esp),%edx               # jmp_ptr address
+       movl 8(%esp),%eax               # Return value
+#endif
+       movl (%edx),%ebx
+       movl 4(%edx),%esp
+       movl 8(%edx),%ebp
+       movl 12(%edx),%esi
+       movl 16(%edx),%edi
+       jmp *20(%edx)
+
+       .size longjmp,.-longjmp

arch/x86/include/asm/setjmp.h new file +12 -0

new file mode 100644
index 0000000..deef67e
@@ -0,0 +1,24 @@
+/*
+ * Written by H. Peter Anvin <[email protected]>
+ * Brought in from Linux v4.4 and modified for U-Boot
+ * From Linux arch/um/sys-i386/setjmp.S
+ *
+ * SPDX-License-Identifier:    GPL-2.0
+ */
+
+#ifndef __setjmp_h
+#define __setjmp_h
+
+struct jmp_buf_data {

Hi Simon,

Quoted 55 lines · Simon Glass

Bring in these functions from Linux v4.4. They will be needed for EFI loader support.

Signed-off-by Simon Glass <[email protected]>

---

 arch/x86/cpu/Makefile         |  2 +-
 arch/x86/cpu/setjmp.S         | 71 +++++++++++++++++++++++++++++++++++++++++++
 arch/x86/include/asm/setjmp.h | 24 +++++++++++++++
 3 files changed, 96 insertions(+), 1 deletion(-)
 create mode 100644 arch/x86/cpu/setjmp.S
 create mode 100644 arch/x86/include/asm/setjmp.h

arch/x86/cpu/Makefile +1 -1

index 2667e0b..f5b8c9e 100644
@@ -10,7 +10,7 @@
 
 extra-y        = start.o
 obj-$(CONFIG_X86_RESET_VECTOR) += resetvec.o start16.o
-obj-y  += interrupts.o cpu.o cpu_x86.o call64.o
+obj-y  += interrupts.o cpu.o cpu_x86.o call64.o setjmp.o
 
 AFLAGS_REMOVE_call32.o := -mregparm=3 \
        $(if $(CONFIG_EFI_STUB_64BIT),-march=i386 -m32)

arch/x86/cpu/setjmp.S new file +23 -0

new file mode 100644
index 0000000..24e7d8a
@@ -0,0 +1,71 @@
+/*
+ * Written by H. Peter Anvin <[email protected]>
+ * Brought in from Linux v4.4 and modified for U-Boot
+ * From Linux arch/um/sys-i386/setjmp.S
+ *
+ * SPDX-License-Identifier:    GPL-2.0
+ */
+
+#include <asm/global_data.h>
+#include <asm/msr-index.h>
+#include <asm/processor-flags.h>
+
+#define _REGPARM
+
+/*
+ * The jmp_buf is assumed to contain the following, in order:
+ *     %ebx
+ *     %esp
+ *     %ebp
+ *     %esi
+ *     %edi
+ *     <return address>
+ */

arch/x86/cpu/setjmp.S line 29

Quoted 6 lines

arch/x86/cpu/setjmp.S new file +6 -0

+
+       /*
+        * rdi - 32-bit code segment selector
+        * rsi - target address
+        * rdx - table address (0 if none)
+        */

The comment above looks irrelevant.

arch/x86/cpu/setjmp.S line 36

Quoted 8 lines

arch/x86/cpu/setjmp.S new file +7 -0

+       .text
+       .align 4
+       .globl setjmp
+       .type setjmp, @function
+setjmp:
+#ifdef _REGPARM
+       movl %eax,%edx

nits: needs space after ",". please fix this globally in this file.

arch/x86/cpu/setjmp.S line 40

Quoted 4 lines

arch/x86/cpu/setjmp.S new file +4 -0

+#else
+       movl 4(%esp),%edx
+#endif
+       popl %ecx                       # Return address, and adjust the stack

I believe # is deprecated. We should use /* */

arch/x86/cpu/setjmp.S line 51

Quoted 12 lines

arch/x86/cpu/setjmp.S new file +11 -0

+       xorl %eax,%eax                  # Return value
+       movl %ebx,(%edx)
+       movl %esp,4(%edx)               # Post-return %esp!
+       pushl %ecx                      # Make the call/return stack happy
+       movl %ebp,8(%edx)
+       movl %esi,12(%edx)
+       movl %edi,16(%edx)
+       movl %ecx,20(%edx)              # Return address
+       ret
+
+       .size setjmp,.-setjmp

What is this .size for?

arch/x86/cpu/setjmp.S line 53

Quoted 3 lines

arch/x86/cpu/setjmp.S new file +2 -0

+
+       .text

nits: not necessary

Quoted 41 lines

arch/x86/cpu/setjmp.S new file +18 -0

+       .align 4
+       .globl longjmp
+       .type longjmp, @function
+longjmp:
+#ifdef _REGPARM
+       xchgl %eax,%edx
+#else
+       movl 4(%esp),%edx               # jmp_ptr address
+       movl 8(%esp),%eax               # Return value
+#endif
+       movl (%edx),%ebx
+       movl 4(%edx),%esp
+       movl 8(%edx),%ebp
+       movl 12(%edx),%esi
+       movl 16(%edx),%edi
+       jmp *20(%edx)
+
+       .size longjmp,.-longjmp

arch/x86/include/asm/setjmp.h new file +17 -0

new file mode 100644
index 0000000..deef67e
@@ -0,0 +1,24 @@
+/*
+ * Written by H. Peter Anvin <[email protected]>
+ * Brought in from Linux v4.4 and modified for U-Boot
+ * From Linux arch/um/sys-i386/setjmp.S
+ *
+ * SPDX-License-Identifier:    GPL-2.0
+ */
+
+#ifndef __setjmp_h
+#define __setjmp_h
+
+struct jmp_buf_data {
+       unsigned int __ebx;
+       unsigned int __esp;
+       unsigned int __ebp;
+       unsigned int __esi;
+       unsigned int __edi;

arch/x86/include/asm/setjmp.h line 22

Quoted 5 lines

arch/x86/include/asm/setjmp.h new file +5 -0

+       unsigned int __eip;
+};
+
+int setjmp(struct jmp_buf_data *jmp_buf);
+void longjmp(struct jmp_buf_data *jmp_buf);

shouldn't it be void longjmp(struct jmp_buf_data *jmp_buf, int val)? I am wondering how EFI loader could work with this longjmp()?

arch/x86/include/asm/setjmp.h

Quoted 4 lines

arch/x86/include/asm/setjmp.h new file +2 -1

+
+#endif
--

Regards,
Bin

Hi Bin,

Quoted 58 lines · Bin Meng

Hi Simon,

Quoted 55 lines · Simon Glass

Bring in these functions from Linux v4.4. They will be needed for EFI loader support.

Signed-off-by Simon Glass <[email protected]>

---

 arch/x86/cpu/Makefile         |  2 +-
 arch/x86/cpu/setjmp.S         | 71 +++++++++++++++++++++++++++++++++++++++++++
 arch/x86/include/asm/setjmp.h | 24 +++++++++++++++
 3 files changed, 96 insertions(+), 1 deletion(-)
 create mode 100644 arch/x86/cpu/setjmp.S
 create mode 100644 arch/x86/include/asm/setjmp.h

arch/x86/cpu/Makefile +1 -1

index 2667e0b..f5b8c9e 100644
@@ -10,7 +10,7 @@
 
 extra-y        = start.o
 obj-$(CONFIG_X86_RESET_VECTOR) += resetvec.o start16.o
-obj-y  += interrupts.o cpu.o cpu_x86.o call64.o
+obj-y  += interrupts.o cpu.o cpu_x86.o call64.o setjmp.o
 
 AFLAGS_REMOVE_call32.o := -mregparm=3 \
        $(if $(CONFIG_EFI_STUB_64BIT),-march=i386 -m32)

arch/x86/cpu/setjmp.S new file +23 -0

new file mode 100644
index 0000000..24e7d8a
@@ -0,0 +1,71 @@
+/*
+ * Written by H. Peter Anvin <[email protected]>
+ * Brought in from Linux v4.4 and modified for U-Boot
+ * From Linux arch/um/sys-i386/setjmp.S
+ *
+ * SPDX-License-Identifier:    GPL-2.0
+ */
+
+#include <asm/global_data.h>
+#include <asm/msr-index.h>
+#include <asm/processor-flags.h>
+
+#define _REGPARM
+
+/*
+ * The jmp_buf is assumed to contain the following, in order:
+ *     %ebx
+ *     %esp
+ *     %ebp
+ *     %esi
+ *     %edi
+ *     <return address>
+ */

Quoted 8 lines

arch/x86/cpu/setjmp.S line 29

Quoted 6 lines

arch/x86/cpu/setjmp.S new file +6 -0

+
+       /*
+        * rdi - 32-bit code segment selector
+        * rsi - target address
+        * rdx - table address (0 if none)
+        */

The comment above looks irrelevant.

OK, will drop.

Quoted 11 lines

arch/x86/cpu/setjmp.S line 36

Quoted 8 lines

arch/x86/cpu/setjmp.S new file +7 -0

+       .text
+       .align 4
+       .globl setjmp
+       .type setjmp, @function
+setjmp:
+#ifdef _REGPARM
+       movl %eax,%edx

nits: needs space after ",". please fix this globally in this file.

Quoted 6 lines

arch/x86/cpu/setjmp.S line 40

Quoted 4 lines

arch/x86/cpu/setjmp.S new file +4 -0

+#else
+       movl 4(%esp),%edx
+#endif
+       popl %ecx                       # Return address, and adjust the stack

I believe # is deprecated. We should use /* */

OK

Quoted 13 lines

arch/x86/cpu/setjmp.S line 51

Quoted 12 lines

arch/x86/cpu/setjmp.S new file +11 -0

+       xorl %eax,%eax                  # Return value
+       movl %ebx,(%edx)
+       movl %esp,4(%edx)               # Post-return %esp!
+       pushl %ecx                      # Make the call/return stack happy
+       movl %ebp,8(%edx)
+       movl %esi,12(%edx)
+       movl %edi,16(%edx)
+       movl %ecx,20(%edx)              # Return address
+       ret
+
+       .size setjmp,.-setjmp

Quoted 1 line

What is this .size for?

Size of the function code. It helps with nm --size-sort I think.

Quoted 47 lines

arch/x86/cpu/setjmp.S line 53

Quoted 3 lines

arch/x86/cpu/setjmp.S new file +2 -0

+
+       .text

nits: not necessary

Quoted 41 lines

arch/x86/cpu/setjmp.S new file +18 -0

+       .align 4
+       .globl longjmp
+       .type longjmp, @function
+longjmp:
+#ifdef _REGPARM
+       xchgl %eax,%edx
+#else
+       movl 4(%esp),%edx               # jmp_ptr address
+       movl 8(%esp),%eax               # Return value
+#endif
+       movl (%edx),%ebx
+       movl 4(%edx),%esp
+       movl 8(%edx),%ebp
+       movl 12(%edx),%esi
+       movl 16(%edx),%edi
+       jmp *20(%edx)
+
+       .size longjmp,.-longjmp

arch/x86/include/asm/setjmp.h new file +17 -0

new file mode 100644
index 0000000..deef67e
@@ -0,0 +1,24 @@
+/*
+ * Written by H. Peter Anvin <[email protected]>
+ * Brought in from Linux v4.4 and modified for U-Boot
+ * From Linux arch/um/sys-i386/setjmp.S
+ *
+ * SPDX-License-Identifier:    GPL-2.0
+ */
+
+#ifndef __setjmp_h
+#define __setjmp_h
+
+struct jmp_buf_data {
+       unsigned int __ebx;
+       unsigned int __esp;
+       unsigned int __ebp;
+       unsigned int __esi;
+       unsigned int __edi;

Quoted 8 lines

arch/x86/include/asm/setjmp.h line 22

Quoted 5 lines

arch/x86/include/asm/setjmp.h new file +5 -0

+       unsigned int __eip;
+};
+
+int setjmp(struct jmp_buf_data *jmp_buf);
+void longjmp(struct jmp_buf_data *jmp_buf);

shouldn't it be void longjmp(struct jmp_buf_data *jmp_buf, int val)? I am wondering how EFI loader could work with this longjmp()?

efi_exit() seems to not need the extra parameter.