drivers: wifi: ipc service support

drivers/flash/soc_flash_nrf_mram.c

@@ -25,7 +25,7 @@ LOG_MODULE_REGISTER(flash_nrf_mram, CONFIG_FLASH_LOG_LEVEL);
 
 #define ERASE_VALUE 0xff
 
-BUILD_ASSERT(MRAM_START > 0, "nordic,mram: start address expected to be non-zero");
+BUILD_ASSERT(MRAM_START >= 0, "nordic,mram: start address expected to be non-zero");
 BUILD_ASSERT((ERASE_BLOCK_SIZE % WRITE_BLOCK_SIZE) == 0,
 	     "erase-block-size expected to be a multiple of write-block-size");
 

drivers/flash/soc_flash_nrf_rram.c

@@ -54,6 +54,11 @@ LOG_MODULE_REGISTER(flash_nrf_rram, CONFIG_FLASH_LOG_LEVEL);
 #define WRITE_BLOCK_SIZE_FROM_DT DT_PROP(RRAM, write_block_size)
 #define ERASE_VALUE              0xFF
 
+#if CONFIG_TRUSTED_EXECUTION_NONSECURE && USE_PARTITION_MANAGER
+#include <soc_secure.h>
+#include <pm_config.h>
+#endif /* CONFIG_TRUSTED_EXECUTION_NONSECURE && USE_PARTITION_MANAGER */
+
 #ifdef CONFIG_MULTITHREADING
 static struct k_sem sem_lock;
 #define SYNC_INIT()   k_sem_init(&sem_lock, 1, 1)
@@ -279,6 +284,12 @@ static int nrf_rram_read(const struct device *dev, off_t addr, void *data, size_
 	}
 	addr += RRAM_START;
 
+#if CONFIG_TRUSTED_EXECUTION_NONSECURE && USE_PARTITION_MANAGER && PM_APP_ADDRESS
+	if (addr < PM_APP_ADDRESS) {
+		return soc_secure_mem_read(data, (void *)addr, len);
+	}
+#endif
+
 	memcpy(data, (void *)addr, len);
 
 	return 0;

drivers/wifi/nrf_wifi/CMakeLists.txt

@@ -27,9 +27,11 @@ zephyr_library_sources_ifndef(CONFIG_NRF70_OFFLOADED_RAW_TX
   src/fmac_main.c
 )
 
+if (NOT CONFIG_NRF71_ON_IPC)
 zephyr_library_sources_ifdef(CONFIG_NRF_WIFI_PATCHES_BUILTIN
   src/fw_load.c
 )
+endif()
 
 if(NOT CONFIG_NRF70_RADIO_TEST AND NOT CONFIG_NRF70_OFFLOADED_RAW_TX)
   zephyr_library_sources(

drivers/wifi/nrf_wifi/Kconfig.nrfwifi

@@ -16,15 +16,16 @@ menuconfig WIFI_NRF70
 	depends on \
 		DT_HAS_NORDIC_NRF7002_SPI_ENABLED || DT_HAS_NORDIC_NRF7002_QSPI_ENABLED || \
 		DT_HAS_NORDIC_NRF7001_SPI_ENABLED || DT_HAS_NORDIC_NRF7001_QSPI_ENABLED || \
-		DT_HAS_NORDIC_NRF7000_SPI_ENABLED || DT_HAS_NORDIC_NRF7000_QSPI_ENABLED
+		DT_HAS_NORDIC_NRF7000_SPI_ENABLED || DT_HAS_NORDIC_NRF7000_QSPI_ENABLED || \
+		DT_HAS_NORDIC_WIFI_ENABLED
 	help
 	  Nordic Wi-Fi Driver
 
 if WIFI_NRF70
 # Hidden symbols for internal use
 config WIFI_NRF7002
 	bool
-	default y if DT_HAS_NORDIC_NRF7002_SPI_ENABLED || DT_HAS_NORDIC_NRF7002_QSPI_ENABLED
+	default y if DT_HAS_NORDIC_NRF7002_SPI_ENABLED || DT_HAS_NORDIC_NRF7002_QSPI_ENABLED || DT_HAS_NORDIC_WIFI_ENABLED
 
 config WIFI_NRF7001
 	bool
@@ -148,7 +149,8 @@ endchoice
 
 config NRF_WIFI_LOW_POWER
 	bool "Low power mode in nRF Wi-Fi chipsets"
-	default y
+	depends on !NRF71_ON_IPC
+	default y if !NRF71_ON_IPC
 
 config NRF70_TCP_IP_CHECKSUM_OFFLOAD
 	bool "TCP/IP checksum offload"
@@ -192,6 +194,13 @@ config NRF70_ON_SPI
 			 DT_HAS_NORDIC_NRF7000_SPI_ENABLED
 	select SPI
 
+config NRF71_ON_IPC
+	def_bool DT_HAS_NORDIC_WIFI_ENABLED
+	select MBOX
+	select IPC
+	select IPC_SERVICE
+	select SPSC_PBUF
+
 config NRF70_2_4G_ONLY
 	def_bool y if WIFI_NRF7001
 
@@ -807,4 +816,8 @@ config NRF70_PASSIVE_SCAN_ONLY
 	help
 	  Enable this configuration to force passive scan on all channels.
 	  This will override application-specified scan type.
+
+config NRF_WIFI_RX_BUFF_PROG_UMAC
+	bool "RX buffers programming through UMAC"
+	default y
 endif # WIFI_NRF70

drivers/wifi/nrf_wifi/inc/wifi_mgmt.h

@@ -70,6 +70,12 @@ int nrf_wifi_filter(const struct device *dev,
 		    struct wifi_filter_info *filter);
 #endif /* CONFIG_NRF70_RAW_DATA_RX || CONFIG_NRF70_PROMISC_DATA_RX */
 
+int nrf_wifi_set_loopback_mode(const struct device *dev,
+			       unsigned char loopback_mode);
+
+int nrf_wifi_get_throughput(const struct device *dev,
+			    struct wifi_throughput_info *throughput_info);
+
 int nrf_wifi_set_rts_threshold(const struct device *dev,
 			       unsigned int rts_threshold);
 

drivers/wifi/nrf_wifi/src/fmac_main.c

@@ -476,8 +476,12 @@ void reg_change_callbk_fn(void *vif_ctx,
 }
 #endif /* !CONFIG_NRF70_RADIO_TEST */
 
+#ifdef CONFIG_DT_HAS_NORDIC_WIFI_ENABLED
+#define MAX_TX_PWR(label) DT_PROP(DT_NODELABEL(wifi), label) * 4
+#else
 /* DTS uses 1dBm as the unit for TX power, while the RPU uses 0.25dBm */
 #define MAX_TX_PWR(label) DT_PROP(DT_NODELABEL(nrf70), label) * 4
+#endif /* CONFIG_DT_HAS_NORDIC_WIFI_ENABLED */
 
 void configure_tx_pwr_settings(struct nrf_wifi_tx_pwr_ctrl_params *tx_pwr_ctrl_params,
 				struct nrf_wifi_tx_pwr_ceil_params *tx_pwr_ceil_params)
@@ -843,6 +847,8 @@ static struct wifi_mgmt_ops nrf_wifi_mgmt_ops = {
 #if defined(CONFIG_NRF70_RAW_DATA_RX) || defined(CONFIG_NRF70_PROMISC_DATA_RX)
 	.filter = nrf_wifi_filter,
 #endif /* CONFIG_NRF70_RAW_DATA_RX || CONFIG_NRF70_PROMISC_DATA_RX */
+	.loopback_mode = nrf_wifi_set_loopback_mode,
+	.throughput = nrf_wifi_get_throughput,
 };
 #endif /* CONFIG_NET_L2_WIFI_MGMT */
 

drivers/wifi/nrf_wifi/src/fw_load.c

@@ -17,26 +17,32 @@
 LOG_MODULE_DECLARE(wifi_nrf, CONFIG_WIFI_NRF70_LOG_LEVEL);
 
 #include <fmac_main.h>
+#ifndef CONFIG_NRF71_ON_IPC
 static const char fw_patch[] = {
 	#include <nrf70_fw_patch/nrf70.bin.inc>
 };
+#endif /* !CONFIG_NRF71_ON_IPC */
 
 enum nrf_wifi_status nrf_wifi_fw_load(void *rpu_ctx)
 {
 	enum nrf_wifi_status status = NRF_WIFI_STATUS_FAIL;
+#ifndef CONFIG_NRF71_ON_IPC
 	struct nrf_wifi_fmac_fw_info fw_info = { 0 };
 
 	status = nrf_wifi_fmac_fw_parse(rpu_ctx, fw_patch, sizeof(fw_patch), &fw_info);
 	if (status != NRF_WIFI_STATUS_SUCCESS) {
 		LOG_ERR("%s: nrf_wifi_fmac_fw_parse failed", __func__);
 		return status;
 	}
+
 	/* Load the FW patches to the RPU */
 	status = nrf_wifi_fmac_fw_load(rpu_ctx, &fw_info);
 
 	if (status != NRF_WIFI_STATUS_SUCCESS) {
 		LOG_ERR("%s: nrf_wifi_fmac_fw_load failed", __func__);
 	}
-
+#else
+	status = NRF_WIFI_STATUS_SUCCESS;
+#endif /* !CONFIG_NRF71_ON_IPC */
 	return status;
 }

drivers/wifi/nrf_wifi/src/net_if.c

@@ -566,6 +566,7 @@ enum nrf_wifi_status nrf_wifi_get_mac_addr(struct nrf_wifi_vif_ctx_zep *vif_ctx_
 		random_mac_addr,
 		WIFI_MAC_ADDR_LEN);
 #elif CONFIG_WIFI_OTP_MAC_ADDRESS
+#ifndef CONFIG_NRF71_ON_IPC
 	status = nrf_wifi_fmac_otp_mac_addr_get(fmac_dev_ctx,
 				vif_ctx_zep->vif_idx,
 				vif_ctx_zep->mac_addr.addr);
@@ -574,6 +575,15 @@ enum nrf_wifi_status nrf_wifi_get_mac_addr(struct nrf_wifi_vif_ctx_zep *vif_ctx_
 			__func__);
 		goto unlock;
 	}
+#else
+	/* Set dummy MAC address */
+	vif_ctx_zep->mac_addr.addr[0] = 0x00;
+	vif_ctx_zep->mac_addr.addr[1] = 0x00;
+	vif_ctx_zep->mac_addr.addr[2] = 0x5E;
+	vif_ctx_zep->mac_addr.addr[3] = 0x00;
+	vif_ctx_zep->mac_addr.addr[4] = 0x10;
+	vif_ctx_zep->mac_addr.addr[5] = 0x00;
+#endif /* !CONFIG_NRF71_ON_IPC */
 #endif
 
 	if (!nrf_wifi_utils_is_mac_addr_valid(vif_ctx_zep->mac_addr.addr)) {

drivers/wifi/nrf_wifi/src/wifi_mgmt.c

@@ -986,6 +986,70 @@ int nrf_wifi_filter(const struct device *dev,
 	return ret;
 }
 #endif /* CONFIG_NRF70_RAW_DATA_RX || CONFIG_NRF70_PROMISC_DATA_RX */
+int nrf_wifi_get_throughput(const struct device *dev,
+			    struct wifi_throughput_info *throughput_info)
+{
+	enum nrf_wifi_status status = NRF_WIFI_STATUS_FAIL;
+	struct nrf_wifi_ctx_zep *rpu_ctx_zep = NULL;
+	struct nrf_wifi_vif_ctx_zep *vif_ctx_zep = NULL;
+	struct nrf_wifi_fmac_dev_ctx *fmac_dev_ctx = NULL;
+	struct nrf_wifi_fmac_dev_ctx_def *def_dev_ctx = NULL;
+	int ret = -1;
+
+	if (!dev || !throughput_info) {
+		LOG_ERR("%s: Illegal input parameters", __func__);
+		goto out;
+	}
+
+	vif_ctx_zep = dev->data;
+	if (!vif_ctx_zep) {
+		LOG_ERR("%s: vif_ctx_zep is NULL\n", __func__);
+		goto out;
+	}
+
+	rpu_ctx_zep = vif_ctx_zep->rpu_ctx_zep;
+	fmac_dev_ctx = rpu_ctx_zep->rpu_ctx;
+	def_dev_ctx = wifi_dev_priv(fmac_dev_ctx);
+
+	/* Fill throughput data here */
+out:
+	return status;
+}
+
+int nrf_wifi_set_loopback_mode(const struct device *dev,
+			       unsigned char loopback_mode)
+{
+	enum nrf_wifi_status status = NRF_WIFI_STATUS_FAIL;
+	struct nrf_wifi_ctx_zep *rpu_ctx_zep = NULL;
+	struct nrf_wifi_vif_ctx_zep *vif_ctx_zep = NULL;
+	int ret = -1;
+
+	if (!dev) {
+		LOG_ERR("%s: dev is NULL", __func__);
+		return ret;
+	}
+
+	vif_ctx_zep = dev->data;
+	if (!vif_ctx_zep) {
+		LOG_ERR("%s: vif_ctx_zep is NULL", __func__);
+		return ret;
+	}
+
+	rpu_ctx_zep = vif_ctx_zep->rpu_ctx_zep;
+	if (!rpu_ctx_zep) {
+		LOG_ERR("%s: rpu_ctx_zep is NULL", __func__);
+		return ret;
+	}
+
+	status = nrf_wifi_fmac_set_loopback_mode(rpu_ctx_zep->rpu_ctx,
+						 vif_ctx_zep->vif_idx,
+						 loopback_mode);
+	if (status != NRF_WIFI_STATUS_SUCCESS) {
+		LOG_ERR("%s: Set loopback mode failed\n", __func__);
+	}
+
+	return status;
+}
 
 int nrf_wifi_set_rts_threshold(const struct device *dev,
 			       unsigned int rts_threshold)

drivers/wifi/nrf_wifi/src/wifi_mgmt_scan.c

@@ -297,6 +297,8 @@ static inline enum wifi_security_type drv_to_wifi_mgmt(int drv_security_type)
 		return WIFI_SECURITY_TYPE_WAPI;
 	case NRF_WIFI_EAP:
 		return WIFI_SECURITY_TYPE_EAP;
+	case NRF_WIFI_EAP_TLS_SHA256:
+		return WIFI_SECURITY_TYPE_EAP_TLS_SHA256;
 	default:
 		return WIFI_SECURITY_TYPE_UNKNOWN;
 	}

drivers/wifi/nrf_wifi/src/wifi_util.c

@@ -79,7 +79,6 @@ int nrf_wifi_util_conf_init(struct rpu_conf_params *conf_params)
 	return 0;
 }
 
-
 static int nrf_wifi_util_set_he_ltf(const struct shell *sh,
 				    size_t argc,
 				    const char *argv[])
@@ -110,7 +109,6 @@ static int nrf_wifi_util_set_he_ltf(const struct shell *sh,
 	return 0;
 }
 
-
 static int nrf_wifi_util_set_he_gi(const struct shell *sh,
 				   size_t argc,
 				   const char *argv[])
@@ -217,7 +215,6 @@ static int nrf_wifi_util_set_uapsd_queue(const struct shell *sh,
 }
 #endif /* CONFIG_NRF70_STA_MODE */
 
-
 static int nrf_wifi_util_show_cfg(const struct shell *sh,
 				  size_t argc,
 				  const char *argv[])
@@ -324,7 +321,6 @@ static int nrf_wifi_util_tx_stats(const struct shell *sh,
 }
 #endif /* CONFIG_NRF70_STA_MODE */
 
-
 static int nrf_wifi_util_tx_rate(const struct shell *sh,
 				 size_t argc,
 				 const char *argv[])
@@ -390,7 +386,6 @@ static int nrf_wifi_util_tx_rate(const struct shell *sh,
 	return 0;
 }
 
-
 #ifdef CONFIG_NRF_WIFI_LOW_POWER
 static int nrf_wifi_util_show_host_rpu_ps_ctrl_state(const struct shell *sh,
 						     size_t argc,
@@ -1067,8 +1062,6 @@ SHELL_STATIC_SUBCMD_SET_CREATE(
 		      0),
 #endif /* CONFIG_NRF_WIFI_RPU_RECOVERY */
 	SHELL_SUBCMD_SET_END);
-
-
 SHELL_CMD_REGISTER(wifi_util,
 		   &nrf_wifi_util_subcmds,
 		   "nRF Wi-Fi utility shell commands",

include/zephyr/net/wifi_mgmt.h

@@ -108,6 +108,10 @@ enum net_request_wifi_cmd {
 	NET_REQUEST_WIFI_CMD_RTS_THRESHOLD_CONFIG,
 	/** WPS config */
 	NET_REQUEST_WIFI_CMD_WPS_CONFIG,
+	/** Wezen Loopback mode */
+	NET_REQUEST_WIFI_CMD_LOOPBACK,
+	/** Wezen get throughput API */
+	NET_REQUEST_WIFI_CMD_THROUGHPUT,
 	/** @cond INTERNAL_HIDDEN */
 	NET_REQUEST_WIFI_CMD_MAX
 /** @endcond */
@@ -191,6 +195,18 @@ NET_MGMT_DEFINE_REQUEST_HANDLER(NET_REQUEST_WIFI_PACKET_FILTER);
 
 NET_MGMT_DEFINE_REQUEST_HANDLER(NET_REQUEST_WIFI_CHANNEL);
 
+/** Request a Wi-Fi loopback mode setting */
+#define NET_REQUEST_WIFI_LOOPBACK_MODE				\
+	(_NET_WIFI_BASE | NET_REQUEST_WIFI_CMD_LOOPBACK)
+
+NET_MGMT_DEFINE_REQUEST_HANDLER(NET_REQUEST_WIFI_LOOPBACK_MODE);
+
+/** Request Wi-Fi TX burst througput setting */
+#define NET_REQUEST_WIFI_THROUGHPUT				\
+	(_NET_WIFI_BASE | NET_REQUEST_WIFI_CMD_THROUGHPUT)
+
+NET_MGMT_DEFINE_REQUEST_HANDLER(NET_REQUEST_WIFI_THROUGHPUT);
+
 /** Request a Wi-Fi access point to disconnect a station */
 #define NET_REQUEST_WIFI_AP_STA_DISCONNECT			\
 	(_NET_WIFI_BASE | NET_REQUEST_WIFI_CMD_AP_STA_DISCONNECT)
@@ -850,6 +866,15 @@ struct wifi_mode_info {
 	enum wifi_mgmt_op oper;
 };
 
+struct wifi_throughput_info {
+	/** Previous second packet count */
+	int previous_sec_packet_count;
+	/** Current second packet count */
+	int current_sec_packet_count;
+	/** Interface index */
+	uint8_t if_index;
+};
+
 /** @brief Wi-Fi filter setting for monitor, prmoiscuous, TX-injection modes */
 struct wifi_filter_info {
 	/** Filter setting */
@@ -1365,6 +1390,10 @@ struct wifi_mgmt_ops {
 	 * @return 0 if ok, < 0 if error
 	 */
 	int (*wps_config)(const struct device *dev, struct wifi_wps_config_params *params);
+
+	int (*loopback_mode)(const struct device *dev, unsigned char loopback_mode);
+
+	int (*throughput)(const struct device *dev, struct wifi_throughput_info *throughput_info);
 };
 
 /** Wi-Fi management offload API */