{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@google.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/75767
Reviewed-by: Kangheui Won <khwon@chromium.org>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Kapil Porwal <kapilporwal@google.com>
This commit is contained in:
Subrata Banik 2023-06-13 00:44:44 +05:30
parent cacdb85979
commit 272ce9a579
6 changed files with 15 additions and 14 deletions

View File

@ -63,7 +63,7 @@ static void intel_ish_get_version(void)
static void intel_ish_final(struct device *dev) 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(); intel_ish_get_version();
} }

View File

@ -87,7 +87,7 @@ config BOARD_GOOGLE_BASEBOARD_NISSA
select SOC_INTEL_ALDERLAKE_PCH_N select SOC_INTEL_ALDERLAKE_PCH_N
select SOC_INTEL_CSE_LITE_COMPRESS_ME_RW select SOC_INTEL_CSE_LITE_COMPRESS_ME_RW
select SOC_INTEL_CSE_LITE_SYNC_IN_RAMSTAGE 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 SYSTEM_TYPE_LAPTOP
select TPM_GOOGLE_TI50 select TPM_GOOGLE_TI50
select SOC_INTEL_COMMON_MMC_OVERRIDE select SOC_INTEL_COMMON_MMC_OVERRIDE

View File

@ -162,7 +162,7 @@ const char *soc_acpi_name(const struct device *dev)
} }
#endif #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. * SoC override API to identify if ISH Firmware existed inside CSE FPT.
* *

View File

@ -45,22 +45,23 @@ config SOC_INTEL_COMMON_BLOCK_HECI1_DISABLE_USING_PCR
Use this config for SoC platform prior to CNL PCH (with postboot_sai implemented) 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. 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 bool
default n default n
depends on DRIVERS_INTEL_ISH depends on DRIVERS_INTEL_ISH
help help
This configuration option stores CSE FPT partitions' version in CBMEM memory. This configuration option stores ISH version in CBMEM area.
This information can be used to identify the currently running firmware partition This information can be used to identify the currently running ISH firmware
version. version.
The cost of sending HECI command to read the CSE FPT is significant (~200ms) ISH BUP is sitting inside the CSE firmware partition. The way to retrieve the
hence, the idea is to read the CSE RW version on every cold reset (to cover ISH version is by sending the HECI command to read the CSE FPT. The cost of sending
the CSE update scenarios) and store into CBMEM to avoid the cost of resending HECI command to read the CSE FPT is significant (~200ms) hence, the idea is to
the HECI command in all consecutive warm boots. 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 Later boot stages can just read the CBMEM ID to retrieve the ISH version.
required.
Additionally, ensure this feature is platform specific hence, only enabled 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 for the platform that would like to store the ISH version into the CBMEM and

View File

@ -1307,7 +1307,7 @@ static void ramstage_cse_misc_ops(void *unused)
* Store the CSE/ISH RW Firmware Version into CBMEM if ISH partition * Store the CSE/ISH RW Firmware Version into CBMEM if ISH partition
* is available * is available
*/ */
if (CONFIG(SOC_INTEL_STORE_CSE_FPT_PARTITION_VERSION) && if (CONFIG(SOC_INTEL_STORE_ISH_FW_VERSION) &&
soc_is_ish_partition_enabled()) { soc_is_ish_partition_enabled()) {
store_cse_rw_fw_version(); store_cse_rw_fw_version();
store_ish_version(); store_ish_version();

View File

@ -528,7 +528,7 @@ void soc_disable_heci1_using_pcr(void);
* identifying the UFS enabled device is enough to conclude if ISH partition is * identifying the UFS enabled device is enough to conclude if ISH partition is
* available. * 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); bool soc_is_ish_partition_enabled(void);
#else #else
static inline bool soc_is_ish_partition_enabled(void) static inline bool soc_is_ish_partition_enabled(void)