Skip to content
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

drivers/mtd_spi_nor: fix init when only ztimer_msec is used #19908

Merged
merged 2 commits into from
Sep 2, 2023
Merged

drivers/mtd_spi_nor: fix init when only ztimer_msec is used #19908

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6e290fb
drivers/mtd_spi_nor: fix init when only ztimer_msec is used
benpicco Aug 31, 2023
4f2f412
drivers/mtd_spi_nor: improve fallback when no timer is used
benpicco Aug 31, 2023
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
20 changes: 14 additions & 6 deletions drivers/mtd_spi_nor/mtd_spi_nor.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,14 @@

#include "byteorder.h"
#include "kernel_defines.h"
#include "macros/math.h"
#include "macros/utils.h"
#include "mtd.h"
#include "mtd_spi_nor.h"
#include "time_units.h"
#include "thread.h"

#if IS_USED(MODULE_ZTIMER_USEC)
#if IS_USED(MODULE_ZTIMER)
#include "ztimer.h"
#elif IS_USED(MODULE_XTIMER)
#include "xtimer.h"
Expand Down Expand Up @@ -444,19 +446,25 @@ static int mtd_spi_nor_power(mtd_dev_t *mtd, enum mtd_power_state power)
switch (power) {
case MTD_POWER_UP:
mtd_spi_cmd(dev, dev->params->opcode->wake);
/* No sense in trying multiple times if no xtimer to wait between
reads */
uint8_t retries = 0;

/* fall back to polling if no timer is used */
unsigned retries = MTD_POWER_UP_WAIT_FOR_ID;
if (!IS_USED(MODULE_ZTIMER) && !IS_USED(MODULE_XTIMER)) {
retries *= dev->params->wait_chip_wake_up * 1000;
}

int res = 0;
do {
#if IS_USED(MODULE_ZTIMER_USEC)
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);
retries++;
} while (res < 0 && retries < MTD_POWER_UP_WAIT_FOR_ID);
} while (res < 0 && --retries);
if (res < 0) {
mtd_spi_release(dev);
return -EIO;
Expand Down