Change in coreboot[master]: ec/google/chromeec: Optionally include SSFC in firmware config

[Patrick Georgi (Code Review)]

Patrick Georgi has submitted this change. ( https://review.coreboot.org/c/coreboot/+/51094 )

Change subject: ec/google/chromeec: Optionally include SSFC in firmware config
......................................................................

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 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/51094
Reviewed-by: Furquan Shaikh 
Reviewed-by: Tim Wawrzynczak 
Tested-by: build bot (Jenkins) 
---
M src/ec/google/chromeec/Kconfig
M src/ec/google/chromeec/ec.c
2 files changed, 19 insertions(+), 1 deletion(-)

Approvals:
  build bot (Jenkins): Verified
  Furquan Shaikh: Looks good to me, approved
  Tim Wawrzynczak: Looks good to me, approved

diff --git a/src/ec/google/chromeec/Kconfig b/src/ec/google/chromeec/Kconfig
index 638c011..4bb0d65 100644
--- a/src/ec/google/chromeec/Kconfig
+++ b/src/ec/google/chromeec/Kconfig
@@ -197,4 +197,11 @@
      Enable support for Chrome OS mode switches provided by the Chrome OS
      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"
diff --git a/src/ec/google/chromeec/ec.c b/src/ec/google/chromeec/ec.c
index 0915833..affe66e 100644
--- a/src/ec/google/chromeec/ec.c
+++ b/src/ec/google/chromeec/ec.c
@@ -848,8 +848,19 @@
    if (cbi_get_uint32(&config, CBI_TAG_FW_CONFIG))
    	return -1;

-	/* FIXME: Yet to determine source of other 32 bits... */
    *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;
 }