RIOT-OS/RIOT
RIOT-OS/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2024-12-29 04:50:03 +01:00
Code Releases Activity

drivers/mtd_spi_nor: make use of busy_wait()

Browse Source
This commit is contained in:
Benjamin Valentin 2024-01-15 14:37:46 +01:00
parent 9d70fbf2e1
commit 1e1244042e
1 changed files with 14 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
drivers/mtd_spi_nor/mtd_spi_nor.c
View File

@ -25,6 +25,7 @@
#include <string.h> #include <string.h>
#include <errno.h> #include <errno.h>
#include "busy_wait.h"
#include "byteorder.h" #include "byteorder.h"
#include "kernel_defines.h" #include "kernel_defines.h"
#include "macros/math.h" #include "macros/math.h"
@ -341,6 +342,17 @@ static uint32_t mtd_spi_nor_get_size(const mtd_jedec_id_t *id)
return 1 << id->device[1]; return 1 << id->device[1];
} }
static void delay_us(unsigned us)
{
#if defined(MODULE_ZTIMER_USEC)
ztimer_sleep(ZTIMER_USEC, us);
#elif defined(MODULE_ZTIMER_MSEC)
ztimer_sleep(ZTIMER_MSEC, DIV_ROUND_UP(us, US_PER_MS));
#else
busy_wait_us(us);
#endif
}
static inline void wait_for_write_complete(const mtd_spi_nor_t *dev, uint32_t us) static inline void wait_for_write_complete(const mtd_spi_nor_t *dev, uint32_t us)
{ {
unsigned i = 0, j = 0; unsigned i = 0, j = 0;
@ -362,14 +374,13 @@ static inline void wait_for_write_complete(const mtd_spi_nor_t *dev, uint32_t us
break; break;
} }
i++; i++;
#if IS_USED(MODULE_ZTIMER_USEC)
if (us) { if (us) {
uint32_t wait_us = us / div; uint32_t wait_us = us / div;
uint32_t wait_min = 2; uint32_t wait_min = 2;
wait_us = wait_us > wait_min ? wait_us : wait_min; wait_us = wait_us > wait_min ? wait_us : wait_min;
ztimer_sleep(ZTIMER_USEC, wait_us); delay_us(wait_us);
/* reduce the waiting time quickly if the estimate was too short, /* reduce the waiting time quickly if the estimate was too short,
* but still avoid busy (yield) waiting */ * but still avoid busy (yield) waiting */
div++; div++;
@ -378,27 +389,6 @@ static inline void wait_for_write_complete(const mtd_spi_nor_t *dev, uint32_t us
j++; j++;
thread_yield(); thread_yield();
} }
#elif IS_USED(MODULE_XTIMER)
if (us) {
uint32_t wait_us = us / div;
uint32_t wait_min = 2 * XTIMER_BACKOFF;
wait_us = wait_us > wait_min ? wait_us : wait_min;
xtimer_usleep(wait_us);
/* reduce the waiting time quickly if the estimate was too short,
* but still avoid busy (yield) waiting */
div++;
}
else {
j++;
thread_yield();
}
#else
(void)div;
(void) us;
thread_yield();
#endif
} while (1); } while (1);
DEBUG("wait loop %u times, yield %u times", i, j); DEBUG("wait loop %u times, yield %u times", i, j);
#if IS_ACTIVE(ENABLE_DEBUG) #if IS_ACTIVE(ENABLE_DEBUG)
@ -455,14 +445,7 @@ static int mtd_spi_nor_power(mtd_dev_t *mtd, enum mtd_power_state power)
int res = 0; int res = 0;
do { do {
#if IS_USED(MODULE_ZTIMER_USEC) delay_us(dev->params->wait_chip_wake_up);
ztimer_sleep(ZTIMER_USEC, dev->params->wait_chip_wake_up);
#elif IS_USED(MODULE_ZTIMER_MSEC)
ztimer_sleep(ZTIMER_MSEC,
DIV_ROUND_UP(dev->params->wait_chip_wake_up, US_PER_MS));
#elif IS_USED(MODULE_XTIMER)
xtimer_usleep(dev->params->wait_chip_wake_up);
#endif
res = mtd_spi_read_jedec_id(dev, &dev->jedec_id); res = mtd_spi_read_jedec_id(dev, &dev->jedec_id);
} while (res < 0 && --retries); } while (res < 0 && --retries);
if (res < 0) { if (res < 0) {