GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ec/google/chromeec: Optionally include SSFC in firmware config 

Fetch second source factory cache configuration (SSFC) as an optional
element to the firmware config interface. Introduce a Kconfig so that it
can be enabled and used on required mainboards.

BUG=b:177055126
TEST=Build and Boot to OS in Magolor.

Change-Id: I81137406d21e77b5d58a33f66778e13cf16c85c7
Signed-off-by: Karthikeyan Ramasubramanian <kramasub@google.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/51094
Reviewed-by: Furquan Shaikh <furquan@google.com>
Reviewed-by: Tim Wawrzynczak <twawrzynczak@chromium.org>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
Karthikeyan Ramasubramanian 2021-02-25 00:29:14 -07:00 committed by Patrick Georgi
parent a904fd6173
commit 867288490a
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/ec/google/chromeec/Kconfig
View File

@ -197,4 +197,11 @@ config EC_GOOGLE_CHROMEEC_SWITCHES
Enable support for Chrome OS mode switches provided by the Chrome OS Enable support for Chrome OS mode switches provided by the Chrome OS
EC. EC.
config EC_GOOGLE_CHROMEEC_INCLUDE_SSFC_IN_FW_CONFIG
depends on FW_CONFIG_SOURCE_CHROMEEC_CBI
bool
help
Fetch Second Source Factory Cache from CBI EEPROM and add it in the most significant
32 bits of firmware configuration.
source "src/ec/google/chromeec/*/Kconfig" source "src/ec/google/chromeec/*/Kconfig"

13
src/ec/google/chromeec/ec.c
View File

@ -848,8 +848,19 @@ int google_chromeec_cbi_get_fw_config(uint64_t *fw_config)
if (cbi_get_uint32(&config, CBI_TAG_FW_CONFIG)) if (cbi_get_uint32(&config, CBI_TAG_FW_CONFIG))
return -1; return -1;
/* FIXME: Yet to determine source of other 32 bits... */
*fw_config = (uint64_t)config; *fw_config = (uint64_t)config;
/*
* If SSFC is configured to be part of FW_CONFIG, add it at the most significant
* 32 bits.
*/
if (CONFIG(EC_GOOGLE_CHROMEEC_INCLUDE_SSFC_IN_FW_CONFIG)) {
uint32_t ssfc;
if (google_chromeec_cbi_get_ssfc(&ssfc))
return -1;
*fw_config |= (uint64_t)ssfc << 32;
}
return 0; return 0;
} }