michaelh/zephyr
1
0
Fork 0
Code Releases Activity

NRF_QSPI_NOR: Exit DPD mode regardless of CONFIG_PM_DEVICE.

Browse source 
A call to exit_dpd mode for the nrf QSPI nor flash should always be
made, even if the currently executing image is compiled with
CONFIG_PM_DEVICE=n, because a previously executing image could have set
the device into DPD mode, and a call to exit_dpd is required for proper
functionality. Call `exit_dpd` regardless of the setting of
CONFIG_PM_DEVICE during QSPI nor initialization.

Signed-off-by: Nickolas Lapp <nickolaslapp@gmail.com>
This commit is contained in:
Nickolas Lapp 2023-01-19 17:01:25 -05:00 • committed by Fabio Baltieri
commit be2906a64c
1 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

11
drivers/flash/nrf_qspi_nor.c
View file

@ -214,9 +214,7 @@ struct qspi_cmd {
static int qspi_nor_write_protection_set(const struct device *dev, static int qspi_nor_write_protection_set(const struct device *dev,
bool write_protect); bool write_protect);
#ifdef CONFIG_PM_DEVICE
static int exit_dpd(const struct device *const dev); static int exit_dpd(const struct device *const dev);
#endif
/** /**
* @brief Test whether offset is aligned. * @brief Test whether offset is aligned.
@ -702,18 +700,21 @@ static int qspi_nrfx_configure(const struct device *dev)
} }
#endif #endif
#ifdef CONFIG_PM_DEVICE
/* It may happen that after the flash chip was previously put into /* It may happen that after the flash chip was previously put into
* the DPD mode, the system was reset but the flash chip was not. * the DPD mode, the system was reset but the flash chip was not.
* Consequently, the flash chip can be in the DPD mode at this point. * Consequently, the flash chip can be in the DPD mode at this point.
* Some flash chips will just exit the DPD mode on the first CS pulse, * Some flash chips will just exit the DPD mode on the first CS pulse,
* but some need to receive the dedicated command to do it, so send it. * but some need to receive the dedicated command to do it, so send it.
* This can be the case even if the current image does not have
* CONFIG_PM_DEVICE set to enter DPD mode, as a previously executing image
* (for example the main image if the currently executing image is the
* bootloader) might have set DPD mode before reboot. As a result,
* attempt to exit DPD mode regardless of whether CONFIG_PM_DEVICE is set.
*/ */
ret = exit_dpd(dev); ret = exit_dpd(dev);
if (ret < 0) { if (ret < 0) {
return ret; return ret;
} }
#endif
/* Set QE to match transfer mode. If not using quad /* Set QE to match transfer mode. If not using quad
* it's OK to leave QE set, but doing so prevents use * it's OK to leave QE set, but doing so prevents use
@ -1287,6 +1288,7 @@ static int enter_dpd(const struct device *const dev)
return 0; return 0;
} }
#endif /* CONFIG_PM_DEVICE */
static int exit_dpd(const struct device *const dev) static int exit_dpd(const struct device *const dev)
{ {
@ -1313,6 +1315,7 @@ static int exit_dpd(const struct device *const dev)
return 0; return 0;
} }
#ifdef CONFIG_PM_DEVICE
static int qspi_nor_pm_action(const struct device *dev, static int qspi_nor_pm_action(const struct device *dev,
enum pm_device_action action) enum pm_device_action action)
{ {