From 0d9cd92efb8b1bf2f9ef75d241040fb6955f4930 Mon Sep 17 00:00:00 2001 From: Furquan Shaikh Date: Mon, 25 Jul 2016 17:00:07 -0700 Subject: [PATCH] chromeos: Clean up elog handling 1. Currenty, boot reason is being added to elog only for some ARM32/ARM64 platforms. Change this so that boot reason is logged by default in elog for all devices which have CHROMEOS selected. 2. Add a new option to select ELOG_WATCHDOG_RESET for the devices that want to add details about watchdog reset in elog. This requires a special region WATCHDOG to be present in the memlayout. 3. Remove calls to elog add boot reason and watchdog reset from mainboards. BUG=chrome-os-partner:55639 Change-Id: I91ff5b158cfd2a0749e7fefc498d8659f7e6aa91 Signed-off-by: Furquan Shaikh Reviewed-on: https://review.coreboot.org/15897 Reviewed-by: Aaron Durbin Tested-by: build bot (Jenkins) --- src/mainboard/google/gru/mainboard.c | 3 -- src/mainboard/google/nyan/mainboard.c | 4 --- src/mainboard/google/nyan_big/mainboard.c | 4 --- src/mainboard/google/nyan_blaze/mainboard.c | 4 --- src/mainboard/google/oak/mainboard.c | 4 --- src/mainboard/google/rush_ryu/mainboard.c | 3 -- src/mainboard/google/veyron/mainboard.c | 4 --- src/mainboard/google/veyron_brain/mainboard.c | 4 --- .../google/veyron_danger/mainboard.c | 4 --- src/mainboard/google/veyron_emile/mainboard.c | 4 --- .../google/veyron_mickey/mainboard.c | 4 --- .../google/veyron_rialto/mainboard.c | 4 --- src/mainboard/google/veyron_romy/mainboard.c | 4 --- src/vendorcode/google/chromeos/Makefile.inc | 2 +- src/vendorcode/google/chromeos/chromeos.h | 6 ---- src/vendorcode/google/chromeos/elog.c | 30 ++++++++++++------- src/vendorcode/google/chromeos/gnvs.c | 18 ----------- src/vendorcode/google/chromeos/watchdog.c | 15 +++++++++- 18 files changed, 34 insertions(+), 87 deletions(-) diff --git a/src/mainboard/google/gru/mainboard.c b/src/mainboard/google/gru/mainboard.c index 5a6b82cbb1..7ec377f201 100644 --- a/src/mainboard/google/gru/mainboard.c +++ b/src/mainboard/google/gru/mainboard.c @@ -189,9 +189,6 @@ static void mainboard_init(device_t dev) register_reset_to_bl31(); register_poweroff_to_bl31(); setup_rtc(); - - elog_init(); - elog_add_boot_reason(); } static void enable_backlight_booster(void) diff --git a/src/mainboard/google/nyan/mainboard.c b/src/mainboard/google/nyan/mainboard.c index 48a0d1c776..92bb3e3409 100644 --- a/src/mainboard/google/nyan/mainboard.c +++ b/src/mainboard/google/nyan/mainboard.c @@ -242,10 +242,6 @@ static void mainboard_init(device_t dev) setup_kernel_info(); clock_init_arm_generic_timer(); setup_ec_spi(); -#if CONFIG_ELOG - elog_init(); - elog_add_boot_reason(); -#endif } static void mainboard_enable(device_t dev) diff --git a/src/mainboard/google/nyan_big/mainboard.c b/src/mainboard/google/nyan_big/mainboard.c index a2fef3c69c..0c0fe5ed55 100644 --- a/src/mainboard/google/nyan_big/mainboard.c +++ b/src/mainboard/google/nyan_big/mainboard.c @@ -240,10 +240,6 @@ static void mainboard_init(device_t dev) setup_kernel_info(); clock_init_arm_generic_timer(); setup_ec_spi(); -#if CONFIG_ELOG - elog_init(); - elog_add_boot_reason(); -#endif } static void mainboard_enable(device_t dev) diff --git a/src/mainboard/google/nyan_blaze/mainboard.c b/src/mainboard/google/nyan_blaze/mainboard.c index 7ceb1234ca..c3b936c1b0 100644 --- a/src/mainboard/google/nyan_blaze/mainboard.c +++ b/src/mainboard/google/nyan_blaze/mainboard.c @@ -240,10 +240,6 @@ static void mainboard_init(device_t dev) setup_kernel_info(); clock_init_arm_generic_timer(); setup_ec_spi(); -#if CONFIG_ELOG - elog_init(); - elog_add_boot_reason(); -#endif } static void mainboard_enable(device_t dev) diff --git a/src/mainboard/google/oak/mainboard.c b/src/mainboard/google/oak/mainboard.c index e33d08c7a1..ad5ecd4bd9 100644 --- a/src/mainboard/google/oak/mainboard.c +++ b/src/mainboard/google/oak/mainboard.c @@ -267,10 +267,6 @@ static void mainboard_init(device_t dev) configure_usb_hub(); configure_ext_buck(); configure_touchscreen(); - - elog_init(); - elog_add_watchdog_reset(); - elog_add_boot_reason(); } static void mainboard_enable(device_t dev) diff --git a/src/mainboard/google/rush_ryu/mainboard.c b/src/mainboard/google/rush_ryu/mainboard.c index b53b0fff06..64e01ece30 100644 --- a/src/mainboard/google/rush_ryu/mainboard.c +++ b/src/mainboard/google/rush_ryu/mainboard.c @@ -269,9 +269,6 @@ static void mainboard_init(device_t dev) /* Temp hack for P1 board: Enable speaker amp (powerup, etc.) */ enable_ad4567_spkr_amp(); - elog_init(); - elog_add_boot_reason(); - fix_ec_sw_sync(); /* configure panel gpio pads */ diff --git a/src/mainboard/google/veyron/mainboard.c b/src/mainboard/google/veyron/mainboard.c index cbc82e932d..a6bbf881e3 100644 --- a/src/mainboard/google/veyron/mainboard.c +++ b/src/mainboard/google/veyron/mainboard.c @@ -108,10 +108,6 @@ static void mainboard_init(device_t dev) configure_emmc(); configure_codec(); configure_vop(); - - elog_init(); - elog_add_watchdog_reset(); - elog_add_boot_reason(); } static void mainboard_enable(device_t dev) diff --git a/src/mainboard/google/veyron_brain/mainboard.c b/src/mainboard/google/veyron_brain/mainboard.c index 22faf6440b..cc07278b94 100644 --- a/src/mainboard/google/veyron_brain/mainboard.c +++ b/src/mainboard/google/veyron_brain/mainboard.c @@ -93,10 +93,6 @@ static void mainboard_init(device_t dev) configure_codec(); configure_vop(); configure_hdmi(); - - elog_init(); - elog_add_watchdog_reset(); - elog_add_boot_reason(); } static void mainboard_enable(device_t dev) diff --git a/src/mainboard/google/veyron_danger/mainboard.c b/src/mainboard/google/veyron_danger/mainboard.c index f923da9d01..39f0b2a305 100644 --- a/src/mainboard/google/veyron_danger/mainboard.c +++ b/src/mainboard/google/veyron_danger/mainboard.c @@ -149,10 +149,6 @@ static void mainboard_init(device_t dev) configure_codec(); configure_vop(); configure_hdmi(); - - elog_init(); - elog_add_watchdog_reset(); - elog_add_boot_reason(); } static void mainboard_enable(device_t dev) diff --git a/src/mainboard/google/veyron_emile/mainboard.c b/src/mainboard/google/veyron_emile/mainboard.c index 5e9c1c1508..b264df9f68 100644 --- a/src/mainboard/google/veyron_emile/mainboard.c +++ b/src/mainboard/google/veyron_emile/mainboard.c @@ -111,10 +111,6 @@ static void mainboard_init(device_t dev) configure_i2s(); configure_vop(); configure_hdmi(); - - elog_init(); - elog_add_watchdog_reset(); - elog_add_boot_reason(); } static void mainboard_enable(device_t dev) diff --git a/src/mainboard/google/veyron_mickey/mainboard.c b/src/mainboard/google/veyron_mickey/mainboard.c index 27e9f745e5..ef085b2f07 100644 --- a/src/mainboard/google/veyron_mickey/mainboard.c +++ b/src/mainboard/google/veyron_mickey/mainboard.c @@ -87,10 +87,6 @@ static void mainboard_init(device_t dev) configure_i2s(); configure_vop(); configure_hdmi(); - - elog_init(); - elog_add_watchdog_reset(); - elog_add_boot_reason(); } static void mainboard_enable(device_t dev) diff --git a/src/mainboard/google/veyron_rialto/mainboard.c b/src/mainboard/google/veyron_rialto/mainboard.c index b4f7685800..b9b6a2225a 100644 --- a/src/mainboard/google/veyron_rialto/mainboard.c +++ b/src/mainboard/google/veyron_rialto/mainboard.c @@ -85,10 +85,6 @@ static void mainboard_init(device_t dev) configure_3g(); /* No video. */ - elog_init(); - elog_add_watchdog_reset(); - elog_add_boot_reason(); - /* If recovery mode is detected, reduce frequency and voltage to reduce * heat in case machine is left unattended. chrome-os-partner:41201. */ if (vboot_recovery_mode_enabled()) { diff --git a/src/mainboard/google/veyron_romy/mainboard.c b/src/mainboard/google/veyron_romy/mainboard.c index c023338dac..9f68a09111 100644 --- a/src/mainboard/google/veyron_romy/mainboard.c +++ b/src/mainboard/google/veyron_romy/mainboard.c @@ -86,10 +86,6 @@ static void mainboard_init(device_t dev) configure_emmc(); configure_codec(); configure_vop(); - - elog_init(); - elog_add_watchdog_reset(); - elog_add_boot_reason(); } static void mainboard_enable(device_t dev) diff --git a/src/vendorcode/google/chromeos/Makefile.inc b/src/vendorcode/google/chromeos/Makefile.inc index 253c30e326..dffbcd5b23 100644 --- a/src/vendorcode/google/chromeos/Makefile.inc +++ b/src/vendorcode/google/chromeos/Makefile.inc @@ -24,7 +24,7 @@ ramstage-$(CONFIG_CHROMEOS_RAMOOPS) += ramoops.c romstage-y += vpd_decode.c ramstage-y += vpd_decode.c cros_vpd.c vpd_mac.c vpd_serialno.c vpd_calibration.c ramstage-$(CONFIG_HAVE_REGULATORY_DOMAIN) += wrdd.c -ifeq ($(CONFIG_ARCH_X86)$(CONFIG_ARCH_MIPS),) +ifeq ($(CONFIG_ARCH_MIPS),) bootblock-y += watchdog.c ramstage-y += watchdog.c endif diff --git a/src/vendorcode/google/chromeos/chromeos.h b/src/vendorcode/google/chromeos/chromeos.h index 92c943cbd2..0a93ccd307 100644 --- a/src/vendorcode/google/chromeos/chromeos.h +++ b/src/vendorcode/google/chromeos/chromeos.h @@ -26,16 +26,10 @@ void save_chromeos_gpios(void); #if CONFIG_CHROMEOS -/* functions implemented in elog.c */ -void elog_add_boot_reason(void); - /* functions implemented in watchdog.c */ -void elog_add_watchdog_reset(void); void mark_watchdog_tombstone(void); void reboot_from_watchdog(void); #else -static inline void elog_add_boot_reason(void) { return; } -static inline void elog_add_watchdog_reset(void) { return; } static inline void mark_watchdog_tombstone(void) { return; } static inline void reboot_from_watchdog(void) { return; } #endif /* CONFIG_CHROMEOS */ diff --git a/src/vendorcode/google/chromeos/elog.c b/src/vendorcode/google/chromeos/elog.c index 206f9d9d7b..061c1776dd 100644 --- a/src/vendorcode/google/chromeos/elog.c +++ b/src/vendorcode/google/chromeos/elog.c @@ -13,6 +13,7 @@ * GNU General Public License for more details. */ +#include #include #include #include @@ -21,19 +22,26 @@ #include #include -void elog_add_boot_reason(void) +static void elog_add_boot_reason(void *unused) { - if (vboot_developer_mode_enabled()) { + int rec = vboot_recovery_mode_enabled(); + int dev = vboot_developer_mode_enabled(); + + if (!rec && !dev) + return; + + if (rec) { + u8 reason = vboot_check_recovery_request(); + elog_add_event_byte(ELOG_TYPE_CROS_RECOVERY_MODE, reason); + printk(BIOS_DEBUG, "%s: Logged recovery mode boot%s, " + "reason: 0x%02x\n", __func__, + dev ? " (Dev-switch on)" : "", reason); + } + + if (dev) { elog_add_event(ELOG_TYPE_CROS_DEVELOPER_MODE); printk(BIOS_DEBUG, "%s: Logged dev mode boot\n", __func__); - } else if (vboot_recovery_mode_enabled()) { - u8 reason = vboot_check_recovery_request(); - elog_add_event_byte(ELOG_TYPE_CROS_RECOVERY_MODE, - reason ? reason : ELOG_CROS_RECOVERY_MODE_BUTTON); - printk(BIOS_DEBUG, "%s: Logged recovery mode boot, " - "reason: 0x%02x\n", __func__, reason); - } else { - printk(BIOS_DEBUG, "%s: Normal mode boot, nothing " - "interesting to log\n", __func__); } } + +BOOT_STATE_INIT_ENTRY(BS_POST_DEVICE, BS_ON_ENTRY, elog_add_boot_reason, NULL); diff --git a/src/vendorcode/google/chromeos/gnvs.c b/src/vendorcode/google/chromeos/gnvs.c index 5e14849004..1f13d1c195 100644 --- a/src/vendorcode/google/chromeos/gnvs.c +++ b/src/vendorcode/google/chromeos/gnvs.c @@ -52,24 +52,6 @@ void chromeos_init_vboot(chromeos_acpi_t *chromeos) ARRAY_SIZE(chromeos->vdat)); #endif -#if CONFIG_ELOG - if (vboot_developer_mode_enabled() || - (vboot_wants_oprom() && !vboot_recovery_mode_enabled())) - elog_add_event(ELOG_TYPE_CROS_DEVELOPER_MODE); - if (vboot_recovery_mode_enabled()) { - int reason = get_recovery_mode_from_vbnv(); -#if CONFIG_VBOOT - if (vboot_handoff && !reason) { - VbSharedDataHeader *sd = (VbSharedDataHeader *) - vboot_handoff->shared_data; - reason = sd->recovery_reason; - } -#endif - elog_add_event_byte(ELOG_TYPE_CROS_RECOVERY_MODE, - reason ? reason : ELOG_CROS_RECOVERY_MODE_BUTTON); - } -#endif - chromeos_ram_oops_init(chromeos); } diff --git a/src/vendorcode/google/chromeos/watchdog.c b/src/vendorcode/google/chromeos/watchdog.c index a2b18b75e5..fdaa17761a 100644 --- a/src/vendorcode/google/chromeos/watchdog.c +++ b/src/vendorcode/google/chromeos/watchdog.c @@ -14,24 +14,37 @@ */ #include +#include +#include #include #include #include +#include #include "chromeos.h" #include "symbols.h" #define WATCHDOG_TOMBSTONE_MAGIC 0x9d2f41a7 -void elog_add_watchdog_reset(void) +DECLARE_OPTIONAL_REGION(watchdog_tombstone); + +static void elog_handle_watchdog_tombstone(void *unused) { + if (!_watchdog_tombstone_size) + return; + if (read32(_watchdog_tombstone) == WATCHDOG_TOMBSTONE_MAGIC) elog_add_event(ELOG_TYPE_ASYNC_HW_TIMER_EXPIRED); + write32(_watchdog_tombstone, 0); } +BOOT_STATE_INIT_ENTRY(BS_POST_DEVICE, BS_ON_ENTRY, + elog_handle_watchdog_tombstone, NULL); + void mark_watchdog_tombstone(void) { + assert(_watchdog_tombstone_size); write32(_watchdog_tombstone, WATCHDOG_TOMBSTONE_MAGIC); }