riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #10020 from gebart/pr/kinetis-lptmr-reload

Browse Source 
kinetis: lptmr reload instead of spinning
This commit is contained in:
benpicco 2019-09-11 10:12:58 +02:00 committed by GitHub
commit b6fe0e25fe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
cpu/kinetis/periph/timer.c
View File

@ -407,11 +407,11 @@ static inline uint16_t lptmr_read(uint8_t dev)
} }
/** /**
* @brief Reload the timer with the given timeout, or spin if timeout is too small * @brief Reload the timer with the given timeout
* *
* @pre IRQs masked, timer running * @pre IRQs masked, timer running
*/ */
static inline void lptmr_reload_or_spin(uint8_t dev, uint16_t timeout) static inline void lptmr_reload(uint8_t dev, uint16_t timeout)
{ {
LPTMR_Type *hw = lptmr_config[dev].dev; LPTMR_Type *hw = lptmr_config[dev].dev;
@ -419,27 +419,15 @@ static inline void lptmr_reload_or_spin(uint8_t dev, uint16_t timeout)
* hardware during the disable-enable cycle */ * hardware during the disable-enable cycle */
/* Disable the timer interrupt first */ /* Disable the timer interrupt first */
hw->CSR = LPTMR_CSR_TEN_MASK | LPTMR_CSR_TFC_MASK; hw->CSR = LPTMR_CSR_TEN_MASK | LPTMR_CSR_TFC_MASK;
if (timeout <= LPTMR_RELOAD_OVERHEAD) { if (timeout >= LPTMR_RELOAD_OVERHEAD) {
/* we spin if the timeout is too short to reload the timer */ timeout -= LPTMR_RELOAD_OVERHEAD;
hw->CNR = 0;
uint16_t cnr_begin = hw->CNR;
while ((hw->CNR - cnr_begin) <= timeout) {
hw->CNR = 0;
}
/* Emulate IRQ handler behaviour */
lptmr[dev].running = 0;
if (lptmr[dev].isr_ctx.cb != NULL) {
lptmr[dev].isr_ctx.cb(lptmr[dev].isr_ctx.arg, 0);
}
thread_yield_higher();
return;
} }
/* Update reference */ /* Update reference */
hw->CNR = 0; hw->CNR = 0;
lptmr[dev].cnr += hw->CNR + LPTMR_RELOAD_OVERHEAD; lptmr[dev].cnr += hw->CNR + LPTMR_RELOAD_OVERHEAD;
/* Disable timer */ /* Disable timer */
hw->CSR = 0; hw->CSR = 0;
hw->CMR = timeout - LPTMR_RELOAD_OVERHEAD; hw->CMR = timeout;
/* Enable timer and IRQ */ /* Enable timer and IRQ */
hw->CSR = LPTMR_CSR_TEN_MASK | LPTMR_CSR_TFC_MASK | LPTMR_CSR_TIE_MASK; hw->CSR = LPTMR_CSR_TEN_MASK | LPTMR_CSR_TFC_MASK | LPTMR_CSR_TIE_MASK;
} }
@ -461,7 +449,7 @@ static inline int lptmr_set(uint8_t dev, uint16_t timeout)
lptmr[dev].cmr = 0; lptmr[dev].cmr = 0;
} }
} }
else if (hw->CSR & LPTMR_CSR_TCF_MASK) { else if ((timeout > 0) && (hw->CSR & LPTMR_CSR_TCF_MASK)) {
/* TCF is set, safe to update CMR live */ /* TCF is set, safe to update CMR live */
hw->CNR = 0; hw->CNR = 0;
hw->CMR = timeout + hw->CNR; hw->CMR = timeout + hw->CNR;
@ -472,7 +460,7 @@ static inline int lptmr_set(uint8_t dev, uint16_t timeout)
hw->CSR = LPTMR_CSR_TEN_MASK | LPTMR_CSR_TFC_MASK | LPTMR_CSR_TIE_MASK; hw->CSR = LPTMR_CSR_TEN_MASK | LPTMR_CSR_TFC_MASK | LPTMR_CSR_TIE_MASK;
} }
else { else {
lptmr_reload_or_spin(dev, timeout); lptmr_reload(dev, timeout);
} }
irq_restore(mask); irq_restore(mask);
return 1; return 1;
@ -507,7 +495,7 @@ static inline int lptmr_set_absolute(uint8_t dev, uint16_t target)
} }
else { else {
uint16_t timeout = target - lptmr_read(dev); uint16_t timeout = target - lptmr_read(dev);
lptmr_reload_or_spin(dev, timeout); lptmr_reload(dev, timeout);
} }
irq_restore(mask); irq_restore(mask);
return 1; return 1;