[nrf fromlist] drivers: flash: nrf_qspi_nor: align to errno codes in nrfx

NRFX drivers now return errno codes, aligned driver.

Upstream PR #: 97997

Signed-off-by: Michał Stasiak <[email protected]>

Author: mstasiaknordic

drivers/flash/nrf_qspi_nor.c

@@ -238,32 +238,6 @@ static int exit_dpd(const struct device *const dev);
 #define QSPI_IS_SECTOR_ALIGNED(_ofs) (((_ofs) & (QSPI_SECTOR_SIZE - 1U)) == 0)
 #define QSPI_IS_BLOCK_ALIGNED(_ofs) (((_ofs) & (QSPI_BLOCK_SIZE - 1U)) == 0)
 
-/**
- * @brief Converts NRFX return codes to the zephyr ones
- */
-static inline int qspi_get_zephyr_ret_code(nrfx_err_t res)
-{
-	switch (res) {
-	case NRFX_SUCCESS:
-		return 0;
-	case NRFX_ERROR_INVALID_PARAM:
-	case NRFX_ERROR_INVALID_ADDR:
-		return -EINVAL;
-	case NRFX_ERROR_INVALID_STATE:
-		return -ECANCELED;
-#if NRF_ERRATA_STATIC_CHECK(53, 159)
-	case NRFX_ERROR_FORBIDDEN:
-		LOG_ERR("nRF5340 anomaly 159 conditions detected");
-		LOG_ERR("Set the CPU clock to 64 MHz before starting QSPI operation");
-		return -ECANCELED;
-#endif
-	case NRFX_ERROR_BUSY:
-	case NRFX_ERROR_TIMEOUT:
-	default:
-		return -EBUSY;
-	}
-}
-
 static inline void qspi_lock(const struct device *dev)
 {
 #ifdef CONFIG_MULTITHREADING
@@ -375,12 +349,11 @@ static void qspi_release(const struct device *dev)
 	}
 }
 
-static inline void qspi_wait_for_completion(const struct device *dev,
-					    nrfx_err_t res)
+static inline void qspi_wait_for_completion(const struct device *dev, int res)
 {
 	struct qspi_nor_data *dev_data = dev->data;
 
-	if (res == NRFX_SUCCESS) {
+	if (res == 0) {
 #ifdef CONFIG_MULTITHREADING
 		k_sem_take(&dev_data->sync, K_FOREVER);
 #else /* CONFIG_MULTITHREADING */
@@ -476,9 +449,7 @@ static int qspi_send_cmd(const struct device *dev, const struct qspi_cmd *cmd,
 		.wren = wren,
 	};
 
-	int res = nrfx_qspi_cinstr_xfer(&cinstr_cfg, tx_buf, rx_buf);
-
-	return qspi_get_zephyr_ret_code(res);
+	return nrfx_qspi_cinstr_xfer(&cinstr_cfg, tx_buf, rx_buf);
 }
 
 #if !IS_EQUAL(INST_0_QER, JESD216_DW15_QER_VAL_NONE)
@@ -606,7 +577,7 @@ static int qspi_erase(const struct device *dev, uint32_t addr, uint32_t size)
 		return rc;
 	}
 	while (size > 0) {
-		nrfx_err_t res = !NRFX_SUCCESS;
+		int res = -1;
 		uint32_t adj = 0;
 
 		if (size == params->size) {
@@ -626,11 +597,11 @@ static int qspi_erase(const struct device *dev, uint32_t addr, uint32_t size)
 		} else {
 			/* minimal erase size is at least a sector size */
 			LOG_ERR("unsupported at 0x%lx size %zu", (long)addr, size);
-			res = NRFX_ERROR_INVALID_PARAM;
+			res = -EINVAL;
 		}
 
 		qspi_wait_for_completion(dev, res);
-		if (res == NRFX_SUCCESS) {
+		if (res == 0) {
 			addr += adj;
 			size -= adj;
 
@@ -645,7 +616,7 @@ static int qspi_erase(const struct device *dev, uint32_t addr, uint32_t size)
 			}
 		} else {
 			LOG_ERR("erase error at 0x%lx size %zu", (long)addr, size);
-			rc = qspi_get_zephyr_ret_code(res);
+			rc = res;
 			break;
 		}
 	}
@@ -780,39 +751,39 @@ static int qspi_sfdp_read(const struct device *dev, off_t offset,
 		.io2_level = true,
 		.io3_level = true,
 	};
-	nrfx_err_t res;
+	int res;
 
 	qspi_acquire(dev);
 
 	res = nrfx_qspi_lfm_start(&cinstr_cfg);
-	if (res != NRFX_SUCCESS) {
+	if (res != 0) {
 		LOG_DBG("lfm_start: %x", res);
 		goto out;
 	}
 
 	res = nrfx_qspi_lfm_xfer(addr_buf, NULL, sizeof(addr_buf), false);
-	if (res != NRFX_SUCCESS) {
+	if (res != 0) {
 		LOG_DBG("lfm_xfer addr: %x", res);
 		goto out;
 	}
 
 	res = nrfx_qspi_lfm_xfer(NULL, data, len, true);
-	if (res != NRFX_SUCCESS) {
+	if (res != 0) {
 		LOG_DBG("lfm_xfer read: %x", res);
 		goto out;
 	}
 
 out:
 	qspi_release(dev);
 
-	return qspi_get_zephyr_ret_code(res);
+	return res;
 }
 
 #endif /* CONFIG_FLASH_JESD216_API */
 
-static inline nrfx_err_t read_non_aligned(const struct device *dev,
-					  off_t addr,
-					  void *dest, size_t size)
+static inline int read_non_aligned(const struct device *dev,
+				   off_t addr,
+				   void *dest, size_t size)
 {
 	uint8_t __aligned(WORD_SIZE) buf[WORD_SIZE * 2];
 	uint8_t *dptr = dest;
@@ -839,14 +810,14 @@ static inline nrfx_err_t read_non_aligned(const struct device *dev,
 		flash_suffix = size - flash_prefix - flash_middle;
 	}
 
-	nrfx_err_t res = NRFX_SUCCESS;
+	int res = 0;
 
 	/* read from aligned flash to aligned memory */
 	if (flash_middle != 0) {
 		res = nrfx_qspi_read(dptr + dest_prefix, flash_middle,
 				     addr + flash_prefix);
 		qspi_wait_for_completion(dev, res);
-		if (res != NRFX_SUCCESS) {
+		if (res != 0) {
 			return res;
 		}
 
@@ -861,7 +832,7 @@ static inline nrfx_err_t read_non_aligned(const struct device *dev,
 		res = nrfx_qspi_read(buf, WORD_SIZE, addr -
 				     (WORD_SIZE - flash_prefix));
 		qspi_wait_for_completion(dev, res);
-		if (res != NRFX_SUCCESS) {
+		if (res != 0) {
 			return res;
 		}
 		memcpy(dptr, buf + WORD_SIZE - flash_prefix, flash_prefix);
@@ -872,7 +843,7 @@ static inline nrfx_err_t read_non_aligned(const struct device *dev,
 		res = nrfx_qspi_read(buf, WORD_SIZE * 2,
 				     addr + flash_prefix + flash_middle);
 		qspi_wait_for_completion(dev, res);
-		if (res != NRFX_SUCCESS) {
+		if (res != 0) {
 			return res;
 		}
 		memcpy(dptr + flash_prefix + flash_middle, buf, flash_suffix);
@@ -885,7 +856,7 @@ static int qspi_nor_read(const struct device *dev, off_t addr, void *dest,
 			 size_t size)
 {
 	const struct qspi_nor_config *params = dev->config;
-	nrfx_err_t res;
+	int res;
 
 	if (!dest) {
 		return -EINVAL;
@@ -911,23 +882,23 @@ static int qspi_nor_read(const struct device *dev, off_t addr, void *dest,
 
 	qspi_release(dev);
 
-	return qspi_get_zephyr_ret_code(res);
+	return res;
 }
 
 /* addr aligned, sptr not null, slen less than 4 */
-static inline nrfx_err_t write_sub_word(const struct device *dev, off_t addr,
-					const void *sptr, size_t slen)
+static inline int write_sub_word(const struct device *dev, off_t addr,
+				 const void *sptr, size_t slen)
 {
 	uint8_t __aligned(4) buf[4];
-	nrfx_err_t res;
+	int res;
 
 	/* read out the whole word so that unchanged data can be
 	 * written back
 	 */
 	res = nrfx_qspi_read(buf, sizeof(buf), addr);
 	qspi_wait_for_completion(dev, res);
 
-	if (res == NRFX_SUCCESS) {
+	if (res == 0) {
 		memcpy(buf, sptr, slen);
 		res = nrfx_qspi_write(buf, sizeof(buf), addr);
 		qspi_wait_for_completion(dev, res);
@@ -944,30 +915,30 @@ BUILD_ASSERT((CONFIG_NORDIC_QSPI_NOR_STACK_WRITE_BUFFER_SIZE % 4) == 0,
  *
  * If not enabled return the error the peripheral would have produced.
  */
-static nrfx_err_t write_through_buffer(const struct device *dev, off_t addr,
+static int write_through_buffer(const struct device *dev, off_t addr,
 				       const void *sptr, size_t slen)
 {
-	nrfx_err_t res = NRFX_SUCCESS;
+	int res = 0;
 
 	if (CONFIG_NORDIC_QSPI_NOR_STACK_WRITE_BUFFER_SIZE > 0) {
 		uint8_t __aligned(4) buf[CONFIG_NORDIC_QSPI_NOR_STACK_WRITE_BUFFER_SIZE];
 		const uint8_t *sp = sptr;
 
-		while ((slen > 0) && (res == NRFX_SUCCESS)) {
+		while ((slen > 0) && (res == 0)) {
 			size_t len = MIN(slen, sizeof(buf));
 
 			memcpy(buf, sp, len);
 			res = nrfx_qspi_write(buf, len, addr);
 			qspi_wait_for_completion(dev, res);
 
-			if (res == NRFX_SUCCESS) {
+			if (res == 0) {
 				slen -= len;
 				sp += len;
 				addr += len;
 			}
 		}
 	} else {
-		res = NRFX_ERROR_INVALID_ADDR;
+		res = -EACCES;
 	}
 	return res;
 }
@@ -1006,19 +977,15 @@ static int qspi_nor_write(const struct device *dev, off_t addr,
 
 	rc = qspi_nor_write_protection_set(dev, false);
 	if (rc == 0) {
-		nrfx_err_t res;
-
 		if (size < 4U) {
-			res = write_sub_word(dev, addr, src, size);
+			rc = write_sub_word(dev, addr, src, size);
 		} else if (!nrfx_is_in_ram(src) ||
 			   !nrfx_is_word_aligned(src)) {
-			res = write_through_buffer(dev, addr, src, size);
+			rc = write_through_buffer(dev, addr, src, size);
 		} else {
-			res = nrfx_qspi_write(src, size, addr);
-			qspi_wait_for_completion(dev, res);
+			rc = nrfx_qspi_write(src, size, addr);
+			qspi_wait_for_completion(dev, rc);
 		}
-
-		rc = qspi_get_zephyr_ret_code(res);
 	}
 
 	rc2 = qspi_nor_write_protection_set(dev, true);
@@ -1080,11 +1047,9 @@ static int qspi_init(const struct device *dev)
 {
 	const struct qspi_nor_config *dev_config = dev->config;
 	uint8_t id[SPI_NOR_MAX_ID_LEN];
-	nrfx_err_t res;
 	int rc;
 
-	res = nrfx_qspi_init(&dev_config->nrfx_cfg, qspi_handler, dev->data);
-	rc = qspi_get_zephyr_ret_code(res);
+	rc = nrfx_qspi_init(&dev_config->nrfx_cfg, qspi_handler, dev->data);
 	if (rc < 0) {
 		return rc;
 	}
@@ -1269,15 +1234,14 @@ static int exit_dpd(const struct device *const dev)
 			.op_code = SPI_NOR_CMD_RDPD,
 		};
 		uint32_t t_exit_dpd = DT_INST_PROP_OR(0, t_exit_dpd, 0);
-		nrfx_err_t res;
 		int rc;
 
 		nrf_qspi_pins_get(NRF_QSPI, &pins);
 		nrf_qspi_pins_set(NRF_QSPI, &disconnected_pins);
-		res = nrfx_qspi_activate(true);
+		rc = nrfx_qspi_activate(true);
 		nrf_qspi_pins_set(NRF_QSPI, &pins);
 
-		if (res != NRFX_SUCCESS) {
+		if (rc != 0) {
 			return -EIO;
 		}
 
@@ -1301,11 +1265,10 @@ static int exit_dpd(const struct device *const dev)
 static int qspi_suspend(const struct device *dev)
 {
 	const struct qspi_nor_config *dev_config = dev->config;
-	nrfx_err_t res;
 	int rc;
 
-	res = nrfx_qspi_mem_busy_check();
-	if (res != NRFX_SUCCESS) {
+	rc = nrfx_qspi_mem_busy_check();
+	if (rc != -) {
 		return -EBUSY;
 	}
 
@@ -1322,17 +1285,16 @@ static int qspi_suspend(const struct device *dev)
 static int qspi_resume(const struct device *dev)
 {
 	const struct qspi_nor_config *dev_config = dev->config;
-	nrfx_err_t res;
 	int rc;
 
 	rc = pinctrl_apply_state(dev_config->pcfg, PINCTRL_STATE_DEFAULT);
 	if (rc < 0) {
 		return rc;
 	}
 
-	res = nrfx_qspi_init(&dev_config->nrfx_cfg, qspi_handler, dev->data);
-	if (res != NRFX_SUCCESS) {
-		return -EIO;
+	rc = nrfx_qspi_init(&dev_config->nrfx_cfg, qspi_handler, dev->data);
+	if (rc < 0) {
+		return rc;
 	}
 
 	return exit_dpd(dev);