michaelh/zephyr
1
0
Fork 0
Code Releases Activity

drivers: memc: memc_mcux_flexspi_hyperram: move device data to RAM

Browse source 
flexspi driver should not interact with flash whenever possible, and
should never use flash while in a critical write or erase section.
Move device data to RAM to prevent this read-while-write hazard.

Signed-off-by: Daniel DeGrasse <daniel.degrasse@nxp.com>
This commit is contained in:
Daniel DeGrasse 2022-03-21 15:08:41 -05:00 • committed by David Leach
commit 8d556c0623
1 changed files with 18 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

25
drivers/memc/memc_mcux_flexspi_hyperram.c
View file

@ -37,6 +37,11 @@ struct memc_flexspi_hyperram_config {
flexspi_device_config_t config;
};
/* Device variables used in critical sections should be in this structure */
struct memc_flexspi_hyperram_data {
const struct device *controller;
};
static const uint32_t memc_flexspi_hyperram_lut[][4] = {
/* Read Data */
[READ_DATA] = {
@ -83,6 +88,7 @@ static int memc_flexspi_hyperram_get_vendor_id(const struct device *dev,
uint16_t *vendor_id)
{
const struct memc_flexspi_hyperram_config *config = dev->config;
struct memc_flexspi_hyperram_data *data = dev->data;
uint32_t buffer = 0;
int ret;
@ -98,7 +104,7 @@ static int memc_flexspi_hyperram_get_vendor_id(const struct device *dev,
LOG_DBG("Reading id");
ret = memc_flexspi_transfer(config->controller, &transfer);
ret = memc_flexspi_transfer(data->controller, &transfer);
*vendor_id = buffer & 0xffff;
return ret;
@ -107,27 +113,28 @@ static int memc_flexspi_hyperram_get_vendor_id(const struct device *dev,
static int memc_flexspi_hyperram_init(const struct device *dev)
{
const struct memc_flexspi_hyperram_config *config = dev->config;
struct memc_flexspi_hyperram_data *data = dev->data;
uint16_t vendor_id;
if (!device_is_ready(config->controller)) {
if (!device_is_ready(data->controller)) {
LOG_ERR("Controller device not ready");
return -ENODEV;
}
if (memc_flexspi_set_device_config(config->controller, &config->config,
if (memc_flexspi_set_device_config(data->controller, &config->config,
config->port)) {
LOG_ERR("Could not set device configuration");
return -EINVAL;
}
if (memc_flexspi_update_lut(config->controller, 0,
if (memc_flexspi_update_lut(data->controller, 0,
(const uint32_t *) memc_flexspi_hyperram_lut,
sizeof(memc_flexspi_hyperram_lut) / 4)) {
LOG_ERR("Could not update lut");
return -EINVAL;
}
memc_flexspi_reset(config->controller);
memc_flexspi_reset(data->controller);
if (memc_flexspi_hyperram_get_vendor_id(dev, &vendor_id)) {
LOG_ERR("Could not read vendor id");
@ -175,15 +182,19 @@ static int memc_flexspi_hyperram_init(const struct device *dev)
#define MEMC_FLEXSPI_HYPERRAM(n) \
static const struct memc_flexspi_hyperram_config \
memc_flexspi_hyperram_config_##n = { \
.controller = DEVICE_DT_GET(DT_INST_BUS(n)), \
.port = DT_INST_REG_ADDR(n), \
.config = MEMC_FLEXSPI_DEVICE_CONFIG(n), \
}; \
\
static struct memc_flexspi_hyperram_data \
memc_flexspi_hyperram_data_##n = { \
.controller = DEVICE_DT_GET(DT_INST_BUS(n)), \
}; \
\
DEVICE_DT_INST_DEFINE(n, \
memc_flexspi_hyperram_init, \
NULL, \
NULL, \
&memc_flexspi_hyperram_data_##n, \
&memc_flexspi_hyperram_config_##n, \
POST_KERNEL, \
CONFIG_KERNEL_INIT_PRIORITY_DEVICE, \