coreboot-gerrit April 2023

coreboot-gerrit@coreboot.org

1 participants
5761 discussions

[L] Change in coreboot[master]: [RFC] drivers/option: Add option list in cbtable
by Benjamin Doron (Code Review) 15 Apr '23

15 Apr '23

Attention is currently required from: Angel Pons, Maximilian Brune. Benjamin Doron has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/74121 ) Change subject: [RFC] drivers/option: Add option list in cbtable ...................................................................... Patch Set 1: (1 comment) File src/drivers/option/cfr.c: https://review.coreboot.org/c/coreboot/+/74121/comment/83dc5688_e73e6c5a PS1, Line 127: write_body(header); : : menu->size = sm_compute_record_size((char *)menu, header); > A thought: if we let the boot-state machine do this, then silicon, platform drivers, board code, etc […] I should be sleeping at 2am instead - this would fragment the CFR into 'actual' tags rather than one effective structure. I still like the theory of it, but implementing it with CBTABLE rules would mean gathering up forms. Besides, we currently offload the option table responsibility to the board. Is it worth dedicated `CB_TAG_CFR_{SILICON,BOARD}_FORM` tags? We have to exclude drivers. -- To view, visit https://review.coreboot.org/c/coreboot/+/74121 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I304de7d26d79245a2e31a6d01f6c5643b31cb772 Gerrit-Change-Number: 74121 Gerrit-PatchSet: 1 Gerrit-Owner: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: Benjamin Doron <benjamin.doron00(a)gmail.com> Gerrit-Reviewer: Maximilian Brune <maximilian.brune(a)9elements.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Daniel Maslowski <info(a)orangecms.org> Gerrit-CC: Lean Sheng Tan <sheng.tan(a)9elements.com> Gerrit-CC: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-Attention: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Attention: Maximilian Brune <maximilian.brune(a)9elements.com> Gerrit-Comment-Date: Sat, 15 Apr 2023 16:15:32 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: Benjamin Doron <benjamin.doron00(a)gmail.com> Gerrit-MessageType: comment

1 0

[M] Change in coreboot[master]: SMBIOS: Move identification strings
by Kyösti Mälkki (Code Review) 15 Apr '23

15 Apr '23

Attention is currently required from: Sean Rhodes, Jason Nien, Patrick Rudolph, Caveh Jalali, Christian Walter, Martin Roth, Kyösti Mälkki, Boris Mittelberg. Hello build bot (Jenkins), Sean Rhodes, Jason Nien, Patrick Rudolph, Caveh Jalali, Christian Walter, Martin Roth, Boris Mittelberg, I'd like you to reexamine a change. Please visit https://review.coreboot.org/c/coreboot/+/74452 to look at the new patch set (#2). Change subject: SMBIOS: Move identification strings ...................................................................... SMBIOS: Move identification strings This improve ccache hit rate, as the strings are only expanded in for object lib/identity.o. Change-Id: I28a8199b4a5482984dd7fdde67e90acca5af5ca6 Signed-off-by: Kyösti Mälkki <kyosti.malkki(a)gmail.com> --- M src/arch/x86/smbios.c M src/arch/x86/smbios_defaults.c M src/drivers/generic/cbfs-serial/cbfs-serial.c M src/ec/google/chromeec/ec_smbios.c M src/include/identity.h M src/lib/identity.c M src/mainboard/emulation/qemu-i440fx/fw_cfg.c M src/mainboard/google/kahlee/variants/baseboard/mainboard.c M src/mainboard/google/poppy/variants/nami/mainboard.c M src/mainboard/prodrive/hermes/smbios.c M src/mainboard/starlabs/lite/smbios.c M src/mainboard/starlabs/starbook/smbios.c 12 files changed, 63 insertions(+), 23 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/52/74452/2 -- To view, visit https://review.coreboot.org/c/coreboot/+/74452 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I28a8199b4a5482984dd7fdde67e90acca5af5ca6 Gerrit-Change-Number: 74452 Gerrit-PatchSet: 2 Gerrit-Owner: Kyösti Mälkki <kyosti.malkki(a)gmail.com> Gerrit-Reviewer: Boris Mittelberg <bmbm(a)google.com> Gerrit-Reviewer: Caveh Jalali <caveh(a)chromium.org> Gerrit-Reviewer: Christian Walter <christian.walter(a)9elements.com> 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: Patrick Rudolph <patrick.rudolph(a)9elements.com> Gerrit-Reviewer: Sean Rhodes <sean(a)starlabs.systems> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Attention: Sean Rhodes <sean(a)starlabs.systems> Gerrit-Attention: Jason Nien <jason.nien(a)amd.corp-partner.google.com> Gerrit-Attention: Patrick Rudolph <patrick.rudolph(a)9elements.com> Gerrit-Attention: Caveh Jalali <caveh(a)chromium.org> Gerrit-Attention: Christian Walter <christian.walter(a)9elements.com> Gerrit-Attention: Martin Roth <martin.roth(a)amd.corp-partner.google.com> Gerrit-Attention: Kyösti Mälkki <kyosti.malkki(a)gmail.com> Gerrit-Attention: Boris Mittelberg <bmbm(a)google.com> Gerrit-MessageType: newpatchset

1 0

[M] Change in coreboot[master]: soc/intel/cmn/cse: Move API to get FW partition info into cse_lite.c
by Subrata Banik (Code Review) 15 Apr '23

15 Apr '23

Subrata Banik has submitted this change. ( https://review.coreboot.org/c/coreboot/+/74382 ) ( 2 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: soc/intel/cmn/cse: Move API to get FW partition info into cse_lite.c ...................................................................... soc/intel/cmn/cse: Move API to get FW partition info into cse_lite.c The patch moves API that gets the CSE FW partition information into CSE Lite specific file aka cse_lite.c because the consumer of this API is the cse_lite specific ChromeOS devices hence, it's meaningful to move the cse lite specific implementation inside cse_lite.c file. BUG=b:273661726 TEST=Able to build and boot google/marasov with this code change. Signed-off-by: Subrata Banik <subratabanik(a)google.com> Change-Id: I49ffaec467f6fb24327de3b2882e37bf31eeb7cf Reviewed-on: https://review.coreboot.org/c/coreboot/+/74382 Reviewed-by: Kangheui Won <khwon(a)chromium.org> Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> --- M src/soc/intel/common/block/cse/cse.c M src/soc/intel/common/block/cse/cse_lite.c 2 files changed, 78 insertions(+), 57 deletions(-) Approvals: build bot (Jenkins): Verified Kangheui Won: Looks good to me, approved diff --git a/src/soc/intel/common/block/cse/cse.c b/src/soc/intel/common/block/cse/cse.c index 9a4cd45..1aa3454 100644 --- a/src/soc/intel/common/block/cse/cse.c +++ b/src/soc/intel/common/block/cse/cse.c @@ -1213,63 +1213,6 @@ } } -static enum cb_err send_get_fpt_partition_info_cmd(enum fpt_partition_id id, - struct fw_version_resp *resp) -{ - enum cse_tx_rx_status ret; - struct fw_version_msg { - struct mkhi_hdr hdr; - enum fpt_partition_id partition_id; - } __packed msg = { - .hdr = { - .group_id = MKHI_GROUP_ID_GEN, - .command = GEN_GET_IMAGE_FW_VERSION, - }, - .partition_id = id, - }; - - /* - * Prerequisites: - * 1) HFSTS1 CWS is Normal - * 2) HFSTS1 COM is Normal - * 3) Only sent after DID (accomplished by compiling this into ramstage) - */ - - if (cse_is_hfs1_com_soft_temp_disable() || !cse_is_hfs1_cws_normal() || - !cse_is_hfs1_com_normal()) { - printk(BIOS_ERR, - "HECI: Prerequisites not met for Get Image Firmware Version command\n"); - return CB_ERR; - } - - size_t resp_size = sizeof(struct fw_version_resp); - ret = heci_send_receive(&msg, sizeof(msg), resp, &resp_size, HECI_MKHI_ADDR); - - if (ret || resp->hdr.result) { - printk(BIOS_ERR, "CSE: Failed to get partition information for %d: 0x%x\n", - id, resp->hdr.result); - return CB_ERR; - } - - return CB_SUCCESS; -} - -enum cb_err cse_get_fpt_partition_info(enum fpt_partition_id id, struct fw_version_resp *resp) -{ - if (vboot_recovery_mode_enabled()) { - printk(BIOS_WARNING, - "CSE: Skip sending Get Image Info command during recovery mode!\n"); - return CB_ERR; - } - - if (id == FPT_PARTITION_NAME_ISHC && !CONFIG(DRIVERS_INTEL_ISH)) { - printk(BIOS_WARNING, "CSE: Info request denied, no ISH partition\n"); - return CB_ERR; - } - - return send_get_fpt_partition_info_cmd(id, resp); -} - #if ENV_RAMSTAGE /* diff --git a/src/soc/intel/common/block/cse/cse_lite.c b/src/soc/intel/common/block/cse/cse_lite.c index 4a624e6..4cc9e19 100644 --- a/src/soc/intel/common/block/cse/cse_lite.c +++ b/src/soc/intel/common/block/cse/cse_lite.c @@ -1152,6 +1152,63 @@ } } +static enum cb_err send_get_fpt_partition_info_cmd(enum fpt_partition_id id, + struct fw_version_resp *resp) +{ + enum cse_tx_rx_status ret; + struct fw_version_msg { + struct mkhi_hdr hdr; + enum fpt_partition_id partition_id; + } __packed msg = { + .hdr = { + .group_id = MKHI_GROUP_ID_GEN, + .command = GEN_GET_IMAGE_FW_VERSION, + }, + .partition_id = id, + }; + + /* + * Prerequisites: + * 1) HFSTS1 CWS is Normal + * 2) HFSTS1 COM is Normal + * 3) Only sent after DID (accomplished by compiling this into ramstage) + */ + + if (cse_is_hfs1_com_soft_temp_disable() || !cse_is_hfs1_cws_normal() || + !cse_is_hfs1_com_normal()) { + printk(BIOS_ERR, + "HECI: Prerequisites not met for Get Image Firmware Version command\n"); + return CB_ERR; + } + + size_t resp_size = sizeof(struct fw_version_resp); + ret = heci_send_receive(&msg, sizeof(msg), resp, &resp_size, HECI_MKHI_ADDR); + + if (ret || resp->hdr.result) { + printk(BIOS_ERR, "CSE: Failed to get partition information for %d: 0x%x\n", + id, resp->hdr.result); + return CB_ERR; + } + + return CB_SUCCESS; +} + +enum cb_err cse_get_fpt_partition_info(enum fpt_partition_id id, struct fw_version_resp *resp) +{ + if (vboot_recovery_mode_enabled()) { + printk(BIOS_WARNING, + "CSE: Skip sending Get Image Info command during recovery mode!\n"); + return CB_ERR; + } + + if (id == FPT_PARTITION_NAME_ISHC && !CONFIG(DRIVERS_INTEL_ISH)) { + printk(BIOS_WARNING, "CSE: Info request denied, no ISH partition\n"); + return CB_ERR; + } + + return send_get_fpt_partition_info_cmd(id, resp); +} + static void ramstage_cse_fw_sync(void *unused) { bool s3wake; -- To view, visit https://review.coreboot.org/c/coreboot/+/74382 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I49ffaec467f6fb24327de3b2882e37bf31eeb7cf Gerrit-Change-Number: 74382 Gerrit-PatchSet: 5 Gerrit-Owner: Subrata Banik <subratabanik(a)google.com> Gerrit-Reviewer: Dinesh Gehlot <digehlot(a)google.com> Gerrit-Reviewer: Kangheui Won <khwon(a)chromium.org> Gerrit-Reviewer: Kapil Porwal <kapilporwal(a)google.com> Gerrit-Reviewer: SRIDHAR SIRICILLA Gerrit-Reviewer: Subrata Banik <subratabanik(a)google.com> Gerrit-Reviewer: Tarun Tuli <taruntuli(a)google.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Sridhar Siricilla <sridhar.siricilla(a)intel.com> Gerrit-MessageType: merged

1 0

[M] Change in coreboot[master]: SMBIOS: Move identication strings
by Kyösti Mälkki (Code Review) 15 Apr '23

15 Apr '23

Attention is currently required from: Sean Rhodes, Jason Nien, Patrick Rudolph, Caveh Jalali, Christian Walter, Martin Roth, Boris Mittelberg. Kyösti Mälkki has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/74452 ) Change subject: SMBIOS: Move identication strings ...................................................................... SMBIOS: Move identication strings This improve ccache hit rate, as the strings are only expanded in for object lib/identity.o. Change-Id: I28a8199b4a5482984dd7fdde67e90acca5af5ca6 Signed-off-by: Kyösti Mälkki <kyosti.malkki(a)gmail.com> --- M src/arch/x86/smbios.c M src/arch/x86/smbios_defaults.c M src/drivers/generic/cbfs-serial/cbfs-serial.c M src/ec/google/chromeec/ec_smbios.c M src/include/identity.h M src/include/smbios.h M src/lib/identity.c M src/mainboard/emulation/qemu-i440fx/fw_cfg.c M src/mainboard/google/kahlee/variants/baseboard/mainboard.c M src/mainboard/google/poppy/variants/nami/mainboard.c M src/mainboard/prodrive/hermes/smbios.c M src/mainboard/starlabs/lite/smbios.c M src/mainboard/starlabs/starbook/smbios.c 13 files changed, 60 insertions(+), 23 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/52/74452/1 diff --git a/src/arch/x86/smbios.c b/src/arch/x86/smbios.c index 1ec0ad2..d40b958 100644 --- a/src/arch/x86/smbios.c +++ b/src/arch/x86/smbios.c @@ -4,13 +4,13 @@ #include <string.h> #include <smbios.h> #include <console/console.h> -#include <version.h> #include <device/device.h> #include <device/dram/spd.h> #include <arch/cpu.h> #include <cpu/x86/name.h> #include <elog.h> #include <endian.h> +#include <identity.h> #include <memory_info.h> #include <spd.h> #include <cbmem.h> @@ -19,6 +19,7 @@ #include <device/pci.h> #include <drivers/vpd/vpd.h> #include <stdlib.h> +#include <version.h> #define update_max(len, max_len, stmt) \ do { \ @@ -493,9 +494,8 @@ t->wakeup_type = smbios_system_wakeup_type(); t->sku = smbios_add_string(t->eos, smbios_system_sku()); t->version = smbios_add_string(t->eos, smbios_system_version()); -#ifdef CONFIG_MAINBOARD_FAMILY - t->family = smbios_add_string(t->eos, CONFIG_MAINBOARD_FAMILY); -#endif + if (smbios_cfg_mb_family[0]) + t->family = smbios_add_string(t->eos, smbios_cfg_mb_family); smbios_system_set_uuid(t->uuid); const int len = smbios_full_table_len(&t->header, t->eos); *current += len; diff --git a/src/arch/x86/smbios_defaults.c b/src/arch/x86/smbios_defaults.c index 8b62ebb..171802c 100644 --- a/src/arch/x86/smbios_defaults.c +++ b/src/arch/x86/smbios_defaults.c @@ -1,5 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0-only */ +#include <identity.h> #include <memory_info.h> #include <smbios.h> #include <stdint.h> @@ -39,22 +40,22 @@ __weak const char *smbios_mainboard_serial_number(void) { - return CONFIG_MAINBOARD_SERIAL_NUMBER; + return smbios_cfg_mb_serial_number; } __weak const char *smbios_mainboard_version(void) { - return CONFIG_MAINBOARD_VERSION; + return smbios_cfg_mb_version; } __weak const char *smbios_mainboard_manufacturer(void) { - return CONFIG_MAINBOARD_SMBIOS_MANUFACTURER; + return smbios_cfg_mb_manufacturer; } __weak const char *smbios_mainboard_product_name(void) { - return CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME; + return smbios_cfg_mb_product_name; } __weak const char *smbios_mainboard_asset_tag(void) diff --git a/src/drivers/generic/cbfs-serial/cbfs-serial.c b/src/drivers/generic/cbfs-serial/cbfs-serial.c index 6ff010c..6963df9 100644 --- a/src/drivers/generic/cbfs-serial/cbfs-serial.c +++ b/src/drivers/generic/cbfs-serial/cbfs-serial.c @@ -20,8 +20,7 @@ return serial_number; } - strncpy(serial_number, CONFIG_MAINBOARD_SERIAL_NUMBER, - MAX_SERIAL_LENGTH); + strncpy(serial_number, smbios_cfg_mb_serial_number, MAX_SERIAL_LENGTH); return serial_number; } diff --git a/src/ec/google/chromeec/ec_smbios.c b/src/ec/google/chromeec/ec_smbios.c index d804f64..9878c0b 100644 --- a/src/ec/google/chromeec/ec_smbios.c +++ b/src/ec/google/chromeec/ec_smbios.c @@ -27,7 +27,7 @@ if (manuf) return manuf; - manuf = CONFIG_MAINBOARD_SMBIOS_MANUFACTURER; + manuf = smbios_cfg_mb_manufacturer; if (google_chromeec_cbi_get_oem_name(&oem_name[0], ARRAY_SIZE(oem_name)) < 0) printk(BIOS_INFO, "Couldn't obtain OEM name from CBI\n"); else if (strlen(oem_name) > 0) diff --git a/src/include/identity.h b/src/include/identity.h index d939291..e329cae 100644 --- a/src/include/identity.h +++ b/src/include/identity.h @@ -8,4 +8,11 @@ extern const char mainboard_vendor[]; extern const char mainboard_part_number[]; +/* SMBIOS defaults */ +extern const char smbios_cfg_mb_serial_number[]; +extern const char smbios_cfg_mb_manufacturer[]; +extern const char smbios_cfg_mb_version[]; +extern const char smbios_cfg_mb_product_name[]; +extern const char smbios_cfg_mb_family[]; + #endif /* IDENTITY_H */ diff --git a/src/include/smbios.h b/src/include/smbios.h index 446652c..fc93c4b 100644 --- a/src/include/smbios.h +++ b/src/include/smbios.h @@ -6,6 +6,9 @@ #include <types.h> #include <memory_info.h> +/* indirect */ +#include <version.h> + unsigned long smbios_write_tables(unsigned long start); int smbios_add_string(u8 *start, const char *str); int smbios_string_table_len(u8 *start); diff --git a/src/lib/identity.c b/src/lib/identity.c index 04371a7..3cc90b82 100644 --- a/src/lib/identity.c +++ b/src/lib/identity.c @@ -12,3 +12,15 @@ const char mainboard_vendor[] = CONFIG_MAINBOARD_VENDOR; const char mainboard_part_number[] = CONFIG_MAINBOARD_PART_NUMBER; const char mainboard_name[] = CONFIG_MAINBOARD_VENDOR " " CONFIG_MAINBOARD_PART_NUMBER; + +const char smbios_cfg_mb_version[] = CONFIG_MAINBOARD_VERSION; +const char smbios_cfg_mb_serial_number[] = CONFIG_MAINBOARD_SERIAL_NUMBER; +#ifdef CONFIG_MAINBOARD_FAMILY +const char smbios_cfg_mb_family[] = CONFIG_MAINBOARD_FAMILY; +#else +const char smbios_cfg_mb_family[] = "\0"; +#endif + +/* These default to MAINBOARD_VENDOR and MAINBOARD_PART_NUMBER. */ +const char smbios_cfg_mb_manufacturer[] = CONFIG_MAINBOARD_SMBIOS_MANUFACTURER; +const char smbios_cfg_mb_product_name[] = CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME; diff --git a/src/mainboard/emulation/qemu-i440fx/fw_cfg.c b/src/mainboard/emulation/qemu-i440fx/fw_cfg.c index 5c23988..bea0964 100644 --- a/src/mainboard/emulation/qemu-i440fx/fw_cfg.c +++ b/src/mainboard/emulation/qemu-i440fx/fw_cfg.c @@ -478,25 +478,25 @@ const char *smbios_mainboard_manufacturer(void) { fw_cfg_smbios_init(); - return type1_manufacturer ?: CONFIG_MAINBOARD_SMBIOS_MANUFACTURER; + return type1_manufacturer ?: smbios_cfg_mb_manufacturer; } const char *smbios_mainboard_product_name(void) { fw_cfg_smbios_init(); - return type1_product_name ?: CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME; + return type1_product_name ?: smbios_cfg_mb_product_name; } const char *smbios_mainboard_version(void) { fw_cfg_smbios_init(); - return type1_version ?: CONFIG_MAINBOARD_VERSION; + return type1_version ?: smbios_cfg_mb_version; } const char *smbios_mainboard_serial_number(void) { fw_cfg_smbios_init(); - return type1_serial_number ?: CONFIG_MAINBOARD_SERIAL_NUMBER; + return type1_serial_number ?: smbios_cfg_mb_serial_number; } void smbios_system_set_uuid(u8 *uuid) diff --git a/src/mainboard/google/kahlee/variants/baseboard/mainboard.c b/src/mainboard/google/kahlee/variants/baseboard/mainboard.c index 7893449..5c012e2 100644 --- a/src/mainboard/google/kahlee/variants/baseboard/mainboard.c +++ b/src/mainboard/google/kahlee/variants/baseboard/mainboard.c @@ -35,7 +35,7 @@ static const char *manuf; if (!CONFIG(USE_OEM_BIN)) - return CONFIG_MAINBOARD_SMBIOS_MANUFACTURER; + return smbios_cfg_mb_manufacturer; if (manuf) return manuf; @@ -43,7 +43,7 @@ if (cbfs_load("oem.bin", oem_bin_data, sizeof(oem_bin_data) - 1)) manuf = &oem_bin_data[0]; else - manuf = CONFIG_MAINBOARD_SMBIOS_MANUFACTURER; + manuf = smbios_cfg_mb_manufacturer; return manuf; } diff --git a/src/mainboard/google/poppy/variants/nami/mainboard.c b/src/mainboard/google/poppy/variants/nami/mainboard.c index b703d40..ad7a7df 100644 --- a/src/mainboard/google/poppy/variants/nami/mainboard.c +++ b/src/mainboard/google/poppy/variants/nami/mainboard.c @@ -153,7 +153,7 @@ /* If OEM ID cannot be determined, return default manuf string. */ if (oem_id == OEM_UNKNOWN) - return CONFIG_MAINBOARD_SMBIOS_MANUFACTURER; + return smbios_cfg_mb_manufacturer; oem_data_size = cbfs_load("oem.bin", oem_bin_data, sizeof(oem_bin_data)); @@ -169,7 +169,7 @@ } if (manuf == NULL) - manuf = CONFIG_MAINBOARD_SMBIOS_MANUFACTURER; + manuf = smbios_cfg_mb_manufacturer; return manuf; } diff --git a/src/mainboard/prodrive/hermes/smbios.c b/src/mainboard/prodrive/hermes/smbios.c index 923ce81..855c288 100644 --- a/src/mainboard/prodrive/hermes/smbios.c +++ b/src/mainboard/prodrive/hermes/smbios.c @@ -9,13 +9,13 @@ const char *smbios_system_serial_number(void) { const size_t offset = offsetof(struct eeprom_layout, system_serial_number); - return eeprom_read_serial(offset, CONFIG_MAINBOARD_SERIAL_NUMBER); + return eeprom_read_serial(offset, smbios_cfg_mb_serial_number); } const char *smbios_mainboard_serial_number(void) { const size_t offset = offsetof(struct eeprom_layout, board_serial_number); - return eeprom_read_serial(offset, CONFIG_MAINBOARD_SERIAL_NUMBER); + return eeprom_read_serial(offset, smbios_cfg_mb_serial_number); } const char *smbios_mainboard_version(void) diff --git a/src/mainboard/starlabs/lite/smbios.c b/src/mainboard/starlabs/lite/smbios.c index d9ae270..2f578fa 100644 --- a/src/mainboard/starlabs/lite/smbios.c +++ b/src/mainboard/starlabs/lite/smbios.c @@ -8,6 +8,7 @@ #include <types.h> #include <uuid.h> #include <variants.h> +#include <identity.h> /* Get the Embedded Controller firmware version */ void smbios_ec_revision(uint8_t *ec_major_revision, uint8_t *ec_minor_revision) @@ -20,7 +21,7 @@ const char *smbios_system_sku(void) { - return CONFIG_MAINBOARD_FAMILY; + return smbios_cfg_mb_family; } u8 smbios_mainboard_feature_flags(void) diff --git a/src/mainboard/starlabs/starbook/smbios.c b/src/mainboard/starlabs/starbook/smbios.c index ab2c211..3a53f6e 100644 --- a/src/mainboard/starlabs/starbook/smbios.c +++ b/src/mainboard/starlabs/starbook/smbios.c @@ -8,6 +8,7 @@ #include <types.h> #include <uuid.h> #include <variants.h> +#include <identity.h> /* Get the Embedded Controller firmware version */ void smbios_ec_revision(uint8_t *ec_major_revision, uint8_t *ec_minor_revision) @@ -20,7 +21,7 @@ const char *smbios_system_sku(void) { - return CONFIG_MAINBOARD_FAMILY; + return smbios_cfg_mb_family; } u8 smbios_mainboard_feature_flags(void) -- To view, visit https://review.coreboot.org/c/coreboot/+/74452 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I28a8199b4a5482984dd7fdde67e90acca5af5ca6 Gerrit-Change-Number: 74452 Gerrit-PatchSet: 1 Gerrit-Owner: Kyösti Mälkki <kyosti.malkki(a)gmail.com> Gerrit-Reviewer: Boris Mittelberg <bmbm(a)google.com> Gerrit-Reviewer: Caveh Jalali <caveh(a)chromium.org> Gerrit-Reviewer: Christian Walter <christian.walter(a)9elements.com> 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: Patrick Rudolph <patrick.rudolph(a)9elements.com> Gerrit-Reviewer: Sean Rhodes <sean(a)starlabs.systems> Gerrit-Attention: Sean Rhodes <sean(a)starlabs.systems> Gerrit-Attention: Jason Nien <jason.nien(a)amd.corp-partner.google.com> Gerrit-Attention: Patrick Rudolph <patrick.rudolph(a)9elements.com> Gerrit-Attention: Caveh Jalali <caveh(a)chromium.org> Gerrit-Attention: Christian Walter <christian.walter(a)9elements.com> Gerrit-Attention: Martin Roth <martin.roth(a)amd.corp-partner.google.com> Gerrit-Attention: Boris Mittelberg <bmbm(a)google.com> Gerrit-MessageType: newchange

1 0

[S] Change in coreboot[master]: SMBIOS: Group Kconfig dependency
by Kyösti Mälkki (Code Review) 15 Apr '23

15 Apr '23

Kyösti Mälkki has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/74451 ) Change subject: SMBIOS: Group Kconfig dependency ...................................................................... SMBIOS: Group Kconfig dependency Change-Id: I5a75a7230fd78c0a9926adc491059f55647cc9a3 Signed-off-by: Kyösti Mälkki <kyosti.malkki(a)gmail.com> --- M src/Kconfig 1 file changed, 15 insertions(+), 5 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/51/74451/1 diff --git a/src/Kconfig b/src/Kconfig index e35df43..3b2b29a 100644 --- a/src/Kconfig +++ b/src/Kconfig @@ -883,10 +883,11 @@ bool default n +if GENERATE_SMBIOS_TABLES + config MAINBOARD_SERIAL_NUMBER prompt "SMBIOS Serial Number" if !SMBIOS_PROVIDED_BY_MOBO string - depends on GENERATE_SMBIOS_TABLES default "123456789" help The Serial Number to store in SMBIOS structures. @@ -894,7 +895,6 @@ config MAINBOARD_VERSION prompt "SMBIOS Version Number" if !SMBIOS_PROVIDED_BY_MOBO string - depends on GENERATE_SMBIOS_TABLES default "1.0" help The Version Number to store in SMBIOS structures. @@ -902,7 +902,6 @@ config MAINBOARD_SMBIOS_MANUFACTURER prompt "SMBIOS Manufacturer" if !SMBIOS_PROVIDED_BY_MOBO string - depends on GENERATE_SMBIOS_TABLES default MAINBOARD_VENDOR help Override the default Manufacturer stored in SMBIOS structures. @@ -910,7 +909,6 @@ config MAINBOARD_SMBIOS_PRODUCT_NAME prompt "SMBIOS Product name" if !SMBIOS_PROVIDED_BY_MOBO string - depends on GENERATE_SMBIOS_TABLES default MAINBOARD_PART_NUMBER help Override the default Product name stored in SMBIOS structures. @@ -918,13 +916,15 @@ config VPD_SMBIOS_VERSION bool "Populates SMBIOS type 0 version from the VPD_RO variable 'firmware_version'" default n - depends on VPD && GENERATE_SMBIOS_TABLES + depends on VPD help Selecting this option will read firmware_version from VPD_RO and override SMBIOS type 0 version. One special scenario of using this feature is to assign a BIOS version to a coreboot image without the need to rebuild from source. +endif + endmenu source "payloads/Kconfig" -- To view, visit https://review.coreboot.org/c/coreboot/+/74451 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I5a75a7230fd78c0a9926adc491059f55647cc9a3 Gerrit-Change-Number: 74451 Gerrit-PatchSet: 1 Gerrit-Owner: Kyösti Mälkki <kyosti.malkki(a)gmail.com> Gerrit-MessageType: newchange

1 0

[M] Change in coreboot[master]: [WIP] Avoid literal uses of CONFIG_MAINBOARD_PART_NUMBER
by Kyösti Mälkki (Code Review) 15 Apr '23

15 Apr '23

Attention is currently required from: Hung-Te Lin, Michał Żygowski, Jason Nien, Michał Kopeć, Martin Roth, Yidi Lin, Yu-Ping Wu, Piotr Król. Kyösti Mälkki has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/74450 ) Change subject: [WIP] Avoid literal uses of CONFIG_MAINBOARD_PART_NUMBER ...................................................................... [WIP] Avoid literal uses of CONFIG_MAINBOARD_PART_NUMBER Change-Id: I917222922560c6273b4be91cd7d99ce2ff8e4231 Signed-off-by: Kyösti Mälkki <kyosti.malkki(a)gmail.com> --- M src/arch/x86/mpspec.c M src/drivers/i2c/max98390/max98390.c M src/lib/fit.c M src/mainboard/emulation/qemu-i440fx/northbridge.c M src/mainboard/google/cherry/mainboard.c M src/mainboard/google/corsola/mainboard.c M src/mainboard/google/geralt/mainboard.c M src/mainboard/google/guybrush/mainboard.c M src/mainboard/google/herobrine/mainboard.c M src/mainboard/google/kukui/mainboard.c M src/mainboard/google/myst/mainboard.c M src/mainboard/google/skyrim/mainboard.c M src/mainboard/msi/ms7d25/mainboard.c M src/mainboard/pcengines/apu2/mainboard.c 14 files changed, 32 insertions(+), 26 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/50/74450/1 diff --git a/src/arch/x86/mpspec.c b/src/arch/x86/mpspec.c index cbf6743..754460b 100644 --- a/src/arch/x86/mpspec.c +++ b/src/arch/x86/mpspec.c @@ -11,6 +11,7 @@ #include <device/pci_ids.h> #include <stdint.h> #include <string.h> +#include <identity.h> /* Initialize the specified "mc" struct with initial values. */ void mptable_init(struct mp_config_table *mc) @@ -33,16 +34,16 @@ mc->mpe_checksum = 0; mc->reserved = 0; - strncpy(mc->mpc_oem, CONFIG_MAINBOARD_VENDOR, 8); - strncpy(mc->mpc_productid, CONFIG_MAINBOARD_PART_NUMBER, 12); + strncpy(mc->mpc_oem, mainboard_vendor, 8); + strncpy(mc->mpc_productid, mainboard_part_number, 12); /* * The oem/productid fields are exactly 8/12 bytes long. If the resp. * entry is shorter, the remaining bytes are filled with spaces. */ - for (i = MIN(strlen(CONFIG_MAINBOARD_VENDOR), 8); i < 8; i++) + for (i = MIN(strlen(mainboard_vendor), 8); i < 8; i++) mc->mpc_oem[i] = ' '; - for (i = MIN(strlen(CONFIG_MAINBOARD_PART_NUMBER), 12); i < 12; i++) + for (i = MIN(strlen(mainboard_part_number), 12); i < 12; i++) mc->mpc_productid[i] = ' '; } diff --git a/src/drivers/i2c/max98390/max98390.c b/src/drivers/i2c/max98390/max98390.c index 12c8c9d..fc87332 100644 --- a/src/drivers/i2c/max98390/max98390.c +++ b/src/drivers/i2c/max98390/max98390.c @@ -7,6 +7,7 @@ #include <device/device.h> #include <device/path.h> #include <stdint.h> +#include <identity.h> #include <vendorcode/google/chromeos/chromeos.h> #include "chip.h" @@ -68,8 +69,8 @@ dp = acpi_dp_new_table("_DSD"); size_t chars = snprintf(dsm_name, sizeof(dsm_name), "%s_%s_%s.bin", - config->dsm_param_file_name, CONFIG_MAINBOARD_VENDOR, - CONFIG_MAINBOARD_PART_NUMBER); + config->dsm_param_file_name, mainboard_vendor, + mainboard_part_number); if (chars >= sizeof(dsm_name)) printk(BIOS_ERR, "String too long in %s\n", __func__); diff --git a/src/lib/fit.c b/src/lib/fit.c index 0513950..7eccc4f 100644 --- a/src/lib/fit.c +++ b/src/lib/fit.c @@ -13,6 +13,7 @@ #include <boardid.h> #include <commonlib/stdlib.h> #include <types.h> +#include <identity.h> static struct list_node image_nodes; static struct list_node config_nodes; @@ -42,30 +43,28 @@ if ((board_id() != UNDEFINED_STRAPPING_ID) && (sku_id() != UNDEFINED_STRAPPING_ID)) { snprintf(compat_string, sizeof(compat_string), - "%s,%s-rev%u-sku%u", CONFIG_MAINBOARD_VENDOR, - CONFIG_MAINBOARD_PART_NUMBER, board_id(), sku_id()); + "%s,%s-rev%u-sku%u", mainboard_vendor, mainboard_part_number, + board_id(), sku_id()); fit_add_compat_string(compat_string); } if (board_id() != UNDEFINED_STRAPPING_ID) { snprintf(compat_string, sizeof(compat_string), "%s,%s-rev%u", - CONFIG_MAINBOARD_VENDOR, CONFIG_MAINBOARD_PART_NUMBER, - board_id()); + mainboard_vendor, mainboard_part_number, board_id()); fit_add_compat_string(compat_string); } if (sku_id() != UNDEFINED_STRAPPING_ID) { snprintf(compat_string, sizeof(compat_string), "%s,%s-sku%u", - CONFIG_MAINBOARD_VENDOR, CONFIG_MAINBOARD_PART_NUMBER, - sku_id()); + mainboard_vendor, mainboard_part_number, sku_id()); fit_add_compat_string(compat_string); } snprintf(compat_string, sizeof(compat_string), "%s,%s", - CONFIG_MAINBOARD_VENDOR, CONFIG_MAINBOARD_PART_NUMBER); + mainboard_vendor, mainboard_part_number); fit_add_compat_string(compat_string); } diff --git a/src/mainboard/emulation/qemu-i440fx/northbridge.c b/src/mainboard/emulation/qemu-i440fx/northbridge.c index 56693c3..fe3d292 100644 --- a/src/mainboard/emulation/qemu-i440fx/northbridge.c +++ b/src/mainboard/emulation/qemu-i440fx/northbridge.c @@ -9,6 +9,7 @@ #include <device/pci_ops.h> #include <arch/ioapic.h> #include <device/device.h> +#include <identity.h> #include <stdlib.h> #include <smbios.h> #include <types.h> @@ -191,7 +192,7 @@ t->type_detail = MEMORY_TYPE_DETAIL_SYNCHRONOUS; t->speed = 200; t->clock_speed = 200; - t->manufacturer = smbios_add_string(t->eos, CONFIG_MAINBOARD_VENDOR); + t->manufacturer = smbios_add_string(t->eos, mainboard_vendor); const int len = smbios_full_table_len(&t->header, t->eos); *current += len; diff --git a/src/mainboard/google/cherry/mainboard.c b/src/mainboard/google/cherry/mainboard.c index 4447806..c1593ca 100644 --- a/src/mainboard/google/cherry/mainboard.c +++ b/src/mainboard/google/cherry/mainboard.c @@ -159,6 +159,5 @@ } struct chip_operations mainboard_ops = { - .name = CONFIG_MAINBOARD_PART_NUMBER, .enable_dev = mainboard_enable, }; diff --git a/src/mainboard/google/corsola/mainboard.c b/src/mainboard/google/corsola/mainboard.c index 3efedf8..b6823c6 100644 --- a/src/mainboard/google/corsola/mainboard.c +++ b/src/mainboard/google/corsola/mainboard.c @@ -58,6 +58,5 @@ } struct chip_operations mainboard_ops = { - .name = CONFIG_MAINBOARD_PART_NUMBER, .enable_dev = mainboard_enable, }; diff --git a/src/mainboard/google/geralt/mainboard.c b/src/mainboard/google/geralt/mainboard.c index 1422398..4042dce 100644 --- a/src/mainboard/google/geralt/mainboard.c +++ b/src/mainboard/google/geralt/mainboard.c @@ -69,6 +69,5 @@ } struct chip_operations mainboard_ops = { - .name = CONFIG_MAINBOARD_PART_NUMBER, .enable_dev = mainboard_enable, }; diff --git a/src/mainboard/google/guybrush/mainboard.c b/src/mainboard/google/guybrush/mainboard.c index 71d3ec5..af79a5e 100644 --- a/src/mainboard/google/guybrush/mainboard.c +++ b/src/mainboard/google/guybrush/mainboard.c @@ -179,8 +179,6 @@ static void mainboard_enable(struct device *dev) { - printk(BIOS_INFO, "Mainboard " CONFIG_MAINBOARD_PART_NUMBER " Enable.\n"); - dev->ops->acpi_fill_ssdt = mainboard_fill_ssdt; /* TODO: b/184678786 - Move into espi_config */ diff --git a/src/mainboard/google/herobrine/mainboard.c b/src/mainboard/google/herobrine/mainboard.c index e2c4199..6b54678 100644 --- a/src/mainboard/google/herobrine/mainboard.c +++ b/src/mainboard/google/herobrine/mainboard.c @@ -173,6 +173,5 @@ } struct chip_operations mainboard_ops = { - .name = CONFIG_MAINBOARD_PART_NUMBER, .enable_dev = mainboard_enable, }; diff --git a/src/mainboard/google/kukui/mainboard.c b/src/mainboard/google/kukui/mainboard.c index e1c50f4..6606cf2 100644 --- a/src/mainboard/google/kukui/mainboard.c +++ b/src/mainboard/google/kukui/mainboard.c @@ -19,6 +19,7 @@ #include <soc/spm.h> #include <soc/usb.h> #include <string.h> +#include <identity.h> #include "gpio.h" #include "panel.h" @@ -65,7 +66,7 @@ struct panel_description __weak *get_panel_description(int panel_id) { printk(BIOS_ERR, "%s: ERROR: No panels defined for board: %s.\n", - __func__, CONFIG_MAINBOARD_PART_NUMBER); + __func__, mainboard_part_number); return NULL; } diff --git a/src/mainboard/google/myst/mainboard.c b/src/mainboard/google/myst/mainboard.c index e433c98..0e084cb 100644 --- a/src/mainboard/google/myst/mainboard.c +++ b/src/mainboard/google/myst/mainboard.c @@ -37,8 +37,6 @@ static void mainboard_enable(struct device *dev) { - printk(BIOS_INFO, "Mainboard " CONFIG_MAINBOARD_PART_NUMBER " Enable.\n"); - /* TODO: b/184678786 - Move into espi_config */ /* Unmask eSPI IRQ 1 (Keyboard) */ pm_write32(PM_ESPI_INTR_CTRL, PM_ESPI_DEV_INTR_MASK & ~(BIT(1))); diff --git a/src/mainboard/google/skyrim/mainboard.c b/src/mainboard/google/skyrim/mainboard.c index 475e5cf..172f8de 100644 --- a/src/mainboard/google/skyrim/mainboard.c +++ b/src/mainboard/google/skyrim/mainboard.c @@ -90,7 +90,6 @@ static void mainboard_enable(struct device *dev) { - printk(BIOS_INFO, "Mainboard " CONFIG_MAINBOARD_PART_NUMBER " Enable.\n"); /* TODO: b/184678786 - Move into espi_config */ /* Unmask eSPI IRQ 1 (Keyboard) */ diff --git a/src/mainboard/msi/ms7d25/mainboard.c b/src/mainboard/msi/ms7d25/mainboard.c index 539f897e..cc001ff 100644 --- a/src/mainboard/msi/ms7d25/mainboard.c +++ b/src/mainboard/msi/ms7d25/mainboard.c @@ -6,6 +6,7 @@ #include <soc/ramstage.h> #include <smbios.h> #include <string.h> +#include <identity.h> void mainboard_fill_fadt(acpi_fadt_t *fadt) { @@ -49,7 +50,7 @@ return "PRO Z690-A (MS-7D25)"; } - return CONFIG_MAINBOARD_PART_NUMBER; + return mainboard_part_number; } /* Only baseboard serial number is populated */ diff --git a/src/mainboard/pcengines/apu2/mainboard.c b/src/mainboard/pcengines/apu2/mainboard.c index 9371ee9..7c1bfc4 100644 --- a/src/mainboard/pcengines/apu2/mainboard.c +++ b/src/mainboard/pcengines/apu2/mainboard.c @@ -16,6 +16,7 @@ #include <superio/nuvoton/nct5104d/nct5104d.h> #include <smbios.h> #include <string.h> +#include <identity.h> #include <AGESA.h> #include "gpio_ftns.h" @@ -226,7 +227,7 @@ static void mainboard_enable(struct device *dev) { /* Maintain this text unchanged for manufacture process. */ - printk(BIOS_INFO, "Mainboard " CONFIG_MAINBOARD_PART_NUMBER " Enable.\n"); + printk(BIOS_INFO, "Mainboard %s Enable.\n", mainboard_part_number); config_gpio_mux(); -- To view, visit https://review.coreboot.org/c/coreboot/+/74450 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I917222922560c6273b4be91cd7d99ce2ff8e4231 Gerrit-Change-Number: 74450 Gerrit-PatchSet: 1 Gerrit-Owner: Kyösti Mälkki <kyosti.malkki(a)gmail.com> Gerrit-Reviewer: Hung-Te Lin <hungte(a)chromium.org> 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: Michał Kopeć <michal.kopec(a)3mdeb.com> Gerrit-Reviewer: Michał Żygowski <michal.zygowski(a)3mdeb.com> Gerrit-Reviewer: Piotr Król <piotr.krol(a)3mdeb.com> Gerrit-Reviewer: Yidi Lin <yidilin(a)google.com> Gerrit-Reviewer: Yu-Ping Wu <yupingso(a)google.com> Gerrit-Attention: Hung-Te Lin <hungte(a)chromium.org> Gerrit-Attention: Michał Żygowski <michal.zygowski(a)3mdeb.com> Gerrit-Attention: Jason Nien <jason.nien(a)amd.corp-partner.google.com> Gerrit-Attention: Michał Kopeć <michal.kopec(a)3mdeb.com> Gerrit-Attention: Martin Roth <martin.roth(a)amd.corp-partner.google.com> Gerrit-Attention: Yidi Lin <yidilin(a)google.com> Gerrit-Attention: Yu-Ping Wu <yupingso(a)google.com> Gerrit-Attention: Piotr Król <piotr.krol(a)3mdeb.com> Gerrit-MessageType: newchange

1 0

[M] Change in coreboot[master]: lib/version: Move board identification strings
by Kyösti Mälkki (Code Review) 15 Apr '23

15 Apr '23

Attention is currently required from: Martin L Roth. Kyösti Mälkki has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/74449 ) Change subject: lib/version: Move board identification strings ...................................................................... lib/version: Move board identification strings These strings are now only expanded in lib/identity.c. This improves ccache hit rates slightly, as one built object file lib/version.o is used for all variants of a board. Also one built object file lib/identity.o can become a ccache hit for successive builds of a variant, while the commit hash changes. Change-Id: Ia7d5454d95c8698ab1c1744e63ea4c04d615bb3b Signed-off-by: Kyösti Mälkki <kyosti.malkki(a)gmail.com> --- M src/device/root_device.c M src/include/device/device.h A src/include/identity.h M src/include/version.h M src/lib/Makefile.inc M src/lib/coreboot_table.c A src/lib/identity.c M src/lib/version.c M util/sconfig/main.c 9 files changed, 47 insertions(+), 25 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/49/74449/1 diff --git a/src/device/root_device.c b/src/device/root_device.c index 1f51786..d8edbd5 100644 --- a/src/device/root_device.c +++ b/src/device/root_device.c @@ -5,8 +5,6 @@ #include <device/pci.h> #include <reset.h> -const char mainboard_name[] = CONFIG_MAINBOARD_VENDOR " " CONFIG_MAINBOARD_PART_NUMBER; - void enable_static_device(struct device *dev) { if (dev->chip_ops && dev->chip_ops->enable_dev) diff --git a/src/include/device/device.h b/src/include/device/device.h index 0b67d3d..d044ae2 100644 --- a/src/include/device/device.h +++ b/src/include/device/device.h @@ -174,8 +174,6 @@ extern struct resource *free_resources; extern struct bus *free_links; -extern const char mainboard_name[]; - /* Generic device interface functions */ struct device *alloc_dev(struct bus *parent, struct device_path *path); void dev_initialize_chips(void); diff --git a/src/include/identity.h b/src/include/identity.h new file mode 100644 index 0000000..d939291 --- /dev/null +++ b/src/include/identity.h @@ -0,0 +1,11 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +#ifndef IDENTITY_H +#define IDENTITY_H + +/* Motherboard Information */ +extern const char mainboard_name[]; +extern const char mainboard_vendor[]; +extern const char mainboard_part_number[]; + +#endif /* IDENTITY_H */ diff --git a/src/include/version.h b/src/include/version.h index 84bb34a..926756a 100644 --- a/src/include/version.h +++ b/src/include/version.h @@ -3,10 +3,6 @@ #ifndef VERSION_H #define VERSION_H -/* Motherboard Information */ -extern const char mainboard_vendor[]; -extern const char mainboard_part_number[]; - /* coreboot Version */ extern const char coreboot_version[]; extern const char coreboot_extra_version[]; diff --git a/src/lib/Makefile.inc b/src/lib/Makefile.inc index c83004a..385c87e 100644 --- a/src/lib/Makefile.inc +++ b/src/lib/Makefile.inc @@ -229,12 +229,8 @@ smm-$(CONFIG_CONSOLE_CBMEM) += cbmem_console.c endif -bootblock-y += version.c -romstage-y += version.c -ramstage-y += version.c -smm-y += version.c -verstage-y += version.c -postcar-y += version.c +all-y += identity.c version.c +smm-y += identity.c version.c $(call src-to-obj,bootblock,$(dir)/version.c) : $(obj)/build.h $(call src-to-obj,romstage,$(dir)/version.c) : $(obj)/build.h diff --git a/src/lib/coreboot_table.c b/src/lib/coreboot_table.c index 0707fd3..bee389d 100644 --- a/src/lib/coreboot_table.c +++ b/src/lib/coreboot_table.c @@ -4,12 +4,12 @@ #include <arch/cbconfig.h> #include <console/console.h> #include <console/uart.h> +#include <identity.h> #include <ip_checksum.h> #include <boot/coreboot_tables.h> #include <boot/tables.h> #include <boot_device.h> #include <string.h> -#include <version.h> #include <boardid.h> #include <device/device.h> #include <drivers/tpm/tpm_ppi.h> @@ -23,6 +23,7 @@ #include <spi_flash.h> #include <smmstore.h> #include <types.h> +#include <version.h> #if CONFIG(USE_OPTION_TABLE) #include <option_table.h> diff --git a/src/lib/identity.c b/src/lib/identity.c new file mode 100644 index 0000000..04371a7 --- /dev/null +++ b/src/lib/identity.c @@ -0,0 +1,14 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +#include <identity.h> + +#ifndef CONFIG_MAINBOARD_VENDOR +#error CONFIG_MAINBOARD_VENDOR not defined +#endif +#ifndef CONFIG_MAINBOARD_PART_NUMBER +#error CONFIG_MAINBOARD_PART_NUMBER not defined +#endif + +const char mainboard_vendor[] = CONFIG_MAINBOARD_VENDOR; +const char mainboard_part_number[] = CONFIG_MAINBOARD_PART_NUMBER; +const char mainboard_name[] = CONFIG_MAINBOARD_VENDOR " " CONFIG_MAINBOARD_PART_NUMBER; diff --git a/src/lib/version.c b/src/lib/version.c index 8471832..43d6a45 100644 --- a/src/lib/version.c +++ b/src/lib/version.c @@ -3,13 +3,6 @@ #include <version.h> #include <build.h> -#ifndef CONFIG_MAINBOARD_VENDOR -#error CONFIG_MAINBOARD_VENDOR not defined -#endif -#ifndef CONFIG_MAINBOARD_PART_NUMBER -#error CONFIG_MAINBOARD_PART_NUMBER not defined -#endif - #ifndef COREBOOT_VERSION #error COREBOOT_VERSION not defined #endif @@ -25,9 +18,6 @@ #define COREBOOT_EXTRA_VERSION "" #endif -const char mainboard_vendor[] = CONFIG_MAINBOARD_VENDOR; -const char mainboard_part_number[] = CONFIG_MAINBOARD_PART_NUMBER; - const char coreboot_version[] = COREBOOT_VERSION; const char coreboot_extra_version[] = COREBOOT_EXTRA_VERSION; const char coreboot_build[] = COREBOOT_BUILD; diff --git a/util/sconfig/main.c b/util/sconfig/main.c index aa79f1e..a246c01 100644 --- a/util/sconfig/main.c +++ b/util/sconfig/main.c @@ -1965,6 +1965,7 @@ fprintf(f, "#include <device/device.h>\n"); fprintf(f, "#include <device/pci.h>\n"); fprintf(f, "#include <fw_config.h>\n"); + fprintf(f, "#include <identity.h>\n"); fprintf(f, "#include <%s>\n", static_header); emit_chip_headers(f, chip_header.next); emit_identifiers(f, "struct device_operations", device_operations); -- To view, visit https://review.coreboot.org/c/coreboot/+/74449 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: Ia7d5454d95c8698ab1c1744e63ea4c04d615bb3b Gerrit-Change-Number: 74449 Gerrit-PatchSet: 1 Gerrit-Owner: Kyösti Mälkki <kyosti.malkki(a)gmail.com> Gerrit-Reviewer: Martin L Roth <gaumless(a)gmail.com> Gerrit-Attention: Martin L Roth <gaumless(a)gmail.com> Gerrit-MessageType: newchange

1 0

[S] Change in coreboot[master]: Drop unused include <version.h>
by Kyösti Mälkki (Code Review) 15 Apr '23

15 Apr '23

Attention is currently required from: Jason Glenesk, Matt DeVillier, Fred Reitberger, Felix Held. Kyösti Mälkki has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/74448 ) Change subject: Drop unused include <version.h> ...................................................................... Drop unused include <version.h> Change-Id: I7d0718b5d2e0dd16eb90f63dd9d33329a2d808ba Signed-off-by: Kyösti Mälkki <kyosti.malkki(a)gmail.com> --- M src/lib/hardwaremain.c M src/soc/amd/picasso/acpi.c M src/soc/amd/stoneyridge/acpi.c M src/southbridge/amd/pi/hudson/fadt.c M src/southbridge/intel/i82371eb/fadt.c M src/southbridge/intel/i82801gx/fadt.c M src/southbridge/intel/i82801ix/fadt.c M src/southbridge/intel/i82801jx/fadt.c 8 files changed, 10 insertions(+), 8 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/48/74448/1 diff --git a/src/lib/hardwaremain.c b/src/lib/hardwaremain.c index 714452d..47022ac 100644 --- a/src/lib/hardwaremain.c +++ b/src/lib/hardwaremain.c @@ -23,7 +23,6 @@ #include <timer.h> #include <timestamp.h> #include <types.h> -#include <version.h> static boot_state_t bs_pre_device(void *arg); static boot_state_t bs_dev_init_chips(void *arg); diff --git a/src/soc/amd/picasso/acpi.c b/src/soc/amd/picasso/acpi.c index a6f1ebd..7ff291e 100644 --- a/src/soc/amd/picasso/acpi.c +++ b/src/soc/amd/picasso/acpi.c @@ -23,7 +23,6 @@ #include <soc/acpi.h> #include <soc/pci_devs.h> #include <soc/southbridge.h> -#include <version.h> #include "chip.h" unsigned long acpi_fill_madt(unsigned long current) diff --git a/src/soc/amd/stoneyridge/acpi.c b/src/soc/amd/stoneyridge/acpi.c index caa6496..bb61123 100644 --- a/src/soc/amd/stoneyridge/acpi.c +++ b/src/soc/amd/stoneyridge/acpi.c @@ -22,7 +22,6 @@ #include <soc/pci_devs.h> #include <soc/southbridge.h> #include <soc/northbridge.h> -#include <version.h> unsigned long acpi_fill_madt(unsigned long current) { diff --git a/src/southbridge/amd/pi/hudson/fadt.c b/src/southbridge/amd/pi/hudson/fadt.c index 4989d6b..2d553ad 100644 --- a/src/southbridge/amd/pi/hudson/fadt.c +++ b/src/southbridge/amd/pi/hudson/fadt.c @@ -7,7 +7,6 @@ #include <console/console.h> #include <acpi/acpi.h> #include <device/device.h> -#include <version.h> #include "hudson.h" #include "smi.h" diff --git a/src/southbridge/intel/i82371eb/fadt.c b/src/southbridge/intel/i82371eb/fadt.c index 1d640f4..3e96497 100644 --- a/src/southbridge/intel/i82371eb/fadt.c +++ b/src/southbridge/intel/i82371eb/fadt.c @@ -7,7 +7,6 @@ #include <acpi/acpi.h> #include <device/device.h> #include <device/pci.h> -#include <version.h> #include "i82371eb.h" diff --git a/src/southbridge/intel/i82801gx/fadt.c b/src/southbridge/intel/i82801gx/fadt.c index 6d63e72..3f97145 100644 --- a/src/southbridge/intel/i82801gx/fadt.c +++ b/src/southbridge/intel/i82801gx/fadt.c @@ -3,7 +3,6 @@ #include <device/pci_ops.h> #include <acpi/acpi.h> #include <cpu/x86/smm.h> -#include <version.h> #include <southbridge/intel/common/pmbase.h> #include "i82801gx.h" #include "chip.h" diff --git a/src/southbridge/intel/i82801ix/fadt.c b/src/southbridge/intel/i82801ix/fadt.c index 54ebcbd..78443ea 100644 --- a/src/southbridge/intel/i82801ix/fadt.c +++ b/src/southbridge/intel/i82801ix/fadt.c @@ -3,7 +3,6 @@ #include <device/pci_ops.h> #include <acpi/acpi.h> #include <cpu/x86/smm.h> -#include <version.h> #include <southbridge/intel/common/pmutil.h> void acpi_fill_fadt(acpi_fadt_t *fadt) diff --git a/src/southbridge/intel/i82801jx/fadt.c b/src/southbridge/intel/i82801jx/fadt.c index 9d60ca5a..f0f4ca1 100644 --- a/src/southbridge/intel/i82801jx/fadt.c +++ b/src/southbridge/intel/i82801jx/fadt.c @@ -3,7 +3,6 @@ #include <device/pci_ops.h> #include <acpi/acpi.h> #include <cpu/x86/smm.h> -#include <version.h> #include <southbridge/intel/common/pmutil.h> void acpi_fill_fadt(acpi_fadt_t *fadt) -- To view, visit https://review.coreboot.org/c/coreboot/+/74448 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I7d0718b5d2e0dd16eb90f63dd9d33329a2d808ba Gerrit-Change-Number: 74448 Gerrit-PatchSet: 1 Gerrit-Owner: Kyösti Mälkki <kyosti.malkki(a)gmail.com> Gerrit-Reviewer: Felix Held <felix-coreboot(a)felixheld.de> Gerrit-Reviewer: Fred Reitberger <reitbergerfred(a)gmail.com> Gerrit-Reviewer: Jason Glenesk <jason.glenesk(a)gmail.com> Gerrit-Reviewer: Matt DeVillier <matt.devillier(a)amd.corp-partner.google.com> Gerrit-Attention: Jason Glenesk <jason.glenesk(a)gmail.com> Gerrit-Attention: Matt DeVillier <matt.devillier(a)amd.corp-partner.google.com> Gerrit-Attention: Fred Reitberger <reitbergerfred(a)gmail.com> Gerrit-Attention: Felix Held <felix-coreboot(a)felixheld.de> Gerrit-MessageType: newchange

1 0

[S] Change in coreboot[master]: soc/intel/braswell: Replace <build.h> with <version.h>
by Kyösti Mälkki (Code Review) 15 Apr '23

15 Apr '23

Kyösti Mälkki has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/74447 ) Change subject: soc/intel/braswell: Replace <build.h> with <version.h> ...................................................................... soc/intel/braswell: Replace <build.h> with <version.h> To use generated build.h one should have had a pre-requisite in the Makefile. Reference coreboot_build_date from lib/version.c instead. Change-Id: Icd6fa2ddf8aa584b0f51ba130592f227bbdad975 Signed-off-by: Kyösti Mälkki <kyosti.malkki(a)gmail.com> --- M src/soc/intel/braswell/bootblock/bootblock.c 1 file changed, 17 insertions(+), 5 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/47/74447/1 diff --git a/src/soc/intel/braswell/bootblock/bootblock.c b/src/soc/intel/braswell/bootblock/bootblock.c index 2c9783a..8ab95ef 100644 --- a/src/soc/intel/braswell/bootblock/bootblock.c +++ b/src/soc/intel/braswell/bootblock/bootblock.c @@ -2,7 +2,6 @@ #include <arch/io.h> #include <bootblock_common.h> -#include <build.h> #include <console/console.h> #include <device/pci_ops.h> #include <fsp/util.h> @@ -14,6 +13,7 @@ #include <soc/msr.h> #include <soc/pm.h> #include <soc/spi.h> +#include <version.h> asmlinkage void bootblock_c_entry(uint64_t base_timestamp) { @@ -79,11 +79,10 @@ { int rtc_failed = rtc_failure(); - if (rtc_failed) { + if (rtc_failed) printk(BIOS_ERR, "RTC Failure detected. Resetting date to %x/%x/%x%x\n", - COREBOOT_BUILD_MONTH_BCD, COREBOOT_BUILD_DAY_BCD, 0x20, - COREBOOT_BUILD_YEAR_BCD); - } + coreboot_build_date.month, coreboot_build_date.day, + coreboot_build_date.century, coreboot_build_date.year); cmos_init(rtc_failed); } -- To view, visit https://review.coreboot.org/c/coreboot/+/74447 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: Icd6fa2ddf8aa584b0f51ba130592f227bbdad975 Gerrit-Change-Number: 74447 Gerrit-PatchSet: 1 Gerrit-Owner: Kyösti Mälkki <kyosti.malkki(a)gmail.com> Gerrit-MessageType: newchange

1 0

[S] Change in coreboot[master]: drivers/ipmi: Replace <build.h> with <version.h>
by Kyösti Mälkki (Code Review) 15 Apr '23

15 Apr '23

Kyösti Mälkki has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/74446 ) Change subject: drivers/ipmi: Replace <build.h> with <version.h> ...................................................................... drivers/ipmi: Replace <build.h> with <version.h> To use generated build.h one should have had a pre-requisite in the Makefile. Reference coreboot_version from lib/version.c instead. Change-Id: I7f10acabf1838deb90fde8215a32718028096852 Signed-off-by: Kyösti Mälkki <kyosti.malkki(a)gmail.com> --- M src/drivers/ipmi/supermicro_oem.c 1 file changed, 18 insertions(+), 5 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/46/74446/1 diff --git a/src/drivers/ipmi/supermicro_oem.c b/src/drivers/ipmi/supermicro_oem.c index c63da5f..fcf97f4 100644 --- a/src/drivers/ipmi/supermicro_oem.c +++ b/src/drivers/ipmi/supermicro_oem.c @@ -5,7 +5,7 @@ #include <console/console.h> #include <drivers/ipmi/ipmi_if.h> #include <string.h> -#include <build.h> +#include <version.h> #include "ipmi_supermicro_oem.h" #define IPMI_NETFN_OEM 0x30 @@ -20,7 +20,6 @@ static void set_coreboot_ver(const uint16_t kcs_port) { - const char *coreboot_ver = COREBOOT_VERSION; struct ipmi_oem_set_bios_str bios_ver; struct ipmi_rsp rsp; int ret; @@ -28,9 +27,9 @@ /* Only 8 characters are visible in UI. Cut of on first dash */ for (i = 0; i < 15; i++) { - if (coreboot_ver[i] == '-') + if (coreboot_version[i] == '-') break; - bios_ver.str[i] = coreboot_ver[i]; + bios_ver.str[i] = coreboot_version[i]; } bios_ver.str[i] = 0; bios_ver.ver = IPMI_LUN0_AC_SET_BIOS_VER; @@ -50,7 +49,7 @@ struct ipmi_rsp rsp; int ret; - strncpy(bios_ver.str, COREBOOT_DMI_DATE, 15); + strncpy(bios_ver.str, coreboot_dmi_date, 15); bios_ver.str[15] = 0; bios_ver.ver = IPMI_LUN0_AC_SET_BIOS_DATE; -- To view, visit https://review.coreboot.org/c/coreboot/+/74446 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I7f10acabf1838deb90fde8215a32718028096852 Gerrit-Change-Number: 74446 Gerrit-PatchSet: 1 Gerrit-Owner: Kyösti Mälkki <kyosti.malkki(a)gmail.com> Gerrit-MessageType: newchange

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

coreboot-gerrit April 2023