aboutsummaryrefslogtreecommitdiff
path: root/platforms/chibios/timer.c
diff options
context:
space:
mode:
authorDavid Hoelscher <[email protected]>2025-01-02 01:11:10 -0600
committerGitHub <[email protected]>2025-01-01 23:11:10 -0800
commitc53d02d511ef9c3b42097123749895a91536bcdd (patch)
tree5a994248174086f9f2bf9eb9d06a1755c82c3243 /platforms/chibios/timer.c
parentcf975e2bfa9fc5315cff1eb82498e7184a87feb1 (diff)
downloadqmk_firmware-c53d02d511ef9c3b42097123749895a91536bcdd.tar.gz
qmk_firmware-c53d02d511ef9c3b42097123749895a91536bcdd.zip
Ensure timer_read() is safe to call from interrupt handlers on ARM (#24529)
Diffstat (limited to 'platforms/chibios/timer.c')
-rw-r--r--platforms/chibios/timer.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/platforms/chibios/timer.c b/platforms/chibios/timer.c
index 4a347b445d..a07cf5714f 100644
--- a/platforms/chibios/timer.c
+++ b/platforms/chibios/timer.c
@@ -99,7 +99,7 @@ uint16_t timer_read(void) {
}
uint32_t timer_read32(void) {
- chSysLock();
+ syssts_t sts = chSysGetStatusAndLockX();
uint32_t ticks = get_system_time_ticks() - ticks_offset;
if (ticks < last_ticks) {
// The 32-bit tick counter overflowed and wrapped around. We cannot just extend the counter to 64 bits here,
@@ -114,7 +114,7 @@ uint32_t timer_read32(void) {
}
last_ticks = ticks;
uint32_t ms_offset_copy = ms_offset; // read while still holding the lock to ensure a consistent value
- chSysUnlock();
+ chSysRestoreStatusX(sts);
return (uint32_t)TIME_I2MS(ticks) + ms_offset_copy;
}