From f94ccc236fb4193de14f6fbf7b4ffd55920f6000 Mon Sep 17 00:00:00 2001 From: Abhishek Pandit-Subedi Date: Thu, 27 Jun 2024 15:24:46 -0700 Subject: ec/google/chromeec: Stop checking CBI for UCSI The ucsi_enabled flag is no longer used by the EC. Update coreboot to only use only EC_FEATURE_UCSI_PPM to determine whether UCSI is enabled. BUG=b:319124515 TEST=emerge-brox coreboot chromeos-bootimage Cq-Depend: chromium:5664227 Change-Id: Ia9d820c637e56a527fd90f45b1848158a960dee7 Signed-off-by: Abhishek Pandit-Subedi Reviewed-on: https://review.coreboot.org/c/coreboot/+/83252 Reviewed-by: Karthik Ramasubramanian Reviewed-by: Daisuke Nojiri Reviewed-by: Forest Mittelberg Reviewed-by: Caveh Jalali Tested-by: build bot (Jenkins) --- src/ec/google/chromeec/ec.c | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) (limited to 'src') diff --git a/src/ec/google/chromeec/ec.c b/src/ec/google/chromeec/ec.c index a32b2a54a4..088f2fe553 100644 --- a/src/ec/google/chromeec/ec.c +++ b/src/ec/google/chromeec/ec.c @@ -726,7 +726,6 @@ int google_chromeec_cbi_get_ssfc(uint32_t *ssfc) bool google_chromeec_get_ucsi_enabled(void) { int rv; - union ec_common_control cc; rv = google_chromeec_check_feature(EC_FEATURE_UCSI_PPM); if (rv < 0) { @@ -734,18 +733,7 @@ bool google_chromeec_get_ucsi_enabled(void) return false; } - if (rv == 0) - return false; - - /* Check if PPM is enabled at runtime. */ - cc.ucsi_enabled = 0; - rv = cbi_get_uint32(&cc.raw_value, CBI_TAG_COMMON_CONTROL); - if (rv < 0) { - printk(BIOS_DEBUG, "Cannot get tag CBI_TAG_COMMON_CONTROL from CBI: status = %d\n", rv); - return false; - } - - return (cc.ucsi_enabled != 0); + return rv != 0; } static int cbi_get_string(char *buf, size_t bufsize, uint32_t tag) -- cgit v1.2.3