Skip to content

drivers: flash: soc_mcux: Fix ram function permission issue #99469

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

drivers: flash: soc_mcux: Fix ram function permission issue #99469

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
26 changes: 26 additions & 0 deletions drivers/flash/soc_flash_mcux.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,23 @@ static void clear_flash_caches(void)
#define clear_flash_caches(...)
#endif

#if defined(FTFx_DRIVER_IS_FLASH_RESIDENT) && FTFx_DRIVER_IS_FLASH_RESIDENT
/*
* MCUXSDK FTFX driver (fsl_ftfx_controller.c) places the run command function
* in data section (array s_ftfxRunCommand). When Zephyr configured the memory
* permission, the data section is not executable. The workaround is
* implementing a ram function in Zephyr, to replace FTFX driver's run command
* function.
*/
static __ramfunc void flash_ftfx_run_command(FTFx_REG8_ACCESS_TYPE ftfx_fstat)
{
*ftfx_fstat = FTFx_FSTAT_CCIF_MASK;

while (!((*ftfx_fstat) & FTFx_FSTAT_CCIF_MASK)) {
}
}
#endif /* FTFx_DRIVER_IS_FLASH_RESIDENT */

struct flash_priv {
flash_config_t config;
/*
Expand Down Expand Up @@ -376,6 +393,15 @@ static int flash_mcux_init(const struct device *dev)

rc = FLASH_Init(&priv->config);

#if defined(FTFx_DRIVER_IS_FLASH_RESIDENT) && FTFx_DRIVER_IS_FLASH_RESIDENT
/* MCUXSDK FTFX driver's commadAddr is an address to data (LSB = 0), but
* (uint32_t)flash_ftfx_run_command is an address to code (LDB = 1), so
* clear the LSB here.
*/
priv->config.ftfxConfig->runCmdFuncAddr.commadAddr =
((uint32_t)flash_ftfx_run_command) & ~0x01U;
#endif /* FTFx_DRIVER_IS_FLASH_RESIDENT */

FLASH_GetProperty(&priv->config, FLASH_PROP_BLOCK_BASE, &pflash_block_base);

priv->pflash_block_base = (uint32_t) pflash_block_base;
Expand Down