drivers: wifi: ipc service support

ajayparida · ajayparida · commit 7da32cf2fad4 · 2024-12-15T21:05:15.000+05:30
IPC service support

Signed-off-by: Ajay Parida &lt;ajay.parida@nordicsemi.no&gt;
diff --git a/drivers/wifi/nrf_wifi/Kconfig.nrfwifi b/drivers/wifi/nrf_wifi/Kconfig.nrfwifi
@@ -148,7 +148,7 @@ endchoice
 
 config NRF_WIFI_LOW_POWER
 	bool "Low power mode in nRF Wi-Fi chipsets"
-	default y
+	default y if !NRF71_ON_IPC
 
 config NRF70_TCP_IP_CHECKSUM_OFFLOAD
 	bool "TCP/IP checksum offload"
@@ -192,6 +192,14 @@ config NRF70_ON_SPI
 			 DT_HAS_NORDIC_NRF7000_SPI_ENABLED
 	select SPI
 
+config NRF71_ON_IPC
+        # TODO: Do this properly from DTS
+        # def_bool NRF71_HAS_IPC
+        bool "Enable IPC"
+ 	# select IPC_SERVICE
+        # select IPC_SERVICE_BACKEND_ICMSG
+        # select MBOX
+
 config NRF70_2_4G_ONLY
 	def_bool y if WIFI_NRF7001
 
diff --git a/drivers/wifi/nrf_wifi/src/fmac_main.c b/drivers/wifi/nrf_wifi/src/fmac_main.c
@@ -591,13 +591,13 @@ enum nrf_wifi_status nrf_wifi_fmac_dev_add_zep(struct nrf_wifi_drv_priv_zep *drv
 	}
 
 	rpu_ctx_zep->rpu_ctx = rpu_ctx;
-
+#ifndef CONFIG_NRF71_ON_IPC
 	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_NRF71_ON_IPC */
 	status = nrf_wifi_fmac_ver_get(rpu_ctx,
 				       &fw_ver);
 
diff --git a/drivers/wifi/nrf_wifi/src/net_if.c b/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)) {
diff --git a/modules/nrf_wifi/bus/CMakeLists.txt b/modules/nrf_wifi/bus/CMakeLists.txt
@@ -15,13 +15,17 @@ if (CONFIG_NRF70_BUSLIB)
     inc
   )
   zephyr_library_sources(
-    rpu_hw_if.c
     device.c
   )
   zephyr_library_sources_ifdef(CONFIG_NRF70_ON_QSPI
+    rpu_hw_if.c
     qspi_if.c
   )
   zephyr_library_sources_ifdef(CONFIG_NRF70_ON_SPI
+    rpu_hw_if.c
     spi_if.c
   )
+  zephyr_library_sources_ifdef(CONFIG_NRF71_ON_IPC
+    ipc_if.c
+  )
 endif()
diff --git a/modules/nrf_wifi/bus/device.c b/modules/nrf_wifi/bus/device.c
@@ -12,28 +12,45 @@
 #include <zephyr/kernel.h>
 #include <zephyr/sys/printk.h>
 #include <zephyr/drivers/gpio.h>
-#include <zephyr/drivers/wifi/nrf_wifi/bus/qspi_if.h>
 #include <stdio.h>
 #include <string.h>
 
+#if defined(CONFIG_NRF71_ON_IPC)
+#include "ipc_if.h"
+#else
+#include <zephyr/drivers/wifi/nrf_wifi/bus/qspi_if.h>
 #include "spi_if.h"
-
 static struct qspi_config config;
+#endif
 
-#if defined(CONFIG_NRF70_ON_QSPI)
-static struct qspi_dev qspi = {.init = qspi_init,
-			       .deinit = qspi_deinit,
-			       .read = qspi_read,
-			       .write = qspi_write,
-			       .hl_read = qspi_hl_read};
+
+#if defined(CONFIG_NRF71_ON_IPC)
+static struct rpu_dev ipc = {
+        .init = ipc_init,
+        .deinit = ipc_deinit,
+        .send = ipc_send,
+        .recv = ipc_recv,
+        .register_rx_cb = ipc_register_rx_cb,
+};
+#elif defined(CONFIG_NRF70_ON_QSPI)
+static struct qspi_dev qspi = {
+	.init = qspi_init,
+	.deinit = qspi_deinit,
+	.read = qspi_read,
+	.write = qspi_write,
+	.hl_read = qspi_hl_read
+};
 #else
-static struct qspi_dev spim = {.init = spim_init,
-			       .deinit = spim_deinit,
-			       .read = spim_read,
-			       .write = spim_write,
-			       .hl_read = spim_hl_read};
+static struct qspi_dev spim = {
+	.init = spim_init,
+	.deinit = spim_deinit,
+	.read = spim_read,
+	.write = spim_write,
+	.hl_read = spim_hl_read
+};
 #endif
 
+#ifndef CONFIG_NRF71_ON_IPC
 struct qspi_config *qspi_defconfig(void)
 {
 	memset(&config, 0, sizeof(struct qspi_config));
@@ -65,18 +82,26 @@ struct qspi_config *qspi_defconfig(void)
 #endif /*CONFIG_NRF70_ON_QSPI && (NRF_QSPI_HAS_XIP_ENC || NRF_QSPI_HAS_DMA_ENC)*/
 
 	return &config;
-}
+} 
 
 struct qspi_config *qspi_get_config(void)
 {
 	return &config;
 }
+#endif
 
+#ifndef CONFIG_NRF71_ON_IPC
 struct qspi_dev *qspi_dev(void)
 {
-#if CONFIG_NRF70_ON_QSPI
+#if defined(CONFIG_NRF70_ON_QSPI)
 	return &qspi;
 #else
 	return &spim;
 #endif
 }
+#else
+struct rpu_dev *rpu_dev(void)
+{
+	return &ipc;
+}
+#endif /*! CONFIG_NRF71_ON_IPC */
diff --git a/modules/nrf_wifi/bus/ipc_if.c b/modules/nrf_wifi/bus/ipc_if.c
@@ -0,0 +1,112 @@
+
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+ */
+
+#include "ipc_if.h"
+//#include "qspi.h"
+//#include "bal_structs.h"
+//#include "hal_structs.h"
+
+/* Define addresses to use for the free queues */
+#define EVENT_FREEQ_ADDR        0x2FC08000
+#define CMD_FREEQ_ADDR          0x2FC05000
+
+#define NUM_INSTANCES 3
+#define NUM_ENDPOINTS 1
+
+struct device *ipc_instances[NUM_INSTANCES];
+struct ipc_ept ept[NUM_ENDPOINTS];
+struct ipc_ept_cfg ept_cfg[NUM_ENDPOINTS];
+
+static WIFI_IPC_T wifi_event;
+static WIFI_IPC_T wifi_cmd;
+static WIFI_IPC_T wifi_tx;
+
+static int (*callback_func)(void *data);
+
+static void event_recv(void *data, void *priv)
+{
+ //   struct nrf_wifi_bus_qspi_dev_ctx *dev_ctx = NULL;
+ //   struct nrf_wifi_bal_dev_ctx *bal_dev_ctx = NULL;
+ //   struct nrf_wifi_hal_dev_ctx *hal_dev_ctx = NULL;
+    printf(" EVENT RECIEVED\n ");
+    printf(" data adress is 0x%x\n",data);
+//    dev_ctx = (struct nrf_wifi_bus_qspi_dev_ctx *) priv;
+//    bal_dev_ctx = (struct nrf_wifi_bal_dev_ctx *) dev_ctx->bal_dev_ctx;
+//    hal_dev_ctx = (struct nrf_wifi_hal_dev_ctx *) bal_dev_ctx->hal_dev_ctx;
+
+//    hal_dev_ctx->ipc_msg = data;
+    callback_func(priv);
+}
+
+int ipc_init() {
+    wifi_ipc_host_event_init(&wifi_event, EVENT_FREEQ_ADDR);
+    wifi_ipc_host_cmd_init(&wifi_cmd, CMD_FREEQ_ADDR);
+    return 0;
+}
+
+int ipc_deinit(void) {
+    return 0;
+}
+
+int ipc_recv(ipc_ctx_t ctx, const void *data, int len) {
+    return 0;
+}
+
+int ipc_send(ipc_ctx_t ctx, void *data, int len) {
+
+    int ret;
+
+    switch (ctx.inst) {
+        case IPC_INSTANCE_CMD_CTRL:
+
+            /* IPC service on RPU may not have been established. Keep trying. */
+            do {
+                ret = wifi_ipc_host_cmd_send_memcpy(&wifi_cmd, data, len);
+            } while (ret == WIFI_IPC_STATUS_BUSYQ_NOTREADY);
+
+            /* Critical error during IPC service transfer. Should never happen. */
+            if (ret == WIFI_IPC_STATUS_BUSYQ_CRITICAL_ERR) {
+                return -1;
+            }
+
+            break;
+        case IPC_INSTANCE_CMD_TX:
+
+            /* IPC service on RPU may not have been established. Keep trying. */
+
+            do {
+		printf(" adress of data cmd is 0x%x\n",data);
+                ret = wifi_ipc_host_tx_send(&wifi_tx, data);
+            } while (ret == WIFI_IPC_STATUS_BUSYQ_NOTREADY);
+             printf("Data cmd critical error is %d\n",ret);
+            /* Critical error during IPC service transfer. Should never happen. */
+            if (ret == WIFI_IPC_STATUS_BUSYQ_CRITICAL_ERR) {
+                return -1;
+            }
+
+            break;
+        case IPC_INSTANCE_RX:
+            break;
+        default:
+            break;
+    }
+
+    return 0;
+}
+
+int ipc_register_rx_cb(int (*rx_handler)(void *priv), void *data) {
+    callback_func = rx_handler;
+#ifdef NOTYET
+    int ret = wifi_ipc_bind_ipc_service_tx_rx(&wifi_cmd, &wifi_event, DEVICE_DT_GET(DT_NODELABEL(ipc0)), event_recv, data);
+    if (ret != WIFI_IPC_STATUS_OK) {
+        return -1;
+    }
+
+    ret = wifi_ipc_bind_ipc_service(&wifi_tx, DEVICE_DT_GET(DT_NODELABEL(ipc1)), event_recv, data);
+    return (ret == WIFI_IPC_STATUS_OK ? 0 : -1);
+#endif
+}
diff --git a/modules/nrf_wifi/bus/ipc_if.h b/modules/nrf_wifi/bus/ipc_if.h
@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+ */
+
+#ifndef __IPC_IF_H__
+#define __IPC_IF_H__
+
+#include <zephyr/kernel.h>
+#include "wifi_ipc_service.h"
+
+typedef enum {
+	IPC_INSTANCE_CMD_CTRL = 0,
+	IPC_INSTANCE_CMD_TX,
+	IPC_INSTANCE_EVT,
+	IPC_INSTANCE_RX
+} ipc_instances_nrf71_t;
+
+typedef enum {
+	IPC_EPT_UMAC = 0,
+	IPC_EPT_LMAC
+} ipc_epts_nrf71_t;
+
+
+typedef struct ipc_ctx {
+	ipc_instances_nrf71_t inst;
+	ipc_epts_nrf71_t ept;
+} ipc_ctx_t;
+
+struct rpu_dev {
+	int (*init)();
+	int (*deinit)(void);
+	int (*send)(ipc_ctx_t ctx, const void *data, int len);
+	int (*recv)(ipc_ctx_t ctx, void *data, int len);
+	int (*register_rx_cb)(void (*rx_handler)(void *priv), void *data);
+};
+
+struct rpu_dev *rpu_dev(void);
+
+int ipc_init();
+int ipc_deinit(void);
+int ipc_send(ipc_ctx_t ctx, void *data, int len);
+// Blocking Receive
+int ipc_recv(ipc_ctx_t ctx, const void *data, int len);
+// Non-blocking Receive (global, not per instance)
+int ipc_register_rx_cb(int (*rx_handler)(void *priv), void *data);
+
+#endif /* __IPC_IF_H__ */
diff --git a/modules/nrf_wifi/os/CMakeLists.txt b/modules/nrf_wifi/os/CMakeLists.txt
@@ -114,7 +114,7 @@ else()
   )
 endif()
 
-zephyr_library_sources(
+zephyr_library_sources_ifndef(CONFIG_NRF71_ON_IPC
   ${NRF_WIFI_DIR}/os_if/src/osal.c
   ${NRF_WIFI_DIR}/utils/src/list.c
   ${NRF_WIFI_DIR}/utils/src/queue.c
@@ -133,6 +133,25 @@ zephyr_library_sources(
   ${NRF_WIFI_DIR}/fw_if/umac_if/src/fmac_api_common.c
 )
 
+zephyr_library_sources_ifdef(CONFIG_NRF71_ON_IPC
+  ${NRF_WIFI_DIR}/os_if/src/osal.c
+  ${NRF_WIFI_DIR}/utils/src/list.c
+  ${NRF_WIFI_DIR}/utils/src/queue.c
+  ${NRF_WIFI_DIR}/utils/src/util.c
+  ${NRF_WIFI_DIR}/hw_if/hal/src/hal_api.c
+  ${NRF_WIFI_DIR}/hw_if/hal/src/hal_mem.c
+  ${NRF_WIFI_DIR}/hw_if/hal/src/hal_reg.c
+  ${NRF_WIFI_DIR}/hw_if/hal/src/hpqm.c
+  ${NRF_WIFI_DIR}/hw_if/hal/src/pal.c
+  ${NRF_WIFI_DIR}/hw_if/hal/src/spsc_qm.c
+  ${NRF_WIFI_DIR}/hw_if/hal/src/wifi_ipc_service.c
+  ${NRF_WIFI_DIR}/bus_if/bal/src/bal.c
+  ${NRF_WIFI_DIR}/bus_if/bus/qspi/src/qspi.c
+  ${NRF_WIFI_DIR}/fw_if/umac_if/src/cmd.c
+  ${NRF_WIFI_DIR}/fw_if/umac_if/src/event.c
+  ${NRF_WIFI_DIR}/fw_if/umac_if/src/fmac_api_common.c
+)
+
 if(CONFIG_NRF70_RADIO_TEST)
   zephyr_library_sources(
     ${NRF_WIFI_DIR}/fw_if/umac_if/src/radio_test/fmac_api.c
diff --git a/modules/nrf_wifi/os/shim.c b/modules/nrf_wifi/os/shim.c

Original file line number	Diff line number	Diff line change
`@@ -591,13 +591,13 @@ enum nrf_wifi_status nrf_wifi_fmac_dev_add_zep(struct nrf_wifi_drv_priv_zep *drv`
`591`	`591`	`}`
`592`	`592`
`593`	`593`	`rpu_ctx_zep->rpu_ctx = rpu_ctx;`
`594`		`-`
	`594`	`+#ifndef CONFIG_NRF71_ON_IPC`
`595`	`595`	`status = nrf_wifi_fw_load(rpu_ctx);`
`596`	`596`	`if (status != NRF_WIFI_STATUS_SUCCESS) {`
`597`	`597`	`LOG_ERR("%s: nrf_wifi_fw_load failed", __func__);`
`598`	`598`	`goto err;`
`599`	`599`	`}`
`600`		`-`
	`600`	`+#endif /* !CONFIG_NRF71_ON_IPC */`
`601`	`601`	`status = nrf_wifi_fmac_ver_get(rpu_ctx,`
`602`	`602`	`&fw_ver);`
`603`	`603`
Original file line number	Diff line number	Diff line change
`@@ -15,13 +15,17 @@ if (CONFIG_NRF70_BUSLIB)`
`15`	`15`	`inc`
`16`	`16`	`)`
`17`	`17`	`zephyr_library_sources(`
`18`		`- rpu_hw_if.c`
`19`	`18`	`device.c`
`20`	`19`	`)`
`21`	`20`	`zephyr_library_sources_ifdef(CONFIG_NRF70_ON_QSPI`
	`21`	`+ rpu_hw_if.c`
`22`	`22`	`qspi_if.c`
`23`	`23`	`)`
`24`	`24`	`zephyr_library_sources_ifdef(CONFIG_NRF70_ON_SPI`
	`25`	`+ rpu_hw_if.c`
`25`	`26`	`spi_if.c`
`26`	`27`	`)`
	`28`	`+ zephyr_library_sources_ifdef(CONFIG_NRF71_ON_IPC`
	`29`	`+ ipc_if.c`
	`30`	`+ )`
`27`	`31`	`endif()`