coreboot-gerrit September 2021

coreboot-gerrit@coreboot.org

1 participants
6530 discussions

Change in coreboot[master]: lib/edid_fill_fb: Make framebuffer orientation to be configurable
by shkim (Code Review) 02 Sep '21

02 Sep '21

Attention is currently required from: SH Kim. Hello SH Kim, I'd like you to do a code review. Please visit https://review.coreboot.org/c/coreboot/+/57327 to review the following change. Change subject: lib/edid_fill_fb: Make framebuffer orientation to be configurable ...................................................................... lib/edid_fill_fb: Make framebuffer orientation to be configurable Some panels have portrait orientation as default, this change makes framebuffer orientation to be configurable to adjust the proper firmware screen UI orientation for them. BUG=b:194967458 TEST=Build and checked the firmware screen UI orientation on bugzzy BRANCH=None Change-Id: Ice7f7ab66e40d19c76fbf5876e7d4d3e3b2088fa Signed-off-by: Seunghwan Kim <sh_.kim(a)samsung.corp-partner.google.com> --- M src/lib/Kconfig M src/lib/edid_fill_fb.c 2 files changed, 10 insertions(+), 0 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/27/57327/1 diff --git a/src/lib/Kconfig b/src/lib/Kconfig index 0f651b3..614d688 100644 --- a/src/lib/Kconfig +++ b/src/lib/Kconfig @@ -109,3 +109,10 @@ The SoC needs to define a payload_preload_cache region where the raw payload can be placed. + +config FRAMEBUFFER_ORIENTATION_OVERRIDE + int + default -1 + help + Overrides framebuffer orientation setting. We should set this with one + of lb_fb_orientation. '-1' means disabled. diff --git a/src/lib/edid_fill_fb.c b/src/lib/edid_fill_fb.c index 7e8aa95..a57828e 100644 --- a/src/lib/edid_fill_fb.c +++ b/src/lib/edid_fill_fb.c @@ -74,6 +74,9 @@ /* Update */ info->fb = *fb; + if (CONFIG_FRAMEBUFFER_ORIENTATION_OVERRIDE != 1) + info->fb.orientation = CONFIG_FRAMEBUFFER_ORIENTATION_OVERRIDE; + list_insert_after(&info->node, &list); return info; -- To view, visit https://review.coreboot.org/c/coreboot/+/57327 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: Ice7f7ab66e40d19c76fbf5876e7d4d3e3b2088fa Gerrit-Change-Number: 57327 Gerrit-PatchSet: 1 Gerrit-Owner: shkim <sh_.kim(a)samsung.com> Gerrit-Reviewer: SH Kim <sh_.kim(a)samsung.corp-partner.google.com> Gerrit-Attention: SH Kim <sh_.kim(a)samsung.corp-partner.google.com> Gerrit-MessageType: newchange

1 0

Change in coreboot[master]: mb/google/dedede/var/cappy2: Add fw_config probe for ALC5682I-VS
by Weimin Wu (Code Review) 02 Sep '21

02 Sep '21

Attention is currently required from: Furquan Shaikh, Sunwei Li, Henry Sun, Paul Menzel, Karthik Ramasubramanian. Weimin Wu has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/57105 ) Change subject: mb/google/dedede/var/cappy2: Add fw_config probe for ALC5682I-VS ...................................................................... Patch Set 4: (1 comment) Patchset: PS4: > Recommend rebasing this change on top of CB:57111 or waiting until it gets merged. @Karthik,Furquan, According CB:57111 has been merged, pls help with CR+2. Thanks. -- To view, visit https://review.coreboot.org/c/coreboot/+/57105 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: Iac09663b095e758f1bc0cfaf7adb6e84d203788a Gerrit-Change-Number: 57105 Gerrit-PatchSet: 4 Gerrit-Owner: Sunwei Li <lisunwei(a)huaqin.corp-partner.google.com> Gerrit-Reviewer: Henry Sun <henrysun(a)google.com> Gerrit-Reviewer: Karthik Ramasubramanian <kramasub(a)google.com> Gerrit-Reviewer: Weimin Wu <wuweimin(a)huaqin.corp-partner.google.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Furquan Shaikh <furquan(a)google.com> Gerrit-CC: Ginger Zhang <zhangqingchun(a)huaqin.corp-partner.google.com> Gerrit-CC: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-Attention: Furquan Shaikh <furquan(a)google.com> Gerrit-Attention: Sunwei Li <lisunwei(a)huaqin.corp-partner.google.com> Gerrit-Attention: Henry Sun <henrysun(a)google.com> Gerrit-Attention: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-Attention: Karthik Ramasubramanian <kramasub(a)google.com> Gerrit-Comment-Date: Thu, 02 Sep 2021 01:14:33 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: Karthik Ramasubramanian <kramasub(a)google.com> Gerrit-MessageType: comment

1 0

Change in coreboot[master]: [RFC] kconfig_lint: Drop overly restrictive rules about choice configs
by Felix Singer (Code Review) 02 Sep '21

02 Sep '21

Attention is currently required from: Nico Huber, Angel Pons. Felix Singer has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/56410 ) Change subject: [RFC] kconfig_lint: Drop overly restrictive rules about choice configs ...................................................................... Patch Set 2: Code-Review+1 (1 comment) Patchset: PS2: Are there any more todos left? I would like to get CB:56217 into the tree. -- To view, visit https://review.coreboot.org/c/coreboot/+/56410 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I48a17f6403470251be6b6d44bb82a8bdcbefe9f6 Gerrit-Change-Number: 56410 Gerrit-PatchSet: 2 Gerrit-Owner: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Felix Singer <felixsinger(a)posteo.net> Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: Martin Roth <martinroth(a)google.com> Gerrit-Reviewer: Patrick Georgi <pgeorgi(a)google.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Julius Werner <jwerner(a)chromium.org> Gerrit-Attention: Nico Huber <nico.h(a)gmx.de> Gerrit-Attention: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Comment-Date: Thu, 02 Sep 2021 00:41:22 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in coreboot[master]: wifi: Add support for new revisions of SAR table entries
by Sugnan Prabhu S (Code Review) 02 Sep '21

02 Sep '21

Attention is currently required from: Furquan Shaikh, Tim Wawrzynczak, Paul Menzel. Sugnan Prabhu S has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/56750 ) Change subject: wifi: Add support for new revisions of SAR table entries ...................................................................... Patch Set 26: (3 comments) File src/vendorcode/google/chromeos/sar.c: https://review.coreboot.org/c/coreboot/+/56750/comment/46538a95_d2b2b00c PS25, Line 59: (1 + sar->dsar_set_count) > comment why the `1 + ` is required? https://review.coreboot.org/c/coreboot/+/56750/25/src/include/sar.h#30 sar_table will have data for both WRDS and EWRD. So it will be 1 + sar->dsar_set_count. https://review.coreboot.org/c/coreboot/+/56750/comment/99959d2c_4f5bc5a6 PS25, Line 99: void * > a `uint8_t *` should be able to cast to anything, this can be: […] Done https://review.coreboot.org/c/coreboot/+/56750/comment/aed7bf64_5d84ff51 PS25, Line 220: !strncmp(sar_str, SAR_STR_PREFIX, SAR_STR_PREFIX_SIZE) != 0 > extra `!` at the beginning […] Done Typo :( updated thanks -- To view, visit https://review.coreboot.org/c/coreboot/+/56750 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I08c3f321938eba04e8bcff4d87cb215422715bb2 Gerrit-Change-Number: 56750 Gerrit-PatchSet: 26 Gerrit-Owner: Sugnan Prabhu S <sugnan.prabhu.s(a)intel.com> Gerrit-Reviewer: Furquan Shaikh <furquan(a)google.com> Gerrit-Reviewer: Tim Wawrzynczak <twawrzynczak(a)chromium.org> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Dtrain Hsu <dtrain_hsu(a)compal.corp-partner.google.com> Gerrit-CC: Jamie Chen <jamie.chen(a)intel.com> Gerrit-CC: Janiex Tu <janiex.tu(a)intel.corp-partner.google.com> Gerrit-CC: Matt Chen <matt.chen(a)intel.corp-partner.google.com> Gerrit-CC: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-CC: Rizwan Qureshi <rizwan.qureshi(a)intel.com> Gerrit-CC: Simon Yang <simon1.yang(a)intel.com> Gerrit-Attention: Furquan Shaikh <furquan(a)google.com> Gerrit-Attention: Tim Wawrzynczak <twawrzynczak(a)chromium.org> Gerrit-Attention: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-Comment-Date: Thu, 02 Sep 2021 00:39:03 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: Tim Wawrzynczak <twawrzynczak(a)chromium.org> Gerrit-MessageType: comment

1 0

Change in coreboot[master]: wifi: Add support for new revisions of SAR table entries
by Sugnan Prabhu S (Code Review) 02 Sep '21

02 Sep '21

Attention is currently required from: Furquan Shaikh, Sugnan Prabhu S, Paul Menzel. Hello build bot (Jenkins), Furquan Shaikh, Tim Wawrzynczak, I'd like you to reexamine a change. Please visit https://review.coreboot.org/c/coreboot/+/56750 to look at the new patch set (#26). Change subject: wifi: Add support for new revisions of SAR table entries ...................................................................... wifi: Add support for new revisions of SAR table entries Existing SAR infrastructure supports only revision 0 of the SAR tables. This patch modifies it to extend support for intel wifi 6 and wifi 6e configurations as per the connectivity document: 559910_Intel_Connectivity_Platforms_BIOS_Guidelines_Rev6_4.pdf The SAR table and WGDS configuration block sizes were static in the legacy SAR file format. Following is the format of the new binary file. +------------------------------------------------------------+ | Field | Size | Description | +------------------------------------------------------------+ | Marker | 4 bytes | "$SAR" | +------------------------------------------------------------+ | Version | 1 byte | Current version = 1 | +------------------------------------------------------------+ | SAR table | 2 bytes | Offset of SAR table from start of | | offset | | the header | +------------------------------------------------------------+ | WGDS | 2 bytes | Offset of WGDS table from start of | | offset | | the header | +------------------------------------------------------------+ | Data | n bytes | Data for the different tables | +------------------------------------------------------------+ This change supports both the legacy and the new format of SAR file BUG=b:193665559 TEST=Checked the SSDT entries for WRDS, EWRD and WGDS with different binaries generated by setting different versions in the config.star Change-Id: I08c3f321938eba04e8bcff4d87cb215422715bb2 Signed-off-by: Sugnan Prabhu S <sugnan.prabhu.s(a)intel.com> --- M src/drivers/wifi/generic/acpi.c M src/include/sar.h M src/vendorcode/google/chromeos/sar.c 3 files changed, 385 insertions(+), 136 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/50/56750/26 -- To view, visit https://review.coreboot.org/c/coreboot/+/56750 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I08c3f321938eba04e8bcff4d87cb215422715bb2 Gerrit-Change-Number: 56750 Gerrit-PatchSet: 26 Gerrit-Owner: Sugnan Prabhu S <sugnan.prabhu.s(a)intel.com> Gerrit-Reviewer: Furquan Shaikh <furquan(a)google.com> Gerrit-Reviewer: Tim Wawrzynczak <twawrzynczak(a)chromium.org> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Dtrain Hsu <dtrain_hsu(a)compal.corp-partner.google.com> Gerrit-CC: Jamie Chen <jamie.chen(a)intel.com> Gerrit-CC: Janiex Tu <janiex.tu(a)intel.corp-partner.google.com> Gerrit-CC: Matt Chen <matt.chen(a)intel.corp-partner.google.com> Gerrit-CC: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-CC: Rizwan Qureshi <rizwan.qureshi(a)intel.com> Gerrit-CC: Simon Yang <simon1.yang(a)intel.com> Gerrit-Attention: Furquan Shaikh <furquan(a)google.com> Gerrit-Attention: Sugnan Prabhu S <sugnan.prabhu.s(a)intel.com> Gerrit-Attention: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-MessageType: newpatchset

1 0

Change in coreboot[master]: drivers/mipi: Make orientation a property of the mainboard, not panel
by Yu-Ping Wu (Code Review) 02 Sep '21

02 Sep '21

Attention is currently required from: Hung-Te Lin, Paul Menzel, Julius Werner. Yu-Ping Wu has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/57324 ) Change subject: drivers/mipi: Make orientation a property of the mainboard, not panel ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://review.coreboot.org/c/coreboot/+/57324 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: If2b716aa4dae036515730c12961fdd8a9ac34753 Gerrit-Change-Number: 57324 Gerrit-PatchSet: 4 Gerrit-Owner: Julius Werner <jwerner(a)chromium.org> Gerrit-Reviewer: Hung-Te Lin <hungte(a)chromium.org> Gerrit-Reviewer: Yu-Ping Wu <yupingso(a)google.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-Attention: Hung-Te Lin <hungte(a)chromium.org> Gerrit-Attention: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-Attention: Julius Werner <jwerner(a)chromium.org> Gerrit-Comment-Date: Thu, 02 Sep 2021 00:32:22 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in coreboot[master]: tests: Add lib/cbfs-verification-test test case
by Julius Werner (Code Review) 02 Sep '21

02 Sep '21

Julius Werner has submitted this change. ( https://review.coreboot.org/c/coreboot/+/56601 ) Change subject: tests: Add lib/cbfs-verification-test test case ...................................................................... tests: Add lib/cbfs-verification-test test case This commit adds test case for lib/cbfs verification mechanisms. Signed-off-by: Jakub Czapiga <jacz(a)semihalf.com> Change-Id: I1d8cbb1c2d0a9db3236de065428b70a9c2a66330 Reviewed-on: https://review.coreboot.org/c/coreboot/+/56601 Reviewed-by: Julius Werner <jwerner(a)chromium.org> Reviewed-by: Paul Fagerburg <pfagerburg(a)chromium.org> Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> --- A tests/include/tests/lib/cbfs_util.h M tests/lib/Makefile.inc A tests/lib/cbfs-verification-test.c A tests/mock/cbfs_file_mock.c A tests/stubs/die.c 5 files changed, 392 insertions(+), 0 deletions(-) Approvals: build bot (Jenkins): Verified Julius Werner: Looks good to me, approved Paul Fagerburg: Looks good to me, approved diff --git a/tests/include/tests/lib/cbfs_util.h b/tests/include/tests/lib/cbfs_util.h new file mode 100644 index 0000000..ebf2fb8 --- /dev/null +++ b/tests/include/tests/lib/cbfs_util.h @@ -0,0 +1,102 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +#ifndef TESTS_LIB_CBFS_UTIL_H +#define TESTS_LIB_CBFS_UTIL_H + +#include <cbfs.h> +#include <symbols.h> +#include <tests/test.h> + +#define BE32(be32) EMPTY_WRAP(\ + ((be32) >> 24) & 0xff, ((be32) >> 16) & 0xff, \ + ((be32) >> 8) & 0xff, ((be32) >> 0) & 0xff) + +#define BE64(be64) EMPTY_WRAP( \ + BE32(((be64) >> 32) & 0xFFFFFFFF), \ + BE32(((be64) >> 0) & 0xFFFFFFFF)) + +#define FILENAME_SIZE 16 + +struct cbfs_test_file { + struct cbfs_file header; + u8 filename[FILENAME_SIZE]; + u8 attrs_and_data[200]; +}; + +#define TEST_CBFS_CACHE_SIZE (2 * MiB) +#define TEST_MCACHE_SIZE (2 * MiB) + +#define HEADER_INITIALIZER(ftype, attr_len, file_len) { \ + .magic = CBFS_FILE_MAGIC, \ + .len = cpu_to_be32(file_len), \ + .type = cpu_to_be32(ftype), \ + .attributes_offset = \ + cpu_to_be32(attr_len ? sizeof(struct cbfs_file) + FILENAME_SIZE : 0), \ + .offset = cpu_to_be32(sizeof(struct cbfs_file) + FILENAME_SIZE + attr_len), \ +} + +#define HASH_ATTR_SIZE (offsetof(struct cbfs_file_attr_hash, hash.raw) + VB2_SHA256_DIGEST_SIZE) + +/* This macro basically does nothing but suppresses linter messages */ +#define EMPTY_WRAP(...) __VA_ARGS__ + +#define TEST_DATA_1_FILENAME "test/data/1" +#define TEST_DATA_1_SIZE sizeof((u8[]){TEST_DATA_1}) +#define TEST_DATA_1 EMPTY_WRAP( \ + '!', '"', '#', '$', '%', '&', '\'', '(', ')', '*', '+', ',', '-', '.', '/', \ + '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', ':', ';', '<', '=', '>', '?', '@', \ + 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', \ + 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', \ + '[', '\\', ']', '^', '_', '`', \ + 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', \ + 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z') + +#define TEST_DATA_2_FILENAME "test/data/2" +#define TEST_DATA_2_SIZE sizeof((u8[]){TEST_DATA_2}) +#define TEST_DATA_2 EMPTY_WRAP( \ + 0x9d, 0xa9, 0x91, 0xac, 0x5d, 0xb2, 0x70, 0x76, 0x37, 0x94, 0x94, 0xa8, 0x8b, 0x78, \ + 0xb9, 0xaa, 0x1a, 0x8e, 0x9a, 0x16, 0xbe, 0xdc, 0x29, 0x42, 0x46, 0x58, 0xd4, 0x37, \ + 0x94, 0xca, 0x05, 0xdb, 0x54, 0xfa, 0xd8, 0x6e, 0x54, 0xd8, 0x30, 0x46, 0x5d, 0x62, \ + 0xc2, 0xce, 0xd8, 0x74, 0x60, 0xaf, 0x83, 0x8f, 0xfa, 0x97, 0xdd, 0x6e, 0xcb, 0x60, \ + 0xfa, 0xed, 0x8b, 0x55, 0x9e, 0xc1, 0xc2, 0x18, 0x4f, 0xe2, 0x28, 0x7e, 0xd7, 0x2f, \ + 0xa2, 0x86, 0xfb, 0x4d, 0x3e, 0x00, 0x5a, 0xf7, 0xc2, 0xad, 0x0e, 0xa7, 0xa2, 0xf7, \ + 0x38, 0x66, 0xe6, 0x5c, 0x76, 0x98, 0x89, 0x63, 0xeb, 0xc5, 0xf5, 0xb7, 0xa7, 0x58, \ + 0xe0, 0xf0, 0x2e, 0x2f, 0xb0, 0x95, 0xb7, 0x43, 0x28, 0x19, 0x2d, 0xef, 0x1a, 0xb3, \ + 0x42, 0x31, 0x55, 0x0f, 0xbc, 0xcd, 0x01, 0xe5, 0x39, 0x18, 0x88, 0x83, 0xb2, 0xc5, \ + 0x4b, 0x3b, 0x38, 0xe7) + +#define TEST_DATA_INT_1_FILENAME "test-int-1" +#define TEST_DATA_INT_1_SIZE 8 +#define TEST_DATA_INT_1 0xFEDCBA9876543210ULL + +#define TEST_DATA_INT_2_FILENAME "test-int-2" +#define TEST_DATA_INT_2_SIZE 8 +#define TEST_DATA_INT_2 0x10FE32DC54A97698ULL + +#define TEST_DATA_INT_3_FILENAME "test-int-3" +#define TEST_DATA_INT_3_SIZE 8 +#define TEST_DATA_INT_3 0xFA57F003B0036667ULL + +#define TEST_SHA256 EMPTY_WRAP( \ + 0xef, 0xc7, 0xb1, 0x0a, 0xbf, 0x54, 0x2f, 0xaa, 0x12, 0xa6, 0xeb, 0xf, 0xff, 0xf4, \ + 0x19, 0xc1, 0x63, 0xf4, 0x60, 0x50, 0xc5, 0xb0, 0xbe, 0x37, 0x32, 0x11, 0x19, 0x63, \ + 0x61, 0xe0, 0x53, 0xe0) + +#define INVALID_SHA256 EMPTY_WRAP( \ + 'T', 'h', 'i', 's', ' ', 'i', 's', ' ', 'n', 'o', 't', ' ', 'a', ' ', \ + 'v', 'a', 'l', 'i', 'd', ' ', 'S', 'H', 'A', '2', '5', '6', '!', '!', \ + '!', '!', '!', '!') + +extern const u8 test_data_1[TEST_DATA_1_SIZE]; +extern const u8 test_data_2[TEST_DATA_2_SIZE]; +extern const u8 test_data_int_1[TEST_DATA_INT_1_SIZE]; +extern const u8 test_data_int_2[TEST_DATA_INT_2_SIZE]; +extern const u8 test_data_int_3[TEST_DATA_INT_3_SIZE]; + +extern const u8 good_hash[VB2_SHA256_DIGEST_SIZE]; +extern const u8 bad_hash[VB2_SHA256_DIGEST_SIZE]; + +extern const struct cbfs_test_file file_no_hash; +extern const struct cbfs_test_file file_valid_hash; +extern const struct cbfs_test_file file_broken_hash; + +#endif /* TESTS_LIB_CBFS_UTIL_H */ diff --git a/tests/lib/Makefile.inc b/tests/lib/Makefile.inc index 45cef1b..44679eb 100644 --- a/tests/lib/Makefile.inc +++ b/tests/lib/Makefile.inc @@ -32,6 +32,10 @@ tests-y += spd_cache-ddr4-test tests-y += cbmem_stage_cache-test tests-y += libgcc-test +tests-y += cbfs-verification-no-sha512-test +tests-y += cbfs-verification-has-sha512-test +tests-y += cbfs-no-verification-no-sha512-test +tests-y += cbfs-no-verification-has-sha512-test string-test-srcs += tests/lib/string-test.c string-test-srcs += src/lib/string.c @@ -176,3 +180,31 @@ cbmem_stage_cache-test-config += CONFIG_CBMEM_STAGE_CACHE=1 libgcc-test-srcs += tests/lib/libgcc-test.c + +# CBFS varification tests are compiled with CONFIG_CBFS_VERIFICATION +# and VB2_SUPPORT_SHA512 set and unset. Code should work with and without +# verification and with hash structure of different sizes. +cbfs-verification-no-sha512-test-stage := bootblock +cbfs-verification-no-sha512-test-srcs := tests/lib/cbfs-verification-test.c \ + tests/stubs/console.c \ + tests/stubs/die.c \ + tests/mock/cbfs_file_mock.c \ + src/lib/cbfs.c \ + src/commonlib/bsd/cbfs_private.c \ + src/commonlib/mem_pool.c \ + src/commonlib/region.c +cbfs-verification-no-sha512-test-mocks += cbfs_get_boot_device cbfs_lookup +cbfs-verification-no-sha512-test-config += CONFIG_COLLECT_TIMESTAMPS=0 \ + CONFIG_CBFS_VERIFICATION=1 \ + CONFIG_NO_CBFS_MCACHE=1 \ + VB2_SUPPORT_SHA512=0 + +$(call copy-test,cbfs-verification-no-sha512-test,cbfs-verification-has-sha512-test) +cbfs-verification-has-sha512-test-config += VB2_SUPPORT_SHA512=1 + +$(call copy-test,cbfs-verification-no-sha512-test,cbfs-no-verification-no-sha512-test) +cbfs-no-verification-no-sha512-test-config += CONFIG_CBFS_VERIFICATION=0 + +$(call copy-test,cbfs-verification-no-sha512-test,cbfs-no-verification-has-sha512-test) +cbfs-no-verification-has-sha512-test-config += CONFIG_CBFS_VERIFICATION=0 \ + VB2_SUPPORT_SHA512=1 diff --git a/tests/lib/cbfs-verification-test.c b/tests/lib/cbfs-verification-test.c new file mode 100644 index 0000000..3f35739 --- /dev/null +++ b/tests/lib/cbfs-verification-test.c @@ -0,0 +1,196 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +#include <cbfs.h> +#include <commonlib/region.h> +#include <string.h> +#include <tests/lib/cbfs_util.h> +#include <tests/test.h> + + +/* Mocks */ + +static struct cbfs_boot_device cbd; + +const struct cbfs_boot_device *cbfs_get_boot_device(bool force_ro) +{ + check_expected(force_ro); + return &cbd; +} + +size_t vb2_digest_size(enum vb2_hash_algorithm hash_alg) +{ + if (hash_alg != VB2_HASH_SHA256) { + fail_msg("Unsupported hash algorithm: %d\n", hash_alg); + return 0; + } + + return VB2_SHA256_DIGEST_SIZE; +} + +vb2_error_t vb2_hash_verify(const void *buf, uint32_t size, const struct vb2_hash *hash) +{ + check_expected_ptr(buf); + check_expected(size); + assert_int_equal(hash->algo, VB2_HASH_SHA256); + + if (!memcmp(hash->sha256, good_hash, sizeof(good_hash))) + return VB2_SUCCESS; + + if (!memcmp(hash->sha256, bad_hash, sizeof(bad_hash))) + return VB2_ERROR_SHA_MISMATCH; + + fail_msg("%s called with bad hash", __func__); + return VB2_ERROR_SHA_MISMATCH; +} + +size_t ulzman(const void *src, size_t srcn, void *dst, size_t dstn) +{ + fail_msg("Unexpected call to %s", __func__); + return 0; +} + +size_t ulz4fn(const void *src, size_t srcn, void *dst, size_t dstn) +{ + fail_msg("Unexpected call to %s", __func__); + return 0; +} + +vb2_error_t vb2_digest_init(struct vb2_digest_context *dc, enum vb2_hash_algorithm hash_alg) +{ + if (hash_alg != VB2_HASH_SHA256) { + fail_msg("Unsupported hash algorithm: %d\n", hash_alg); + return VB2_ERROR_SHA_INIT_ALGORITHM; + } + + return VB2_SUCCESS; +} + +vb2_error_t vb2_digest_extend(struct vb2_digest_context *dc, const uint8_t *buf, uint32_t size) +{ + check_expected(buf); + check_expected(size); + return VB2_SUCCESS; +} + +vb2_error_t vb2_digest_finalize(struct vb2_digest_context *dc, uint8_t *digest, uint32_t size) +{ + memcpy(digest, mock_ptr_type(void *), size); + return VB2_SUCCESS; +} + +/* Original function alias created by test framework. Used for call wrapping in mock below. */ +cb_err_t __real_cbfs_lookup(cbfs_dev_t dev, const char *name, union cbfs_mdata *mdata_out, + size_t *data_offset_out, struct vb2_hash *metadata_hash); + +cb_err_t cbfs_lookup(cbfs_dev_t dev, const char *name, union cbfs_mdata *mdata_out, + size_t *data_offset_out, struct vb2_hash *metadata_hash) +{ + const cb_err_t err = + __real_cbfs_lookup(dev, name, mdata_out, data_offset_out, metadata_hash); + assert_int_equal(mock_type(cb_err_t), err); + return err; +} + +/* Tests */ + +static int setup_test_cbfs(void **state) +{ + memset(&cbd, 0, sizeof(cbd)); + return 0; +} + +static void test_cbfs_map_no_hash(void **state) +{ + void *mapping = NULL; + assert_int_equal(0, rdev_chain_mem(&cbd.rdev, &file_no_hash, sizeof(file_no_hash))); + + if (CONFIG(CBFS_VERIFICATION)) { + /* File with no hash. No hash causes hash mismatch by default, + so mapping will not be completed successfully. */ + expect_value(cbfs_get_boot_device, force_ro, false); + will_return(cbfs_lookup, CB_SUCCESS); + mapping = cbfs_map(TEST_DATA_1_FILENAME, NULL); + assert_null(mapping); + } else { + expect_value(cbfs_get_boot_device, force_ro, false); + will_return(cbfs_lookup, CB_SUCCESS); + mapping = cbfs_map(TEST_DATA_1_FILENAME, NULL); + assert_ptr_equal(mapping, file_no_hash.attrs_and_data); + } +} + +static void test_cbfs_map_valid_hash(void **state) +{ + void *mapping = NULL; + assert_int_equal(0, + rdev_chain_mem(&cbd.rdev, &file_valid_hash, sizeof(file_valid_hash))); + + if (CONFIG(CBFS_VERIFICATION)) { + expect_value(cbfs_get_boot_device, force_ro, false); + expect_value(vb2_hash_verify, buf, + &file_valid_hash.attrs_and_data[HASH_ATTR_SIZE]); + expect_value(vb2_hash_verify, size, TEST_DATA_1_SIZE); + will_return(cbfs_lookup, CB_SUCCESS); + mapping = cbfs_map(TEST_DATA_1_FILENAME, NULL); + assert_ptr_equal(mapping, &file_valid_hash.attrs_and_data[HASH_ATTR_SIZE]); + } else { + expect_value(cbfs_get_boot_device, force_ro, false); + will_return(cbfs_lookup, CB_SUCCESS); + mapping = cbfs_map(TEST_DATA_1_FILENAME, NULL); + assert_ptr_equal(mapping, &file_valid_hash.attrs_and_data[HASH_ATTR_SIZE]); + } +} + +static void test_cbfs_map_invalid_hash(void **state) +{ + void *mapping = NULL; + assert_int_equal( + 0, rdev_chain_mem(&cbd.rdev, &file_broken_hash, sizeof(file_broken_hash))); + + if (CONFIG(CBFS_VERIFICATION)) { + expect_value(cbfs_get_boot_device, force_ro, false); + expect_value(vb2_hash_verify, buf, + &file_broken_hash.attrs_and_data[HASH_ATTR_SIZE]); + expect_value(vb2_hash_verify, size, TEST_DATA_1_SIZE); + will_return(cbfs_lookup, CB_SUCCESS); + mapping = cbfs_map(TEST_DATA_1_FILENAME, NULL); + assert_null(mapping); + } else { + expect_value(cbfs_get_boot_device, force_ro, false); + will_return(cbfs_lookup, CB_SUCCESS); + mapping = cbfs_map(TEST_DATA_1_FILENAME, NULL); + assert_ptr_equal(mapping, &file_broken_hash.attrs_and_data[HASH_ATTR_SIZE]); + } +} + +void test_init_boot_device_verify(void **state) +{ + struct vb2_hash hash = {.algo = VB2_HASH_SHA256}; + const uint8_t hash_value[VB2_SHA256_DIGEST_SIZE] = {0}; + memset(&cbd, 0, sizeof(cbd)); + assert_int_equal(0, + rdev_chain_mem(&cbd.rdev, &file_valid_hash, sizeof(file_valid_hash))); + + if (CONFIG(CBFS_VERIFICATION)) { + expect_memory(vb2_digest_extend, buf, &file_valid_hash, + be32_to_cpu(file_valid_hash.header.offset)); + expect_value(vb2_digest_extend, size, + be32_to_cpu(file_valid_hash.header.offset)); + will_return(vb2_digest_finalize, hash_value); + } + + assert_int_equal(CB_SUCCESS, cbfs_init_boot_device(&cbd, &hash)); +} + +int main(void) +{ + const struct CMUnitTest tests[] = { + cmocka_unit_test_setup(test_cbfs_map_no_hash, setup_test_cbfs), + cmocka_unit_test_setup(test_cbfs_map_valid_hash, setup_test_cbfs), + cmocka_unit_test_setup(test_cbfs_map_invalid_hash, setup_test_cbfs), + + cmocka_unit_test(test_init_boot_device_verify), + }; + + return cb_run_group_tests(tests, NULL, NULL); +} diff --git a/tests/mock/cbfs_file_mock.c b/tests/mock/cbfs_file_mock.c new file mode 100644 index 0000000..a4feb61 --- /dev/null +++ b/tests/mock/cbfs_file_mock.c @@ -0,0 +1,46 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +#include <tests/lib/cbfs_util.h> + +TEST_REGION(cbfs_cache, TEST_CBFS_CACHE_SIZE); + +const u8 test_data_1[TEST_DATA_1_SIZE] = { TEST_DATA_1 }; +const u8 test_data_2[TEST_DATA_2_SIZE] = { TEST_DATA_2 }; +const u8 test_data_int_1[TEST_DATA_INT_1_SIZE] = { BE64(TEST_DATA_INT_1) }; +const u8 test_data_int_2[TEST_DATA_INT_2_SIZE] = { BE64(TEST_DATA_INT_2) }; +const u8 test_data_int_3[TEST_DATA_INT_3_SIZE] = { BE64(TEST_DATA_INT_3) }; + +const u8 good_hash[VB2_SHA256_DIGEST_SIZE] = { TEST_SHA256 }; +const u8 bad_hash[VB2_SHA256_DIGEST_SIZE] = { INVALID_SHA256 }; + +const struct cbfs_test_file file_no_hash = { + .header = HEADER_INITIALIZER(CBFS_TYPE_RAW, 0, TEST_DATA_1_SIZE), + .filename = TEST_DATA_1_FILENAME, + .attrs_and_data = { + TEST_DATA_1, + }, +}; + +const struct cbfs_test_file file_valid_hash = { + .header = HEADER_INITIALIZER(CBFS_TYPE_RAW, HASH_ATTR_SIZE, TEST_DATA_1_SIZE), + .filename = TEST_DATA_1_FILENAME, + .attrs_and_data = { + BE32(CBFS_FILE_ATTR_TAG_HASH), + BE32(HASH_ATTR_SIZE), + BE32(VB2_HASH_SHA256), + TEST_SHA256, + TEST_DATA_1, + }, +}; + +const struct cbfs_test_file file_broken_hash = { + .header = HEADER_INITIALIZER(CBFS_TYPE_RAW, HASH_ATTR_SIZE, TEST_DATA_1_SIZE), + .filename = TEST_DATA_1_FILENAME, + .attrs_and_data = { + BE32(CBFS_FILE_ATTR_TAG_HASH), + BE32(HASH_ATTR_SIZE), + BE32(VB2_HASH_SHA256), + INVALID_SHA256, + TEST_DATA_1, + }, +}; diff --git a/tests/stubs/die.c b/tests/stubs/die.c new file mode 100644 index 0000000..84bb401 --- /dev/null +++ b/tests/stubs/die.c @@ -0,0 +1,16 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +#include <stdarg.h> +#include <stdio.h> +#include <tests/test.h> + +void die(const char *msg, ...) +{ + /* die() can be called in middle a function, so we should not allow for it to return */ + static char msg_buf[256]; + va_list v; + va_start(v, msg); + vsnprintf(msg_buf, ARRAY_SIZE(msg_buf), msg, v); + va_end(v); + fail_msg("%s", msg_buf); +} -- To view, visit https://review.coreboot.org/c/coreboot/+/56601 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I1d8cbb1c2d0a9db3236de065428b70a9c2a66330 Gerrit-Change-Number: 56601 Gerrit-PatchSet: 12 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: Paul Fagerburg <pfagerburg(a)chromium.org> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Patrick Georgi <pgeorgi(a)google.com> Gerrit-CC: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-MessageType: merged

1 0

Change in coreboot[master]: tests: Add lib/cbfs-verification-test test case
by Julius Werner (Code Review) 02 Sep '21

02 Sep '21

Attention is currently required from: Jakub Czapiga, Jan Dabros. Julius Werner has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/56601 ) Change subject: tests: Add lib/cbfs-verification-test test case ...................................................................... Patch Set 11: (1 comment) File tests/include/tests/lib/cbfs_util.h: https://review.coreboot.org/c/coreboot/+/56601/comment/103697b7_9a944841 PS8, Line 74: TEST_REGION(cbfs_cache, TEST_CBFS_CACHE_SIZE); > Julius, all good here? Done -- To view, visit https://review.coreboot.org/c/coreboot/+/56601 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I1d8cbb1c2d0a9db3236de065428b70a9c2a66330 Gerrit-Change-Number: 56601 Gerrit-PatchSet: 11 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: Paul Fagerburg <pfagerburg(a)chromium.org> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Patrick Georgi <pgeorgi(a)google.com> Gerrit-CC: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-Attention: Jakub Czapiga <jacz(a)semihalf.com> Gerrit-Attention: Jan Dabros <jsd(a)semihalf.com> Gerrit-Comment-Date: Thu, 02 Sep 2021 00:30:56 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: Patrick Georgi <pgeorgi(a)google.com> Comment-In-Reply-To: Jakub Czapiga <jacz(a)semihalf.com> Comment-In-Reply-To: Julius Werner <jwerner(a)chromium.org> Gerrit-MessageType: comment

1 0

Change in coreboot[master]: drivers/mipi: Make orientation a property of the mainboard, not panel
by Julius Werner (Code Review) 02 Sep '21

02 Sep '21

Attention is currently required from: Hung-Te Lin, Paul Menzel, Yu-Ping Wu. Hello Hung-Te Lin, build bot (Jenkins), Yu-Ping Wu, I'd like you to reexamine a change. Please visit https://review.coreboot.org/c/coreboot/+/57324 to look at the new patch set (#4). Change subject: drivers/mipi: Make orientation a property of the mainboard, not panel ...................................................................... drivers/mipi: Make orientation a property of the mainboard, not panel It doesn't make sense to store the orientation field directly in the panel information structure, which is supposed to be reuseable between different boards. The thing that determines orientation is how that panel is built into the board in question, which only the board itself can know. The same portrait panel could be rotated left to be used as landscape in one board and rotated right to be used as landscape in another. This patch moves the orientation field out of the panel structure back into the mainboards to reflect this. Signed-off-by: Julius Werner <jwerner(a)chromium.org> Change-Id: If2b716aa4dae036515730c12961fdd8a9ac34753 --- M src/drivers/mipi/panel-AUO_B101UAN08_3.c M src/drivers/mipi/panel-AUO_KD101N80_45NA.c M src/drivers/mipi/panel-BOE_TV101WUM_N53.c M src/drivers/mipi/panel-BOE_TV101WUM_NL6.c M src/drivers/mipi/panel-BOE_TV105WUM_NW0.c M src/drivers/mipi/panel-CMN_P097PFG_SSD2858.c M src/drivers/mipi/panel-STA_2081101QFH032011_53G.c M src/drivers/mipi/panel-VIS_RM69299.c M src/include/mipi/panel.h M src/mainboard/google/kukui/mainboard.c M src/mainboard/google/kukui/panel.h M src/mainboard/google/kukui/panel_anx7625.c M src/mainboard/google/kukui/panel_flapjack.c M src/mainboard/google/kukui/panel_kakadu.c M src/mainboard/google/kukui/panel_katsu.c M src/mainboard/google/kukui/panel_kodama.c M src/mainboard/google/kukui/panel_krane.c M src/mainboard/google/kukui/panel_kukui.c M src/mainboard/google/kukui/panel_ps8640.c M src/mainboard/google/trogdor/mainboard.c 20 files changed, 23 insertions(+), 34 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/24/57324/4 -- To view, visit https://review.coreboot.org/c/coreboot/+/57324 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: If2b716aa4dae036515730c12961fdd8a9ac34753 Gerrit-Change-Number: 57324 Gerrit-PatchSet: 4 Gerrit-Owner: Julius Werner <jwerner(a)chromium.org> Gerrit-Reviewer: Hung-Te Lin <hungte(a)chromium.org> Gerrit-Reviewer: Yu-Ping Wu <yupingso(a)google.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-Attention: Hung-Te Lin <hungte(a)chromium.org> Gerrit-Attention: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-Attention: Yu-Ping Wu <yupingso(a)google.com> Gerrit-MessageType: newpatchset

1 0

Change in coreboot[master]: drivers/mipi: Make orientation a property of the mainboard, not the p...
by Julius Werner (Code Review) 02 Sep '21

02 Sep '21

Attention is currently required from: Hung-Te Lin, Paul Menzel, Yu-Ping Wu. Julius Werner has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/57324 ) Change subject: drivers/mipi: Make orientation a property of the mainboard, not the panel ...................................................................... Patch Set 3: (2 comments) Commit Message: https://review.coreboot.org/c/coreboot/+/57324/comment/e09a1775_2d64d663 PS3, Line 7: drivers/mipi: Make orientation a property of the mainboard, not the panel > Line too long Done File src/mainboard/google/trogdor/mainboard.c: https://review.coreboot.org/c/coreboot/+/57324/comment/cb31801e_1d7f9ecf PS3, Line 144: panel > Just a note that by removing 'static' from edp_panel, we need to make sure this pointer won't be ref […] Yeah I honestly don't really know why I made it static in the first place... I think I just wanted to have the static initializer in the if-block, but in hindsight that was a really ugly way to do that. It's not used outside of this function. -- To view, visit https://review.coreboot.org/c/coreboot/+/57324 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: If2b716aa4dae036515730c12961fdd8a9ac34753 Gerrit-Change-Number: 57324 Gerrit-PatchSet: 3 Gerrit-Owner: Julius Werner <jwerner(a)chromium.org> Gerrit-Reviewer: Hung-Te Lin <hungte(a)chromium.org> Gerrit-Reviewer: Yu-Ping Wu <yupingso(a)google.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-Attention: Hung-Te Lin <hungte(a)chromium.org> Gerrit-Attention: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-Attention: Yu-Ping Wu <yupingso(a)google.com> Gerrit-Comment-Date: Thu, 02 Sep 2021 00:24:21 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: Yu-Ping Wu <yupingso(a)google.com> Gerrit-MessageType: comment

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

coreboot-gerrit September 2021