Skip to content

Update STM DFU mode software implementation. #6961

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 29, 2022
Merged

Update STM DFU mode software implementation. #6961

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3609c29
Update STM DFU mode software implementation.
flom84 Sep 25, 2022
7af8a23
Use macro for computing size of array.
flom84 Sep 29, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 13 additions & 4 deletions ports/stm/supervisor/port.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,13 +290,22 @@ condition and generating hardware reset or using Go command to execute user code
HAL_RCC_DeInit();
HAL_DeInit();

// disable all interupts
__disable_irq();
// Disable all pending interrupts using NVIC
for (uint8_t i = 0; i < MP_ARRAY_SIZE(NVIC->ICER); ++i) {
NVIC->ICER[i] = 0xFFFFFFFF;
}

// Clear all pending interrupts
for (uint8_t i = 0; i < (sizeof(NVIC->ICPR) / NVIC->ICPR[0]); ++i) {
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I looked at this many times before I spotted the problem.

In CircuitPython, you can use MP_ARRAY_SIZE(arr) (in py/misc.h) to compute the size of the array. Note that if the expression arr is actually a pointer instead, it will NOT be detected as an error. (the implementation is just sizeof(arr) / sizeof(arr[0]), more or less)

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jepler did the changes. Testing now.

// if it is necessary to ensure an interrupt will not be triggered after disabling it in the NVIC,
// add a DSB instruction and then an ISB instruction. (ARM Cortex™-M Programming Guide to
// Memory Barrier Instructions, 4.6 Disabling Interrupts using NVIC)
__DSB();
__ISB();

// Clear all pending interrupts using NVIC
for (uint8_t i = 0; i < MP_ARRAY_SIZE(NVIC->ICPR); ++i) {
NVIC->ICPR[i] = 0xFFFFFFFF;
}

// information about jump addresses has been taken from STM AN2606.
#if defined(STM32F4)
__set_MSP(*((uint32_t *)0x1FFF0000));
Expand Down