Michael Niewöhner has submitted this change. ( https://review.coreboot.org/c/coreboot/+/45413 )
Change subject: soc/intel/common/block/sgx: drop no-ops from PRMRR Kconfig
......................................................................
soc/intel/common/block/sgx: drop no-ops from PRMRR Kconfig
Since PRMRR size can only be set when SGX is enabled and since SGX
depends on PRMRR size >= 32MB, any lower setting (including "Disabled")
is invalid. Drop these settings.
Change-Id: If7a19c7223a0de2e03b7df9184cddf7c9fc87a68
Signed-off-by: Michael Niewöhner <foss(a)mniewoehner.de>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/45413
Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org>
Reviewed-by: Nico Huber <nico.h(a)gmx.de>
---
M src/soc/intel/common/block/sgx/Kconfig
1 file changed, 0 insertions(+), 11 deletions(-)
Approvals:
build bot (Jenkins): Verified
Nico Huber: Looks good to me, approved
diff --git a/src/soc/intel/common/block/sgx/Kconfig b/src/soc/intel/common/block/sgx/Kconfig
index ef3365f..48ba1fc 100644
--- a/src/soc/intel/common/block/sgx/Kconfig
+++ b/src/soc/intel/common/block/sgx/Kconfig
@@ -31,14 +31,11 @@
default 256 if SOC_INTEL_COMMON_BLOCK_SGX_PRMRR_SIZE_256MB
default 128 if SOC_INTEL_COMMON_BLOCK_SGX_PRMRR_SIZE_128MB
default 64 if SOC_INTEL_COMMON_BLOCK_SGX_PRMRR_SIZE_64MB
- default 32 if SOC_INTEL_COMMON_BLOCK_SGX_PRMRR_SIZE_32MB
- default 1 if SOC_INTEL_COMMON_BLOCK_SGX_PRMRR_SIZE_1MB
choice
prompt "PRMRR size"
depends on SOC_INTEL_COMMON_BLOCK_SGX_ENABLE
default SOC_INTEL_COMMON_BLOCK_SGX_PRMRR_SIZE_MAX if SOC_INTEL_COMMON_BLOCK_SGX_ENABLE
- default SOC_INTEL_COMMON_BLOCK_SGX_PRMRR_DISABLED if !SOC_INTEL_COMMON_BLOCK_SGX_ENABLE
help
PRMRR (Protected Memory Range) is the space in RAM that is used to provide a protected
memory area (e.g. for the Intel SGX Secure Enclaves). The memory region is accessible
@@ -63,14 +60,6 @@
config SOC_INTEL_COMMON_BLOCK_SGX_PRMRR_SIZE_32MB
bool "32 MiB"
-config SOC_INTEL_COMMON_BLOCK_SGX_PRMRR_SIZE_1MB
- depends on !SOC_INTEL_COMMON_BLOCK_SGX_ENABLE # SGX depends on PRMRR >= 32 MiB
- bool "1 MiB"
-
-config SOC_INTEL_COMMON_BLOCK_SGX_PRMRR_DISABLED
- depends on !SOC_INTEL_COMMON_BLOCK_SGX_ENABLE # SGX depends on PRMRR >= 32 MiB
- bool "Disabled"
-
endchoice
endif
--
To view, visit https://review.coreboot.org/c/coreboot/+/45413
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: If7a19c7223a0de2e03b7df9184cddf7c9fc87a68
Gerrit-Change-Number: 45413
Gerrit-PatchSet: 5
Gerrit-Owner: Michael Niewöhner <foss(a)mniewoehner.de>
Gerrit-Reviewer: Michael Niewöhner <foss(a)mniewoehner.de>
Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de>
Gerrit-Reviewer: Patrick Rudolph
Gerrit-Reviewer: Patrick Rudolph <siro(a)das-labor.org>
Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>
Gerrit-CC: Paul Menzel <paulepanter(a)users.sourceforge.net>
Gerrit-MessageType: merged
Michael Niewöhner has submitted this change. ( https://review.coreboot.org/c/coreboot/+/45412 )
Change subject: soc/intel/common/block/sgx: make PRMRR size setting depend on SGX
......................................................................
soc/intel/common/block/sgx: make PRMRR size setting depend on SGX
PRMRR size shall only be set when SGX is enabled. Make PRMRR depend on
SGX enablement in Kconfig.
Change-Id: I551942fd9cb8e7123d00dbd752abffe24788148c
Signed-off-by: Michael Niewöhner <foss(a)mniewoehner.de>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/45412
Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org>
Reviewed-by: Nico Huber <nico.h(a)gmx.de>
---
M src/soc/intel/common/block/cpu/cpulib.c
M src/soc/intel/common/block/sgx/Kconfig
2 files changed, 3 insertions(+), 1 deletion(-)
Approvals:
build bot (Jenkins): Verified
Nico Huber: Looks good to me, approved
diff --git a/src/soc/intel/common/block/cpu/cpulib.c b/src/soc/intel/common/block/cpu/cpulib.c
index fd39197..9ff7923 100644
--- a/src/soc/intel/common/block/cpu/cpulib.c
+++ b/src/soc/intel/common/block/cpu/cpulib.c
@@ -346,7 +346,7 @@
int i;
int valid_size;
- if (!CONFIG(SOC_INTEL_COMMON_BLOCK_SGX))
+ if (!CONFIG(SOC_INTEL_COMMON_BLOCK_SGX_ENABLE))
return 0;
msr = rdmsr(MSR_PRMRR_VALID_CONFIG);
diff --git a/src/soc/intel/common/block/sgx/Kconfig b/src/soc/intel/common/block/sgx/Kconfig
index 771c54c..ef3365f 100644
--- a/src/soc/intel/common/block/sgx/Kconfig
+++ b/src/soc/intel/common/block/sgx/Kconfig
@@ -26,6 +26,7 @@
config SOC_INTEL_COMMON_BLOCK_SGX_PRMRR_SIZE
int
+ depends on SOC_INTEL_COMMON_BLOCK_SGX_ENABLE
default 256 if SOC_INTEL_COMMON_BLOCK_SGX_PRMRR_SIZE_MAX
default 256 if SOC_INTEL_COMMON_BLOCK_SGX_PRMRR_SIZE_256MB
default 128 if SOC_INTEL_COMMON_BLOCK_SGX_PRMRR_SIZE_128MB
@@ -35,6 +36,7 @@
choice
prompt "PRMRR size"
+ depends on SOC_INTEL_COMMON_BLOCK_SGX_ENABLE
default SOC_INTEL_COMMON_BLOCK_SGX_PRMRR_SIZE_MAX if SOC_INTEL_COMMON_BLOCK_SGX_ENABLE
default SOC_INTEL_COMMON_BLOCK_SGX_PRMRR_DISABLED if !SOC_INTEL_COMMON_BLOCK_SGX_ENABLE
help
--
To view, visit https://review.coreboot.org/c/coreboot/+/45412
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I551942fd9cb8e7123d00dbd752abffe24788148c
Gerrit-Change-Number: 45412
Gerrit-PatchSet: 5
Gerrit-Owner: Michael Niewöhner <foss(a)mniewoehner.de>
Gerrit-Reviewer: Michael Niewöhner <foss(a)mniewoehner.de>
Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de>
Gerrit-Reviewer: Patrick Rudolph
Gerrit-Reviewer: Patrick Rudolph <siro(a)das-labor.org>
Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>
Gerrit-CC: Paul Menzel <paulepanter(a)users.sourceforge.net>
Gerrit-MessageType: merged
Karthik Ramasubramanian has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/45515 )
Change subject: soc/intel/common/cse_lite: Defer cse_fw_sync for JSL
......................................................................
soc/intel/common/cse_lite: Defer cse_fw_sync for JSL
Defer cse_fw_sync to BS_DEV_RESOURCES boot state so that MRC training
data can be cached before CSE FW Sync and a second MRC training can be
avoided.
BUG=b:168850641
TEST=Build and boot the waddledoo board to OS. Ensure that the memory
training is performed only once.
Change-Id: I0ef5693eaa6ed34dc08c94e5db153f4295578f5f
Signed-off-by: Karthikeyan Ramasubramanian <kramasub(a)google.com>
---
M src/soc/intel/common/block/cse/cse_lite.c
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/15/45515/1
diff --git a/src/soc/intel/common/block/cse/cse_lite.c b/src/soc/intel/common/block/cse/cse_lite.c
index 7daa35e..c9e4e1f 100644
--- a/src/soc/intel/common/block/cse/cse_lite.c
+++ b/src/soc/intel/common/block/cse/cse_lite.c
@@ -751,7 +751,7 @@
}
}
-#if CONFIG(SOC_INTEL_TIGERLAKE)
+#if CONFIG(SOC_INTEL_TIGERLAKE) || CONFIG(SOC_INTEL_JASPERLAKE)
/*
* This needs to happen after the MRC cache write to avoid a 2nd
* memory training sequence.
--
To view, visit https://review.coreboot.org/c/coreboot/+/45515
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I0ef5693eaa6ed34dc08c94e5db153f4295578f5f
Gerrit-Change-Number: 45515
Gerrit-PatchSet: 1
Gerrit-Owner: Karthik Ramasubramanian <kramasub(a)google.com>
Gerrit-MessageType: newchange
Hello build bot (Jenkins), Nico Huber, Patrick Georgi, Martin Roth,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/39995
to look at the new patch set (#18).
Change subject: mb/siemens/chili: Add Chili variant
......................................................................
mb/siemens/chili: Add Chili variant
This Chili mainboard is used in an all-in-one PC.
For more information see
https://www.secunet.com/fileadmin/user_upload/_temp_/importexport/Print/Fac…
Change-Id: Ic7a5dccbb0d5b7bceb154fb050cf991254475f7b
Signed-off-by: Nico Huber <nico.huber(a)secunet.com>
Signed-off-by: Felix Singer <felix.singer(a)secunet.com>
---
M src/mainboard/siemens/chili/Kconfig
M src/mainboard/siemens/chili/Kconfig.name
M src/mainboard/siemens/chili/mainboard.c
M src/mainboard/siemens/chili/romstage.c
M src/mainboard/siemens/chili/variant.h
A src/mainboard/siemens/chili/variants/chili/Makefile.inc
A src/mainboard/siemens/chili/variants/chili/board_info.txt
A src/mainboard/siemens/chili/variants/chili/data.vbt
A src/mainboard/siemens/chili/variants/chili/devicetree.cb
A src/mainboard/siemens/chili/variants/chili/gma-mainboard.ads
A src/mainboard/siemens/chili/variants/chili/gpio.c
A src/mainboard/siemens/chili/variants/chili/hda_verb.c
A src/mainboard/siemens/chili/variants/chili/romstage.c
13 files changed, 483 insertions(+), 3 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/95/39995/18
--
To view, visit https://review.coreboot.org/c/coreboot/+/39995
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: Ic7a5dccbb0d5b7bceb154fb050cf991254475f7b
Gerrit-Change-Number: 39995
Gerrit-PatchSet: 18
Gerrit-Owner: Felix Singer <felixsinger(a)posteo.net>
Gerrit-Reviewer: Martin Roth <martinroth(a)google.com>
Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de>
Gerrit-Reviewer: Patrick Georgi <pgeorgi(a)google.com>
Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>
Gerrit-CC: Angel Pons <th3fanbus(a)gmail.com>
Gerrit-CC: HAOUAS Elyes <ehaouas(a)noos.fr>
Gerrit-CC: Paul Menzel <paulepanter(a)users.sourceforge.net>
Gerrit-MessageType: newpatchset