From 44f1d185697e6dd071046fbb71a66647979ac4c4 Mon Sep 17 00:00:00 2001 From: Patryk Duda Date: Fri, 28 Aug 2020 12:53:47 +0200 Subject: npcx/system: Use newly provided functions to access panic data This change removes usage of PANIC_DATA_PTR where possible. Now panic data is accessed through functions that performs more checks and in case of writing also moves other data when necessary. BUG=b:165773837, b:162254118 BRANCH=none TEST=make -j buildall Signed-off-by: Patryk Duda Change-Id: I83dacf1bf680f15a8d5ce3dbb30b03fc3cc54f48 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2379848 Reviewed-by: Jett Rink --- chip/npcx/system.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/chip/npcx/system.c b/chip/npcx/system.c index 645113baa7..91e7de8169 100644 --- a/chip/npcx/system.c +++ b/chip/npcx/system.c @@ -284,7 +284,7 @@ void chip_panic_data_backup(void) static void chip_panic_data_restore(void) { - struct panic_data *d = PANIC_DATA_PTR; + struct panic_data *d; /* Ensure BBRAM is valid. */ if (!bbram_valid(BKUP_CFSR, 4)) @@ -295,9 +295,11 @@ static void chip_panic_data_restore(void) BKUP_PANIC_DATA_VALID)) return; - memset(d, 0, sizeof(*d)); + d = get_panic_data_write(); + + memset(d, 0, CONFIG_PANIC_DATA_SIZE); d->magic = PANIC_DATA_MAGIC; - d->struct_size = sizeof(*d); + d->struct_size = CONFIG_PANIC_DATA_SIZE; d->struct_version = 2; d->arch = PANIC_ARCH_CORTEX_M; -- cgit v1.2.1