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 <abhishekpandit@chromium.org> Reviewed-on: https://review.coreboot.org/c/coreboot/+/83252 Reviewed-by: Karthik Ramasubramanian <kramasub@google.com> Reviewed-by: Daisuke Nojiri <dnojiri@chromium.org> Reviewed-by: Forest Mittelberg <bmbm@google.com> Reviewed-by: Caveh Jalali <caveh@chromium.org> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
		
				
					committed by
					
						
						Karthik Ramasubramanian
					
				
			
			
				
	
			
			
			
						parent
						
							a1c5c626ff
						
					
				
				
					commit
					f94ccc236f
				
			@@ -726,7 +726,6 @@ int google_chromeec_cbi_get_ssfc(uint32_t *ssfc)
 | 
				
			|||||||
bool google_chromeec_get_ucsi_enabled(void)
 | 
					bool google_chromeec_get_ucsi_enabled(void)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
	int rv;
 | 
						int rv;
 | 
				
			||||||
	union ec_common_control cc;
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
	rv = google_chromeec_check_feature(EC_FEATURE_UCSI_PPM);
 | 
						rv = google_chromeec_check_feature(EC_FEATURE_UCSI_PPM);
 | 
				
			||||||
	if (rv < 0) {
 | 
						if (rv < 0) {
 | 
				
			||||||
@@ -734,18 +733,7 @@ bool google_chromeec_get_ucsi_enabled(void)
 | 
				
			|||||||
		return false;
 | 
							return false;
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	if (rv == 0)
 | 
						return 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);
 | 
					 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
static int cbi_get_string(char *buf, size_t bufsize, uint32_t tag)
 | 
					static int cbi_get_string(char *buf, size_t bufsize, uint32_t tag)
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user