[nrf fromtree] drivers: flash_mspi_nor: Flash control commands to use their own configs

Also in preparation for allowing control command frequency to be
different from the read/write frequency and initialization frequency.

Signed-off-by: Utsav Munendra <[email protected]>
(cherry picked from commit abd35f8)

Author: utsavm9

drivers/flash/flash_mspi_nor.c

@@ -94,10 +94,14 @@ static int perform_xfer(const struct device *dev, uint8_t cmd)
 		dev_data->packet.cmd = cmd;
 	}
 
-	if (dev_config->multi_io_cmd ||
-	    dev_config->mspi_nor_cfg.io_mode == MSPI_IO_MODE_SINGLE) {
-		/* If multiple IO lines are used in all the transfer phases
-		 * or in none of them, there's no need to switch the IO mode.
+	if (!dev_data->chip_initialized ||
+		dev_config->multi_io_cmd ||
+		dev_config->mspi_nor_cfg.io_mode == MSPI_IO_MODE_SINGLE) {
+		/* Commands before chip is initialized manually apply a MSPI config
+		 * which all flash chips support by JEDEC standard. Do not switch
+		 * to device tree config yet.
+		 * If multiple IO lines are used in all the transfer phases
+		 * there's no need to switch the IO mode.
 		 */
 	} else if (mem_access) {
 		/* For commands accessing the flash memory (read and program),
@@ -107,26 +111,13 @@ static int perform_xfer(const struct device *dev, uint8_t cmd)
 			cfg = &dev_config->mspi_nor_cfg;
 		}
 	} else {
-		/* For all other commands, switch to Single IO mode if a given
-		 * command needs the data or address phase and in the target IO
-		 * mode multiple IO lines are used in these phases.
-		 */
-		if (dev_data->in_target_io_mode) {
-			if (dev_data->packet.num_bytes != 0 ||
-			    (dev_data->xfer.addr_length != 0 &&
-			     !dev_config->single_io_addr)) {
-				/* Only the IO mode is to be changed, so the
-				 * initial configuration structure can be used
-				 * for this operation.
-				 */
-				cfg = &dev_config->mspi_nor_init_cfg;
-			}
-		}
+		/* For all other commands, use control command config */
+		cfg = &dev_config->mspi_control_cfg;
 	}
 
 	if (cfg && cfg != dev_data->last_applied_cfg) {
 		rc = mspi_dev_config(dev_config->bus, &dev_config->mspi_id,
-				     MSPI_DEVICE_CONFIG_IO_MODE, cfg);
+			MSPI_DEVICE_CONFIG_IO_MODE | MSPI_DEVICE_CONFIG_FREQUENCY, cfg);
 		if (rc < 0) {
 			LOG_ERR("%s: dev_config() failed: %d", __func__, rc);
 			return rc;
@@ -981,12 +972,12 @@ static int soft_reset(const struct device *dev)
 
 		rc = mspi_dev_config(dev_config->bus, &dev_config->mspi_id,
 				     MSPI_DEVICE_CONFIG_IO_MODE,
-				     &dev_config->mspi_nor_init_cfg);
+				     &dev_config->mspi_control_cfg);
 		if (rc < 0) {
 			LOG_ERR("%s: dev_config() failed: %d", __func__, rc);
 			return rc;
 		}
-		dev_data->last_applied_cfg = &dev_config->mspi_nor_init_cfg;
+		dev_data->last_applied_cfg = &dev_config->mspi_control_cfg;
 		dev_data->in_target_io_mode = false;
 	}
 
@@ -1003,20 +994,23 @@ static int flash_chip_init(const struct device *dev)
 {
 	const struct flash_mspi_nor_config *dev_config = dev->config;
 	struct flash_mspi_nor_data *dev_data = dev->data;
+	struct mspi_dev_cfg mspi_nor_init_cfg;
 	uint8_t id[JESD216_READ_ID_LEN] = {0};
 	uint16_t dts_cmd = 0;
 	uint32_t sfdp_signature;
 	bool flash_reset = false;
 	int rc;
 
+	/* Do initial checks at max 50MHz required to be supported by JEDEC */
+	memcpy(&mspi_nor_init_cfg, &dev_config->mspi_control_cfg, sizeof(mspi_nor_init_cfg));
+	mspi_nor_init_cfg.freq = MIN(dev_config->mspi_control_cfg.freq, MHZ(50));
 	rc = mspi_dev_config(dev_config->bus, &dev_config->mspi_id,
 			     MSPI_DEVICE_CONFIG_ALL,
-			     &dev_config->mspi_nor_init_cfg);
+			     &mspi_nor_init_cfg);
 	if (rc < 0) {
 		LOG_ERR("%s: dev_config() failed: %d", __func__, rc);
 		return rc;
 	}
-	dev_data->last_applied_cfg = &dev_config->mspi_nor_init_cfg;
 	dev_data->in_target_io_mode = false;
 
 #if defined(WITH_SUPPLY_GPIO)
@@ -1115,6 +1109,7 @@ static int flash_chip_init(const struct device *dev)
 		LOG_ERR("Failed to switch to target io mode: %d", rc);
 		return rc;
 	}
+	dev_data->chip_initialized = true;
 
 	dev_data->in_target_io_mode = true;
 
@@ -1267,10 +1262,10 @@ static DEVICE_API(flash, drv_api) = {
 #endif
 };
 
-#define FLASH_INITIAL_CONFIG(inst)					\
+#define FLASH_CONTROL_CMD_CONFIG(inst)					\
 {									\
 	.ce_num = DT_INST_PROP_OR(inst, mspi_hardware_ce_num, 0),	\
-	.freq = MIN(DT_INST_PROP(inst, mspi_max_frequency), MHZ(50)),	\
+	.freq = DT_INST_PROP(inst, mspi_max_frequency),			\
 	.io_mode = MSPI_IO_MODE_SINGLE,					\
 	.data_rate = MSPI_DATA_RATE_SINGLE,				\
 	.cpp = MSPI_CPP_MODE_0,						\
@@ -1336,7 +1331,7 @@ BUILD_ASSERT((FLASH_SIZE(inst) % CONFIG_FLASH_MSPI_NOR_LAYOUT_PAGE_SIZE) == 0, \
 		.page_size = FLASH_PAGE_SIZE(inst),				\
 		.mspi_id = MSPI_DEVICE_ID_DT_INST(inst),			\
 		.mspi_nor_cfg = MSPI_DEVICE_CONFIG_DT_INST(inst),		\
-		.mspi_nor_init_cfg = FLASH_INITIAL_CONFIG(inst),		\
+		.mspi_control_cfg = FLASH_CONTROL_CMD_CONFIG(inst),		\
 	IF_ENABLED(CONFIG_MSPI_XIP,						\
 		(.xip_cfg = MSPI_XIP_CONFIG_DT_INST(inst),))			\
 	IF_ENABLED(WITH_SUPPLY_GPIO,						\

drivers/flash/flash_mspi_nor.h

@@ -75,7 +75,7 @@ struct flash_mspi_nor_config {
 	uint16_t page_size;
 	struct mspi_dev_id mspi_id;
 	struct mspi_dev_cfg mspi_nor_cfg;
-	struct mspi_dev_cfg mspi_nor_init_cfg;
+	struct mspi_dev_cfg mspi_control_cfg;
 #if defined(CONFIG_MSPI_XIP)
 	struct mspi_xip_cfg xip_cfg;
 #endif
@@ -115,6 +115,7 @@ struct flash_mspi_nor_data {
 	struct flash_mspi_nor_switch_info switch_info;
 	bool in_target_io_mode;
 	const struct mspi_dev_cfg *last_applied_cfg;
+	bool chip_initialized;
 };
 
 #ifdef __cplusplus