coreboot-gerrit December 2021

coreboot-gerrit@coreboot.org

1 participants
5525 discussions

Change in coreboot[master]: mb/google/guybrush: Set TPM to to be kernel power managed.
by Rob Barnes (Code Review) 13 Dec '21

13 Dec '21

Rob Barnes has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/60081 ) Change subject: mb/google/guybrush: Set TPM to to be kernel power managed. ...................................................................... mb/google/guybrush: Set TPM to to be kernel power managed. Set TPM power_managed_mode to TPM_KERNEL_POWER_MANAGED. This will cause the TPM kernel driver to send a shutdown command before s0i3 entry. This change depends on S0i3 verstage running and reinitializing the TPM. BUG=b:200578885 BRANCH=None TEST=TPM shutdown sent during s0i3 entry on guybrush Change-Id: I206022cc2a29690186206966c5d45bd55c303248 --- M src/mainboard/google/guybrush/variants/baseboard/devicetree.cb 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/81/60081/1 diff --git a/src/mainboard/google/guybrush/variants/baseboard/devicetree.cb b/src/mainboard/google/guybrush/variants/baseboard/devicetree.cb index 7fb3c7e..21fef85 100644 --- a/src/mainboard/google/guybrush/variants/baseboard/devicetree.cb +++ b/src/mainboard/google/guybrush/variants/baseboard/devicetree.cb @@ -342,6 +342,7 @@ register "hid" = ""GOOG0005"" register "desc" = ""Cr50 TPM"" register "irq_gpio" = "ACPI_GPIO_IRQ_EDGE_LOW(GPIO_85)" + register "power_managed_mode" = "TPM_KERNEL_POWER_MANAGED" device i2c 50 alias cr50 on end end end -- To view, visit https://review.coreboot.org/c/coreboot/+/60081 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I206022cc2a29690186206966c5d45bd55c303248 Gerrit-Change-Number: 60081 Gerrit-PatchSet: 1 Gerrit-Owner: Rob Barnes <robbarnes(a)google.com> Gerrit-MessageType: newchange

1 0

Change in coreboot[master]: libpayload: Enable vboot integration
by Jakub Czapiga (Code Review) 13 Dec '21

13 Dec '21

Attention is currently required from: Jakub Czapiga, Julius Werner, Jan Dabros, Yu-Ping Wu. Hello build bot (Jenkins), Julius Werner, Jan Dabros, Yu-Ping Wu, I'd like you to reexamine a change. Please visit https://review.coreboot.org/c/coreboot/+/60080 to look at the new patch set (#2). Change subject: libpayload: Enable vboot integration ...................................................................... libpayload: Enable vboot integration This patch introduces building and linking of 3rdparty/vboot with libpayload. VBoot configuration can be set using CONFIG_LP_VBOOT and other entries from VBoot Kconfig menu. Change-Id: I2d9d766a461edaa0081041c020ecf580fd2ca64e Signed-off-by: Jakub Czapiga <jacz(a)semihalf.com> --- M payloads/libpayload/Kconfig M payloads/libpayload/Makefile M payloads/libpayload/Makefile.inc A payloads/libpayload/vboot/Kconfig A payloads/libpayload/vboot/Makefile.inc 5 files changed, 125 insertions(+), 4 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/80/60080/2 -- To view, visit https://review.coreboot.org/c/coreboot/+/60080 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I2d9d766a461edaa0081041c020ecf580fd2ca64e Gerrit-Change-Number: 60080 Gerrit-PatchSet: 2 Gerrit-Owner: Jakub Czapiga <jacz(a)semihalf.com> Gerrit-Reviewer: Jan Dabros <jsd(a)semihalf.com> Gerrit-Reviewer: Julius Werner <jwerner(a)chromium.org> Gerrit-Reviewer: Yu-Ping Wu <yupingso(a)google.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Attention: Jakub Czapiga <jacz(a)semihalf.com> Gerrit-Attention: Julius Werner <jwerner(a)chromium.org> Gerrit-Attention: Jan Dabros <jsd(a)semihalf.com> Gerrit-Attention: Yu-Ping Wu <yupingso(a)google.com> Gerrit-MessageType: newpatchset

1 0

Change in coreboot[master]: mb/google/dedede/var/bugzzy: Configure LTE GPIOs using FW_CONFIG
by Henry Sun (Code Review) 13 Dec '21

13 Dec '21

Attention is currently required from: shkim, SH Kim, Edward Doan, Karthik Ramasubramanian. Henry Sun has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/59684 ) Change subject: mb/google/dedede/var/bugzzy: Configure LTE GPIOs using FW_CONFIG ...................................................................... Patch Set 2: Code-Review+1 (1 comment) Patchset: PS2: LGTM, differ to Karthik to approve. Thanks! -- To view, visit https://review.coreboot.org/c/coreboot/+/59684 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I01f4d3c623cb7f1deb6264cb88774788417d291d Gerrit-Change-Number: 59684 Gerrit-PatchSet: 2 Gerrit-Owner: shkim <sh_.kim(a)samsung.com> Gerrit-Reviewer: Edward Doan <edoan(a)google.com> Gerrit-Reviewer: Henry Sun <henrysun(a)google.com> Gerrit-Reviewer: Karthik Ramasubramanian <kramasub(a)google.com> Gerrit-Reviewer: SH Kim <sh_.kim(a)samsung.corp-partner.google.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Attention: shkim <sh_.kim(a)samsung.com> Gerrit-Attention: SH Kim <sh_.kim(a)samsung.corp-partner.google.com> Gerrit-Attention: Edward Doan <edoan(a)google.com> Gerrit-Attention: Karthik Ramasubramanian <kramasub(a)google.com> Gerrit-Comment-Date: Mon, 13 Dec 2021 15:41:15 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in coreboot[master]: payloads/U-Boot: Fix various build errors
by Simon Glass (Code Review) 13 Dec '21

13 Dec '21

Attention is currently required from: Bill XIE, Martin Roth, Paul Menzel, Stefan Reinauer, Simon Glass. Simon Glass has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/60028 ) Change subject: payloads/U-Boot: Fix various build errors ...................................................................... Patch Set 10: Code-Review+2 -- To view, visit https://review.coreboot.org/c/coreboot/+/60028 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: Ic0f11c16274456a452a0422e19fab0c61d8b5d5b Gerrit-Change-Number: 60028 Gerrit-PatchSet: 10 Gerrit-Owner: Bill XIE <persmule(a)hardenedlinux.org> Gerrit-Reviewer: Martin Roth <martinroth(a)google.com> Gerrit-Reviewer: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-Reviewer: Simon Glass <sjg(a)chromium.org> Gerrit-Reviewer: Stefan Reinauer <stefan.reinauer(a)coreboot.org> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Attention: Bill XIE <persmule(a)hardenedlinux.org> Gerrit-Attention: Martin Roth <martinroth(a)google.com> Gerrit-Attention: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-Attention: Stefan Reinauer <stefan.reinauer(a)coreboot.org> Gerrit-Attention: Simon Glass <sjg(a)chromium.org> Gerrit-Comment-Date: Mon, 13 Dec 2021 15:38:26 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in coreboot[master]: payloads/U-Boot: Fix various build errors
by Simon Glass (Code Review) 13 Dec '21

13 Dec '21

Attention is currently required from: Bill XIE, Martin Roth, Paul Menzel, Stefan Reinauer, Simon Glass. Simon Glass has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/60028 ) Change subject: payloads/U-Boot: Fix various build errors ...................................................................... Patch Set 10: Code-Review+1 -- To view, visit https://review.coreboot.org/c/coreboot/+/60028 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: Ic0f11c16274456a452a0422e19fab0c61d8b5d5b Gerrit-Change-Number: 60028 Gerrit-PatchSet: 10 Gerrit-Owner: Bill XIE <persmule(a)hardenedlinux.org> Gerrit-Reviewer: Martin Roth <martinroth(a)google.com> Gerrit-Reviewer: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-Reviewer: Simon Glass <sjg(a)chromium.org> Gerrit-Reviewer: Stefan Reinauer <stefan.reinauer(a)coreboot.org> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Attention: Bill XIE <persmule(a)hardenedlinux.org> Gerrit-Attention: Martin Roth <martinroth(a)google.com> Gerrit-Attention: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-Attention: Stefan Reinauer <stefan.reinauer(a)coreboot.org> Gerrit-Attention: Simon Glass <sjg(a)chromium.org> Gerrit-Comment-Date: Mon, 13 Dec 2021 15:38:17 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in coreboot[master]: libpayload: Implement new CBFS access API
by Jakub Czapiga (Code Review) 13 Dec '21

13 Dec '21

Attention is currently required from: Paul Menzel, Julius Werner. Jakub Czapiga has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/59497 ) Change subject: libpayload: Implement new CBFS access API ...................................................................... Patch Set 5: (13 comments) File payloads/libpayload/include/cbfs.h: https://review.coreboot.org/c/coreboot/+/59497/comment/a88835d5_a39bcf2d PS5, Line 15: /* For documentation look in the main coreboot cbfs header files in paths: > I think you can just refer to <cbfs.h> directly, that's where the main API is declared. […] Done https://review.coreboot.org/c/coreboot/+/59497/comment/211b7162_26cab954 PS5, Line 28: order where possible, since mapping backends often don't support more complicated cases */ > The second sentence is not true for libpayload. Done https://review.coreboot.org/c/coreboot/+/59497/comment/ca070e92_4d25245e PS5, Line 35: /* Defined in include/cbfs_glue.h */ > I think it would be fine to just include <cbfs_glue.h> here, too. I didn't want to include cbfs_glue.h here, because it defines ERROR, LOG and DEBUG macros for commonlib/bsd/cbfs_private.h, and it might collide with payloads defines. I introduces the include/cbfs_boot_device.h to deal with it. cbfs_glue.h and cbfs.h can both include it without collisions. https://review.coreboot.org/c/coreboot/+/59497/comment/4925dcbd_b7332bd5 PS5, Line 43: ssize_t _cbfs_boot_lookup(const char *name, bool force_ro, union cbfs_mdata *mdata); > You only need this if you also duplicate the cbfs_get_type()/cbfs_get_size()/cbfs_file_exists() APIs […] Done https://review.coreboot.org/c/coreboot/+/59497/comment/415021ec_a1724dac PS5, Line 63: void *ret = _cbfs_load(name, buf, &size, false); > nit: why not just […] Done File payloads/libpayload/include/cbfs_core.h: https://review.coreboot.org/c/coreboot/+/59497/comment/db2d3aac_58482e8f PS5, Line 87: #define CBFS_ATTRIBUTE_ALIGN 4 > Not sure why some of this needs to be added here? Since this file is supposed to be deleted anyway, […] Done File payloads/libpayload/libcbfs/cbfs.c: https://review.coreboot.org/c/coreboot/+/59497/comment/ae5a25b3_7f863039 PS5, Line 10: #define CB_CBFS_CORE_WITH_LZ4 > Sorry, I meant these things too when I said "get rid of the cruft". […] Sorry, I forgot to remove these defines after I moved legacy implementation to its own file. Thanks for noticing :) https://review.coreboot.org/c/coreboot/+/59497/comment/521c8b63_4494c601 PS5, Line 23: #ifndef __SMM__ > This doesn't belong here either. Done https://review.coreboot.org/c/coreboot/+/59497/comment/f37801ae_f4acbef6 PS5, Line 34: if (!rw.mcache_size) { > I don't think there's a point checking this here? I'd leave it here. Without it if payload will perform relocation and will fill `virtual_offset` (arch/virtual.h), NULL from `cbfs_*_mcache_offset` will be translated to `virtual_offset`, and we do not want that. https://review.coreboot.org/c/coreboot/+/59497/comment/165fdf91_c4f628ec PS5, Line 45: !lib_sysinfo.fmap_offset > Checking this here shouldn't be needed? Done https://review.coreboot.org/c/coreboot/+/59497/comment/63420bd8_6fe7a1ec PS5, Line 170: *size_inout = MIN(size, *size_inout); > You shouldn't need the MIN() here... if the buffer is too small, we need to fail anyway. […] Done. I also moved this assignment after call to `cbfs_load_and_decompress()`, because it should have no effect if the file will not be decompressed correctly. https://review.coreboot.org/c/coreboot/+/59497/comment/0788dbf8_646be048 PS5, Line 172: loc = malloc(size); > nit: rather than introducing `loc` I think you can just do buf = malloc(... […] Done https://review.coreboot.org/c/coreboot/+/59497/comment/f0267e43_0fedf88b PS5, Line 182: if (cbfs_load_and_decompress(offset, size, loc, size, compression, NULL) != size) { > Be careful with the size parameters here. The first size should be the *compressed* file size in CBFS (i.e. be32toh(mdata.h.len)) Fixed :) > he second one should be the size of the allocated buffer (I guess you can use `size` here for simplicity, even though that might be smaller, since we know it's gonna be enough anyway. I think, that after adding if-statement for `size_inout` it will be safe enough. As you said, we will know, that `size` bytes should suffice. -- To view, visit https://review.coreboot.org/c/coreboot/+/59497 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I00da0658dbac0cddf92ad55611def947932d23c7 Gerrit-Change-Number: 59497 Gerrit-PatchSet: 5 Gerrit-Owner: Jakub Czapiga <jacz(a)semihalf.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Julius Werner <jwerner(a)chromium.org> Gerrit-CC: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-Attention: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-Attention: Julius Werner <jwerner(a)chromium.org> Gerrit-Comment-Date: Mon, 13 Dec 2021 15:35:54 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: Julius Werner <jwerner(a)chromium.org> Gerrit-MessageType: comment

1 0

Change in coreboot[master]: libpayload/libc/fmap: Implement new FlashMap API
by Jakub Czapiga (Code Review) 13 Dec '21

13 Dec '21

Attention is currently required from: Julius Werner. Jakub Czapiga has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/59494 ) Change subject: libpayload/libc/fmap: Implement new FlashMap API ...................................................................... Patch Set 5: (11 comments) File payloads/libpayload/libc/fmap.c: https://review.coreboot.org/c/coreboot/+/59494/comment/6a74812b_a1005a9a PS5, Line 38: /* Private fmap cache. Left non-static to make testing easier. */ > I thought we didn't do things like this? Can't you just use the #include trick? (Exporting a symbol […] Done https://review.coreboot.org/c/coreboot/+/59494/comment/ec704896_e7a10eed PS5, Line 43: for (size_t i = 0; i < fmap->nareas; ++i) { > Would be good to sprinkle le32toh() everywhere applicable here, like has recently been added to the […] Done https://review.coreboot.org/c/coreboot/+/59494/comment/ab5d0c8a_2a9446d4 PS5, Line 56: _fmap_check_signature > nit: just in general, try to follow the pattern of "function sounds like an action" -> 0 success, ne […] Done https://review.coreboot.org/c/coreboot/+/59494/comment/dda4646f_32d10a23 PS5, Line 61: _ > I'm not sure why you're prefixing everything with an underscore here... […] Thanks for clarifying that :) https://review.coreboot.org/c/coreboot/+/59494/comment/7458956a_ec58e2d3 PS5, Line 63: if (_fmap_cache) > nit: you don't really need to check it on both ends Done https://review.coreboot.org/c/coreboot/+/59494/comment/d7f17353_090b2196 PS5, Line 69: _fmap_cache = (struct fmap *)lib_sysinfo.fmap_cache; > phys_to_virt()? Done https://review.coreboot.org/c/coreboot/+/59494/comment/b20e7300_7bc15dd6 PS5, Line 73: /* Load FMAP from boot media to internal cache */ > outdated comment Done File payloads/libpayload/tests/include/mocks/boot_device.h: https://review.coreboot.org/c/coreboot/+/59494/comment/5144e961_f80c53a6 PS5, Line 8: libpayload_boot_device_read > Looks like you meant to delete this file? Done File payloads/libpayload/tests/libc/fmap_locate_area-test.c: https://review.coreboot.org/c/coreboot/+/59494/comment/033daaba_625d87e2 PS5, Line 101: /* Different contents of fmap_cache and fmap_offset */ > This test doesn't test what the comments suggest it does. Done https://review.coreboot.org/c/coreboot/+/59494/comment/5a1c4224_f2f58f63 PS5, Line 112: static void test_fmap_locate_area_repeated_area(void **state) > Honestly don't think we should test this, because it's an invalid FMAP and the result is undefined ( […] Ok, I see your point. If there are two areas with same name, then it's implementation-dependent, so basically UB from user's point of view. File payloads/libpayload/tests/mocks/boot_device.c: PS5: > This file too? Done -- To view, visit https://review.coreboot.org/c/coreboot/+/59494 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: Idbf9016ce73aa58e17f3ee19920ab83dc6c25abb Gerrit-Change-Number: 59494 Gerrit-PatchSet: 5 Gerrit-Owner: Jakub Czapiga <jacz(a)semihalf.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Julius Werner <jwerner(a)chromium.org> Gerrit-CC: Patrick Georgi <patrick(a)coreboot.org> Gerrit-CC: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-Attention: Julius Werner <jwerner(a)chromium.org> Gerrit-Comment-Date: Mon, 13 Dec 2021 15:35:50 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: Julius Werner <jwerner(a)chromium.org> Gerrit-MessageType: comment

1 0

Change in coreboot[master]: libpayload: Enable vboot integration
by Jakub Czapiga (Code Review) 13 Dec '21

13 Dec '21

Jakub Czapiga has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/60080 ) Change subject: libpayload: Enable vboot integration ...................................................................... libpayload: Enable vboot integration This patch introduces building and linking of 3rdparty/vboot with libpayload. VBoot configuration can be set using CONFIG_LP_VBOOT and other entries from VBoot Kconfig menu. Change-Id: I2d9d766a461edaa0081041c020ecf580fd2ca64e Signed-off-by: Jakub Czapiga <jacz(a)semihalf.com> --- M payloads/libpayload/Kconfig M payloads/libpayload/Makefile M payloads/libpayload/Makefile.inc A payloads/libpayload/vboot/Kconfig A payloads/libpayload/vboot/Makefile.inc 5 files changed, 126 insertions(+), 4 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/80/60080/1 diff --git a/payloads/libpayload/Kconfig b/payloads/libpayload/Kconfig index 382f5af..71895fb 100644 --- a/payloads/libpayload/Kconfig +++ b/payloads/libpayload/Kconfig @@ -486,6 +486,8 @@ This option is turned on if the target system has a separate IO address space. This is typically only the case on x86. +source "vboot/Kconfig" + source "arch/arm/Kconfig" source "arch/arm64/Kconfig" source "arch/x86/Kconfig" diff --git a/payloads/libpayload/Makefile b/payloads/libpayload/Makefile index 3ad313f..51f5f68 100644 --- a/payloads/libpayload/Makefile +++ b/payloads/libpayload/Makefile @@ -273,6 +273,7 @@ add-class= \ $(eval $(1)-srcs:=) \ $(eval $(1)-objs:=) \ + $(eval $(1)-libs:=) \ $(eval classes+=$(1)) # Special classes are managed types with special behaviour @@ -326,7 +327,7 @@ $(basename \ $(addprefix $(obj)/,\ $(subst $(coreboottop)/,coreboot/,$(2))))) -$(foreach class,$(classes),$(eval $(class)-objs:=$(call src-to-obj,$(class),$($(class)-srcs)))) +$(foreach class,$(classes),$(eval $(class)-objs+=$(call src-to-obj,$(class),$($(class)-srcs)))) allsrcs:=$(foreach var, $(addsuffix -srcs,$(classes)), $($(var))) allobjs:=$(foreach var, $(addsuffix -objs,$(classes)), $($(var))) diff --git a/payloads/libpayload/Makefile.inc b/payloads/libpayload/Makefile.inc index 0e90364..067a2d8 100644 --- a/payloads/libpayload/Makefile.inc +++ b/payloads/libpayload/Makefile.inc @@ -46,6 +46,7 @@ classes-$(CONFIG_LP_LZMA) += liblzma classes-$(CONFIG_LP_LZ4) += liblz4 classes-$(CONFIG_LP_REMOTEGDB) += libgdb +classes-$(CONFIG_LP_VBOOT) += vboot libraries := $(classes-y) classes-y += head.o @@ -55,6 +56,7 @@ subdirs-$(CONFIG_LP_CBFS) += libcbfs subdirs-$(CONFIG_LP_LZMA) += liblzma subdirs-$(CONFIG_LP_LZ4) += liblz4 +subdirs-$(CONFIG_LP_VBOOT) += vboot INCLUDES := -Iinclude -Iinclude/$(ARCHDIR-y) -I$(obj) INCLUDES += -include include/kconfig.h -include include/compiler.h @@ -77,7 +79,8 @@ $(obj)/libpayload-config.h: $(KCONFIG_AUTOHEADER) $(obj)/libpayload.config cmp $@ $< 2>/dev/null || cp $< $@ -library-targets = $(addsuffix .a,$(addprefix $(obj)/,$(libraries))) $(obj)/libpayload.a +library-targets = $(addsuffix .a,$(addprefix $(obj)/,$(libraries))) $(obj)/libpayload.a \ + $(foreach class,$(classes),$($(class)-libs)) lib: $$(library-targets) $(obj)/head.o extract_nth=$(word $(1), $(subst |, ,$(2))) @@ -89,9 +92,14 @@ $(if $(wildcard $(1)$(call extract_nth,1,$(2))), \ $(eval includes += $(1)$(2))) -$(obj)/libpayload.a: $(foreach class,$(libraries),$$($(class)-objs)) +$(obj)/libpayload.a: $(foreach class,$(libraries),$$($(class)-objs) $$($(class)-libs)) printf " AR $(subst $(CURDIR)/,,$(@))\n" - $(AR) rc $@ $^ + $(AR) rc $@ $(filter-out %.a,$^) + cat <(printf "open %s\n" "$@") \ + <(for lib in $(filter %.a,$^); do \ + printf "addlib %s\n" "$$lib"; \ + done) \ + <(printf "save\nend\n") | $(AR) -M $(obj)/%.a: $$(%-objs) printf " AR $(subst $(CURDIR)/,,$(@))\n" diff --git a/payloads/libpayload/vboot/Kconfig b/payloads/libpayload/vboot/Kconfig new file mode 100644 index 0000000..e4cf630 --- /dev/null +++ b/payloads/libpayload/vboot/Kconfig @@ -0,0 +1,68 @@ +# SPDX-License-Identifier: BSD-3-Clause + +menu "Verified boot (vboot)" + +config VBOOT + bool "Enable VBoot" + default n + help + This option enables compiling and buildinf vboot libraries. + +if VBOOT + +config VBOOT_FIRMWARE_ARCH + string "vboot architecture" + default "arm" if ARCH_ARM + default "x86" if ARCH_X86 + default "arm64" if ARCH_ARM64 + default "" if ARCH_MOCK + +config VBOOT_DEBUG + bool "Compile vboot with debug flags" + default n + +config VBOOT_DEBUG_PRINT + bool "Enable debug messages" + default y + +config VBOOT_FORCE_LOGGING_ON + bool "Force logging" + default n + +config VBOOT_TPM2_MODE + bool "TPM2 Mode" + default y + +config VBOOT_GPT_SPI_NOR + bool "GPT SPI NOR" + default n + +config VBOOT_TPM2_SIMULATOR + bool "TPM2 Simulator" + default n + +config VBOOT_VTPM_PROXY + bool "VTPM Proxy" + default n + +config VBOOT_STATIC + bool "Build static vboot" + default n + +config VBOOT_EXTRA_CFLAGS + string "Additional vboot CFLAGS" + default "" + +config VBOOT_X86_SHA_EXT + bool "x86 SHA Extension" + depends on ARCH_X86 + default y if ARCH_X86 + default n + +config VBOOT_UNROLL_LOOPS + bool + default y + +endif + +endmenu diff --git a/payloads/libpayload/vboot/Makefile.inc b/payloads/libpayload/vboot/Makefile.inc new file mode 100644 index 0000000..0ac596c --- /dev/null +++ b/payloads/libpayload/vboot/Makefile.inc @@ -0,0 +1,43 @@ +# SPDX-License-Identifier: BSD-3-Clause + +VBOOT_SOURCE ?= $(coreboottop)/3rdparty/vboot + +VBOOT_BUILD_DIR ?= $(abspath $(obj)/external/vboot) +VBOOT_LIB = $(VBOOT_BUILD_DIR)/vboot_fw.a +TLCL_LIB = $(VBOOT_BUILD_DIR)/tlcl.a + +ifeq ($(CONFIG_LP_VBOOT),y) +vboot-libs += $(VBOOT_LIB) +ifeq ($(CONFIG_LP_VBOOT_TPM2_MODE),y) +vboot-libs += $(TLCL_LIB) +endif +endif + +kconfig-to-binary=$(if $(strip $(1)),$(strip $(subst n,0,$(subst y,1,$(1)))),0) + +VBOOT_INCLUDES := -I$(top)/include -I$(top)/include/$(ARCHDIR-y) -I$(absobj) +VBOOT_INCLUDES += -include $(top)/include/kconfig.h -include $(top)/include/compiler.h + +$(VBOOT_LIB): $(obj)/libpayload-config.h + @printf " MAKE $(subst $(obj)/,,$(@))\n" + +$(Q) unset CFLAGS CXXFLAGS LDFLAGS && \ + FIRMWARE_ARCH=$(CONFIG_LP_VBOOT_FIRMWARE_ARCH) \ + CC=$(CC) \ + $(MAKE) -C "$(VBOOT_SOURCE)" \ + DEBUG=$(call kconfig-to-binary, $(CONFIG_LP_VBOOT_DEBUG)) \ + TEST_PRINT=$(call kconfig-to-binary, $(CONFIG_LP_VBOOT_DEBUG_PRINT)) \ + FORCE_LOGGING_ON=$(call kconfig-to-binary, $(CONFIG_LP_VBOOT_FORCE_LOGGING_ON)) \ + TPM2_MODE=$(call kconfig-to-binary, $(CONFIG_LP_VBOOT_TPM2_MODE)) \ + GPT_SPI_NOR=$(call kconfig-to-binary, $(CONFIG_LP_VBOOT_GPT_SPI_NOR)) \ + TPM2_SIMULATOR=$(call kconfig-to-binary, $(CONFIG_LP_VBOOT_TPM2_SIMULATOR)) \ + VTPM_PROXY=$(call kconfig-to-binary, $(CONFIG_LP_VTPM_PROXY)) \ + STATIC=$(call kconfig-to-binary, $(CONFIG_LP_VBOOT_STATIC)) \ + FUZZ_FLAGS="$(VBOOT_INCLUDES) $(call strip_quotes, $(CONFIG_LP_VBOOT_EXTRA_CFLAGS))" \ + X86_SHA_EXT=$(call kconfig-to-binary, $(CONFIG_LP_VBOOT_X86_SHA_EXT)) \ + UNROLL_LOOPS=$(call kconfig-to-binary, $(CONFIG_LP_VBOOT_UNROLL_LOOPS)) \ + BUILD=$(VBOOT_BUILD_DIR) \ + V=$(V) \ + fwlib tlcl + +$(TLCL_LIB): $(VBOOT_LIB) + -- To view, visit https://review.coreboot.org/c/coreboot/+/60080 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I2d9d766a461edaa0081041c020ecf580fd2ca64e Gerrit-Change-Number: 60080 Gerrit-PatchSet: 1 Gerrit-Owner: Jakub Czapiga <jacz(a)semihalf.com> Gerrit-MessageType: newchange

1 0

Change in coreboot[master]: libpayload: Implement new CBFS access API
by Jakub Czapiga (Code Review) 13 Dec '21

13 Dec '21

Attention is currently required from: Jakub Czapiga, Paul Menzel. Hello build bot (Jenkins), I'd like you to reexamine a change. Please visit https://review.coreboot.org/c/coreboot/+/59497 to look at the new patch set (#6). Change subject: libpayload: Implement new CBFS access API ...................................................................... libpayload: Implement new CBFS access API Change-Id: I00da0658dbac0cddf92ad55611def947932d23c7 Signed-off-by: Jakub Czapiga <jacz(a)semihalf.com> --- M payloads/libpayload/Kconfig M payloads/libpayload/Makefile.inc M payloads/libpayload/include/cbfs.h A payloads/libpayload/include/cbfs_boot_device.h M payloads/libpayload/include/cbfs_core.h A payloads/libpayload/include/cbfs_glue.h A payloads/libpayload/include/cbfs_legacy.h A payloads/libpayload/libcbfs/Kconfig M payloads/libpayload/libcbfs/Makefile.inc M payloads/libpayload/libcbfs/cbfs.c M payloads/libpayload/libcbfs/cbfs_core.c A payloads/libpayload/libcbfs/cbfs_legacy.c M payloads/libpayload/tests/Makefile.inc A payloads/libpayload/tests/include/mocks/cbfs_util.h A payloads/libpayload/tests/libcbfs/Makefile.inc A payloads/libpayload/tests/libcbfs/cbfs-lookup-test.c A payloads/libpayload/tests/libcbfs/cbfs-verification-test.c A payloads/libpayload/tests/mocks/cbfs_file_mock.c A payloads/libpayload/tests/mocks/die.c 19 files changed, 2,137 insertions(+), 413 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/97/59497/6 -- To view, visit https://review.coreboot.org/c/coreboot/+/59497 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I00da0658dbac0cddf92ad55611def947932d23c7 Gerrit-Change-Number: 59497 Gerrit-PatchSet: 6 Gerrit-Owner: Jakub Czapiga <jacz(a)semihalf.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Julius Werner <jwerner(a)chromium.org> Gerrit-CC: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-Attention: Jakub Czapiga <jacz(a)semihalf.com> Gerrit-Attention: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-MessageType: newpatchset

1 0

Change in coreboot[master]: libpayload/libc/fmap: Implement new FlashMap API
by Jakub Czapiga (Code Review) 13 Dec '21

13 Dec '21

Attention is currently required from: Jakub Czapiga. Hello build bot (Jenkins), I'd like you to reexamine a change. Please visit https://review.coreboot.org/c/coreboot/+/59494 to look at the new patch set (#6). Change subject: libpayload/libc/fmap: Implement new FlashMap API ...................................................................... libpayload/libc/fmap: Implement new FlashMap API This patch introduces new FlashMap API, the fmap_locate_area(). This function requires implementation of libpayload_boot_device_read(), and either lib_sysinfo.fmap_cache or lib_sysinfo.fmap_offset to be set. This function uses its own cache in RAM to limit flash reads to maximum of two calls to libpayload_boot_device_read(). Change-Id: Idbf9016ce73aa58e17f3ee19920ab83dc6c25abb Signed-off-by: Jakub Czapiga <jacz(a)semihalf.com> --- A payloads/libpayload/include/fmap.h M payloads/libpayload/include/libpayload.h M payloads/libpayload/libc/fmap.c A payloads/libpayload/tests/libc/Makefile.inc A payloads/libpayload/tests/libc/fmap_locate_area-test.c 5 files changed, 200 insertions(+), 0 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/94/59494/6 -- To view, visit https://review.coreboot.org/c/coreboot/+/59494 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: Idbf9016ce73aa58e17f3ee19920ab83dc6c25abb Gerrit-Change-Number: 59494 Gerrit-PatchSet: 6 Gerrit-Owner: Jakub Czapiga <jacz(a)semihalf.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Julius Werner <jwerner(a)chromium.org> Gerrit-CC: Patrick Georgi <patrick(a)coreboot.org> Gerrit-CC: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-Attention: Jakub Czapiga <jacz(a)semihalf.com> Gerrit-MessageType: newpatchset

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

coreboot-gerrit December 2021