summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJack Rosenthal <jrosenth@chromium.org>2019-05-13 14:47:38 -0600
committerChromeOS Commit Bot <chromeos-commit-bot@chromium.org>2019-05-16 21:24:26 +0000
commit9e6195664d94582d3f24287a2ea2e3504287dd7a (patch)
tree917bc19c8d90289552d8e225fd34ae2e5485b78c
parentc17a52b12966ee3584e2c974980c72c30fd3706d (diff)
downloadchrome-ec-9e6195664d94582d3f24287a2ea2e3504287dd7a.tar.gz
ish: move panic data into AON ROM
Currently the panic data is placed in a region that conflicts with the aontaskfw stack. With the extended ROM space, we can put the panic data in a safer location. BUG=b:132457636 BRANCH=none TEST=ran 'crash divzero', observed the panic data copy across reset without any issues Change-Id: I876f3f071e000017c8f2ee744838711da928857c Signed-off-by: Jack Rosenthal <jrosenth@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/1610998 Reviewed-by: Jett Rink <jettrink@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/1615650 Commit-Queue: Jett Rink <jettrink@chromium.org> Tested-by: Jett Rink <jettrink@chromium.org>
-rw-r--r--chip/ish/config_chip.h11
1 files changed, 7 insertions, 4 deletions
diff --git a/chip/ish/config_chip.h b/chip/ish/config_chip.h
index 9d42f7a0a8..cf0bd75c1a 100644
--- a/chip/ish/config_chip.h
+++ b/chip/ish/config_chip.h
@@ -54,10 +54,13 @@
+ CONFIG_AON_RAM_SIZE \
- CONFIG_AON_ROM_SIZE)
-/* Store persistent panic data in AON memory */
-#define CONFIG_PANIC_DATA_SIZE 0xFF
-#define CONFIG_PANIC_DATA_BASE (CONFIG_AON_ROM_BASE \
- - CONFIG_PANIC_DATA_SIZE)
+/*
+ * Store persistent panic data in AON memory. There are 256 bytes
+ * available for ECOS use, and we need two software-defined REG32's at
+ * the end.
+ */
+#define CONFIG_PANIC_DATA_BASE CONFIG_AON_ROM_BASE
+#define CONFIG_PANIC_DATA_SIZE (256 - (2 * sizeof(uint32_t)))
/* System stack size */
#define CONFIG_STACK_SIZE 1024