Subrata Banik has submitted this change. ( https://review.coreboot.org/c/coreboot/+/75767?usp=email )
(
1 is the latest approved patch-set.
No files were changed between the latest approved patch-set and the submitted one.
)Change subject: {driver, mb, soc}: Rename Intel CSE FPT config to ISH FW version config
......................................................................
{driver, mb, soc}: Rename Intel CSE FPT config to ISH FW version config
This patch renames `SOC_INTEL_STORE_CSE_FPT_PARTITION_VERSION` config
to `SOC_INTEL_STORE_ISH_FW_VERSION` to ensure the usage of this config
is clear.
Any platform would like to fetch the currently running ISH firmware
version should select this configuration.
TEST=Able to build and boot google/marasov.
Change-Id: Ie503d6a5bf5bd0d3d561355b592e75b22c910bf5
Signed-off-by: Subrata Banik <subratabanik(a)google.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/75767
Reviewed-by: Kangheui Won <khwon(a)chromium.org>
Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org>
Reviewed-by: Kapil Porwal <kapilporwal(a)google.com>
---
M src/drivers/intel/ish/ish.c
M src/mainboard/google/brya/Kconfig
M src/soc/intel/alderlake/chip.c
M src/soc/intel/common/block/cse/Kconfig
M src/soc/intel/common/block/cse/cse_lite.c
M src/soc/intel/common/block/include/intelblocks/cse.h
6 files changed, 15 insertions(+), 14 deletions(-)
Approvals:
Kangheui Won: Looks good to me, but someone else must approve
build bot (Jenkins): Verified
Kapil Porwal: Looks good to me, approved
diff --git a/src/drivers/intel/ish/ish.c b/src/drivers/intel/ish/ish.c
index 0415af0..a84be5b 100644
--- a/src/drivers/intel/ish/ish.c
+++ b/src/drivers/intel/ish/ish.c
@@ -63,7 +63,7 @@
static void intel_ish_final(struct device *dev)
{
- if (CONFIG(SOC_INTEL_STORE_CSE_FPT_PARTITION_VERSION))
+ if (CONFIG(SOC_INTEL_STORE_ISH_FW_VERSION))
intel_ish_get_version();
}
diff --git a/src/mainboard/google/brya/Kconfig b/src/mainboard/google/brya/Kconfig
index b27945e..2a9941a 100644
--- a/src/mainboard/google/brya/Kconfig
+++ b/src/mainboard/google/brya/Kconfig
@@ -87,7 +87,7 @@
select SOC_INTEL_ALDERLAKE_PCH_N
select SOC_INTEL_CSE_LITE_COMPRESS_ME_RW
select SOC_INTEL_CSE_LITE_SYNC_IN_RAMSTAGE
- select SOC_INTEL_STORE_CSE_FPT_PARTITION_VERSION
+ select SOC_INTEL_STORE_ISH_FW_VERSION
select SYSTEM_TYPE_LAPTOP
select TPM_GOOGLE_TI50
select SOC_INTEL_COMMON_MMC_OVERRIDE
diff --git a/src/soc/intel/alderlake/chip.c b/src/soc/intel/alderlake/chip.c
index f052279..7f24032 100644
--- a/src/soc/intel/alderlake/chip.c
+++ b/src/soc/intel/alderlake/chip.c
@@ -162,7 +162,7 @@
}
#endif
-#if CONFIG(SOC_INTEL_STORE_CSE_FPT_PARTITION_VERSION)
+#if CONFIG(SOC_INTEL_STORE_ISH_FW_VERSION)
/*
* SoC override API to identify if ISH Firmware existed inside CSE FPT.
*
diff --git a/src/soc/intel/common/block/cse/Kconfig b/src/soc/intel/common/block/cse/Kconfig
index 26c623f..d809e03 100644
--- a/src/soc/intel/common/block/cse/Kconfig
+++ b/src/soc/intel/common/block/cse/Kconfig
@@ -45,22 +45,23 @@
Use this config for SoC platform prior to CNL PCH (with postboot_sai implemented)
to make `HECI1` device disable using private configuration register (PCR) write.
-config SOC_INTEL_STORE_CSE_FPT_PARTITION_VERSION
+config SOC_INTEL_STORE_ISH_FW_VERSION
bool
default n
depends on DRIVERS_INTEL_ISH
help
- This configuration option stores CSE FPT partitions' version in CBMEM memory.
- This information can be used to identify the currently running firmware partition
+ This configuration option stores ISH version in CBMEM area.
+ This information can be used to identify the currently running ISH firmware
version.
- The cost of sending HECI command to read the CSE FPT is significant (~200ms)
- hence, the idea is to read the CSE RW version on every cold reset (to cover
- the CSE update scenarios) and store into CBMEM to avoid the cost of resending
- the HECI command in all consecutive warm boots.
+ ISH BUP is sitting inside the CSE firmware partition. The way to retrieve the
+ ISH version is by sending the HECI command to read the CSE FPT. The cost of sending
+ HECI command to read the CSE FPT is significant (~200ms) hence, the idea is to
+ read the CSE RW version on every cold reset (to cover the CSE update scenarios)
+ and store into CBMEM to avoid the cost of resending the HECI command in all
+ consecutive warm boots.
- Later boot stages can just read the CBMEM ID to retrieve the ISH version if
- required.
+ Later boot stages can just read the CBMEM ID to retrieve the ISH version.
Additionally, ensure this feature is platform specific hence, only enabled
for the platform that would like to store the ISH version into the CBMEM and
diff --git a/src/soc/intel/common/block/cse/cse_lite.c b/src/soc/intel/common/block/cse/cse_lite.c
index 733f68b..7063ecb 100644
--- a/src/soc/intel/common/block/cse/cse_lite.c
+++ b/src/soc/intel/common/block/cse/cse_lite.c
@@ -1307,7 +1307,7 @@
* Store the CSE/ISH RW Firmware Version into CBMEM if ISH partition
* is available
*/
- if (CONFIG(SOC_INTEL_STORE_CSE_FPT_PARTITION_VERSION) &&
+ if (CONFIG(SOC_INTEL_STORE_ISH_FW_VERSION) &&
soc_is_ish_partition_enabled()) {
store_cse_rw_fw_version();
store_ish_version();
diff --git a/src/soc/intel/common/block/include/intelblocks/cse.h b/src/soc/intel/common/block/include/intelblocks/cse.h
index 23a4490..636b1f4 100644
--- a/src/soc/intel/common/block/include/intelblocks/cse.h
+++ b/src/soc/intel/common/block/include/intelblocks/cse.h
@@ -528,7 +528,7 @@
* identifying the UFS enabled device is enough to conclude if ISH partition is
* available.
*/
-#if CONFIG(SOC_INTEL_STORE_CSE_FPT_PARTITION_VERSION)
+#if CONFIG(SOC_INTEL_STORE_ISH_FW_VERSION)
bool soc_is_ish_partition_enabled(void);
#else
static inline bool soc_is_ish_partition_enabled(void)
--
To view, visit https://review.coreboot.org/c/coreboot/+/75767?usp=email
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: Ie503d6a5bf5bd0d3d561355b592e75b22c910bf5
Gerrit-Change-Number: 75767
Gerrit-PatchSet: 6
Gerrit-Owner: Subrata Banik <subratabanik(a)google.com>
Gerrit-Reviewer: Dinesh Gehlot <digehlot(a)google.com>
Gerrit-Reviewer: Eric Lai <eric_lai(a)quanta.corp-partner.google.com>
Gerrit-Reviewer: Kangheui Won <khwon(a)chromium.org>
Gerrit-Reviewer: Kapil Porwal <kapilporwal(a)google.com>
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-MessageType: merged
Attention is currently required from: Paul Menzel, Pratikkumar V Prajapati.
Subrata Banik has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/75625?usp=email )
Change subject: soc/intel/common: Add configs for TME exclusion range and new key gen
......................................................................
Patch Set 6: Code-Review+2
--
To view, visit https://review.coreboot.org/c/coreboot/+/75625?usp=email
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: Id5008fee07b97faadc7dd585f445295425173782
Gerrit-Change-Number: 75625
Gerrit-PatchSet: 6
Gerrit-Owner: Pratikkumar V Prajapati <pratikkumar.v.prajapati(a)intel.com>
Gerrit-Reviewer: Subrata Banik <subratabanik(a)google.com>
Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>
Gerrit-CC: Paul Menzel <paulepanter(a)mailbox.org>
Gerrit-Attention: Paul Menzel <paulepanter(a)mailbox.org>
Gerrit-Attention: Pratikkumar V Prajapati <pratikkumar.v.prajapati(a)intel.com>
Gerrit-Comment-Date: Thu, 15 Jun 2023 07:37:54 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Attention is currently required from: Kangheui Won, Reka Norman, Tarun Tuli, Yunlong Jia.
Eric Lai has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/75834?usp=email )
Change subject: mb/google/brya/var/gothrax: Generate RAM IDs for new memory parts
......................................................................
Patch Set 2: Code-Review+2
(1 comment)
Commit Message:
https://review.coreboot.org/c/coreboot/+/75834/comment/41a13283_b1dbf01e :
PS2, Line 7: brya
nit:nissa
--
To view, visit https://review.coreboot.org/c/coreboot/+/75834?usp=email
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: Ib16846f7b2061ee254db674ac7bac66c9b9f4e70
Gerrit-Change-Number: 75834
Gerrit-PatchSet: 2
Gerrit-Owner: Yunlong Jia <yunlong.jia(a)ecs.corp-partner.google.com>
Gerrit-Reviewer: Eric Lai <eric_lai(a)quanta.corp-partner.google.com>
Gerrit-Reviewer: Henry Sun <henrysun(a)google.com>
Gerrit-Reviewer: Kangheui Won <khwon(a)chromium.org>
Gerrit-Reviewer: Reka Norman <rekanorman(a)chromium.org>
Gerrit-Reviewer: Tarun Tuli <taruntuli(a)google.com>
Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>
Gerrit-Attention: Tarun Tuli <taruntuli(a)google.com>
Gerrit-Attention: Kangheui Won <khwon(a)chromium.org>
Gerrit-Attention: Reka Norman <rekanorman(a)chromium.org>
Gerrit-Attention: Yunlong Jia <yunlong.jia(a)ecs.corp-partner.google.com>
Gerrit-Comment-Date: Thu, 15 Jun 2023 07:37:46 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Attention is currently required from: Lucas Chen, Nick Vaccaro, Ren Kuo, Tarun Tuli, YH Lin.
Eric Lai has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/75826?usp=email )
Change subject: mb/google/brya/var/volmar: Add Micron MT53E2G32D4NQ-046 WT:C SPD
......................................................................
Patch Set 2: Code-Review+2
--
To view, visit https://review.coreboot.org/c/coreboot/+/75826?usp=email
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I3797de01629fdb5ace4c610943d88db525da112b
Gerrit-Change-Number: 75826
Gerrit-PatchSet: 2
Gerrit-Owner: Ren Kuo <ren.kuo(a)quanta.corp-partner.google.com>
Gerrit-Reviewer: David Wu <david_wu(a)quanta.corp-partner.google.com>
Gerrit-Reviewer: Eric Lai <eric_lai(a)quanta.corp-partner.google.com>
Gerrit-Reviewer: Lucas Chen <lucas.chen(a)quanta.corp-partner.google.com>
Gerrit-Reviewer: Nick Vaccaro <nvaccaro(a)google.com>
Gerrit-Reviewer: Tarun Tuli <taruntuli(a)google.com>
Gerrit-Reviewer: Tyler Wang <tyler.wang(a)quanta.corp-partner.google.com>
Gerrit-Reviewer: YH Lin <yueherngl(a)google.com>
Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>
Gerrit-Attention: YH Lin <yueherngl(a)google.com>
Gerrit-Attention: Tarun Tuli <taruntuli(a)google.com>
Gerrit-Attention: Lucas Chen <lucas.chen(a)quanta.corp-partner.google.com>
Gerrit-Attention: Ren Kuo <ren.kuo(a)quanta.corp-partner.google.com>
Gerrit-Attention: Nick Vaccaro <nvaccaro(a)google.com>
Gerrit-Comment-Date: Thu, 15 Jun 2023 07:36:44 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment