drivers: wifi: Add support for testing NRF71

Add support for testing NRF71.

Signed-off-by: Ajay Parida <[email protected]>

Author: ajayparida

boards/nordic/nrf7002dk/nrf5340_cpuapp_common_pinctrl.dtsi

@@ -57,10 +57,12 @@
 				<NRF_PSEL(QSPI_IO1, 0, 14)>,
 				<NRF_PSEL(QSPI_IO2, 0, 15)>,
 				<NRF_PSEL(QSPI_IO3, 0, 16)>;
+			nordic,drive-mode = <NRF_DRIVE_E0E1>;
 			bias-pull-down;
 		};
 		group2 {
 			psels = <NRF_PSEL(QSPI_CSN, 0, 18)>;
+			nordic,drive-mode = <NRF_DRIVE_E0E1>;
 			bias-pull-up;
 		};
 	};
@@ -72,10 +74,12 @@
 				<NRF_PSEL(QSPI_IO1, 0, 14)>,
 				<NRF_PSEL(QSPI_IO2, 0, 15)>,
 				<NRF_PSEL(QSPI_IO3, 0, 16)>;
+			nordic,drive-mode = <NRF_DRIVE_E0E1>;
 			bias-pull-down;
 		};
 		group2 {
 			psels = <NRF_PSEL(QSPI_CSN, 0, 18)>;
+			nordic,drive-mode = <NRF_DRIVE_E0E1>;
 			bias-pull-up;
 		};
 		low-power-enable;

drivers/wifi/nrf_wifi/src/fmac_main.c

@@ -69,7 +69,11 @@ BUILD_ASSERT(CONFIG_NRF70_MAX_TX_AGGREGATION <= 15,
 	"Max TX aggregation is 15");
 BUILD_ASSERT(CONFIG_NRF70_RX_NUM_BUFS >= 1,
 	"At least one RX buffer is required");
+#ifdef CONFIG_WIFI_NRF71
+BUILD_ASSERT(RPU_DATA_RAM_SIZE - TOTAL_RX_SIZE >= TOTAL_TX_SIZE,
+#else
 BUILD_ASSERT(RPU_PKTRAM_SIZE - TOTAL_RX_SIZE >= TOTAL_TX_SIZE,
+#endif  /* CONFGI_WIFI_NRF71 */
 	"Packet RAM overflow: not enough memory for TX");
 
 BUILD_ASSERT(CONFIG_NRF70_TX_MAX_DATA_SIZE >= MAX_TX_FRAME_SIZE,
@@ -631,21 +635,32 @@ enum nrf_wifi_status nrf_wifi_fmac_dev_add_zep(struct nrf_wifi_drv_priv_zep *drv
 	}
 
 	rpu_ctx_zep->rpu_ctx = rpu_ctx;
-
+#ifdef CONFIG_WIFI_NRF71
+	/** Block the loading of firmware as
+	 * it has to be done from codescape for NRF71 case.
+	 */
+	/** Check if frimware loaded properly */
+	status = nrf_wifi_fmac_fw_boot(rpu_ctx);
+	if (status != NRF_WIFI_STATUS_SUCCESS) {
+		LOG_ERR("%s: nrf_wifi_fw_boot failed", __func__);
+		goto err;
+	} else {
+		printf("Boot check passed\n");
+	}
+#else
 	status = nrf_wifi_fw_load(rpu_ctx);
 	if (status != NRF_WIFI_STATUS_SUCCESS) {
 		LOG_ERR("%s: nrf_wifi_fw_load failed", __func__);
 		goto err;
 	}
-
+#endif /* CONFIG_WIFI_NRF71 */
 	status = nrf_wifi_fmac_ver_get(rpu_ctx,
 				       &fw_ver);
 
 	if (status != NRF_WIFI_STATUS_SUCCESS) {
 		LOG_ERR("%s: FW version read failed", __func__);
 		goto err;
 	}
-
 	LOG_DBG("Firmware (v%d.%d.%d.%d) booted successfully",
 		NRF_WIFI_UMAC_VER(fw_ver),
 		NRF_WIFI_UMAC_VER_MAJ(fw_ver),
@@ -833,7 +848,11 @@ static int nrf_wifi_drv_main_zep(const struct device *dev)
 
 	sys_fpriv = wifi_fmac_priv(rpu_drv_priv_zep.fmac_priv);
 	sys_fpriv->max_ampdu_len_per_token =
+#ifdef CONFIG_WIFI_NRF71
+		(RPU_DATA_RAM_SIZE - (CONFIG_NRF70_RX_NUM_BUFS * CONFIG_NRF70_RX_MAX_DATA_SIZE)) /
+#else
 		(RPU_PKTRAM_SIZE - (CONFIG_NRF70_RX_NUM_BUFS * CONFIG_NRF70_RX_MAX_DATA_SIZE)) /
+#endif /* CONFIG_WIFI_NRF71 */
 		CONFIG_NRF70_MAX_TX_TOKENS;
 	/* Align to 4-byte */
 	sys_fpriv->max_ampdu_len_per_token &= ~0x3;

drivers/wifi/nrf_wifi/src/wifi_mgmt.c

@@ -393,12 +393,13 @@ void nrf_wifi_event_proc_get_power_save_info(void *vif_ctx,
 	vif_ctx_zep->ps_info->ps_params.timeout_ms = ps_info->ps_timeout;
 	vif_ctx_zep->ps_info->ps_params.listen_interval = ps_info->listen_interval;
 	vif_ctx_zep->ps_info->ps_params.wakeup_mode = ps_info->extended_ps;
+#ifndef CONFIG_WIFI_NRF71
 	if (ps_info->ps_exit_strategy == EVERY_TIM) {
 		vif_ctx_zep->ps_info->ps_params.exit_strategy = WIFI_PS_EXIT_EVERY_TIM;
 	} else if (ps_info->ps_exit_strategy == INT_PS) {
 		vif_ctx_zep->ps_info->ps_params.exit_strategy = WIFI_PS_EXIT_CUSTOM_ALGO;
 	}
-
+#endif /* !CONFIG_WIFI_NRF71 */
 	for (int i = 0; i < ps_info->num_twt_flows; i++) {
 		struct twt_interval_float twt_interval_fp;
 		struct wifi_twt_flow_info *twt_zep = &vif_ctx_zep->ps_info->twt_flows[i];

include/zephyr/drivers/wifi/nrf_wifi/bus/rpu_hw_if.h

@@ -16,6 +16,21 @@
 #include <stdlib.h>
 #include <zephyr/drivers/gpio.h>
 
+#ifdef CONFIG_WIFI_NRF71
+enum {
+	WIFIMCU_REG = 0,
+	RAM0,
+	RAM1,
+	DATARAM,
+	CODERAM,
+	RAM2,
+	BELLBOARD,
+	GRTC,
+	WICR,
+	SECURERAM,
+	NUM_MEM_BLOCKS
+};
+#else /* CONFIG_WIFI_NRF71 */
 enum {
 	SYSBUS = 0,
 	EXT_SYS_BUS,
@@ -30,6 +45,7 @@ enum {
 	UMAC_SRC_RAM,
 	NUM_MEM_BLOCKS
 };
+#endif /* !CONFIG_WIFI_NRF71 */
 
 /* Keeping it higher to avoid changing it ofter, but modify this value
  * if rpu_7002_memmap is changed.
@@ -63,4 +79,9 @@ int sr_ant_switch(unsigned int ant_switch);
 int sr_gpio_remove(void);
 int sr_gpio_config(void);
 #endif /* CONFIG_NRF70_SR_COEX_RF_SWITCH */
+#ifdef CONFIG_WIFI_NRF71
+int rpu_validate_addr(uint32_t start_addr, uint32_t len, bool *hl_flag);
+int rpu_pwron(void);
+int rpu_gpio_config(void);
+#endif /* CONFIG_WIFI_NRF71 */
 #endif /* __RPU_HW_IF_H_ */

modules/nrf_wifi/bus/CMakeLists.txt

@@ -58,4 +58,7 @@ if (CONFIG_NRF70_BUSLIB)
     ipc_service.c
     spsc_qm.c
   )
+  zephyr_library_include_directories_ifdef(CONFIG_WIFI_NRF71
+    ${NRF_WIFI_DIR}/bus_if/bus/qspi/inc
+  )
 endif()

modules/nrf_wifi/bus/Kconfig

@@ -53,4 +53,9 @@ config NRF70_LOG_VERBOSE
 	bool "Maintains the verbosity of information in logs"
 	default y
 
+config WIFI_NRF71
+	bool "For nrf71 testing with fpga"
+	select EXPERIMENTAL
+	help
+	  Enable to do system testn with nrf71 and fpga
 endif # NRF70_BUSLIB

modules/nrf_wifi/bus/device.c

@@ -60,9 +60,10 @@ struct qspi_config *qspi_defconfig(void)
 	config.test_name = "QSPI TEST";
 	config.test_hlread = false;
 	config.test_iteration = 0;
-
 	config.qspi_slave_latency = 0;
-
+#ifdef CONFIG_WIFI_NRF71
+	config.qspi_slave_latency = 1;
+#endif /* CONFIG_WIFI_NRF71 */
 	config.encryption = config.CMD_CNONCE = false;
 
 #if defined(CONFIG_NRF70_ON_QSPI) && (NRF_QSPI_HAS_XIP_ENC || NRF_QSPI_HAS_DMA_ENC)

modules/nrf_wifi/bus/qspi_if.c

@@ -1243,9 +1243,11 @@ void qspi_update_nonce(unsigned int addr, int len, int hlread)
 void qspi_addr_check(unsigned int addr, const void *data, unsigned int len)
 {
 	if ((addr % 4 != 0) || (((unsigned int)data) % 4 != 0) || (len % 4 != 0)) {
+#ifndef CONFIG_WIFI_NRF71
 		LOG_ERR("%s : Unaligned address %x %x %d %x %x", __func__, addr,
 		       (unsigned int)data, (addr % 4 != 0), (((unsigned int)data) % 4 != 0),
 		       (len % 4 != 0));
+#endif /* !CONFIG_WIFI_NRF71 */
 	}
 }
 

modules/nrf_wifi/bus/rpu_hw_if.c

@@ -35,6 +35,23 @@ GPIO_DT_SPEC_GET(NRF7002_NODE, iovdd_ctrl_gpios);
 static const struct gpio_dt_spec bucken_spec =
 GPIO_DT_SPEC_GET(NRF7002_NODE, bucken_gpios);
 
+#ifdef CONFIG_WIFI_NRF71
+char blk_name[][15] = { "WIFIMCU_REG", "RAM0", "RAM1", "DATARAM",
+			"CODERAM", "RAM2", "BELLBOARD", "GRTC", "WICR", "SECURERAM"};
+
+uint32_t rpu_7002_memmap[][3] = {
+	{ 0x000000, 0x0FFFFF, 1 },
+	{ 0x100000, 0x17FFFF, 1 }, /* RAM0 is LMAC Memory */
+	{ 0x180000, 0x1FFFFF, 1 }, /* RAM1 is UMAC Memory */
+	{ 0x200000, 0x2FFFFF, 0 }, /* PKTRAM is DATARAM */
+	{ 0x300000, 0x37FFFF, 1 }, /* CODERAM is ROM (LMAC & UMAC) */
+	{ 0x3C0000, 0x3DFFFF, 2 }, /* RAM2 is GRAM */
+	{ 0x380000, 0x38FFFF, 1 }, /* BELLBOARD */
+	{ 0x392000, 0x393FFF, 1 }, /* GRTC */
+	{ 0x3B0000, 0x3BFFFF, 1 }, /* WICR */
+	{ 0x3e0000, 0x3FFFFB, 1 }  /* Secure RAM */
+};
+#else
 char blk_name[][15] = { "SysBus",   "ExtSysBus",	   "PBus",	   "PKTRAM",
 			       "GRAM",	   "LMAC_ROM",	   "LMAC_RET_RAM", "LMAC_SRC_RAM",
 			       "UMAC_ROM", "UMAC_RET_RAM", "UMAC_SRC_RAM" };
@@ -52,6 +69,7 @@ uint32_t rpu_7002_memmap[][3] = {
 	{ 0x280000, 0x2A4000, 1 },
 	{ 0x300000, 0x338000, 1 }
 };
+#endif /* CONFIG_WIFI_NRF71 */
 
 static const struct qspi_dev *qdev;
 static struct qspi_config *cfg;
@@ -66,7 +84,11 @@ static int validate_addr_blk(uint32_t start_addr,
 
 	if (((start_addr >= block_map[0]) && (start_addr <= block_map[1])) &&
 	    ((end_addr >= block_map[0]) && (end_addr <= block_map[1]))) {
+#ifdef CONFIG_WIFI_NRF71
+		if (block_no == DATARAM) {
+#else
 		if (block_no == PKTRAM) {
+#endif /* CONFIG_WIFI_NRF71 */
 			*hl_flag = 0;
 		}
 		*selected_blk = block_no;
@@ -76,7 +98,11 @@ static int validate_addr_blk(uint32_t start_addr,
 	return -1;
 }
 
+#ifdef CONFIG_WIFI_NRF71
+int rpu_validate_addr(uint32_t start_addr, uint32_t len, bool *hl_flag)
+#else /* CONFIG_WIFI_NRF71 */
 static int rpu_validate_addr(uint32_t start_addr, uint32_t len, bool *hl_flag)
+#endif /* !CONFIG_WIFI_NRF71 */
 {
 	int ret = 0, i;
 	uint32_t end_addr;
@@ -97,8 +123,11 @@ static int rpu_validate_addr(uint32_t start_addr, uint32_t len, bool *hl_flag)
 		LOG_ERR("Address validation failed - pls check memmory map and re-try");
 		return -1;
 	}
-
+#ifdef CONFIG_WIFI_NRF71
+	if (selected_blk == CODERAM) {
+#else  /* CONFIG_WIFI_NRF71 */
 	if ((selected_blk == LMAC_ROM) || (selected_blk == UMAC_ROM)) {
+#endif /* !CONFIG_WIFI_NRF71 */
 		LOG_ERR("Error: Cannot write to ROM blocks");
 		return -1;
 	}
@@ -168,8 +197,11 @@ int rpu_irq_remove(struct gpio_callback *irq_callback_data)
 out:
 	return ret;
 }
-
+#ifdef CONFIG_WIFI_NRF71
+int rpu_gpio_config(void)
+#else /* CONFIG_WIFI_NRF71 */
 static int rpu_gpio_config(void)
+#endif /* !CONFIG_WIFI_NRF71 */
 {
 	int ret;
 
@@ -221,7 +253,11 @@ static int rpu_gpio_remove(void)
 	return ret;
 }
 
+#ifdef CONFIG_WIFI_NRF71
+int rpu_pwron(void)
+#else /* CONFIG_WIFI_NRF71 */
 static int rpu_pwron(void)
+#endif /* !CONFIG_WIFI_NRF71 */
 {
 	int ret;
 
@@ -487,12 +523,14 @@ int rpu_enable(void)
  * successfully before it can be called. So, disable this for
  * nrf70_buslib only usage.
  */
+#ifndef CONFIG_WIFI_NRF71
 #ifdef CONFIG_WIFI_NRF70
 	ret = rpu_validate_comms();
 	if (ret) {
 		goto rpu_pwroff;
 	}
 #endif
+#endif /* !CONFIG_WIFI_NRF71 */
 	return 0;
 rpu_pwroff:
 	rpu_pwroff();

modules/nrf_wifi/os/shim.c

@@ -156,7 +156,11 @@ static unsigned int zep_shim_qspi_read_reg32(void *priv, unsigned long addr)
 
 	dev = qspi_priv->qspi_dev;
 
+#ifdef CONFIG_WIFI_NRF71
+	if (addr < 0x200000) {
+#else
 	if (addr < 0x0C0000) {
+#endif /* CONFIG_WIFI_NRF71 */
 		dev->hl_read(addr, &val, 4);
 	} else {
 		dev->read(addr, &val, 4);
@@ -182,8 +186,11 @@ static void zep_shim_qspi_cpy_from(void *priv, void *dest, unsigned long addr, s
 	size_t count_aligned = ROUND_UP(count, 4);
 
 	dev = qspi_priv->qspi_dev;
-
+#ifdef CONFIG_WIFI_NRF71
+	if (addr < 0x200000) {
+#else
 	if (addr < 0x0C0000) {
+#endif /* CONFIG_WIFI_NRF71 */
 		dev->hl_read(addr, dest, count_aligned);
 	} else {
 		dev->read(addr, dest, count_aligned);