Raw tx fixes/debugs

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

Author: krish2718

drivers/wifi/nrf_wifi/Kconfig.nrfwifi

@@ -221,7 +221,7 @@ config NRF70_WORKQ_MAX_ITEMS
 
 config NRF70_MAX_TX_PENDING_QLEN
 	int "Maximum number of pending TX packets"
-	default 18
+	default 48
 
 config NRF70_UTIL
 	depends on SHELL

drivers/wifi/nrf_wifi/src/net_if.c

@@ -29,6 +29,7 @@ LOG_MODULE_DECLARE(wifi_nrf, CONFIG_WIFI_NRF70_LOG_LEVEL);
 #include "fmac_main.h"
 #include "wpa_supp_if.h"
 #include "net_if.h"
+ unsigned int tx_sent_dbg_1, tx_sent_dbg_2, tx_sent_dbg_3;
 
 extern char *net_sprint_ll_addr_buf(const uint8_t *ll, uint8_t ll_len,
 				    char *buf, int buflen);
@@ -253,6 +254,10 @@ void nrf_wifi_if_sniffer_rx_frm(void *os_vif_ctx, void *frm,
 
 	net_capture_pkt(iface, pkt);
 
+	LOG_INF("Received packet: len: %d, freq: %d, signal: %d, rate_flags: 0x%x, rate: %d",
+		net_pkt_get_len(pkt), raw_rx_hdr->frequency,
+		raw_rx_hdr->signal, raw_rx_hdr->rate_flags,
+		raw_rx_hdr->rate);
 	ret = net_recv_data(iface, pkt);
 	if (ret < 0) {
 		LOG_DBG("RCV Packet dropped by NET stack: %d", ret);
@@ -363,6 +368,8 @@ int nrf_wifi_if_send(const struct device *dev,
 	struct raw_tx_pkt_header raw_hdr;
 #endif /* CONFIG_NRF70_RAW_DATA_TX */
 
+	tx_sent_dbg_3++;
+
 	if (!dev || !pkt) {
 		LOG_ERR("%s: vif_ctx_zep is NULL", __func__);
 		goto out;
@@ -392,14 +399,19 @@ int nrf_wifi_if_send(const struct device *dev,
 	if (!nbuf) {
 		LOG_DBG("Failed to allocate net_pkt");
 		host_stats->total_tx_drop_pkts++;
+		tx_sent_dbg_1++;
 		goto out;
 	}
 
 #ifdef CONFIG_NRF70_RAW_DATA_TX
 	memcpy(&raw_hdr, net_pkt_data(pkt), sizeof(raw_hdr));
-	if ((ntohl(raw_hdr.magic_num) == NRF_WIFI_MAGIC_NUM_RAWTX) ||
-		ntohl(raw_hdr.magic_num) == ntohl(NRF_WIFI_MAGIC_NUM_RAWTX)) {
+	LOG_DBG("%s: raw_hdr.magic_num=0x%x, pkt_len=%d",
+		__func__, ntohl(raw_hdr.magic_num), net_pkt_get_len(pkt));
+	if (ntohl(raw_hdr.magic_num) == NRF_WIFI_MAGIC_NUM_RAWTX || 
+	    ntohl(raw_hdr.magic_num) == ntohl(NRF_WIFI_MAGIC_NUM_RAWTX)) {
 		if (vif_ctx_zep->if_carr_state != NRF_WIFI_FMAC_IF_CARR_STATE_ON) {
+			LOG_ERR("%s: Carrier state is not ON, dropping raw packet",
+				__func__);;
 			goto drop;
 		}
 		LOG_DBG("%s: Sending raw packet: len=%d, vif_idx=%d",
@@ -754,7 +766,6 @@ int nrf_wifi_if_start_zep(const struct device *dev)
 		fmac_dev_added = true;
 		LOG_DBG("%s: FMAC device added", __func__);
 	}
-
 	fmac_dev_ctx = rpu_ctx_zep->rpu_ctx;
 
 	memset(&add_vif_info,

modules/nrf_wifi/bus/ipc_if.c

@@ -43,6 +43,7 @@ static void event_recv(void *data, void *priv)
 	hal_dev_ctx = (struct nrf_wifi_hal_dev_ctx *) bal_dev_ctx->hal_dev_ctx;
 
 	hal_dev_ctx->ipc_msg = data;
+	LOG_DBG("Received event data: %p", data);
 	callback_func(priv);
 }
 

modules/nrf_wifi/os/shim.c

@@ -119,18 +119,22 @@ static void zep_shim_qspi_cpy_to(void *priv, unsigned long addr, const void *src
 	dev->write(addr, src, count_aligned);
 }
 #endif /* !CONFIG_NRF71_ON_IPC */
+struct zep_shim_spinlock {
+	struct k_spinlock lock;
+	k_spinlock_key_t key;
+};
 
 static void *zep_shim_spinlock_alloc(void)
 {
-	struct k_mutex *lock = NULL;
+	struct zep_shim_spinlock *slock = NULL;
 
-	lock = k_malloc(sizeof(*lock));
+	slock = k_calloc(sizeof(*slock), sizeof(char));
 
-	if (!lock) {
+	if (!slock) {
 		LOG_ERR("%s: Unable to allocate memory for spinlock", __func__);
 	}
 
-	return lock;
+	return slock;
 }
 
 static void zep_shim_spinlock_free(void *lock)
@@ -140,29 +144,34 @@ static void zep_shim_spinlock_free(void *lock)
 
 static void zep_shim_spinlock_init(void *lock)
 {
-	k_mutex_init(lock);
+	/* No explicit initialization needed for k_spinlock_t */
+	ARG_UNUSED(lock);
 }
 
 static void zep_shim_spinlock_take(void *lock)
 {
-	k_mutex_lock(lock, K_FOREVER);
+	struct zep_shim_spinlock *slock = (struct zep_shim_spinlock *)lock;
+	slock->key = k_spin_lock(&slock->lock);
 }
 
 static void zep_shim_spinlock_rel(void *lock)
 {
-	k_mutex_unlock(lock);
+	struct zep_shim_spinlock *slock = (struct zep_shim_spinlock *)lock;
+	k_spin_unlock(&slock->lock, slock->key);
 }
 
 static void zep_shim_spinlock_irq_take(void *lock, unsigned long *flags)
 {
+	struct zep_shim_spinlock *slock = (struct zep_shim_spinlock *)lock;
 	ARG_UNUSED(flags);
-	k_mutex_lock(lock, K_FOREVER);
+	slock->key = k_spin_lock(&slock->lock);
 }
 
 static void zep_shim_spinlock_irq_rel(void *lock, unsigned long *flags)
 {
+	struct zep_shim_spinlock *slock = (struct zep_shim_spinlock *)lock;
 	ARG_UNUSED(flags);
-	k_mutex_unlock(lock);
+	k_spin_unlock(&slock->lock, slock->key);
 }
 
 static int zep_shim_pr_dbg(const char *fmt, va_list args)
@@ -618,7 +627,7 @@ static void zep_shim_work_kill(void *item)
 
 static unsigned long zep_shim_time_get_curr_us(void)
 {
-	return k_uptime_get() * USEC_PER_MSEC;
+	return k_ticks_to_us_floor64(k_uptime_ticks());
 }
 
 static unsigned int zep_shim_time_elapsed_us(unsigned long start_time_us)

samples/net/zperf/overlay-loopback.conf

@@ -6,7 +6,7 @@ CONFIG_NET_LOOPBACK_SIMULATE_PACKET_DROP=y
 
 CONFIG_NET_BUF_DATA_SIZE=1100
 # Optimized networking settings for performance
-CONFIG_NET_PKT_RX_COUNT=32
+CONFIG_NET_PKT_RX_COUNT=24
 CONFIG_NET_PKT_TX_COUNT=48
-CONFIG_NET_BUF_RX_COUNT=32
+CONFIG_NET_BUF_RX_COUNT=24
 CONFIG_NET_BUF_TX_COUNT=96

samples/subsys/ipc/ipc_service/icmsg/src/main.c

@@ -42,36 +42,16 @@ static void ep_bound(void *priv)
 
 static void ep_recv(const void *data, size_t len, void *priv)
 {
-#if defined(CONFIG_ASSERT)
-	struct data_packet *packet = (struct data_packet *)data;
 
-	__ASSERT(packet->data[0] == expected_message, "Unexpected message. Expected %c, got %c",
-		expected_message, packet->data[0]);
-	__ASSERT(len == expected_len, "Unexpected length. Expected %zu, got %zu",
-		expected_len, len);
-#endif
-
-#ifndef CONFIG_MULTITHREADING
-	recv_sem = 0;
-#endif
 
 	received += len;
-	expected_message++;
-	expected_len++;
 
-	if (expected_message > 'Z') {
-		expected_message = 'A';
-	}
-
-	if (expected_len > sizeof(struct data_packet)) {
-		expected_len = PACKET_SIZE_START;
-	}
 }
 
 static int send_for_time(struct ipc_ept *ep, const int64_t sending_time_ms)
 {
 	struct data_packet msg = {.data[0] = 'a'};
-	size_t mlen = PACKET_SIZE_START;
+	size_t mlen = sizeof(msg);
 	size_t bytes_sent = 0;
 	int ret = 0;
 
@@ -101,11 +81,13 @@ static int send_for_time(struct ipc_ept *ep, const int64_t sending_time_ms)
 		}
 
 		bytes_sent += mlen;
+#if 0
 		mlen++;
 
 		if (mlen > sizeof(struct data_packet)) {
 			mlen = PACKET_SIZE_START;
 		}
+#endif
 
 #if defined(CONFIG_MULTITHREADING)
 		k_usleep(1);
@@ -160,20 +142,17 @@ int main(void)
 	while (bound_sem != 0) {
 	};
 #endif
-
+#if 0
 	ret = send_for_time(&ep, SENDING_TIME_MS);
 	if (ret < 0) {
 		LOG_ERR("send_for_time() failure");
 		return ret;
 	}
-
-	LOG_INF("Wait 500ms. Let remote core finish its sends");
-#if defined(CONFIG_MULTITHREADING)
-	k_msleep(500);
 #else
-	k_busy_wait(500000);
+	LOG_INF("Wait till remote Tx is done");
+	k_msleep(SENDING_TIME_MS);
 #endif
-
+	
 	LOG_INF("Received %zu [Bytes] in total", received);
 
 #if defined(CONFIG_SOC_NRF5340_CPUAPP)