nrf71: Add support for RX buffer refilling to UMAC

Instead of filling buffers directly to LMAC, send them to the UMAC first
which will take care of relaying them to LMAC, this is done via IPC
instead of relying on internal memory acccess.

Signed-off-by: Chaitanya Tata <[email protected]>

Author: krish2718

CMakeLists.txt

@@ -107,6 +107,14 @@ target_compile_definitions(
   WIFI_NRF70_LOG_LEVEL=${CONFIG_WIFI_NRF70_LOG_LEVEL}
 )
 
+if (CONFIG_NRF71_ON_IPC)
+  target_compile_definitions(
+    nrf-wifi-osal
+    PUBLIC
+    NRF_WIFI_RX_BUFF_PROG_UMAC
+  )
+endif()
+
 target_include_directories(
   nrf-wifi-osal
   PUBLIC

fw_if/umac_if/inc/system/fmac_api.h

@@ -1174,6 +1174,22 @@ enum nrf_wifi_status nrf_wifi_sys_fmac_conf_ltf_gi(struct nrf_wifi_fmac_dev_ctx
 enum nrf_wifi_status nrf_wifi_sys_fmac_stats_get(struct nrf_wifi_fmac_dev_ctx *fmac_dev_ctx,
 						 enum rpu_op_mode op_mode,
 						 struct rpu_sys_op_stats *stats);
+#ifdef NRF_WIFI_RX_BUFF_PROG_UMAC
+/**
+ * @brief Send  Rx buffer details to firmware.
+ * @param fmac_dev_ctx Pointer to the UMAC IF context for a RPU WLAN device.
+ * @param nrf_wifi_rx_buf RX buffer info.
+ * @param num_buffs Number of buffers.
+ *
+ * This function is used to send host Rx buffers to UMAC module
+ *
+ *@retval	NRF_WIFI_STATUS_SUCCESS On success
+ *@retval	NRF_WIFI_STATUS_FAIL On failure to execute command
+ */
+enum nrf_wifi_status nrf_wifi_fmac_prog_rx_buf_info(void *fmac_dev_ctx,
+					       struct nrf_wifi_rx_buf *rx_buf,
+					       unsigned int num_buffs);
+#endif /*NRF_WIFI_RX_BUFF_PROG_UMAC*/
 
 /**
  * @}

fw_if/umac_if/inc/system/fmac_rx.h

@@ -38,4 +38,9 @@ enum nrf_wifi_status nrf_wifi_fmac_rx_event_process(struct nrf_wifi_fmac_dev_ctx
 
 void nrf_wifi_fmac_rx_tasklet(void *data);
 
+#ifdef NRF_WIFI_RX_BUFF_PROG_UMAC
+unsigned long nrf_wifi_fmac_get_rx_buf_map_addr(struct nrf_wifi_fmac_dev_ctx *fmac_dev_ctx,
+	unsigned int desc_id);
+#endif /* NRF_WIFI_RX_BUFF_PROG_UMAC */
+
 #endif /* __FMAC_RX_H__ */

fw_if/umac_if/src/system/fmac_api.c

@@ -206,6 +206,11 @@ static enum nrf_wifi_status nrf_wifi_sys_fmac_fw_init(struct nrf_wifi_fmac_dev_c
 	unsigned long start_time_us = 0;
 	enum nrf_wifi_status status = NRF_WIFI_STATUS_FAIL;
 	struct nrf_wifi_sys_fmac_priv *sys_fpriv = NULL;
+#ifdef NRF_WIFI_RX_BUFF_PROG_UMAC
+	struct nrf_wifi_rx_buf *rx_buf_ipc = NULL, *rx_buf_info_iter = NULL;
+	unsigned int desc_id = 0;
+	unsigned int buf_addr = 0;
+#endif /*NRF_WIFI_RX_BUFF_PROG_UMAC */
 
 	sys_fpriv = wifi_fmac_priv(fmac_dev_ctx->fpriv);
 
@@ -273,6 +278,46 @@ static enum nrf_wifi_status nrf_wifi_sys_fmac_fw_init(struct nrf_wifi_fmac_dev_c
 		goto out;
 	}
 
+#ifdef NRF_WIFI_RX_BUFF_PROG_UMAC
+	rx_buf_ipc = nrf_wifi_osal_mem_zalloc(sys_fpriv->num_rx_bufs * sizeof(struct nrf_wifi_rx_buf));
+
+	rx_buf_info_iter = rx_buf_ipc;
+
+	for (desc_id = 0; desc_id < sys_fpriv->num_rx_bufs; desc_id++) {
+		buf_addr = (unsigned int) nrf_wifi_fmac_get_rx_buf_map_addr(fmac_dev_ctx, desc_id);
+		if (buf_addr) {
+			rx_buf_info_iter->skb_pointer = buf_addr;
+			nrf_wifi_osal_log_dbg("%s: RX buffer mapped for desc_id = %d, buf_addr = %p",
+					      __func__,
+					      desc_id,
+					      (void *)buf_addr);
+			rx_buf_info_iter->skb_desc_no = desc_id;
+			rx_buf_info_iter++;
+		} else {
+			nrf_wifi_osal_log_err("%s: UMAC rx buff not mapped \
+					       for desc_id = %d\n", desc_id,
+					      __func__);
+			status = NRF_WIFI_STATUS_FAIL;
+			goto out;
+		}
+	}
+	status = nrf_wifi_fmac_prog_rx_buf_info(fmac_dev_ctx,
+						rx_buf_ipc,
+						sys_fpriv->num_rx_bufs);
+	if (status != NRF_WIFI_STATUS_SUCCESS) {
+		nrf_wifi_osal_log_err("%s: UMAC rx buff \
+				      programming failed \n",
+				      __func__);
+		status = NRF_WIFI_STATUS_FAIL;
+		goto out;
+	 } else {
+		nrf_wifi_osal_log_dbg("%s During initialization UMAC rx buff \
+				       programmed for num_buffs= %d\n",
+				       __func__,
+				       sys_fpriv->num_rx_bufs);
+		nrf_wifi_osal_mem_free(rx_buf_ipc);
+	}
+#endif /*NRF_WIFI_RX_BUFF_PROG_UMAC */
 	status = NRF_WIFI_STATUS_SUCCESS;
 
 out:
@@ -3907,3 +3952,81 @@ enum nrf_wifi_status nrf_wifi_sys_fmac_get_host_rpu_ps_ctrl_state(void *dev_ctx,
 }
 #endif /* NRF_WIFI_LOW_POWER */
 #endif /* NRF70_UTIL */
+
+
+#ifdef NRF_WIFI_RX_BUFF_PROG_UMAC
+#define MAX_BUFS_PER_CMD 32
+enum nrf_wifi_status nrf_wifi_fmac_prog_rx_buf_info(void *dev_ctx,
+						struct nrf_wifi_rx_buf *rx_buf,
+						unsigned int rx_buf_nums)
+{
+	enum nrf_wifi_status status = NRF_WIFI_STATUS_FAIL;
+	struct nrf_wifi_cmd_rx_buf_info *rx_buf_cmd = NULL;
+	struct nrf_wifi_fmac_dev_ctx *fmac_dev_ctx = NULL;
+	struct nrf_wifi_fmac_dev_ctx_def *def_dev_ctx = NULL;
+	struct nrf_wifi_rx_buf *rx_buf_iter = NULL;
+	int i = 0, remained_buf_cnt = 0, counter = 0,  rx_buff_prog_cnt = 0;
+
+	fmac_dev_ctx = dev_ctx;
+	def_dev_ctx = wifi_dev_priv(fmac_dev_ctx);
+
+	if (rx_buf_nums > MAX_BUFS_PER_CMD) {
+		rx_buff_prog_cnt = MAX_BUFS_PER_CMD;
+		remained_buf_cnt = rx_buf_nums % MAX_BUFS_PER_CMD;
+		counter = rx_buf_nums / MAX_BUFS_PER_CMD;
+	} else {
+		rx_buff_prog_cnt = rx_buf_nums;
+		counter = 1;
+	}
+
+	rx_buf_iter = rx_buf;
+
+	for (i = 0; i < counter; i++) {
+		rx_buf_cmd = nrf_wifi_osal_mem_zalloc(sizeof(*rx_buf_cmd) +
+					rx_buff_prog_cnt * sizeof(struct nrf_wifi_rx_buf));
+		if (!rx_buf_cmd) {
+			nrf_wifi_osal_log_err("%s: Unable to allocate memory\n", __func__);
+			goto out;
+		}
+
+		rx_buf_cmd->umac_hdr.cmd_evnt = NRF_WIFI_UMAC_CMD_CONFIG_RX_BUF;
+		nrf_wifi_osal_mem_cpy(&rx_buf_cmd->info,
+				      rx_buf,
+				      rx_buff_prog_cnt * sizeof(struct nrf_wifi_rx_buf));
+
+		rx_buf_cmd->rx_buf_num = rx_buff_prog_cnt;
+
+		status = umac_cmd_cfg(fmac_dev_ctx,
+				      rx_buf_cmd,
+				      sizeof(*rx_buf_cmd) +
+				      rx_buff_prog_cnt * sizeof(struct nrf_wifi_rx_buf));
+		if (rx_buf_cmd) {
+			nrf_wifi_osal_mem_free(rx_buf_cmd);
+		}
+	}
+	if (remained_buf_cnt > 0) {
+		rx_buf_cmd = nrf_wifi_osal_mem_zalloc(sizeof(*rx_buf_cmd) +
+						      remained_buf_cnt * sizeof(struct nrf_wifi_rx_buf));
+		if (!rx_buf_cmd) {
+			nrf_wifi_osal_log_err("%s: Unable to allocate memory\n", __func__);
+			goto out;
+		}
+
+		rx_buf_cmd->umac_hdr.cmd_evnt = NRF_WIFI_UMAC_CMD_CONFIG_RX_BUF;
+		nrf_wifi_osal_mem_cpy(&rx_buf_cmd->info,
+				      rx_buf + (MAX_BUFS_PER_CMD),
+				      remained_buf_cnt * sizeof(struct nrf_wifi_rx_buf));
+
+		rx_buf_cmd->rx_buf_num = remained_buf_cnt;
+
+		status = umac_cmd_cfg(fmac_dev_ctx,
+				      rx_buf_cmd,
+				      sizeof(*rx_buf_cmd) + remained_buf_cnt * sizeof(struct nrf_wifi_rx_buf));
+		if (rx_buf_cmd) {
+			nrf_wifi_osal_mem_free(rx_buf_cmd);
+		}
+	}
+out:
+	return status;
+}
+#endif /*NRF_WIFI_RX_BUFF_PROG_UMAC */

fw_if/umac_if/src/system/fmac_event.c

@@ -315,7 +315,7 @@ nrf_wifi_fmac_data_event_process(struct nrf_wifi_fmac_dev_ctx *fmac_dev_ctx,
 #endif /* NRF_WIFI_CMD_EVENT_LOG */
 
 	switch (event) {
-	case NRF_WIFI_CMD_RX_BUFF:
+	case NRF_WIFI_NRF_WIFI_RX_BUFF_PROG_UMAC:
 #ifdef NRF70_RX_DONE_WQ_ENABLED
 		struct nrf_wifi_rx_buff *config = nrf_wifi_osal_mem_zalloc(
 			sizeof(struct nrf_wifi_rx_buff));