summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/ec/google/chromeec/ec.h2
-rw-r--r--src/ec/google/chromeec/ec_i2c.c4
-rw-r--r--src/ec/google/chromeec/ec_lpc.c8
-rw-r--r--src/ec/google/chromeec/ec_spi.c4
-rw-r--r--src/ec/google/chromeec/smihandler.c2
-rw-r--r--src/mainboard/google/auron/ec.c2
-rw-r--r--src/mainboard/google/auron/smihandler.c6
-rw-r--r--src/mainboard/google/cyan/smihandler.c6
-rw-r--r--src/mainboard/google/link/smihandler.c9
-rw-r--r--src/mainboard/google/rambi/smihandler.c9
-rw-r--r--src/mainboard/google/slippy/ec.c2
-rw-r--r--src/mainboard/google/slippy/smihandler.c9
-rw-r--r--src/mainboard/intel/strago/smihandler.c6
13 files changed, 39 insertions, 30 deletions
diff --git a/src/ec/google/chromeec/ec.h b/src/ec/google/chromeec/ec.h
index 35ce3cce6e..ed9f4e43ba 100644
--- a/src/ec/google/chromeec/ec.h
+++ b/src/ec/google/chromeec/ec.h
@@ -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);
diff --git a/src/ec/google/chromeec/ec_i2c.c b/src/ec/google/chromeec/ec_i2c.c
index 68e3cf2db8..7342fc2ab3 100644
--- a/src/ec/google/chromeec/ec_i2c.c
+++ b/src/ec/google/chromeec/ec_i2c.c
@@ -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;
}
diff --git a/src/ec/google/chromeec/ec_lpc.c b/src/ec/google/chromeec/ec_lpc.c
index 623aed50ff..a82ea5d9ab 100644
--- a/src/ec/google/chromeec/ec_lpc.c
+++ b/src/ec/google/chromeec/ec_lpc.c
@@ -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 */
diff --git a/src/ec/google/chromeec/ec_spi.c b/src/ec/google/chromeec/ec_spi.c
index ecf1b420fe..0124191d35 100644
--- a/src/ec/google/chromeec/ec_spi.c
+++ b/src/ec/google/chromeec/ec_spi.c
@@ -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;
}
diff --git a/src/ec/google/chromeec/smihandler.c b/src/ec/google/chromeec/smihandler.c
index fca67ca810..cd0cd4f41e 100644
--- a/src/ec/google/chromeec/smihandler.c
+++ b/src/ec/google/chromeec/smihandler.c
@@ -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");
diff --git a/src/mainboard/google/auron/ec.c b/src/mainboard/google/auron/ec.c
index 5be20c01d2..d4482b01ba 100644
--- a/src/mainboard/google/auron/ec.c
+++ b/src/mainboard/google/auron/ec.c
@@ -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)
;
}
diff --git a/src/mainboard/google/auron/smihandler.c b/src/mainboard/google/auron/smihandler.c
index 34ed171f8a..6fa95e8dff 100644
--- a/src/mainboard/google/auron/smihandler.c
+++ b/src/mainboard/google/auron/smihandler.c
@@ -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;
diff --git a/src/mainboard/google/cyan/smihandler.c b/src/mainboard/google/cyan/smihandler.c
index d9121e16d0..9083a8773b 100644
--- a/src/mainboard/google/cyan/smihandler.c
+++ b/src/mainboard/google/cyan/smihandler.c
@@ -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;
diff --git a/src/mainboard/google/link/smihandler.c b/src/mainboard/google/link/smihandler.c
index 719076b3f8..2f42b7da18 100644
--- a/src/mainboard/google/link/smihandler.c
+++ b/src/mainboard/google/link/smihandler.c
@@ -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;
}
diff --git a/src/mainboard/google/rambi/smihandler.c b/src/mainboard/google/rambi/smihandler.c
index c16a0f525b..358a92f967 100644
--- a/src/mainboard/google/rambi/smihandler.c
+++ b/src/mainboard/google/rambi/smihandler.c
@@ -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;
}
diff --git a/src/mainboard/google/slippy/ec.c b/src/mainboard/google/slippy/ec.c
index 5761a7c579..a3ee95bd0b 100644
--- a/src/mainboard/google/slippy/ec.c
+++ b/src/mainboard/google/slippy/ec.c
@@ -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)
;
}
diff --git a/src/mainboard/google/slippy/smihandler.c b/src/mainboard/google/slippy/smihandler.c
index 81fcb0aafa..16a1b18b7a 100644
--- a/src/mainboard/google/slippy/smihandler.c
+++ b/src/mainboard/google/slippy/smihandler.c
@@ -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;
}
diff --git a/src/mainboard/intel/strago/smihandler.c b/src/mainboard/intel/strago/smihandler.c
index fc77103537..e953ccd531 100644
--- a/src/mainboard/intel/strago/smihandler.c
+++ b/src/mainboard/intel/strago/smihandler.c
@@ -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;
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-24 14:37:58 +0000