michaelh/zephyr
1
0
Fork 0
Code Releases Activity

drivers: flash: Optimize mspi_nor driver memory

Browse source 
Move MSPI NOR commands to rodata.
Replace array with empty padding (~1kB) with macro-based assignments.

Ref: NCSDK-32779

Signed-off-by: Tomasz Chyrowicz <tomasz.chyrowicz@nordicsemi.no>
This commit is contained in:
Tomasz Chyrowicz 2025-04-10 14:53:50 +02:00 • committed by Benjamin Cabé
commit 2f6ac20654
3 changed files with 199 additions and 167 deletions
Download patch file Download diff file Expand all files Collapse all files

38
drivers/flash/flash_mspi_nor.c
View file

@ -520,7 +520,7 @@ static int quad_enable_set(const struct device *dev, bool enable)
struct flash_mspi_nor_data *dev_data = dev->data; struct flash_mspi_nor_data *dev_data = dev->data;
int rc; int rc;
flash_mspi_command_set(dev, &commands[MSPI_IO_MODE_SINGLE].write_en); flash_mspi_command_set(dev, &commands_single.write_en);
rc = mspi_transceive(dev_config->bus, &dev_config->mspi_id, rc = mspi_transceive(dev_config->bus, &dev_config->mspi_id,
&dev_data->xfer); &dev_data->xfer);
if (rc < 0) { if (rc < 0) {
@ -672,7 +672,7 @@ static int flash_chip_init(const struct device *dev)
} }
#endif #endif
flash_mspi_command_set(dev, &commands[MSPI_IO_MODE_SINGLE].id); flash_mspi_command_set(dev, &commands_single.id);
dev_data->packet.data_buf = id; dev_data->packet.data_buf = id;
dev_data->packet.num_bytes = sizeof(id); dev_data->packet.num_bytes = sizeof(id);
@ -787,7 +787,39 @@ static DEVICE_API(flash, drv_api) = {
} }
#define FLASH_SIZE_INST(inst) (DT_INST_PROP(inst, size) / 8) #define FLASH_SIZE_INST(inst) (DT_INST_PROP(inst, size) / 8)
#define FLASH_CMDS(inst) &commands[DT_INST_ENUM_IDX(inst, mspi_io_mode)]
/* Define copies of mspi_io_mode enum values, so they can be used inside
* the COND_CODE_1 macros.
*/
#define _MSPI_IO_MODE_SINGLE 0
#define _MSPI_IO_MODE_QUAD_1_4_4 6
#define _MSPI_IO_MODE_OCTAL 7
BUILD_ASSERT(_MSPI_IO_MODE_SINGLE == MSPI_IO_MODE_SINGLE,
"Please align _MSPI_IO_MODE_SINGLE macro value");
BUILD_ASSERT(_MSPI_IO_MODE_QUAD_1_4_4 == MSPI_IO_MODE_QUAD_1_4_4,
"Please align _MSPI_IO_MODE_QUAD_1_4_4 macro value");
BUILD_ASSERT(_MSPI_IO_MODE_OCTAL == MSPI_IO_MODE_OCTAL,
"Please align _MSPI_IO_MODE_OCTAL macro value");
/* Define a non-existing extern symbol to get an understandable compile-time error
* if the IO mode is not supported by the driver.
*/
extern const struct flash_mspi_nor_cmds mspi_io_mode_not_supported;
#define FLASH_CMDS(inst) COND_CODE_1( \
IS_EQ(DT_INST_ENUM_IDX(inst, mspi_io_mode), _MSPI_IO_MODE_SINGLE), \
(&commands_single), \
(COND_CODE_1( \
IS_EQ(DT_INST_ENUM_IDX(inst, mspi_io_mode), _MSPI_IO_MODE_QUAD_1_4_4), \
(&commands_quad_1_4_4), \
(COND_CODE_1( \
IS_EQ(DT_INST_ENUM_IDX(inst, mspi_io_mode), _MSPI_IO_MODE_OCTAL), \
(&commands_octal), \
(&mspi_io_mode_not_supported) \
)) \
)) \
)
#define FLASH_QUIRKS(inst) FLASH_MSPI_QUIRKS_GET(DT_DRV_INST(inst)) #define FLASH_QUIRKS(inst) FLASH_MSPI_QUIRKS_GET(DT_DRV_INST(inst))
#define FLASH_DW15_QER_VAL(inst) _CONCAT(JESD216_DW15_QER_VAL_, \ #define FLASH_DW15_QER_VAL(inst) _CONCAT(JESD216_DW15_QER_VAL_, \

16
drivers/flash/flash_mspi_nor.h
View file

@ -39,7 +39,7 @@ struct flash_mspi_nor_config {
struct flash_pages_layout layout; struct flash_pages_layout layout;
#endif #endif
uint8_t jedec_id[SPI_NOR_MAX_ID_LEN]; uint8_t jedec_id[SPI_NOR_MAX_ID_LEN];
struct flash_mspi_nor_cmds *jedec_cmds; const struct flash_mspi_nor_cmds *jedec_cmds;
struct flash_mspi_nor_quirks *quirks; struct flash_mspi_nor_quirks *quirks;
uint8_t dw15_qer; uint8_t dw15_qer;
}; };
@ -73,8 +73,7 @@ struct flash_mspi_nor_cmds {
struct flash_mspi_nor_cmd sfdp; struct flash_mspi_nor_cmd sfdp;
}; };
struct flash_mspi_nor_cmds commands[] = { const struct flash_mspi_nor_cmds commands_single = {
[MSPI_IO_MODE_SINGLE] = {
.id = { .id = {
.dir = MSPI_RX, .dir = MSPI_RX,
.cmd = JESD216_CMD_READ_ID, .cmd = JESD216_CMD_READ_ID,
@ -126,8 +125,9 @@ struct flash_mspi_nor_cmds commands[] = {
.addr_length = 3, .addr_length = 3,
.rx_dummy = 8, .rx_dummy = 8,
}, },
}, };
[MSPI_IO_MODE_QUAD_1_4_4] = {
const struct flash_mspi_nor_cmds commands_quad_1_4_4 = {
.id = { .id = {
.dir = MSPI_RX, .dir = MSPI_RX,
.cmd = JESD216_CMD_READ_ID, .cmd = JESD216_CMD_READ_ID,
@ -184,8 +184,9 @@ struct flash_mspi_nor_cmds commands[] = {
.rx_dummy = 8, .rx_dummy = 8,
.force_single = true, .force_single = true,
}, },
}, };
[MSPI_IO_MODE_OCTAL] = {
const struct flash_mspi_nor_cmds commands_octal = {
.id = { .id = {
.dir = MSPI_RX, .dir = MSPI_RX,
.cmd = JESD216_OCMD_READ_ID, .cmd = JESD216_OCMD_READ_ID,
@ -236,7 +237,6 @@ struct flash_mspi_nor_cmds commands[] = {
.addr_length = 4, .addr_length = 4,
.rx_dummy = 20, .rx_dummy = 20,
}, },
},
}; };
void flash_mspi_command_set(const struct device *dev, const struct flash_mspi_nor_cmd *cmd); void flash_mspi_command_set(const struct device *dev, const struct flash_mspi_nor_cmd *cmd);

4
drivers/flash/flash_mspi_nor_quirks.h
View file

@ -75,7 +75,7 @@ static inline int mxicy_mx25r_post_switch_mode(const struct device *dev)
} while (status & SPI_NOR_WIP_BIT); } while (status & SPI_NOR_WIP_BIT);
/* Write enable */ /* Write enable */
flash_mspi_command_set(dev, &commands[MSPI_IO_MODE_SINGLE].write_en); flash_mspi_command_set(dev, &commands_single.write_en);
rc = mspi_transceive(dev_config->bus, &dev_config->mspi_id, rc = mspi_transceive(dev_config->bus, &dev_config->mspi_id,
&dev_data->xfer); &dev_data->xfer);
if (rc < 0) { if (rc < 0) {
@ -154,7 +154,7 @@ static inline int mxicy_mx25u_post_switch_mode(const struct device *dev)
} }
/* Write enable */ /* Write enable */
flash_mspi_command_set(dev, &commands[MSPI_IO_MODE_SINGLE].write_en); flash_mspi_command_set(dev, &commands_single.write_en);
rc = mspi_transceive(dev_config->bus, &dev_config->mspi_id, rc = mspi_transceive(dev_config->bus, &dev_config->mspi_id,
&dev_data->xfer); &dev_data->xfer);
if (rc < 0) { if (rc < 0) {