Patrick Georgi has submitted this change. ( https://review.coreboot.org/c/coreboot/+/55023 )
Change subject: arch/x86/acpi_bert_storage: change return type of bert_errors_present
......................................................................
arch/x86/acpi_bert_storage: change return type of bert_errors_present
The return value is a boolean, so use the bool type. Also add the
types.h header to have the bool type defined. Also change type of
bert_region_broken static variable to bool.
Signed-off-by: Felix Held <felix-coreboot(a)felixheld.de>
Change-Id: I13d6472deeb26ba92d257761df069e32d9b2e5d4
Reviewed-on: https://review.coreboot.org/c/coreboot/+/55023
Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org>
Reviewed-by: Angel Pons <th3fanbus(a)gmail.com>
---
M src/arch/x86/acpi_bert_storage.c
M src/arch/x86/include/arch/bert_storage.h
2 files changed, 8 insertions(+), 7 deletions(-)
Approvals:
build bot (Jenkins): Verified
Angel Pons: Looks good to me, approved
diff --git a/src/arch/x86/acpi_bert_storage.c b/src/arch/x86/acpi_bert_storage.c
index b07b67e..a8b8628 100644
--- a/src/arch/x86/acpi_bert_storage.c
+++ b/src/arch/x86/acpi_bert_storage.c
@@ -8,6 +8,7 @@
#include <acpi/acpi.h>
#include <arch/bert_storage.h>
#include <string.h>
+#include <types.h>
/* BERT region management: Allow the chipset to determine the specific
* location of the BERT region. We find that base and size, then manage
@@ -19,7 +20,7 @@
* resume cycles. If the requirements change, consider using IMD to help
* manage the space.
*/
-static int bert_region_broken;
+static bool bert_region_broken;
static void *bert_region_base;
static size_t bert_region_size;
static size_t bert_region_used;
@@ -32,9 +33,9 @@
return bert_region_broken ? 0 : bert_region_size - bert_region_used;
}
-int bert_errors_present(void)
+bool bert_errors_present(void)
{
- return bert_region_broken ? 0 : !!bert_region_used;
+ return !bert_region_broken && bert_region_used;
}
void bert_errors_region(void **start, size_t *size)
@@ -585,14 +586,14 @@
/* Always start with a blank bert region. Make sure nothing is
* maintained across reboots or resumes.
*/
- bert_region_broken = 0;
+ bert_region_broken = false;
bert_region_used = 0;
bert_reserved_region(&bert_region_base, &bert_region_size);
if (!bert_region_base || !bert_region_size) {
printk(BIOS_ERR, "Bug: Can't find/add BERT storage area\n");
- bert_region_broken = 1;
+ bert_region_broken = true;
return;
}
diff --git a/src/arch/x86/include/arch/bert_storage.h b/src/arch/x86/include/arch/bert_storage.h
index 0d373e1..6378333 100644
--- a/src/arch/x86/include/arch/bert_storage.h
+++ b/src/arch/x86/include/arch/bert_storage.h
@@ -3,8 +3,8 @@
#ifndef _BERT_STORAGE_H_
#define _BERT_STORAGE_H_
-#include <stdint.h>
#include <acpi/acpi.h>
+#include <types.h>
/* Items in the BERT region
*
@@ -55,7 +55,7 @@
/* Get amount of available storage left for error info */
size_t bert_storage_remaining(void);
/* Find if errors were added, a BERT region is present, and ACPI table needed */
-int bert_errors_present(void);
+bool bert_errors_present(void);
/* Get the number of entries associated with status */
static inline size_t bert_entry_count(acpi_generic_error_status_t *status)
--
To view, visit https://review.coreboot.org/c/coreboot/+/55023
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I13d6472deeb26ba92d257761df069e32d9b2e5d4
Gerrit-Change-Number: 55023
Gerrit-PatchSet: 5
Gerrit-Owner: Felix Held <felix-coreboot(a)felixheld.de>
Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com>
Gerrit-Reviewer: Arthur Heymans <arthur(a)aheymans.xyz>
Gerrit-Reviewer: Patrick Georgi <pgeorgi(a)google.com>
Gerrit-Reviewer: Paul Menzel <paulepanter(a)mailbox.org>
Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>
Gerrit-MessageType: merged
Patrick Georgi has submitted this change. ( https://review.coreboot.org/c/coreboot/+/55016 )
Change subject: Apply more uses for Kconfig TPM
......................................................................
Apply more uses for Kconfig TPM
Change-Id: I54b296563940cd46fe9da9fe789b746f2fc1987d
Signed-off-by: Kyösti Mälkki <kyosti.malkki(a)gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/55016
Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org>
Reviewed-by: Aaron Durbin <adurbin(a)chromium.org>
Reviewed-by: Julius Werner <jwerner(a)chromium.org>
Reviewed-by: Paul Menzel <paulepanter(a)mailbox.org>
---
M src/drivers/tpm/Kconfig
M src/security/intel/txt/Kconfig
M src/security/tpm/Kconfig
M src/security/vboot/Kconfig
M src/security/vboot/Makefile.inc
5 files changed, 7 insertions(+), 9 deletions(-)
Approvals:
build bot (Jenkins): Verified
Paul Menzel: Looks good to me, but someone else must approve
Aaron Durbin: Looks good to me, approved
Julius Werner: Looks good to me, approved
diff --git a/src/drivers/tpm/Kconfig b/src/drivers/tpm/Kconfig
index 79b860f..735cfee 100644
--- a/src/drivers/tpm/Kconfig
+++ b/src/drivers/tpm/Kconfig
@@ -1,6 +1,6 @@
config TPM_INIT_RAMSTAGE
bool
- default y if TPM1 || TPM2
+ default y if TPM
depends on !VBOOT && !VENDORCODE_ELTAN_VBOOT && !VENDORCODE_ELTAN_MBOOT \
&& !TPM_MEASURED_BOOT_INIT_BOOTBLOCK
help
@@ -9,7 +9,7 @@
config TPM_PPI
bool "Generate ACPI code to implement TPM physical presence interface"
- depends on TPM1 || TPM2
+ depends on TPM
depends on HAVE_ACPI_TABLES
depends on !CHROMEOS
default y if PAYLOAD_TIANOCORE
diff --git a/src/security/intel/txt/Kconfig b/src/security/intel/txt/Kconfig
index 14b4f6a..3648925 100644
--- a/src/security/intel/txt/Kconfig
+++ b/src/security/intel/txt/Kconfig
@@ -7,7 +7,7 @@
select ENABLE_VMX if CPU_INTEL_COMMON
select AP_IN_SIPI_WAIT
select TPM_MEASURED_BOOT_INIT_BOOTBLOCK if TPM_MEASURED_BOOT
- depends on (TPM1 || TPM2)
+ depends on TPM
depends on CPU_INTEL_FIRMWARE_INTERFACE_TABLE
depends on PLATFORM_HAS_DRAM_CLEAR
depends on (SOC_INTEL_COMMON_BLOCK_SA || HAVE_CF9_RESET)
diff --git a/src/security/tpm/Kconfig b/src/security/tpm/Kconfig
index e228a3d..4864f12 100644
--- a/src/security/tpm/Kconfig
+++ b/src/security/tpm/Kconfig
@@ -70,7 +70,7 @@
bool "Output verbose TPM debug messages"
default n
select DRIVER_TPM_DISPLAY_TIS_BYTES if I2C_TPM
- depends on TPM1 || TPM2
+ depends on TPM
help
This option enables additional TPM related debug messages.
@@ -96,7 +96,7 @@
bool "Enable Measured Boot"
default n
select VBOOT_LIB
- depends on TPM1 || TPM2
+ depends on TPM
depends on !VBOOT_RETURN_FROM_VERSTAGE
help
Enables measured boot (experimental)
diff --git a/src/security/vboot/Kconfig b/src/security/vboot/Kconfig
index 515efc7..0368758 100644
--- a/src/security/vboot/Kconfig
+++ b/src/security/vboot/Kconfig
@@ -13,7 +13,7 @@
bool "Verify firmware with vboot."
default n
select VBOOT_LIB
- select VBOOT_MOCK_SECDATA if !TPM1 && !TPM2
+ select VBOOT_MOCK_SECDATA if !TPM
depends on 0 = 0 # Must have a 'depends on' or board overrides will break it.
help
Enabling VBOOT will use vboot to verify the components of the firmware
diff --git a/src/security/vboot/Makefile.inc b/src/security/vboot/Makefile.inc
index 668d3d9..47830f3 100644
--- a/src/security/vboot/Makefile.inc
+++ b/src/security/vboot/Makefile.inc
@@ -109,9 +109,7 @@
ramstage-y += secdata_tpm.c
endif
-ifneq ($(CONFIG_TPM1)$(CONFIG_TPM2),)
-verstage-y += tpm_common.c
-endif
+verstage-$(CONFIG_TPM) += tpm_common.c
romstage-y += common.c
--
To view, visit https://review.coreboot.org/c/coreboot/+/55016
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I54b296563940cd46fe9da9fe789b746f2fc1987d
Gerrit-Change-Number: 55016
Gerrit-PatchSet: 2
Gerrit-Owner: Kyösti Mälkki <kyosti.malkki(a)gmail.com>
Gerrit-Reviewer: Aaron Durbin <adurbin(a)chromium.org>
Gerrit-Reviewer: Christian Walter <christian.walter(a)9elements.com>
Gerrit-Reviewer: Julius Werner <jwerner(a)chromium.org>
Gerrit-Reviewer: Patrick Georgi <pgeorgi(a)google.com>
Gerrit-Reviewer: Paul Menzel <paulepanter(a)mailbox.org>
Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>
Gerrit-MessageType: merged
Attention is currently required from: Maulik V Vaghela, Mario Scheithauer, Subrata Banik, Lean Sheng Tan, Werner Zeh, Patrick Rudolph.
Hello build bot (Jenkins), Maulik V Vaghela, Mario Scheithauer, Subrata Banik, Werner Zeh, Patrick Rudolph,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/55082
to look at the new patch set (#8).
Change subject: soc/intel/elkhartlake: Update FSP-S storage related configs
......................................................................
soc/intel/elkhartlake: Update FSP-S storage related configs
Further add initial Silicon UPD storage settings:
- SATA
- SD card
- eMMC
Signed-off-by: Lean Sheng Tan <lean.sheng.tan(a)intel.com>
Change-Id: Id4145fcf156756a610b8a9a705d4ab99fe7b0bf8
---
M src/mainboard/intel/elkhartlake_crb/variants/ehlcrb/devicetree.cb
M src/soc/intel/elkhartlake/Kconfig
M src/soc/intel/elkhartlake/chip.h
M src/soc/intel/elkhartlake/fsp_params.c
4 files changed, 80 insertions(+), 2 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/82/55082/8
--
To view, visit https://review.coreboot.org/c/coreboot/+/55082
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: Id4145fcf156756a610b8a9a705d4ab99fe7b0bf8
Gerrit-Change-Number: 55082
Gerrit-PatchSet: 8
Gerrit-Owner: Lean Sheng Tan <lean.sheng.tan(a)intel.com>
Gerrit-Reviewer: Mario Scheithauer <mario.scheithauer(a)siemens.com>
Gerrit-Reviewer: Maulik V Vaghela <maulik.v.vaghela(a)intel.com>
Gerrit-Reviewer: Patrick Rudolph <siro(a)das-labor.org>
Gerrit-Reviewer: Subrata Banik <subrata.banik(a)intel.com>
Gerrit-Reviewer: Werner Zeh <werner.zeh(a)siemens.com>
Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>
Gerrit-Attention: Maulik V Vaghela <maulik.v.vaghela(a)intel.com>
Gerrit-Attention: Mario Scheithauer <mario.scheithauer(a)siemens.com>
Gerrit-Attention: Subrata Banik <subrata.banik(a)intel.com>
Gerrit-Attention: Lean Sheng Tan <lean.sheng.tan(a)intel.com>
Gerrit-Attention: Werner Zeh <werner.zeh(a)siemens.com>
Gerrit-Attention: Patrick Rudolph <siro(a)das-labor.org>
Gerrit-MessageType: newpatchset
Attention is currently required from: Maulik V Vaghela, Mario Scheithauer, Subrata Banik, Werner Zeh, Patrick Rudolph.
Hello build bot (Jenkins), Maulik V Vaghela, Mario Scheithauer, Subrata Banik, Werner Zeh, Patrick Rudolph,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/55082
to look at the new patch set (#7).
Change subject: soc/intel/elkhartlake: Update FSP-S storage related configs
......................................................................
soc/intel/elkhartlake: Update FSP-S storage related configs
Further add initial Silicon UPD storage settings:
- SATA
- SD card
- eMMC
Signed-off-by: Lean Sheng Tan <lean.sheng.tan(a)intel.com>
Change-Id: Id4145fcf156756a610b8a9a705d4ab99fe7b0bf8
---
M src/mainboard/intel/elkhartlake_crb/variants/ehlcrb/devicetree.cb
M src/soc/intel/elkhartlake/Kconfig
M src/soc/intel/elkhartlake/chip.h
M src/soc/intel/elkhartlake/fsp_params.c
4 files changed, 80 insertions(+), 2 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/82/55082/7
--
To view, visit https://review.coreboot.org/c/coreboot/+/55082
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: Id4145fcf156756a610b8a9a705d4ab99fe7b0bf8
Gerrit-Change-Number: 55082
Gerrit-PatchSet: 7
Gerrit-Owner: Lean Sheng Tan <lean.sheng.tan(a)intel.com>
Gerrit-Reviewer: Mario Scheithauer <mario.scheithauer(a)siemens.com>
Gerrit-Reviewer: Maulik V Vaghela <maulik.v.vaghela(a)intel.com>
Gerrit-Reviewer: Patrick Rudolph <siro(a)das-labor.org>
Gerrit-Reviewer: Subrata Banik <subrata.banik(a)intel.com>
Gerrit-Reviewer: Werner Zeh <werner.zeh(a)siemens.com>
Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>
Gerrit-Attention: Maulik V Vaghela <maulik.v.vaghela(a)intel.com>
Gerrit-Attention: Mario Scheithauer <mario.scheithauer(a)siemens.com>
Gerrit-Attention: Subrata Banik <subrata.banik(a)intel.com>
Gerrit-Attention: Werner Zeh <werner.zeh(a)siemens.com>
Gerrit-Attention: Patrick Rudolph <siro(a)das-labor.org>
Gerrit-MessageType: newpatchset
Attention is currently required from: Maulik V Vaghela, Paul Menzel, Mario Scheithauer, Subrata Banik, Patrick Rudolph.
Hello build bot (Jenkins), Maulik V Vaghela, Mario Scheithauer, Subrata Banik, Werner Zeh, Patrick Rudolph,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/54960
to look at the new patch set (#13).
Change subject: soc/intel/elkhartlake: Update FSP-S UPD graphic & chipset related settings
......................................................................
soc/intel/elkhartlake: Update FSP-S UPD graphic & chipset related settings
Further add initial Silicon UPD settings for:
- graphics & display
- chipset lockdown
- PAVP
- legacy timer
- PCH master gating control
- HECI
This CL also enables HECI 1 in devicetree.cb.
Signed-off-by: Lean Sheng Tan <lean.sheng.tan(a)intel.com>
Change-Id: I657f44f8506640c23049614b2db9d1837e6d44ed
---
M src/mainboard/intel/elkhartlake_crb/variants/ehlcrb/devicetree.cb
M src/soc/intel/elkhartlake/fsp_params.c
2 files changed, 63 insertions(+), 13 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/60/54960/13
--
To view, visit https://review.coreboot.org/c/coreboot/+/54960
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I657f44f8506640c23049614b2db9d1837e6d44ed
Gerrit-Change-Number: 54960
Gerrit-PatchSet: 13
Gerrit-Owner: Lean Sheng Tan <lean.sheng.tan(a)intel.com>
Gerrit-Reviewer: Mario Scheithauer <mario.scheithauer(a)siemens.com>
Gerrit-Reviewer: Maulik V Vaghela <maulik.v.vaghela(a)intel.com>
Gerrit-Reviewer: Patrick Rudolph <siro(a)das-labor.org>
Gerrit-Reviewer: Subrata Banik <subrata.banik(a)intel.com>
Gerrit-Reviewer: Werner Zeh <werner.zeh(a)siemens.com>
Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>
Gerrit-CC: Paul Menzel <paulepanter(a)mailbox.org>
Gerrit-Attention: Maulik V Vaghela <maulik.v.vaghela(a)intel.com>
Gerrit-Attention: Paul Menzel <paulepanter(a)mailbox.org>
Gerrit-Attention: Mario Scheithauer <mario.scheithauer(a)siemens.com>
Gerrit-Attention: Subrata Banik <subrata.banik(a)intel.com>
Gerrit-Attention: Patrick Rudolph <siro(a)das-labor.org>
Gerrit-MessageType: newpatchset
Attention is currently required from: Maulik V Vaghela, Mario Scheithauer, Subrata Banik, Lean Sheng Tan, Werner Zeh, Patrick Rudolph.
Hello build bot (Jenkins), Maulik V Vaghela, Mario Scheithauer, Subrata Banik, Werner Zeh, Patrick Rudolph,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/55082
to look at the new patch set (#6).
Change subject: soc/intel/elkhartlake: Update FSP-S storage related configs
......................................................................
soc/intel/elkhartlake: Update FSP-S storage related configs
Further add initial Silicon UPD storage settings:
- SATA
- SD card
- eMMC
Signed-off-by: Lean Sheng Tan <lean.sheng.tan(a)intel.com>
Change-Id: Id4145fcf156756a610b8a9a705d4ab99fe7b0bf8
---
M src/mainboard/intel/elkhartlake_crb/variants/ehlcrb/devicetree.cb
M src/soc/intel/elkhartlake/Kconfig
M src/soc/intel/elkhartlake/chip.h
M src/soc/intel/elkhartlake/fsp_params.c
4 files changed, 81 insertions(+), 2 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/82/55082/6
--
To view, visit https://review.coreboot.org/c/coreboot/+/55082
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: Id4145fcf156756a610b8a9a705d4ab99fe7b0bf8
Gerrit-Change-Number: 55082
Gerrit-PatchSet: 6
Gerrit-Owner: Lean Sheng Tan <lean.sheng.tan(a)intel.com>
Gerrit-Reviewer: Mario Scheithauer <mario.scheithauer(a)siemens.com>
Gerrit-Reviewer: Maulik V Vaghela <maulik.v.vaghela(a)intel.com>
Gerrit-Reviewer: Patrick Rudolph <siro(a)das-labor.org>
Gerrit-Reviewer: Subrata Banik <subrata.banik(a)intel.com>
Gerrit-Reviewer: Werner Zeh <werner.zeh(a)siemens.com>
Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>
Gerrit-Attention: Maulik V Vaghela <maulik.v.vaghela(a)intel.com>
Gerrit-Attention: Mario Scheithauer <mario.scheithauer(a)siemens.com>
Gerrit-Attention: Subrata Banik <subrata.banik(a)intel.com>
Gerrit-Attention: Lean Sheng Tan <lean.sheng.tan(a)intel.com>
Gerrit-Attention: Werner Zeh <werner.zeh(a)siemens.com>
Gerrit-Attention: Patrick Rudolph <siro(a)das-labor.org>
Gerrit-MessageType: newpatchset