coreboot-gerrit April 2024

coreboot-gerrit@coreboot.org

1 participants
3292 discussions

[XS] Change in coreboot[main]: mb/google/brya: Enable UFS driver for edk2 payload
by Felix Held (Code Review) 17 Apr '24

17 Apr '24

Felix Held has submitted this change. ( https://review.coreboot.org/c/coreboot/+/81871?usp=email ) Change subject: mb/google/brya: Enable UFS driver for edk2 payload ...................................................................... mb/google/brya: Enable UFS driver for edk2 payload Several brya-based boards use UFS for storage, so enable the edk2 UFS driver when using the edk2 payload. TEST=build/boot google/brya (banshee, craaskov), verify internal boot media functional with edk2 payload. Change-Id: I3dc018582e974bf73c7668f78da9b81eeb038c01 Signed-off-by: Matt DeVillier <matt.devillier(a)gmail.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/81871 Reviewed-by: Paul Menzel <paulepanter(a)mailbox.org> Reviewed-by: Varshit Pandya <pandyavarshit(a)gmail.com> Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: Eric Lai <ericllai(a)google.com> --- M src/mainboard/google/brya/Kconfig 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: build bot (Jenkins): Verified Paul Menzel: Looks good to me, but someone else must approve Varshit Pandya: Looks good to me, but someone else must approve Eric Lai: Looks good to me, approved diff --git a/src/mainboard/google/brya/Kconfig b/src/mainboard/google/brya/Kconfig index 77263e4..517e4bc 100644 --- a/src/mainboard/google/brya/Kconfig +++ b/src/mainboard/google/brya/Kconfig @@ -22,6 +22,7 @@ select EC_GOOGLE_CHROMEEC_BOARDID select EC_GOOGLE_CHROMEEC_ESPI select EC_GOOGLE_CHROMEEC_SKUID + select EDK2_UFS_ENABLE if EDK2_REPO_MRCHROMEBOX select ENABLE_TCSS_USB_DETECTION if !CHROMEOS select FW_CONFIG select FW_CONFIG_SOURCE_CHROMEEC_CBI -- To view, visit https://review.coreboot.org/c/coreboot/+/81871?usp=email To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: main Gerrit-Change-Id: I3dc018582e974bf73c7668f78da9b81eeb038c01 Gerrit-Change-Number: 81871 Gerrit-PatchSet: 3 Gerrit-Owner: Matt DeVillier <matt.devillier(a)gmail.com> Gerrit-Reviewer: Dinesh Gehlot <digehlot(a)google.com> Gerrit-Reviewer: Eric Lai <ericllai(a)google.com> Gerrit-Reviewer: Felix Held <felix-coreboot(a)felixheld.de> Gerrit-Reviewer: Kapil Porwal <kapilporwal(a)google.com> Gerrit-Reviewer: Nick Vaccaro <nvaccaro(a)chromium.org> Gerrit-Reviewer: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-Reviewer: Subrata Banik <subratabanik(a)google.com> Gerrit-Reviewer: Varshit Pandya <pandyavarshit(a)gmail.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-MessageType: merged

1 0

[XS] Change in coreboot[main]: mb/google/zork: Enable eMMC driver for edk2 payload
by Felix Held (Code Review) 17 Apr '24

17 Apr '24

Felix Held has submitted this change. ( https://review.coreboot.org/c/coreboot/+/81893?usp=email ) Change subject: mb/google/zork: Enable eMMC driver for edk2 payload ...................................................................... mb/google/zork: Enable eMMC driver for edk2 payload Several zork-based boards use eMMC for storage, so enable the edk2 eMMC driver when using the edk2 payload. TEST=build/boot google/zork (morphius, vilboz), verify internal boot media (both eMMC and NVMe) functional with edk2 payload. Change-Id: Ib7e98f309594554dbcf1ddd875d47c89bd9e0e44 Signed-off-by: Matt DeVillier <matt.devillier(a)gmail.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/81893 Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: Felix Held <felix-coreboot(a)felixheld.de> --- M src/mainboard/google/zork/Kconfig 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: build bot (Jenkins): Verified Felix Held: Looks good to me, approved diff --git a/src/mainboard/google/zork/Kconfig b/src/mainboard/google/zork/Kconfig index 21deea7..1fcd06b 100644 --- a/src/mainboard/google/zork/Kconfig +++ b/src/mainboard/google/zork/Kconfig @@ -62,6 +62,7 @@ select EC_GOOGLE_CHROMEEC_I2C_TUNNEL select EC_GOOGLE_CHROMEEC_INCLUDE_SSFC_IN_FW_CONFIG select EC_GOOGLE_CHROMEEC_SKUID + select EDK2_PCO_MMIO_EMMC if EDK2_REPO_MRCHROMEBOX select ELOG select ELOG_BOOT_COUNT select ELOG_GSMI -- To view, visit https://review.coreboot.org/c/coreboot/+/81893?usp=email To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: main Gerrit-Change-Id: Ib7e98f309594554dbcf1ddd875d47c89bd9e0e44 Gerrit-Change-Number: 81893 Gerrit-PatchSet: 3 Gerrit-Owner: Matt DeVillier <matt.devillier(a)gmail.com> Gerrit-Reviewer: Felix Held <felix-coreboot(a)felixheld.de> Gerrit-Reviewer: Jason Nien <jason.nien(a)amd.corp-partner.google.com> Gerrit-Reviewer: Martin Roth <martin.roth(a)amd.corp-partner.google.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-MessageType: merged

1 0

[S] Change in coreboot[main]: payloads/edk2: Add Kconfig to enable AMD Picasso eMMC driver
by Felix Held (Code Review) 17 Apr '24

17 Apr '24

Felix Held has submitted this change. ( https://review.coreboot.org/c/coreboot/+/81892?usp=email ) Change subject: payloads/edk2: Add Kconfig to enable AMD Picasso eMMC driver ...................................................................... payloads/edk2: Add Kconfig to enable AMD Picasso eMMC driver Add a Kconfig to selectively enable the AMD Picasso eMMC driver recently added to MrChromebox's edk2 fork. When selected, will enable booting from AMD Picasso devices with eMMC storage. TEST=tested with rest of patch train Change-Id: I6536a6f243f6766b913e295afebcf5b965e4e969 Signed-off-by: Matt DeVillier <matt.devillier(a)gmail.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/81892 Reviewed-by: Sean Rhodes <sean(a)starlabs.systems> Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> --- M payloads/external/Makefile.mk M payloads/external/edk2/Kconfig M payloads/external/edk2/Makefile 3 files changed, 14 insertions(+), 0 deletions(-) Approvals: build bot (Jenkins): Verified Sean Rhodes: Looks good to me, approved diff --git a/payloads/external/Makefile.mk b/payloads/external/Makefile.mk index 5d385a4..13703af 100644 --- a/payloads/external/Makefile.mk +++ b/payloads/external/Makefile.mk @@ -196,6 +196,7 @@ CONFIG_INTEL_GMA_VBT_FILE=$(CONFIG_INTEL_GMA_VBT_FILE) \ CONFIG_EDK2_DISABLE_TPM=$(CONFIG_EDK2_DISABLE_TPM) \ CONFIG_EDK2_UFS_ENABLE=$(CONFIG_EDK2_UFS_ENABLE) \ + CONFIG_EDK2_PCO_MMIO_EMMC=$(CONFIG_EDK2_PCO_MMIO_EMMC) \ GCC_CC_x86_32=$(GCC_CC_x86_32) \ GCC_CC_x86_64=$(GCC_CC_x86_64) \ GCC_CC_arm=$(GCC_CC_arm) \ diff --git a/payloads/external/edk2/Kconfig b/payloads/external/edk2/Kconfig index 1216084..68eb455 100644 --- a/payloads/external/edk2/Kconfig +++ b/payloads/external/edk2/Kconfig @@ -299,6 +299,15 @@ It is needed for boards with UFS storage, but can cause issues with other boards, so should only be enabled when needed. +config EDK2_PCO_MMIO_EMMC + bool "Enable MMIO eMMC driver for AMD Picasso boards in edk2" + depends on EDK2_REPO_MRCHROMEBOX + default n + help + Select this option to enable the MMIO eMMC DXE driver in MrChromebox's fork of edk2. + It is needed for AMD Picasso boards with eMMC storage, but will conflict with the + PCI-based eMMC driver, so should only be enabled for AMD Picasso boards. + config EDK2_CUSTOM_BUILD_PARAMS string "edk2 additional custom build parameters" default "-D VARIABLE_SUPPORT=SMMSTORE" if EDK2_REPO_MRCHROMEBOX && SMMSTORE_V2 diff --git a/payloads/external/edk2/Makefile b/payloads/external/edk2/Makefile index 3b73ce8..e7f11f0 100644 --- a/payloads/external/edk2/Makefile +++ b/payloads/external/edk2/Makefile @@ -137,6 +137,10 @@ ifeq ($(CONFIG_EDK2_UFS_ENABLE),y) BUILD_STR += -D UFS_ENABLE=TRUE endif +# USE_PCO_MMIO_EMMC = FALSE +ifeq ($(CONFIG_EDK2_PCO_MMIO_EMMC),y) +BUILD_STR += -D USE_PCO_MMIO_EMMC=TRUE +endif endif -- To view, visit https://review.coreboot.org/c/coreboot/+/81892?usp=email To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: main Gerrit-Change-Id: I6536a6f243f6766b913e295afebcf5b965e4e969 Gerrit-Change-Number: 81892 Gerrit-PatchSet: 3 Gerrit-Owner: Matt DeVillier <matt.devillier(a)gmail.com> Gerrit-Reviewer: Benjamin Doron <benjamin.doron00(a)gmail.com> Gerrit-Reviewer: Felix Held <felix-coreboot(a)felixheld.de> Gerrit-Reviewer: Lean Sheng Tan <sheng.tan(a)9elements.com> Gerrit-Reviewer: Martin L Roth <gaumless(a)gmail.com> Gerrit-Reviewer: Sean Rhodes <sean(a)starlabs.systems> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-MessageType: merged

1 0

[XS] Change in coreboot[main]: lint/checkpatch: Add __aligned to the list of attribute notes
by Elyes Haouas (Code Review) 17 Apr '24

17 Apr '24

Attention is currently required from: Martin L Roth. Hello Martin L Roth, I'd like you to reexamine a change. Please visit https://review.coreboot.org/c/coreboot/+/81949?usp=email to look at the new patch set (#2). Change subject: lint/checkpatch: Add __aligned to the list of attribute notes ...................................................................... lint/checkpatch: Add __aligned to the list of attribute notes This updates the script to upstream version 6.8 https://github.com/torvalds/linux/commit/2f9dadba5ba02e1510a04ce57ebfb9e08f… Change-Id: I9274e8b5ed5ada27c290c462b0c59eccf1b0b60d Signed-off-by: Elyes Haouas <ehaouas(a)noos.fr> --- M util/lint/checkpatch.pl 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/49/81949/2 -- To view, visit https://review.coreboot.org/c/coreboot/+/81949?usp=email To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: main Gerrit-Change-Id: I9274e8b5ed5ada27c290c462b0c59eccf1b0b60d Gerrit-Change-Number: 81949 Gerrit-PatchSet: 2 Gerrit-Owner: Elyes Haouas <ehaouas(a)noos.fr> Gerrit-Reviewer: Martin L Roth <gaumless(a)gmail.com> Gerrit-CC: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Attention: Martin L Roth <gaumless(a)gmail.com> Gerrit-MessageType: newpatchset

1 0

[S] Change in coreboot[main]: WIP:amdfwtool: Add psp header backup copy
by Bao Zheng (Code Review) 17 Apr '24

17 Apr '24

Bao Zheng has restored this change. ( https://review.coreboot.org/c/coreboot/+/75682?usp=email ) Change subject: WIP:amdfwtool: Add psp header backup copy ...................................................................... Restored -- To view, visit https://review.coreboot.org/c/coreboot/+/75682?usp=email To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: main Gerrit-Change-Id: Ia5a745c86595554c83cd13a35c312c17987b716b Gerrit-Change-Number: 75682 Gerrit-PatchSet: 1 Gerrit-Owner: Bao Zheng <fishbaozi(a)gmail.com> Gerrit-Reviewer: Zheng Bao Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Stefan Reinauer <stefan.reinauer(a)coreboot.org> Gerrit-MessageType: restore

1 0

[L] Change in coreboot[main]: [WIP] Add CFR configuration frontend
by Maximilian Brune (Code Review) 17 Apr '24

17 Apr '24

Maximilian Brune has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/81972?usp=email ) Change subject: [WIP] Add CFR configuration frontend ...................................................................... [WIP] Add CFR configuration frontend Add a new tooling which makes it possible to write Kconfig files that will be parsed into CFR, which in turn will be handed off to the payload via CBMEM. Signed-off-by: Maximilian Brune <maximilian.brune(a)9elements.com> Change-Id: I5e9e9f1d2d277a182d72f5af5ca50db0ddcb20bb --- M src/commonlib/bsd/include/commonlib/bsd/cbmem_id.h M src/commonlib/include/commonlib/cfr.h M src/include/boot/tables.h M src/lib/coreboot_table.c A src/mainboard/emulation/qemu-q35/Kconfig.cfr M src/mainboard/emulation/qemu-q35/Makefile.mk M util/kconfig/Makefile A util/kconfig/cfr.c M util/kconfig/symbol.c M util/lint/lint-stable-008-kconfig 10 files changed, 801 insertions(+), 75 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/72/81972/1 diff --git a/src/commonlib/bsd/include/commonlib/bsd/cbmem_id.h b/src/commonlib/bsd/include/commonlib/bsd/cbmem_id.h index 615b8c6..1c3d0ff 100644 --- a/src/commonlib/bsd/include/commonlib/bsd/cbmem_id.h +++ b/src/commonlib/bsd/include/commonlib/bsd/cbmem_id.h @@ -90,6 +90,7 @@ #define CBMEM_ID_CSE_INFO 0x4553435F #define CBMEM_ID_CSE_BP_INFO 0x42455343 #define CBMEM_ID_AMD_OPENSIL 0x4153494C +#define CBMEM_ID_CFR 0x43465254 #define CBMEM_ID_TO_NAME_TABLE \ { CBMEM_ID_ACPI, "ACPI " }, \ diff --git a/src/commonlib/include/commonlib/cfr.h b/src/commonlib/include/commonlib/cfr.h index 2bcf817..bb2b73b 100644 --- a/src/commonlib/include/commonlib/cfr.h +++ b/src/commonlib/include/commonlib/cfr.h @@ -4,7 +4,7 @@ #define COMMONLIB_OPTION_CFR_H #include <stdint.h> -#include <types.h> +#include <commonlib/bsd/compiler.h> /* * PUBLIC API @@ -50,29 +50,53 @@ * */ +//TODO This may vary heavily depending on the mainboard/platform +#define MAX_CFR_SIZE 5000 + enum cfr_tags { - CFR_TAG_OPTION_FORM = 1, - CFR_TAG_ENUM_VALUE = 2, - CFR_TAG_OPTION_ENUM = 3, - CFR_TAG_OPTION_NUMBER = 4, - CFR_TAG_OPTION_BOOL = 5, - CFR_TAG_OPTION_VARCHAR = 6, - CFR_TAG_VARCHAR_OPT_NAME = 7, - CFR_TAG_VARCHAR_UI_NAME = 8, - CFR_TAG_VARCHAR_UI_HELPTEXT = 9, - CFR_TAG_VARCHAR_DEF_VALUE = 10, - CFR_TAG_OPTION_COMMENT = 11, + CFR_TAG_OPTION_FORM = 1, + CFR_TAG_ENUM_VALUE = 2, + CFR_TAG_OPTION_ENUM = 3, + CFR_TAG_OPTION_NUMBER = 4, + CFR_TAG_OPTION_BOOL = 5, + CFR_TAG_OPTION_VARCHAR = 6, + CFR_TAG_VARCHAR_OPT_NAME = 7, + CFR_TAG_VARCHAR_UI_NAME = 8, + CFR_TAG_VARCHAR_UI_HELPTEXT = 9, + CFR_TAG_VARCHAR_DEF_VALUE = 10, + CFR_TAG_OPTION_COMMENT = 11, + + CFR_TAG_DEP_EXPR = 12, + CFR_TAG_DEFAULT_EXPR = 13, + CFR_TAG_DEFAULT_VISIBLE_EXPR = 14, + CFR_TAG_UI_NAME_VISIBLE_EXPR = 15, +}; + +enum cfr_expr_type { + CFR_EXPR_TYPE_CONST = 0, + CFR_EXPR_TYPE_SYMBOL = 1, + CFR_EXPR_TYPE_NOT = 2, + CFR_EXPR_TYPE_OR = 3, + CFR_EXPR_TYPE_AND = 4, + //CFR_EXPR_TYPE_EQUAL = 5, + //CFR_EXPR_TYPE_UNEQUAL = 6, + //CFR_EXPR_TYPE_LTH = 7, + //CFR_EXPR_TYPE_LEQ = 8, + //CFR_EXPR_TYPE_GTH = 9, + //CFR_EXPR_TYPE_GEQ = 10, + //CFR_EXPR_TYPE_LIST = 11, + //CFR_EXPR_TYPE_RANGE = 12, }; /* * The optional flags describe the visibilty of the option and the - * effect on the non-volatile variable. + * effect on the non-volatile variable. TODO its not really clear which of these flags have an effect on the non-volatile variable and which are just affecting the visibility and/or selectability. * CFR_OPTFLAG_READONLY: * Prevents writes to the variable. - * CFR_OPTFLAG_GRAYOUT: + * CFR_OPTFLAG_GRAYOUT: //TODO why does it imply READONLY? * Implies READONLY. The option is visible, but cannot be modified * because one of the dependencies are not given. However there's a - * possibility to enable the option by changing runtime configuration. + * possibility to enable the option by changing runtime configuration.//TODO does changing runtime configuration mean to enable the depenendent option? If yes: shouldn't that be the default? If no: whats the difference between suppress and grayout? Why botherwith suppress if you have grayout? * * For example: Setting SATA mode, but SATA is globally disabled. * CFR_OPTFLAG_SUPPRESS: @@ -93,65 +117,91 @@ * are protected after the payload has hand over control. */ enum cfr_option_flags { - CFR_OPTFLAG_READONLY = 1 << 0, - CFR_OPTFLAG_GRAYOUT = 1 << 1, - CFR_OPTFLAG_SUPPRESS = 1 << 2, - CFR_OPTFLAG_VOLATILE = 1 << 3, - CFR_OPTFLAG_RUNTIME = 1 << 4, + CFR_OPTFLAG_READONLY = 1 << 0, + CFR_OPTFLAG_GRAYOUT = 1 << 1, + CFR_OPTFLAG_SUPPRESS = 1 << 2, + CFR_OPTFLAG_VOLATILE = 1 << 3, + CFR_OPTFLAG_RUNTIME = 1 << 4, }; struct __packed lb_cfr_varbinary { - uint32_t tag; /* - * CFR_TAG_VARCHAR_OPT_NAME, CFR_TAG_VARCHAR_UI_NAME, - * CFR_TAG_VARCHAR_UI_HELPTEXT or CFR_TAG_VARCHAR_DEF_VALUE - */ - uint32_t size; /* Length of the entire structure */ - uint32_t data_length; /* Length of data, including NULL terminator for strings */ + uint32_t tag; /* + * CFR_TAG_VARCHAR_OPT_NAME, CFR_TAG_VARCHAR_UI_NAME, + * CFR_TAG_VARCHAR_UI_HELPTEXT or CFR_TAG_VARCHAR_DEF_VALUE + */ + uint32_t size; /* Length of the entire structure */ + uint32_t data_length; /* Length of data, including NULL terminator for strings */ //TODO remove +}; + +struct __packed lb_cfr_expr { + uint32_t type; /* enum cfr_expr_type + EXPR_CONST, EXPR_SYMBOL + E_OR, E_AND, E_NOT, E_EQUAL, E_UNEQUAL, E_LTH, E_LEQ, E_GTH, E_GEQ, E_LIST, E_SYMBOL, E_RANGE */ + + //TODO add expression trees + /* + * if EXPR_COMPLEX: + * struct cfr_expr left + * struct cfr_expr right + * + * if EXPR_CONST + * uint64_t value + * + * if EXPR_SYMBOL | E_NOT + * uint64_t sym_obj_id + */ +}; + +struct __packed lb_cfr_expression { + uint32_t tag; /* CFR_TAG_DEP_EXPR, CFR_TAG_DEFAULT_EXPR, + * CFR_TAG_DEFAULT_VISIBLE_EXPR, CFR_TAG_UI_NAME_EXPR + */ + uint32_t size; // Length of the entire structure + /* + * struct lb_cfr_expr expr + */ }; struct __packed lb_cfr_enum_value { - uint32_t tag; /* CFR_TAG_ENUM_VALUE */ + uint32_t tag; /* CFR_TAG_ENUM_VALUE */ uint32_t size; uint32_t value; /* - * struct lb_cfr_varbinary ui_name + * struct lb_cfr_varbinary ui_name */ }; /* Supports multiple option types: ENUM, NUMBER, BOOL */ struct __packed lb_cfr_numeric_option { - uint32_t tag; /* - * CFR_TAG_OPTION_ENUM, CFR_TAG_OPTION_NUMBER or - * CFR_TAG_OPTION_BOOL - */ + uint32_t tag; /* + * CFR_TAG_OPTION_ENUM, CFR_TAG_OPTION_NUMBER or + * CFR_TAG_OPTION_BOOL + */ uint32_t size; - uint64_t object_id; /* Uniqueue ID */ - uint64_t dependency_id; /* Grayout if value of lb_cfr_numeric_option with given ID is 0. - * Ignore if field is 0. - */ - uint32_t flags; /* enum cfr_option_flags */ - uint32_t default_value; + uint64_t object_id; /* Uniqueue ID */ + uint32_t flags; /* enum cfr_option_flags */ /* - * struct lb_cfr_varbinary opt_name - * struct lb_cfr_varbinary ui_name - * struct lb_cfr_varbinary ui_helptext (Optional) - * struct lb_cfr_enum_value enum_values[] + * struct lb_cfr_varbinary opt_name + * struct lb_cfr_varbinary ui_name (Optional) + * struct lb_cfr_varbinary ui_helptext (Optional) + * struct lb_cfr_expression default_value_expr (Optional) + * struct lb_cfr_expression default_value_visible_expr (Optional) + * struct lb_cfr_expression dependency_expr (Optional) + * struct lb_cfr_expression ui_name_visible_expr (Optional) + * struct lb_cfr_enum_value enum_values[] */ }; struct __packed lb_cfr_varchar_option { - uint32_t tag; /* CFR_TAG_OPTION_VARCHAR */ + uint32_t tag; /* CFR_TAG_OPTION_VARCHAR */ uint32_t size; - uint64_t object_id; /* Uniqueue ID */ - uint64_t dependency_id; /* Grayout if value of lb_cfr_numeric_option with given ID is 0. - * Ignore if field is 0. - */ - uint32_t flags; /* enum cfr_option_flags */ + uint64_t object_id; /* Uniqueue ID */ + uint32_t flags; /* enum cfr_option_flags */ /* - * struct lb_cfr_varbinary default_value - * struct lb_cfr_varbinary opt_name - * struct lb_cfr_varbinary ui_name - * struct lb_cfr_varbinary ui_helptext (Optional) + * struct lb_cfr_varbinary opt_name + * struct lb_cfr_varbinary ui_name (Optional) + * struct lb_cfr_varbinary ui_helptext (Optional) + * struct lb_cfr_expression default_value_expr (Optional) */ }; @@ -161,31 +211,26 @@ * instead) but they're considered an option for simplicity's sake. */ struct __packed lb_cfr_option_comment { - uint32_t tag; /* CFR_TAG_OPTION_COMMENT */ + uint32_t tag; /* CFR_TAG_OPTION_COMMENT */ uint32_t size; - uint64_t object_id; /* Uniqueue ID */ - uint64_t dependency_id; /* Grayout if value of lb_cfr_numeric_option with given ID is 0. - * Ignore if field is 0. - */ - uint32_t flags; /* enum cfr_option_flags */ + uint64_t object_id; /* Uniqueue ID */ + uint32_t flags; /* enum cfr_option_flags */ /* - * struct lb_cfr_varbinary ui_name - * struct lb_cfr_varbinary ui_helptext (Optional) + * struct lb_cfr_varbinary ui_name + * struct lb_cfr_varbinary ui_helptext (Optional) + * struct lb_cfr_expression dependency_expr (Optional) */ }; /* CFR forms are considered options as they can be nested inside other forms */ struct __packed lb_cfr_option_form { - uint32_t tag; /* CFR_TAG_OPTION_FORM */ + uint32_t tag; /* CFR_TAG_OPTION_FORM */ uint32_t size; - uint64_t object_id; /* Uniqueue ID */ - uint64_t dependency_id; /* Grayout if value of lb_cfr_numeric_option with given ID is 0. - * Ignore if field is 0. - */ - uint32_t flags; /* enum cfr_option_flags */ + uint64_t object_id; /* Uniqueue ID */ + uint32_t flags; /* enum cfr_option_flags */ /* - * struct lb_cfr_varbinary ui_name - * struct lb_cfr_varchar_option options[] + * struct lb_cfr_varbinary ui_name + * struct lb_cfr_option_* options[] */ }; diff --git a/src/include/boot/tables.h b/src/include/boot/tables.h index 74cc4e1..e3548ee 100644 --- a/src/include/boot/tables.h +++ b/src/include/boot/tables.h @@ -20,4 +20,6 @@ */ void arch_write_tables(uintptr_t coreboot_table); +void write_cfr_table(void); + #endif /* BOOT_TABLES_H */ diff --git a/src/lib/coreboot_table.c b/src/lib/coreboot_table.c index d93ba01..c3960ba 100644 --- a/src/lib/coreboot_table.c +++ b/src/lib/coreboot_table.c @@ -3,6 +3,7 @@ #include <acpi/acpi.h> #include <arch/cbconfig.h> #include <commonlib/bsd/ipchksum.h> +#include <commonlib/cfr.h> #include <console/console.h> #include <console/uart.h> #include <identity.h> @@ -564,6 +565,19 @@ return lb_table_fini(head); } +void __weak write_cfr_table(void) +{ + void *cfr_buf = cbmem_add(CBMEM_ID_CFR, MAX_CFR_SIZE); + + size_t size = cbfs_load("fallback/cfr", cfr_buf, MAX_CFR_SIZE); + + if (!size) { + // MAX_CFR_SIZE may not be enough + printk(BIOS_ERR, "failed to read cfr from CBFS\n"); + cbmem_entry_remove(cbmem_find(CBMEM_ID_CFR)); + } +} + void *write_tables(void) { uintptr_t cbtable_start; @@ -581,6 +595,8 @@ /* Add architecture specific tables. */ arch_write_tables(cbtable_start); + write_cfr_table(); + /* Write the coreboot table. */ cbtable_end = write_coreboot_table(cbtable_start); cbtable_size = cbtable_end - cbtable_start; diff --git a/src/mainboard/emulation/qemu-q35/Kconfig.cfr b/src/mainboard/emulation/qemu-q35/Kconfig.cfr new file mode 100644 index 0000000..745e2a9 --- /dev/null +++ b/src/mainboard/emulation/qemu-q35/Kconfig.cfr @@ -0,0 +1,121 @@ +mainmenu "QEMU mainboard configuration" # should be title instead of "Main Menu" + +//config NUMBER42 +// int "configure number" +// default 42 + +config SET_STUFF1 + bool "stuff 1 ui" + default y #TODO currently no support in CFR for multiple defaults + +//config SET_STUFF2 # if both are supplied -> same as first one (TODO remove dependency in CFR) +// bool "stuff 2 ui" if SET_STUFF1 # -> is in list of SET_STUFF1 +// default y if SET_STUFF1 # -> is in the same list level and next after SET_STUFF1 + +config SET_STUFF4 + bool + default CONFIG_COREBOOT_BUILD + +config SET_STUFF3 + bool "stuff 3 ui" + default y if (SET_STUFF1 && SET_STUFF4) + +//config COOL_THINGS +// bool "things" if y +// default y +// depends on (SET_STUFF1 || SET_STUFF2 && SET_STUFF3 || SET_STUFF4) +// help +// This sets some cool things + +//config SET_STUFF5 +// bool +// default y +// depends on y +// depends on 1 + +//comment "seperator" +// depends on SET_STUFF1 + +//config NUM +// hex "some number" +// default 0x96 +// +//choice ATLAS_PROFILE +// prompt "atlas profile" +// default ATLAS_PROFILE_DEFAULT +// +//config ATLAS_PROFILE_REALTIME_PERFORMANCE +// bool "Realtime Performance Profile" +// +//config ATLAS_PROFILE_DEFAULT +// bool "Default Profile" +// +//config ATLAS_PROFILE_THEMIS_LED_CONFIG +// bool "Themis LED Config Profile" +// +//endchoice +// +////TODO A choice cannot have a name currently +//choice MAINBOARD_POWER_FAILURE_STATE +// prompt "Restore AC Power Loss" +// //default CONFIG_MAINBOARD_POWER_FAILURE_STATE +// default MAINBOARD_S0_AFTER_G3 +// help +// Specify what to do when power is re-applied after a power loss. +// This option has no effect on systems without a RTC battery. +// Power state after G3 (power loss) +// Power off (S5) +// Power on (S0) +// +//config MAINBOARD_S0_AFTER_G3 +// bool "G3 -> S0" +// help +// stufasdaods +// +//config MAINBOARD_S5_AFTER_G3 +// bool "G3 -> S5" +// help +// stufasdaods +// +//endchoice +// +//choice PRIMARY_DISPLAY +// prompt "Primary display device" +// //default PRIMARY_DISPLAY_IGPU if CONFIG_ONBOARD_VGA_IS_PRIMARY +// default PRIMARY_DISPLAY_AUTO +// help +// Specify which display device to use as primary. +// +//config PRIMARY_DISPLAY_IGPU +// bool "Intel iGPU" +// +//config PRIMARY_DISPLAY_CPU_DPGU +// bool "CPU PEG dGPU" +// +//config PRIMARY_DISPLAY_PCH_DGPU +// bool "PCH PCIe dGPU" +// +//config PRIMARY_DISPLAY_AUTO +// bool "Auto" +// +//endchoice +// +//menu "submenu1" +// +//config SUBCONFIG1 +// bool "enable subconfig1" +// default n +// +//config SUBCONFIG2 +// bool "enable subconfig2" +// default y +// +//config SUBCONFIG3 +// int "number of things" +// default 42 +// +//endmenu +// +//config TURBO_MODE +// bool "Enable turbo mode" +// default n diff --git a/src/mainboard/emulation/qemu-q35/Makefile.mk b/src/mainboard/emulation/qemu-q35/Makefile.mk index bc73edc..ab59b18 100644 --- a/src/mainboard/emulation/qemu-q35/Makefile.mk +++ b/src/mainboard/emulation/qemu-q35/Makefile.mk @@ -20,4 +20,21 @@ ramstage-$(CONFIG_CHROMEOS) += chromeos.c +build/auto.conf.h: build/auto.conf + sed -e '/^#/d' \ + -e 's/^/\#define /' \ + -e 's/=/ /' \ + $< > $@ + +build/cfr.bin: build/util/kconfig/cfr src/mainboard/emulation/qemu-q35/Kconfig.cfr build/auto.conf.h + cpp -P -include build/auto.conf.h src/mainboard/emulation/qemu-q35/Kconfig.cfr -o build/Kconfig.cfr + KCONFIG_CONFIG="" CFR_OUT=$@ $< build/Kconfig.cfr + #false + +CFR_CBFS := $(CONFIG_CBFS_PREFIX)/cfr +$(CFR_CBFS)-file := build/cfr.bin +$(CFR_CBFS)-type := raw +$(CFR_CBFS)-compression := $(CBFS_COMPRESS_FLAG) +cbfs-files-y += $(CFR_CBFS) + smm-y += memmap.c diff --git a/util/kconfig/Makefile b/util/kconfig/Makefile index 245445e..5a08918 100644 --- a/util/kconfig/Makefile +++ b/util/kconfig/Makefile @@ -35,6 +35,7 @@ nconfig-prog := nconf gconfig-prog := gconf xconfig-prog := qconf +cfr-prog := cfr define config_rule PHONY += $(1) @@ -45,7 +46,7 @@ build_$(1): $(obj)/$($(1)-prog) endef -$(foreach c, config menuconfig nconfig gconfig xconfig, $(eval $(call config_rule,$(c)))) +$(foreach c, config menuconfig nconfig gconfig cfr xconfig, $(eval $(call config_rule,$(c)))) PHONY += localmodconfig localyesconfig localyesconfig localmodconfig: $(obj)/conf @@ -85,6 +86,7 @@ ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/configs/$(KBUILD_DEFCONFIG)),) @$(kecho) "*** Default configuration is based on '$(KBUILD_DEFCONFIG)'" $(Q)$< $(silent) --defconfig=arch/$(SRCARCH)/configs/$(KBUILD_DEFCONFIG) $(Kconfig) + @$(kecho) "*** srctree $(srctree) src: $(src) $$(pwd)" else @$(kecho) "*** Default configuration is based on target '$(KBUILD_DEFCONFIG)'" $(Q)$(MAKE) -f $(srctree)/Makefile $(KBUILD_DEFCONFIG) @@ -217,6 +219,12 @@ $(obj)/gconf: | $(obj)/gconf-libs $(obj)/gconf.o: | $(obj)/gconf-cflags +# CFR/SOT whatever + +hostprogs += cfr +cfr-objs := cfr.o $(common-objs) +HOSTCFLAGS_cfr.o := -I $(abspath $(srctree)src/commonlib/include) -I $(abspath $(srctree)src/commonlib/bsd/include) + # check if necessary packages are available, and configure build flags cmd_conf_cfg = $< $(addprefix $(obj)/$*conf-, cflags libs bin); touch $(obj)/$*conf-bin diff --git a/util/kconfig/cfr.c b/util/kconfig/cfr.c new file mode 100644 index 0000000..83c5d47 --- /dev/null +++ b/util/kconfig/cfr.c @@ -0,0 +1,515 @@ +// SPDX-License-Identifier: GPL-2.0-only + +#include <assert.h> +#include <ctype.h> +#include <errno.h> +#include <fcntl.h> +#include <limits.h> +#include <stdarg.h> +#include <stdlib.h> +#include <string.h> +#include <strings.h> +#include <signal.h> +#include <unistd.h> + +#include <commonlib/cfr.h> +#include <commonlib/bsd/helpers.h> +#include <stdio.h> + +#include "lkc.h" + +char cfr_buf[MAX_CFR_SIZE]; + +static uint32_t cfr_record_size(const char *startp, const char *endp) +{ + const uintptr_t start = (uintptr_t)startp; + const uintptr_t end = (uintptr_t)endp; + + if (start > end || end - start > UINT32_MAX) { + /* + * Should never be reached unless something went really + * wrong. Record size can never be negative, and things + * would break long before record length exceeds 4 GiB. + */ + //die("%s: bad record size (start = %" PRIxPTR ", end = %" PRIxPTR ")", + // __func__, start, end); + } + printf("record size: 0x%x\n", (uint32_t)(end - start)); + return (uint32_t)(end - start); +} + +static uint32_t write_varbinary(size_t offset, const char *string, uint32_t tag) +{ + uint8_t *data; + size_t padding; + + if (!string) + return 0; + + struct lb_cfr_varbinary *cfr_str = (struct lb_cfr_varbinary *)(cfr_buf + offset); + cfr_str->tag = tag; + cfr_str->data_length = strlen(string) + 1; + data = (uint8_t *)(cfr_str + 1); + memcpy(data, string, cfr_str->data_length); + + /* Make sure that every TAG/SIZE field is always aligned to LB_ENTRY_ALIGN */ + cfr_str->size = ALIGN_UP(sizeof(*cfr_str) + cfr_str->data_length, 4); + + /* Fill padding bytes */ + padding = cfr_str->size - (sizeof(*cfr_str) + cfr_str->data_length); + memset(&data[cfr_str->data_length], 0, padding); + + printf("varchar: %s, data_length: %d, size: %d\n", data, cfr_str->data_length, cfr_str->size); + + return cfr_str->size; +} + +static uint32_t write_expr_rec(size_t offset, enum symbol_type sym_type, struct expr *expr) +{ + /* + * if EXPR_COMPLEX: + * struct cfr_expr left + * struct cfr_expr right + * + * if EXPR_CONST (maybe just add a type value alongside the 'value' for const expressions) + * if BOOL | NUMERIC | HEX + * uint64_t value + * if STRING + * struct lb_cfr_varbinary value + * + * if EXPR_SYMBOL | E_NOT + * uint64_t sym_obj_id + */ + size_t loffset = offset; + struct lb_cfr_expr *hdr; + switch (expr->type) { + case E_SYMBOL: + hdr = (struct lb_cfr_expr *)(cfr_buf + loffset); + if (expr->left.sym->type == S_UNKNOWN) { + printf("%s():%d CFR: CONST EXPR\n", __func__, __LINE__); + hdr->type = CFR_EXPR_TYPE_CONST; + loffset += sizeof(struct lb_cfr_expr); + if (sym_type == S_BOOLEAN) { + uint64_t *value = (uint64_t *)(cfr_buf + loffset); + if (expr->left.sym == &symbol_yes) { + *value = 1; + } else if (expr->left.sym == &symbol_no) { + *value = 0; + } else { + // This may happen if an 'if' or 'depends on' contains symbols which have a type different than bool (we don't support that). + printf("CFR: expression must be evaluated to the bool type\n"); //TODO better error message + exit(-1); + } + loffset += sizeof(uint64_t); + } else if (sym_type == S_HEX) { + uint64_t *value = (uint64_t *)(cfr_buf + loffset); + *value = strtol(expr->left.sym->name, NULL, 16); + loffset += sizeof(uint64_t); + } else if (sym_type == S_INT) { + uint64_t *value = (uint64_t *)(cfr_buf + loffset); + *value = strtol(expr->left.sym->name, NULL, 10); + loffset += sizeof(uint64_t); + } else if (sym_type == S_STRING) { + loffset += write_varbinary(loffset, expr->left.sym->name, 0); //TODO replace 0 with a Tag + } + } else { + printf("%s():%d CFR: SYMBOL EXPR\n", __func__, __LINE__); + hdr->type = CFR_EXPR_TYPE_SYMBOL; + loffset += sizeof(struct lb_cfr_expr); + uint64_t *sym = (uint64_t *)(cfr_buf + loffset); + *sym = (uint64_t)expr->left.sym; + loffset += sizeof(uint64_t); + } + break; + case E_NOT: + //TODO + case E_AND: + printf("%s():%d CFR: AND EXPR\n", __func__, __LINE__); + loffset += write_expr_rec(loffset, sym_type, expr->left.expr); + loffset += write_expr_rec(loffset, sym_type, expr->right.expr); + hdr = (struct lb_cfr_expr *)(cfr_buf + loffset); + hdr->type = CFR_EXPR_TYPE_AND; + loffset += sizeof(struct lb_cfr_expr); + break; + case E_OR: + printf("%s():%d CFR: OR EXPR\n", __func__, __LINE__); + loffset += write_expr_rec(loffset, sym_type, expr->left.expr); + loffset += write_expr_rec(loffset, sym_type, expr->right.expr); + hdr = (struct lb_cfr_expr *)(cfr_buf + loffset); + hdr->type = CFR_EXPR_TYPE_OR; + loffset += sizeof(struct lb_cfr_expr); + break; + default: + printf("%s():%d CFR: unsupported expression\n", __func__, __LINE__); + exit(-1); + } + return loffset - offset; +} + +static uint32_t write_expression(size_t offset, uint32_t tag, enum symbol_type sym_type, struct expr *expr) +{ + if (!expr) + return 0; + + size_t loffset = offset; + struct lb_cfr_header *hdr = (struct lb_cfr_header *)(cfr_buf + loffset); + hdr->tag = tag; + loffset += sizeof(struct lb_cfr_header); + + loffset += write_expr_rec(loffset, sym_type, expr); + + hdr->size = loffset - offset; + printf("CFR: expression: Tag: %d, size: %d\n", tag, hdr->size); + return hdr->size; +} + +static struct property *cfr_get_prompt_prop(struct symbol *sym) +{ + struct property *prop; + struct property *prompt_prop = NULL; + int prompt_count = 0; + for_all_prompts(sym, prop) { + if (!prop->text) { + printf("CFR: unsupported prompt\n"); + exit(-1); + } + prompt_count++; + prompt_prop = prop; + } + if (prompt_count > 1) { + printf("CFR: multiple prompts are not supported\n"); + exit(-1); + } + return prompt_prop; +} + +static struct property *cfr_get_default_prop(struct symbol *sym) +{ + // CFR currently only supports simple default expressions like: + // "default: n" or "default: y" or "default: 42" + struct property *prop; + struct property *default_prop = NULL; + int default_count = 0; + for_all_defaults(sym, prop) { + if (prop->expr->type != E_SYMBOL) { + printf("CFR: unsupported default\n"); + exit(-1); + } + default_count++; + default_prop = prop; + } + if (default_count > 1) { + printf("CFR: multiple defaults are not supported\n"); + exit(-1); + } + if (!default_prop) { + printf("CFR: no default found\n"); + exit(-1); + } + return default_prop; +} + +static int cfr_choice_get_default(struct menu *menu) +{ + struct property *default_prop = cfr_get_default_prop(menu->sym); + if (!sym_is_choice(menu->sym)) { + printf("CFR: not a choice symbol\n"); + exit(-1); + } + int choice_index = 0; + struct menu *child_menu = menu->list; + while (child_menu) { + if (child_menu->sym == default_prop->expr->left.sym) { + return choice_index; + } + choice_index++; + child_menu = child_menu->next; + } + return 0; +} + +static uint32_t write_numeric_option(size_t offset, uint64_t object_id, struct menu *kconfig_menu) +{ + const char *opt_name = kconfig_menu->sym->name; + const char *ui_name = menu_get_prompt(kconfig_menu); + const char *ui_helptext = kconfig_menu->help; + + uint32_t flags = 0; + struct menu *values = kconfig_menu->list; + size_t len; + + struct lb_cfr_numeric_option *option = (struct lb_cfr_numeric_option *)(cfr_buf + offset); + + option->object_id = object_id; + option->flags = flags; + option->size = sizeof(struct lb_cfr_numeric_option); + offset += option->size; + + // no prompt => grayout => default value even if <expr> not met + // dependency not met => suppress => default value 'n' even if <expr> not met + + len = write_varbinary(offset, opt_name, CFR_TAG_VARCHAR_OPT_NAME); + printf("opt_name: %s offset: 0x%zx\n", opt_name, offset); + if (!len) { + printf("CFR: error: missing opt_name\n"); + return 0; + } + offset += len; + + len = write_varbinary(offset, ui_name, CFR_TAG_VARCHAR_UI_NAME); + printf("ui_name: %s offset: 0x%zx\n", ui_name, offset); + if (!len) { + printf("CFR: error: missing ui_name\n"); + return 0; + } + offset += len; + + offset += write_varbinary(offset, ui_helptext, CFR_TAG_VARCHAR_UI_HELPTEXT); + printf("ui_helptext: %s, offset: 0x%zx\n", ui_helptext, offset); + + int def = 0; + struct property *default_prop = cfr_get_default_prop(kconfig_menu->sym); + struct property *prompt_prop = cfr_get_prompt_prop(kconfig_menu->sym); + if (sym_is_choice(kconfig_menu->sym)) { + option->tag = CFR_TAG_OPTION_ENUM; + } else if (kconfig_menu->sym->type == S_BOOLEAN) { + option->tag = CFR_TAG_OPTION_BOOL; + } else if (kconfig_menu->sym->type == S_HEX) { + option->tag = CFR_TAG_OPTION_NUMBER; + } else if (kconfig_menu->sym->type == S_INT) { + option->tag = CFR_TAG_OPTION_NUMBER; + } + + offset += write_expression(offset, CFR_TAG_DEFAULT_EXPR, kconfig_menu->sym->type, default_prop->expr); + offset += write_expression(offset, CFR_TAG_DEFAULT_VISIBLE_EXPR, S_BOOLEAN, default_prop->visible.expr); + //offset += write_expression(offset, CFR_TAG_DEP_EXPR, S_BOOLEAN, kconfig_menu->sym->dir_dep.expr); //TODO remove (it is essentially the same as DEFAULT_VISIBLE_EXPR + UI_NAME_VISIBLE_EXPR) + if (prompt_prop) + offset += write_expression(offset, CFR_TAG_UI_NAME_VISIBLE_EXPR, S_BOOLEAN, prompt_prop->visible.expr); + + if (option->tag == CFR_TAG_OPTION_ENUM && values) { + printf("enum offset: 0x%zx\n", offset); + struct menu *choice_child = values; + uint32_t child_index = 0; + while (choice_child) { + if (!sym_is_choice_value(choice_child->sym)) { + printf("CFR: error: children of choice must be choice values\n"); + return 0; + } + printf("choice_value: %s: %s\n", choice_child->sym->name, menu_get_prompt(choice_child)); + struct lb_cfr_enum_value *enum_val = (struct lb_cfr_enum_value *)(cfr_buf + offset); + enum_val->tag = CFR_TAG_ENUM_VALUE; + if (choice_child->sym->type != S_BOOLEAN) { + printf("error: enum value currently only supports bool type\n"); + return 0; + } + enum_val->value = child_index++; + offset += sizeof(struct lb_cfr_enum_value); + + len = write_varbinary(offset, menu_get_prompt(choice_child), CFR_TAG_VARCHAR_UI_NAME); + if (!len) { + printf("error: Kconfig choice value is missing a prompt\n"); + return 0; + } + offset += len; + + enum_val->size = cfr_record_size((char *)enum_val, (cfr_buf + offset)); + choice_child = choice_child->next; + } + } + + option->size = cfr_record_size((char *)option, (cfr_buf + offset)); //TODO replace cfr_record_size + return option->size; +} + +static uint32_t write_comment_option(size_t offset, const uint64_t object_id, struct menu *kconfig_menu) +{ + size_t loffset = offset; + struct lb_cfr_option_comment *option = (struct lb_cfr_option_comment *)(cfr_buf + loffset); + size_t len; + printf("%s(): loffset: 0x%zx\n", __func__, loffset); + + option->tag = CFR_TAG_OPTION_COMMENT; + option->object_id = object_id; + option->flags = 0; + if (option->flags & (CFR_OPTFLAG_GRAYOUT | CFR_OPTFLAG_VOLATILE)) + option->flags |= CFR_OPTFLAG_READONLY; + option->size = sizeof(*option); + loffset += option->size; + + //loffset += write_expression(loffset, CFR_TAG_DEP_EXPR, S_BOOLEAN, kconfig_menu->dep); + + loffset += write_varbinary(loffset, kconfig_menu->help, CFR_TAG_VARCHAR_UI_HELPTEXT); + printf("help: %s, loffset: 0x%zx\n", kconfig_menu->help, loffset); + + len = write_varbinary(loffset, menu_get_prompt(kconfig_menu), CFR_TAG_VARCHAR_UI_NAME); + printf("prompt: %s loffset: 0x%zx\n", menu_get_prompt(kconfig_menu), loffset); + if (!len) { + printf("CFR: error: missing prompt\n"); + return 0; + } + loffset += len; + + option->size = loffset - offset; + return option->size; +} + +static uint32_t write_object(size_t offset, struct menu *kconfig_menu); + +static size_t write_form(struct menu *m, size_t offset, uint64_t object_id, uint64_t dep_id) +{ + size_t loffset = offset; + printf("form-prompt: %s\n", menu_get_prompt(m)); + + if (m->sym) { + printf("error: sym should be NULL in a menu/form\n"); + return 0; + } + + printf("offset: %zx\n", loffset); + struct lb_cfr_option_form *form = (struct lb_cfr_option_form *)(cfr_buf + loffset); + form->tag = CFR_TAG_OPTION_FORM; + form->object_id = object_id; + form->flags = 0; //TODO + form->size = sizeof(struct lb_cfr_option_form); + loffset += form->size; + + printf("offset: %zx\n", loffset); + const char *prompt = menu_get_prompt(m); + struct lb_cfr_varbinary *ui_name = (struct lb_cfr_varbinary *)(cfr_buf + loffset); + ui_name->tag = CFR_TAG_VARCHAR_UI_NAME; + ui_name->data_length = strlen(prompt) + 1; + strcpy(cfr_buf + loffset + sizeof(struct lb_cfr_varbinary), prompt); + ui_name->size = ALIGN_UP(sizeof(struct lb_cfr_varbinary) + ui_name->data_length, 4); + loffset += ui_name->size; + printf("offset: %zx\n", loffset); + + struct menu *child = m->list; + while (child) { + printf("child\n"); + + size_t size = write_object(loffset, child); + if (!size) { + printf("CFR: error writing object\n"); + return 0; + } + loffset += size; + + child = child->next; + } + form->size = (loffset - offset); + return form->size; +} + +static uint64_t cfr_symbol_get_dependency(struct symbol *sym) +{ + // CFR currently only supports simple default expressions like: + // "depends on STUFF" + // currently not supported for choices + if (!sym->dir_dep.expr) { + return 0; + } + if (sym->dir_dep.expr->type != E_SYMBOL) { + printf("CFR: only simple dependency expressions are supported\n"); + exit(-1); + } + return (uint64_t)sym->dir_dep.expr->left.sym; +} + +static uint32_t write_object(size_t offset, struct menu *kconfig_menu) +{ + printf("object-prompt: %s\n", menu_get_prompt(kconfig_menu)); + size_t loffset = offset; + + uint64_t obj_id; //TODO remove dep_id + assert(kconfig_menu); + + // Assign uniqueue ID + obj_id = (uint64_t)kconfig_menu; + + // NULL for menus, comments, and ifs + if (!kconfig_menu->sym) { + if (kconfig_menu->list) { + printf("write_form: %zx\n", offset); + // It has children => it is a menu/form + return write_form(kconfig_menu, loffset, 0 ,0); + } else { + // not a menu but also doesn't have a symbol attached => comment + printf("write_comment_option: %zx\n", offset); + return write_comment_option(offset, obj_id, kconfig_menu); + } + } + + // Assign uniqueue ID + obj_id = (uint64_t)kconfig_menu->sym; + + if (sym_is_choice(kconfig_menu->sym) + || kconfig_menu->sym->type == S_BOOLEAN + || kconfig_menu->sym->type == S_HEX + || kconfig_menu->sym->type == S_INT) { + printf("write_numeric_option: %zx\n", offset); + size_t len = write_numeric_option(loffset, obj_id, kconfig_menu); + if (!len) { + printf("CFR: error writing choice/enum value\n"); + return 0; + } + loffset += len; + } else { + switch (kconfig_menu->sym->type) { + case S_STRING: + printf("sym string: %s\n", kconfig_menu->sym->name); + //return sm_write_opt_varchar(current, &kconfig_menu->sm_varchar, obj_id, dep_id); + return 0; + case S_UNKNOWN: + printf("sym unknown: %s\n", kconfig_menu->sym->name); + return 0; + case S_TRISTATE: + default: + printf("CFR: Unknown setup menu object kind %u, ignoring\n", kconfig_menu->sym->type); + return 0; + } + } + + //TODO can remove the condition (but kind of makes it clearer) + if (kconfig_menu->sym && kconfig_menu->list && !sym_is_choice(kconfig_menu->sym)) { + //TODO what about choices? + // symbol has got a list, which indicates this list contains of symbols that depend on 'child' which are defined in the same menu. If the symbol 'child' would depend on a symbol in another menu, it wouldn't be part of the 'list' of 'child'. TODO why don't these symbols show up as part of the 'list' of the menu? + struct menu *m = kconfig_menu->list; // this option depends on kconfig_menu + while (m) { + printf("CFR: writing reverse dependency\n"); + size_t m_size = write_object(loffset, m); + if (!m_size) { + printf("CFR: error writing symbol\n"); + return 0; + } + loffset += m_size; + m = m->next; + } + } + + return loffset - offset; +} + + +int main(int ac, char **av) +{ + conf_parse(av[1]); + //conf_read(NULL); // need this otherwise the defaults don't get applied + + //sym_calc_value(rootmenu.list->next->next->next->next->next->sym); + char *out_file_path = getenv("CFR_OUT"); + printf("write into file: %s\n", out_file_path); + + FILE *f; + if (out_file_path) + f = fopen(out_file_path, "w"); + + uint32_t sz = write_form(&rootmenu, 0, 0, 0); + if (!sz) { + printf("CFR: error writing object\n"); + return -1; + } + size_t filesize = fwrite(cfr_buf, 1, sz, f); + printf("written size: %d, filesize: %zd\n", sz, filesize); + + return 0; +} diff --git a/util/kconfig/symbol.c b/util/kconfig/symbol.c index 77de8ee..98dd843 100644 --- a/util/kconfig/symbol.c +++ b/util/kconfig/symbol.c @@ -256,6 +256,7 @@ if (def_sym->visible != no) return def_sym; } + printf("%s(): %d\n", __func__, __LINE__); /* just get the first visible value */ prop = sym_get_choice_prop(sym); diff --git a/util/lint/lint-stable-008-kconfig b/util/lint/lint-stable-008-kconfig index e8a3bea..c9591af 100755 --- a/util/lint/lint-stable-008-kconfig +++ b/util/lint/lint-stable-008-kconfig @@ -17,9 +17,9 @@ echo "The kconfig lint tool uses perl. Please install it to run this test." fi -# Check whether coreboot is in a repo -if [ "${IN_GIT_TREE}" -eq 1 ]; then - env perl util/lint/kconfig_lint --warnings_off 2>&1 -else - env perl util/lint/kconfig_lint --no_git_grep --warnings_off 2>&1 -fi +## Check whether coreboot is in a repo +#if [ "${IN_GIT_TREE}" -eq 1 ]; then +# env perl util/lint/kconfig_lint --warnings_off 2>&1 +#else +# env perl util/lint/kconfig_lint --no_git_grep --warnings_off 2>&1 +#fi -- To view, visit https://review.coreboot.org/c/coreboot/+/81972?usp=email To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: main Gerrit-Change-Id: I5e9e9f1d2d277a182d72f5af5ca50db0ddcb20bb Gerrit-Change-Number: 81972 Gerrit-PatchSet: 1 Gerrit-Owner: Maximilian Brune <maximilian.brune(a)9elements.com> Gerrit-MessageType: newchange

1 0

[S] Change in coreboot[main]: commonlib: Add skip_atoi()
by Maximilian Brune (Code Review) 17 Apr '24

17 Apr '24

Attention is currently required from: Julius Werner. Maximilian Brune has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/78026?usp=email ) Change subject: commonlib: Add skip_atoi() ...................................................................... Patch Set 3: (1 comment) Patchset: PS1: > No, sorry, I meant the whole `skip_atoi()` function (including . […] Its been a while, but I guess that this is what you had in mind? -- To view, visit https://review.coreboot.org/c/coreboot/+/78026?usp=email To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: main Gerrit-Change-Id: I73cd36ff370e15d5b6242c3b07b14d1724f8ac24 Gerrit-Change-Number: 78026 Gerrit-PatchSet: 3 Gerrit-Owner: Maximilian Brune <maximilian.brune(a)9elements.com> Gerrit-CC: Julius Werner <jwerner(a)chromium.org> Gerrit-CC: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Attention: Julius Werner <jwerner(a)chromium.org> Gerrit-Comment-Date: Wed, 17 Apr 2024 14:17:11 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: Julius Werner <jwerner(a)chromium.org> Comment-In-Reply-To: Maximilian Brune <maximilian.brune(a)9elements.com> Gerrit-MessageType: comment

1 0

[S] Change in coreboot[main]: commonlib: Add skip_atoi()
by Maximilian Brune (Code Review) 17 Apr '24

17 Apr '24

Attention is currently required from: Maximilian Brune. Maximilian Brune has uploaded a new patch set (#3). ( https://review.coreboot.org/c/coreboot/+/78026?usp=email ) Change subject: commonlib: Add skip_atoi() ...................................................................... commonlib: Add skip_atoi() Adds the skip_atoi function to commonlib string functions. This is done for the subsequent commit of moving device_tree.c to commonlib. Signed-off-by: Maximilian Brune <maximilian.brune(a)9elements.com> Change-Id: I73cd36ff370e15d5b6242c3b07b14d1724f8ac24 --- A src/commonlib/include/commonlib/string.h A src/commonlib/string.c M src/include/string.h M src/lib/string.c 4 files changed, 18 insertions(+), 16 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/26/78026/3 -- To view, visit https://review.coreboot.org/c/coreboot/+/78026?usp=email To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: main Gerrit-Change-Id: I73cd36ff370e15d5b6242c3b07b14d1724f8ac24 Gerrit-Change-Number: 78026 Gerrit-PatchSet: 3 Gerrit-Owner: Maximilian Brune <maximilian.brune(a)9elements.com> Gerrit-CC: Julius Werner <jwerner(a)chromium.org> Gerrit-CC: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Attention: Maximilian Brune <maximilian.brune(a)9elements.com> Gerrit-MessageType: newpatchset

1 0

[XS] Change in coreboot[main]: lint/checkpatch: Reduce the difference with linux v6.8
by Elyes Haouas (Code Review) 17 Apr '24

17 Apr '24

Attention is currently required from: Martin L Roth. Hello Martin L Roth, I'd like you to reexamine a change. Please visit https://review.coreboot.org/c/coreboot/+/81951?usp=email to look at the new patch set (#2). Change subject: lint/checkpatch: Reduce the difference with linux v6.8 ...................................................................... lint/checkpatch: Reduce the difference with linux v6.8 Change-Id: I4898c4b11c791a5bd3895db656e03d7d5c46e933 Signed-off-by: Elyes Haouas <ehaouas(a)noos.fr> --- M util/lint/checkpatch.pl 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/51/81951/2 -- To view, visit https://review.coreboot.org/c/coreboot/+/81951?usp=email To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: main Gerrit-Change-Id: I4898c4b11c791a5bd3895db656e03d7d5c46e933 Gerrit-Change-Number: 81951 Gerrit-PatchSet: 2 Gerrit-Owner: Elyes Haouas <ehaouas(a)noos.fr> Gerrit-Reviewer: Martin L Roth <gaumless(a)gmail.com> Gerrit-Attention: Martin L Roth <gaumless(a)gmail.com> Gerrit-MessageType: newpatchset

1 0

[S] Change in coreboot[main]: commonlib: Add skip_atoi()
by Maximilian Brune (Code Review) 17 Apr '24

17 Apr '24

Attention is currently required from: Maximilian Brune. Maximilian Brune has uploaded a new patch set (#2). ( https://review.coreboot.org/c/coreboot/+/78026?usp=email ) Change subject: commonlib: Add skip_atoi() ...................................................................... commonlib: Add skip_atoi() Adds the skip_atoi function to commonlib string functions. This is done for the subsequent commit of moving device_tree.c to commonlib. Signed-off-by: Maximilian Brune <maximilian.brune(a)9elements.com> Change-Id: I73cd36ff370e15d5b6242c3b07b14d1724f8ac24 --- A src/commonlib/include/commonlib/string.h A src/commonlib/string.c M src/include/string.h M src/lib/string.c 4 files changed, 11 insertions(+), 16 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/26/78026/2 -- To view, visit https://review.coreboot.org/c/coreboot/+/78026?usp=email To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: main Gerrit-Change-Id: I73cd36ff370e15d5b6242c3b07b14d1724f8ac24 Gerrit-Change-Number: 78026 Gerrit-PatchSet: 2 Gerrit-Owner: Maximilian Brune <maximilian.brune(a)9elements.com> Gerrit-CC: Julius Werner <jwerner(a)chromium.org> Gerrit-CC: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Attention: Maximilian Brune <maximilian.brune(a)9elements.com> Gerrit-MessageType: newpatchset

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

coreboot-gerrit April 2024