Change in coreboot[master]: SeaBIOS: fix threaded hardware initialization during oprom execution
Michał Żygowski has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/40345 )
Change subject: SeaBIOS: fix threaded hardware initialization during oprom execution ......................................................................
SeaBIOS: fix threaded hardware initialization during oprom execution
SeaBIOS no longer has CONFIG_THREAD_OPTIONROMS in its config. The threaded hardware initialization during optionrom execution is now controlled with a CBFS file. Add appropriate integer to CBFS when threaded hardware initialization is selected in coreboot's Kconfig.
Signed-off-by: Michał Żygowski michal.zygowski@3mdeb.com Change-Id: I9b5a532b609c6addf31ccdb6be03ff2e937ad326 --- M Makefile.inc M payloads/external/SeaBIOS/Makefile 2 files changed, 4 insertions(+), 3 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/45/40345/1
diff --git a/Makefile.inc b/Makefile.inc index dbf95d4..39dd6dd 100644 --- a/Makefile.inc +++ b/Makefile.inc @@ -1111,6 +1111,10 @@ @printf " SeaBIOS Add sercon-port file\n" $(CBFSTOOL) $@.tmp add-int -i $(CONFIG_SEABIOS_SERCON_PORT_ADDR) -n etc/sercon-port endif +ifeq ($(CONFIG_SEABIOS_THREAD_OPTIONROMS),y) + @printf " SeaBIOS Thread optionroms\n" + $(CBFSTOOL) $@.tmp add-int -i 2 -n etc/threads +endif ifeq ($(CONFIG_CPU_INTEL_FIRMWARE_INTERFACE_TABLE),y) ifneq ($(CONFIG_UPDATE_IMAGE),y) # never update the bootblock ifeq ($(CONFIG_CPU_MICROCODE_CBFS_EXTERNAL_HEADER),y) diff --git a/payloads/external/SeaBIOS/Makefile b/payloads/external/SeaBIOS/Makefile index 0086775..465c7c5 100644 --- a/payloads/external/SeaBIOS/Makefile +++ b/payloads/external/SeaBIOS/Makefile @@ -54,9 +54,6 @@ else echo "# CONFIG_DEBUG_SERIAL is not set" >> seabios/.config endif -ifneq ($(CONFIG_SEABIOS_THREAD_OPTIONROMS),y) - echo "# CONFIG_THREAD_OPTIONROMS is not set" >> seabios/.config -endif ifeq ($(CONFIG_SEABIOS_VGA_COREBOOT),y) echo "CONFIG_VGA_COREBOOT=y" >> seabios/.config echo "CONFIG_BUILD_VGABIOS=y" >> seabios/.config
Nico Huber has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/40345 )
Change subject: SeaBIOS: fix threaded hardware initialization during oprom execution ......................................................................
Patch Set 1:
(1 comment)
https://review.coreboot.org/c/coreboot/+/40345/1/payloads/external/SeaBIOS/M... File payloads/external/SeaBIOS/Makefile:
https://review.coreboot.org/c/coreboot/+/40345/1/payloads/external/SeaBIOS/M... PS1, Line 57: ifneq ($(CONFIG_SEABIOS_THREAD_OPTIONROMS),y) : echo "# CONFIG_THREAD_OPTIONROMS is not set" >> seabios/.config : endif Leave it or make it depend on the selected SeaBIOS version? Given that we allow arbitrary revisions, maybe just add a comment when it was removed.
Hello build bot (Jenkins), Patrick Georgi, Martin Roth,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/40345
to look at the new patch set (#2).
Change subject: SeaBIOS: fix threaded hardware initialization during oprom execution ......................................................................
SeaBIOS: fix threaded hardware initialization during oprom execution
Since SeaBIOS rel-1.7.5 CONFIG_THREAD_OPTIONROMS is not present in its config. The threaded hardware initialization during optionrom execution is now controlled with a CBFS file. Add appropriate integer to CBFS when threaded hardware initialization is selected in coreboot's Kconfig.
Signed-off-by: Michał Żygowski michal.zygowski@3mdeb.com Change-Id: I9b5a532b609c6addf31ccdb6be03ff2e937ad326 --- M Makefile.inc 1 file changed, 4 insertions(+), 0 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/45/40345/2
Michał Żygowski has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/40345 )
Change subject: SeaBIOS: fix threaded hardware initialization during oprom execution ......................................................................
Patch Set 2:
(1 comment)
https://review.coreboot.org/c/coreboot/+/40345/1/payloads/external/SeaBIOS/M... File payloads/external/SeaBIOS/Makefile:
https://review.coreboot.org/c/coreboot/+/40345/1/payloads/external/SeaBIOS/M... PS1, Line 57: ifneq ($(CONFIG_SEABIOS_THREAD_OPTIONROMS),y) : echo "# CONFIG_THREAD_OPTIONROMS is not set" >> seabios/.config : endif
Leave it or make it depend on the selected SeaBIOS version? Given […]
Left it untouched. Added to commit message when the option was moved from config to runtime CBFS file.
Nico Huber has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/40345 )
Change subject: SeaBIOS: fix threaded hardware initialization during oprom execution ......................................................................
Patch Set 2: Code-Review+2
(1 comment)
https://review.coreboot.org/c/coreboot/+/40345/1/payloads/external/SeaBIOS/M... File payloads/external/SeaBIOS/Makefile:
https://review.coreboot.org/c/coreboot/+/40345/1/payloads/external/SeaBIOS/M... PS1, Line 57: ifneq ($(CONFIG_SEABIOS_THREAD_OPTIONROMS),y) : echo "# CONFIG_THREAD_OPTIONROMS is not set" >> seabios/.config : endif
Left it untouched. […]
Thanks
Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/40345 )
Change subject: SeaBIOS: fix threaded hardware initialization during oprom execution ......................................................................
Patch Set 2: Code-Review+2
Michał Żygowski has submitted this change. ( https://review.coreboot.org/c/coreboot/+/40345 )
Change subject: SeaBIOS: fix threaded hardware initialization during oprom execution ......................................................................
SeaBIOS: fix threaded hardware initialization during oprom execution
Since SeaBIOS rel-1.7.5 CONFIG_THREAD_OPTIONROMS is not present in its config. The threaded hardware initialization during optionrom execution is now controlled with a CBFS file. Add appropriate integer to CBFS when threaded hardware initialization is selected in coreboot's Kconfig.
Signed-off-by: Michał Żygowski michal.zygowski@3mdeb.com Change-Id: I9b5a532b609c6addf31ccdb6be03ff2e937ad326 Reviewed-on: https://review.coreboot.org/c/coreboot/+/40345 Tested-by: build bot (Jenkins) no-reply@coreboot.org Reviewed-by: Nico Huber nico.h@gmx.de Reviewed-by: Angel Pons th3fanbus@gmail.com --- M Makefile.inc 1 file changed, 4 insertions(+), 0 deletions(-)
Approvals: build bot (Jenkins): Verified Nico Huber: Looks good to me, approved Angel Pons: Looks good to me, approved
diff --git a/Makefile.inc b/Makefile.inc index dbf95d4..39dd6dd 100644 --- a/Makefile.inc +++ b/Makefile.inc @@ -1111,6 +1111,10 @@ @printf " SeaBIOS Add sercon-port file\n" $(CBFSTOOL) $@.tmp add-int -i $(CONFIG_SEABIOS_SERCON_PORT_ADDR) -n etc/sercon-port endif +ifeq ($(CONFIG_SEABIOS_THREAD_OPTIONROMS),y) + @printf " SeaBIOS Thread optionroms\n" + $(CBFSTOOL) $@.tmp add-int -i 2 -n etc/threads +endif ifeq ($(CONFIG_CPU_INTEL_FIRMWARE_INTERFACE_TABLE),y) ifneq ($(CONFIG_UPDATE_IMAGE),y) # never update the bootblock ifeq ($(CONFIG_CPU_MICROCODE_CBFS_EXTERNAL_HEADER),y)
9elements QA has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/40345 )
Change subject: SeaBIOS: fix threaded hardware initialization during oprom execution ......................................................................
Patch Set 3:
Automatic boot test returned (PASS/FAIL/TOTAL): 3/0/3 Emulation targets: EMULATION_QEMU_X86_Q35 using payload TianoCore : SUCCESS : https://lava.9esec.io/r/2375 EMULATION_QEMU_X86_Q35 using payload SeaBIOS : SUCCESS : https://lava.9esec.io/r/2374 EMULATION_QEMU_X86_I440FX using payload SeaBIOS : SUCCESS : https://lava.9esec.io/r/2373
Please note: This test is under development and might not be accurate at all!
-
9elements QA (Code Review) -
Angel Pons (Code Review)
-
Michał Żygowski (Code Review)
-
Nico Huber (Code Review)