djsundog
/
circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

enable use of CIRCUITPY_CANARY_WORD (needed for 2.2 merge) (#513) 

enable use of CIRCUITPY_CANARY_WORD (needed for 2.2 merge)

RCAUSE (reset cause) is fetched differently in SAMD21 vs SAMD51
This commit is contained in:
Dan Halbert 2018-01-08 12:44:06 -05:00 committed by Scott Shawcroft
parent b1b89c409e
commit 1805bcac76
1 changed files with 37 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
ports/atmel-samd/supervisor/port.c
View File

@ -36,6 +36,14 @@
#include "hpl/gclk/hpl_gclk_base.h"
#include "hpl/pm/hpl_pm_base.h"
#ifdef SAMD21
#include "hri/hri_pm_d21.h"
#endif
#ifdef SAMD51
#include "hri/hri_rstc_d51.h"
#endif
#include "common-hal/microcontroller/Pin.h"
#include "tick.h"
@ -65,28 +73,35 @@ safe_mode_t port_init(void) {
#endif
#endif
// // On power on start or external reset, set _ezero to the canary word. If it
// // gets killed, we boot in safe mod. _ezero is the boundary between statically
// // allocated memory including the fixed MicroPython heap and the stack. If either
// // misbehaves, the canary will not be in tact after soft reset.
// #ifdef CIRCUITPY_CANARY_WORD
// if (PM->RCAUSE.bit.POR == 1 || PM->RCAUSE.bit.EXT == 1) {
// _ezero = CIRCUITPY_CANARY_WORD;
// } else if (PM->RCAUSE.bit.SYST == 1) {
// // If we're starting from a system reset we're likely coming from the
// // bootloader or hard fault handler. If we're coming from the handler
// // the canary will be CIRCUITPY_SAFE_RESTART_WORD and we don't want to
// // revive the canary so that a second hard fault won't restart. Resets
// // from anywhere else are ok.
// if (_ezero == CIRCUITPY_SAFE_RESTART_WORD) {
// _ezero = ~CIRCUITPY_CANARY_WORD;
// } else {
// _ezero = CIRCUITPY_CANARY_WORD;
// }
// }
// #endif
//
// load_serial_number();
// On power on start or external reset, set _ezero to the canary word. If it
// gets killed, we boot in safe mode. _ezero is the boundary between statically
// allocated memory including the fixed MicroPython heap and the stack. If either
// misbehaves, the canary will not be intact after soft reset.
#ifdef CIRCUITPY_CANARY_WORD
#ifdef SAMD21
bool power_on_or_external_reset = hri_pm_get_RCAUSE_POR_bit(PM) || hri_pm_get_RCAUSE_EXT_bit(PM);
bool system_reset = hri_pm_get_RCAUSE_EXT_bit(PM);
#endif
#ifdef SAMD51
bool power_on_or_external_reset = hri_rstc_get_RCAUSE_POR_bit(RSTC) || hri_rstc_get_RCAUSE_EXT_bit(RSTC);
bool system_reset = hri_rstc_get_RCAUSE_EXT_bit(RSTC);
#endif
if (power_on_or_external_reset) {
_ezero = CIRCUITPY_CANARY_WORD;
} else if (system_reset) {
// If we're starting from a system reset we're likely coming from the
// bootloader or hard fault handler. If we're coming from the handler
// the canary will be CIRCUITPY_SAFE_RESTART_WORD and we don't want to
// revive the canary so that a second hard fault won't restart. Resets
// from anywhere else are ok.
if (_ezero == CIRCUITPY_SAFE_RESTART_WORD) {
_ezero = ~CIRCUITPY_CANARY_WORD;
} else {
_ezero = CIRCUITPY_CANARY_WORD;
}
}
#endif
init_mcu();