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 <furquan@google.com> Reviewed-on: https://review.coreboot.org/15897 Reviewed-by: Aaron Durbin <adurbin@chromium.org> Tested-by: build bot (Jenkins)
This commit is contained in:
parent
c66a02634c
commit
0d9cd92efb
|
@ -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)
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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 */
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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()) {
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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 */
|
||||
|
|
|
@ -13,6 +13,7 @@
|
|||
* GNU General Public License for more details.
|
||||
*/
|
||||
|
||||
#include <bootstate.h>
|
||||
#include <cbmem.h>
|
||||
#include <console/console.h>
|
||||
#include <elog.h>
|
||||
|
@ -21,19 +22,26 @@
|
|||
#include <vboot/vboot_common.h>
|
||||
#include <vboot_struct.h>
|
||||
|
||||
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);
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
|
||||
|
|
|
@ -14,24 +14,37 @@
|
|||
*/
|
||||
|
||||
#include <arch/io.h>
|
||||
#include <assert.h>
|
||||
#include <bootstate.h>
|
||||
#include <console/console.h>
|
||||
#include <elog.h>
|
||||
#include <reset.h>
|
||||
#include <symbols.h>
|
||||
|
||||
#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);
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue