ec/google: Use EC_HOST_EVENT_NONE
google_chromeec_get_event returns 0 for no event. Return EC_HOST_EVENT_NONE=0 to improve readability. BUG=b:184074997 TEST=Build and boot guybrush without error Signed-off-by: Rob Barnes <robbarnes@google.com> Change-Id: Ic08ed9ccdd7c0023d0fe8b641fcf60dca495a242 Reviewed-on: https://review.coreboot.org/c/coreboot/+/55547 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Tim Wawrzynczak <twawrzynczak@chromium.org>
This commit is contained in:
parent
8bc5fa9f0a
commit
f1ade489c8
|
@ -19,7 +19,7 @@ uint64_t google_chromeec_get_wake_mask(void);
|
|||
int google_chromeec_set_sci_mask(uint64_t mask);
|
||||
int google_chromeec_set_smi_mask(uint64_t mask);
|
||||
int google_chromeec_set_wake_mask(uint64_t mask);
|
||||
uint8_t google_chromeec_get_event(void);
|
||||
enum host_event_code google_chromeec_get_event(void);
|
||||
|
||||
/* Check if EC supports feature EC_FEATURE_UNIFIED_WAKE_MASKS */
|
||||
bool google_chromeec_is_uhepi_supported(void);
|
||||
|
|
|
@ -239,8 +239,8 @@ int google_chromeec_command(struct chromeec_command *cec_command)
|
|||
|
||||
#endif /* CONFIG_EC_GOOGLE_CHROMEEC_I2C_PROTO3 */
|
||||
|
||||
u8 google_chromeec_get_event(void)
|
||||
enum host_event_code google_chromeec_get_event(void)
|
||||
{
|
||||
printk(BIOS_ERR, "%s: Not supported.\n", __func__);
|
||||
return 0;
|
||||
return EC_HOST_EVENT_NONE;
|
||||
}
|
||||
|
|
|
@ -461,11 +461,11 @@ static int google_chromeec_data_ready(u16 port)
|
|||
EC_LPC_CMDR_DATA);
|
||||
}
|
||||
|
||||
u8 google_chromeec_get_event(void)
|
||||
enum host_event_code google_chromeec_get_event(void)
|
||||
{
|
||||
if (google_chromeec_wait_ready(EC_LPC_ADDR_ACPI_CMD)) {
|
||||
printk(BIOS_ERR, "Timeout waiting for EC ready!\n");
|
||||
return 0;
|
||||
return EC_HOST_EVENT_NONE;
|
||||
}
|
||||
|
||||
/* Issue the ACPI query-event command */
|
||||
|
@ -473,12 +473,12 @@ u8 google_chromeec_get_event(void)
|
|||
|
||||
if (google_chromeec_wait_ready(EC_LPC_ADDR_ACPI_CMD)) {
|
||||
printk(BIOS_ERR, "Timeout waiting for EC QUERY_EVENT!\n");
|
||||
return 0;
|
||||
return EC_HOST_EVENT_NONE;
|
||||
}
|
||||
|
||||
if (google_chromeec_data_ready(EC_LPC_ADDR_ACPI_CMD)) {
|
||||
printk(BIOS_ERR, "Timeout waiting for data ready!\n");
|
||||
return 0;
|
||||
return EC_HOST_EVENT_NONE;
|
||||
}
|
||||
|
||||
/* Event (or 0 if none) is returned directly in the data byte */
|
||||
|
|
|
@ -100,8 +100,8 @@ int google_chromeec_command(struct chromeec_command *cec_command)
|
|||
return crosec_command_proto(cec_command, crosec_spi_io, &slave);
|
||||
}
|
||||
|
||||
u8 google_chromeec_get_event(void)
|
||||
enum host_event_code google_chromeec_get_event(void)
|
||||
{
|
||||
printk(BIOS_ERR, "%s: Not supported.\n", __func__);
|
||||
return 0;
|
||||
return EC_HOST_EVENT_NONE;
|
||||
}
|
||||
|
|
|
@ -37,7 +37,7 @@ static void clear_pending_events(void)
|
|||
{
|
||||
struct ec_response_get_next_event mkbp_event;
|
||||
|
||||
while (google_chromeec_get_event() != 0)
|
||||
while (google_chromeec_get_event() != EC_HOST_EVENT_NONE)
|
||||
;
|
||||
|
||||
printk(BIOS_DEBUG, "Clearing pending EC events. Error code EC_RES_UNAVAILABLE(9) is expected.\n");
|
||||
|
|
|
@ -23,7 +23,7 @@ void mainboard_ec_init(void)
|
|||
google_chromeec_events_init(&info, s3_wakeup);
|
||||
if (s3_wakeup) {
|
||||
/* Clear pending events. */
|
||||
while (google_chromeec_get_event() != 0)
|
||||
while (google_chromeec_get_event() != EC_HOST_EVENT_NONE)
|
||||
;
|
||||
}
|
||||
|
||||
|
|
|
@ -97,7 +97,7 @@ void mainboard_smi_sleep(u8 slp_typ)
|
|||
google_chromeec_set_sci_mask(0);
|
||||
|
||||
/* Clear pending events that may trigger immediate wake */
|
||||
while (google_chromeec_get_event() != 0)
|
||||
while (google_chromeec_get_event() != EC_HOST_EVENT_NONE)
|
||||
;
|
||||
}
|
||||
|
||||
|
@ -107,14 +107,14 @@ int mainboard_smi_apmc(u8 apmc)
|
|||
case APM_CNT_ACPI_ENABLE:
|
||||
google_chromeec_set_smi_mask(0);
|
||||
/* Clear all pending events */
|
||||
while (google_chromeec_get_event() != 0)
|
||||
while (google_chromeec_get_event() != EC_HOST_EVENT_NONE)
|
||||
;
|
||||
google_chromeec_set_sci_mask(MAINBOARD_EC_SCI_EVENTS);
|
||||
break;
|
||||
case APM_CNT_ACPI_DISABLE:
|
||||
google_chromeec_set_sci_mask(0);
|
||||
/* Clear all pending events */
|
||||
while (google_chromeec_get_event() != 0)
|
||||
while (google_chromeec_get_event() != EC_HOST_EVENT_NONE)
|
||||
;
|
||||
google_chromeec_set_smi_mask(MAINBOARD_EC_SMI_EVENTS);
|
||||
break;
|
||||
|
|
|
@ -126,7 +126,7 @@ void mainboard_smi_sleep(uint8_t slp_typ)
|
|||
google_chromeec_set_sci_mask(0);
|
||||
|
||||
/* Clear pending events that may trigger immediate wake */
|
||||
while (google_chromeec_get_event() != 0)
|
||||
while (google_chromeec_get_event() != EC_HOST_EVENT_NONE)
|
||||
;
|
||||
|
||||
/* Set LPC lines to low power in S3/S5. */
|
||||
|
@ -141,14 +141,14 @@ int mainboard_smi_apmc(uint8_t apmc)
|
|||
case APM_CNT_ACPI_ENABLE:
|
||||
google_chromeec_set_smi_mask(0);
|
||||
/* Clear all pending events */
|
||||
while (google_chromeec_get_event() != 0)
|
||||
while (google_chromeec_get_event() != EC_HOST_EVENT_NONE)
|
||||
;
|
||||
google_chromeec_set_sci_mask(MAINBOARD_EC_SCI_EVENTS);
|
||||
break;
|
||||
case APM_CNT_ACPI_DISABLE:
|
||||
google_chromeec_set_sci_mask(0);
|
||||
/* Clear all pending events */
|
||||
while (google_chromeec_get_event() != 0)
|
||||
while (google_chromeec_get_event() != EC_HOST_EVENT_NONE)
|
||||
;
|
||||
google_chromeec_set_smi_mask(MAINBOARD_EC_SMI_EVENTS);
|
||||
break;
|
||||
|
|
|
@ -69,7 +69,8 @@ void mainboard_smi_sleep(u8 slp_typ)
|
|||
google_chromeec_set_sci_mask(0);
|
||||
|
||||
/* Clear pending events that may trigger immediate wake */
|
||||
while (google_chromeec_get_event() != 0);
|
||||
while (google_chromeec_get_event() != EC_HOST_EVENT_NONE)
|
||||
;
|
||||
|
||||
/* Enable wake events */
|
||||
google_chromeec_set_wake_mask(LINK_EC_S3_WAKE_EVENTS);
|
||||
|
@ -81,13 +82,15 @@ int mainboard_smi_apmc(u8 apmc)
|
|||
case APM_CNT_ACPI_ENABLE:
|
||||
google_chromeec_set_smi_mask(0);
|
||||
/* Clear all pending events */
|
||||
while (google_chromeec_get_event() != 0);
|
||||
while (google_chromeec_get_event() != EC_HOST_EVENT_NONE)
|
||||
;
|
||||
google_chromeec_set_sci_mask(LINK_EC_SCI_EVENTS);
|
||||
break;
|
||||
case APM_CNT_ACPI_DISABLE:
|
||||
google_chromeec_set_sci_mask(0);
|
||||
/* Clear all pending events */
|
||||
while (google_chromeec_get_event() != 0);
|
||||
while (google_chromeec_get_event() != EC_HOST_EVENT_NONE)
|
||||
;
|
||||
google_chromeec_set_smi_mask(LINK_EC_SMI_EVENTS);
|
||||
break;
|
||||
}
|
||||
|
|
|
@ -84,7 +84,8 @@ void mainboard_smi_sleep(uint8_t slp_typ)
|
|||
google_chromeec_set_sci_mask(0);
|
||||
|
||||
/* Clear pending events that may trigger immediate wake */
|
||||
while (google_chromeec_get_event() != 0);
|
||||
while (google_chromeec_get_event() != EC_HOST_EVENT_NONE)
|
||||
;
|
||||
}
|
||||
|
||||
int mainboard_smi_apmc(uint8_t apmc)
|
||||
|
@ -93,13 +94,15 @@ int mainboard_smi_apmc(uint8_t apmc)
|
|||
case APM_CNT_ACPI_ENABLE:
|
||||
google_chromeec_set_smi_mask(0);
|
||||
/* Clear all pending events */
|
||||
while (google_chromeec_get_event() != 0);
|
||||
while (google_chromeec_get_event() != EC_HOST_EVENT_NONE)
|
||||
;
|
||||
google_chromeec_set_sci_mask(MAINBOARD_EC_SCI_EVENTS);
|
||||
break;
|
||||
case APM_CNT_ACPI_DISABLE:
|
||||
google_chromeec_set_sci_mask(0);
|
||||
/* Clear all pending events */
|
||||
while (google_chromeec_get_event() != 0);
|
||||
while (google_chromeec_get_event() != EC_HOST_EVENT_NONE)
|
||||
;
|
||||
google_chromeec_set_smi_mask(MAINBOARD_EC_SMI_EVENTS);
|
||||
break;
|
||||
}
|
||||
|
|
|
@ -22,7 +22,7 @@ void mainboard_ec_init(void)
|
|||
google_chromeec_events_init(&info, s3_wakeup);
|
||||
if (s3_wakeup) {
|
||||
/* Clear pending events. */
|
||||
while (google_chromeec_get_event() != 0)
|
||||
while (google_chromeec_get_event() != EC_HOST_EVENT_NONE)
|
||||
;
|
||||
}
|
||||
|
||||
|
|
|
@ -100,7 +100,8 @@ void mainboard_smi_sleep(u8 slp_typ)
|
|||
google_chromeec_set_sci_mask(0);
|
||||
|
||||
/* Clear pending events that may trigger immediate wake */
|
||||
while (google_chromeec_get_event() != 0);
|
||||
while (google_chromeec_get_event() != EC_HOST_EVENT_NONE)
|
||||
;
|
||||
}
|
||||
|
||||
int mainboard_smi_apmc(u8 apmc)
|
||||
|
@ -109,13 +110,15 @@ int mainboard_smi_apmc(u8 apmc)
|
|||
case APM_CNT_ACPI_ENABLE:
|
||||
google_chromeec_set_smi_mask(0);
|
||||
/* Clear all pending events */
|
||||
while (google_chromeec_get_event() != 0);
|
||||
while (google_chromeec_get_event() != EC_HOST_EVENT_NONE)
|
||||
;
|
||||
google_chromeec_set_sci_mask(MAINBOARD_EC_SCI_EVENTS);
|
||||
break;
|
||||
case APM_CNT_ACPI_DISABLE:
|
||||
google_chromeec_set_sci_mask(0);
|
||||
/* Clear all pending events */
|
||||
while (google_chromeec_get_event() != 0);
|
||||
while (google_chromeec_get_event() != EC_HOST_EVENT_NONE)
|
||||
;
|
||||
google_chromeec_set_smi_mask(MAINBOARD_EC_SMI_EVENTS);
|
||||
break;
|
||||
}
|
||||
|
|
|
@ -112,7 +112,7 @@ void mainboard_smi_sleep(uint8_t slp_typ)
|
|||
google_chromeec_set_sci_mask(0);
|
||||
|
||||
/* Clear pending events that may trigger immediate wake */
|
||||
while (google_chromeec_get_event() != 0)
|
||||
while (google_chromeec_get_event() != EC_HOST_EVENT_NONE)
|
||||
;
|
||||
|
||||
/* Set LPC lines to low power in S3/S5. */
|
||||
|
@ -126,14 +126,14 @@ int mainboard_smi_apmc(uint8_t apmc)
|
|||
case APM_CNT_ACPI_ENABLE:
|
||||
google_chromeec_set_smi_mask(0);
|
||||
/* Clear all pending events */
|
||||
while (google_chromeec_get_event() != 0)
|
||||
while (google_chromeec_get_event() != EC_HOST_EVENT_NONE)
|
||||
;
|
||||
google_chromeec_set_sci_mask(MAINBOARD_EC_SCI_EVENTS);
|
||||
break;
|
||||
case APM_CNT_ACPI_DISABLE:
|
||||
google_chromeec_set_sci_mask(0);
|
||||
/* Clear all pending events */
|
||||
while (google_chromeec_get_event() != 0)
|
||||
while (google_chromeec_get_event() != EC_HOST_EVENT_NONE)
|
||||
;
|
||||
google_chromeec_set_smi_mask(MAINBOARD_EC_SMI_EVENTS);
|
||||
break;
|
||||
|
|
Loading…
Reference in New Issue