From 6cbd3980aba050352b09c818ffabe822411c1901 Mon Sep 17 00:00:00 2001 From: Duncan Laurie Date: Sun, 5 Mar 2017 14:35:57 -0800 Subject: elog: Fix duplicate event type The current elog implementation has two event types defined for 0xa7, apparently the result of divergent coreboot trees on chromium where some events were added to ARM systems but not upstreamed until later. Fix this by moving ELOG_TYPE_THERM_TRIP to be 0xab, since the current elog parsing code in chromium is using ELOG_TYPE_SLEEP for 0xa7. BUG=b:35977516 TEST=check for proper "CPU Thermal Trip" event when investigating a device that is unexpectedly powering down. Change-Id: Idfa9b2322527803097f4f19f7930ccbdf2eccf35 Signed-off-by: Duncan Laurie Reviewed-on: https://review.coreboot.org/18579 Tested-by: build bot (Jenkins) Reviewed-by: Furquan Shaikh Reviewed-by: Paul Menzel Reviewed-by: Aaron Durbin --- src/include/elog.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/include') diff --git a/src/include/elog.h b/src/include/elog.h index 501e30db3d..2734612a8a 100644 --- a/src/include/elog.h +++ b/src/include/elog.h @@ -146,9 +146,6 @@ struct elog_event_data_me_extended { /* EC Shutdown Reason */ #define ELOG_TYPE_EC_SHUTDOWN 0xa5 -/* CPU Thermal Trip */ -#define ELOG_TYPE_THERM_TRIP 0xa7 - /* ARM/generic versions of sleep/wake - These came from another firmware * apparently, but not all the firmware sources were updated so that the * elog namespace was coherent. */ @@ -168,6 +165,9 @@ struct elog_event_mem_cache_update { u8 status; } __attribute__ ((packed)); +/* CPU Thermal Trip */ +#define ELOG_TYPE_THERM_TRIP 0xab + #if CONFIG_ELOG /* Eventlog backing storage must be initialized before calling elog_init(). */ extern int elog_init(void); -- cgit v1.2.3