michaelh/zephyr
1
0
Fork 0
Code Releases Activity

drivers: memc: memc_mcux_flexspi: support initializing FLEXSPI when XIP

Browse source 
Add support for initializing the FLEXSPI when using a flash attached to
the FLEXSPI for XIP. This option is guarded behind a Kconfig, as
enabling it is dangerous and requires special care be taken by the user
to ensure that the configuration of pins and FLEXSPI settings will not
break support for reading the attached flash, as this will break XIP
support.

Signed-off-by: Daniel DeGrasse <daniel.degrasse@nxp.com>
This commit is contained in:
Daniel DeGrasse 2024-05-09 17:15:49 +00:00 • committed by Anas Nashif
commit 372cf92060
2 changed files with 35 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
drivers/memc/Kconfig.mcux
View file

@ -40,6 +40,16 @@ config MEMC_MCUX_FLEXSPI_INIT_PRIORITY
MEMC_MCUX_FLEXSPI_INIT_PRIORITY < FLASH_INIT_PRIORITY <
MEMC_INIT_PRIORITY
config MEMC_MCUX_FLEXSPI_INIT_XIP
bool "Initialize FLEXSPI when using device for XIP"
help
Initialize the FLEXSPI device even when using it for XIP. If this
Kconfig is enabled, the user must ensure that the pin control
state used does not reconfigure the pins used to interface with
the flash device used for XIP, and that the configuration settings
used for the FLEXSPI are compatible with those needed for XIP from
the flash device.
config MEMC_MCUX_FLEXSPI
bool
select PINCTRL

31
drivers/memc/memc_mcux_flexspi.c
View file

@ -280,19 +280,21 @@ static int memc_flexspi_init(const struct device *dev)
{
struct memc_flexspi_data *data = dev->data;
flexspi_config_t flexspi_config;
uint32_t flash_sizes[kFLEXSPI_PortCount];
int ret;
uint8_t i;
/* we should not configure the device we are running on */
if (memc_flexspi_is_running_xip(dev)) {
LOG_DBG("XIP active on %s, skipping init", dev->name);
return 0;
if (!IS_ENABLED(CONFIG_MEMC_MCUX_FLEXSPI_INIT_XIP)) {
LOG_DBG("XIP active on %s, skipping init", dev->name);
return 0;
}
}
/*
* SOCs such as the RT1064 and RT1024 have internal flash, and no pinmux
* settings, continue if no pinctrl state found.
*/
int ret;
ret = pinctrl_apply_state(data->pincfg, PINCTRL_STATE_DEFAULT);
if (ret < 0 && ret != -ENOENT) {
return ret;
@ -328,7 +330,7 @@ FSL_FEATURE_FLEXSPI_SUPPORT_SEPERATE_RXCLKSRC_PORTB
/* Configure AHB RX buffers, if any configuration settings are present */
__ASSERT(data->buf_cfg_cnt < FSL_FEATURE_FLEXSPI_AHB_BUFFER_COUNT,
"Maximum RX buffer configuration count exceeded");
for (uint8_t i = 0; i < data->buf_cfg_cnt; i++) {
for (i = 0; i < data->buf_cfg_cnt; i++) {
/* Should AHB prefetch up to buffer size? */
flexspi_config.ahbConfig.buffer[i].enablePrefetch = data->buf_cfg[i].prefetch;
/* AHB access priority (used for suspending control of AHB prefetching )*/
@ -339,8 +341,25 @@ FSL_FEATURE_FLEXSPI_SUPPORT_SEPERATE_RXCLKSRC_PORTB
flexspi_config.ahbConfig.buffer[i].bufferSize = data->buf_cfg[i].buf_size;
}
if (memc_flexspi_is_running_xip(dev)) {
/* Save flash sizes- FlexSPI init will reset them */
for (i = 0; i < kFLEXSPI_PortCount; i++) {
flash_sizes[i] = data->base->FLSHCR0[i];
}
}
FLEXSPI_Init(data->base, &flexspi_config);
if (memc_flexspi_is_running_xip(dev)) {
/* Restore flash sizes */
for (i = 0; i < kFLEXSPI_PortCount; i++) {
data->base->FLSHCR0[i] = flash_sizes[i];
}
/* Reenable FLEXSPI module */
data->base->MCR0 &= ~FLEXSPI_MCR0_MDIS_MASK;
}
return 0;
}