drivers: wifi: siwx917: Make offloading optional

This new mode allows a better compatibility with Zephyr features.
Support for offloading is still supported since it can provide better
performances in some cases (power and memory consumption).

Signed-off-by: Jérôme Pouiller <[email protected]>

Author: jerome-pouiller

drivers/wifi/siwx917/CMakeLists.txt

@@ -1,4 +1,9 @@
 # SPDX-License-Identifier: Apache-2.0
 # Copyright (c) 2024 Silicon Laboratories Inc.
 
-zephyr_library_sources_ifdef(CONFIG_WIFI_SIWX917 siwx917_wifi.c siwx917_wifi_socket.c)
+if(CONFIG_WIFI_SIWX917)
+
+zephyr_library_sources(siwx917_wifi.c)
+zephyr_library_sources_ifdef(CONFIG_WIFI_SIWX917_NET_STACK_OFFLOAD siwx917_wifi_socket.c)
+
+endif()

drivers/wifi/siwx917/Kconfig.siwx917

@@ -7,13 +7,31 @@ config WIFI_SIWX917
 	depends on DT_HAS_SILABS_SIWX917_WIFI_ENABLED
 	select WISECONNECT_NETWORK_STACK
 	select EVENTS
-	select WIFI_OFFLOAD
 	select NET_L2_WIFI_MGMT
 	help
 	  Enable WiFi driver for the Silabs SiWx917 SoC series.
 
 if WIFI_SIWX917
 
+choice
+	prompt "Network stack"
+	default WIFI_SIWX917_NET_STACK_NATIVE
+	help
+	  Choose "Native" stack if you want a better compatibility with Zephyr
+	  features. "Offloaded" stack may provide better resource (power and
+	  memory) consumption.
+
+config WIFI_SIWX917_NET_STACK_NATIVE
+	bool "Native"
+	select WIFI_USE_NATIVE_NETWORKING
+	select NET_L2_ETHERNET
+
+config WIFI_SIWX917_NET_STACK_OFFLOAD
+	bool "Offloaded"
+	select WIFI_OFFLOAD
+
+endchoice
+
 config NET_TCP_WORKQ_STACK_SIZE
 	default 2048
 

drivers/wifi/siwx917/siwx917_wifi.c

@@ -10,6 +10,7 @@
 #include "siwx917_wifi.h"
 #include "siwx917_wifi_socket.h"
 
+#include "sl_rsi_utility.h"
 #include "sl_net_constants.h"
 #include "sl_wifi_types.h"
 #include "sl_wifi_callback_framework.h"
@@ -18,6 +19,8 @@
 
 LOG_MODULE_REGISTER(siwx917_wifi);
 
+NET_BUF_POOL_FIXED_DEFINE(siwx917_tx_pool, 1, NET_ETH_MTU, 0, NULL);
+
 static unsigned int siwx917_on_join(sl_wifi_event_t event,
 				    char *result, uint32_t result_size, void *arg)
 {
@@ -32,6 +35,9 @@ static unsigned int siwx917_on_join(sl_wifi_event_t event,
 
 	wifi_mgmt_raise_connect_result_event(sidev->iface, WIFI_STATUS_CONN_SUCCESS);
 	sidev->state = WIFI_STATE_COMPLETED;
+#ifndef CONFIG_WIFI_SIWX917_NET_STACK_OFFLOAD
+	net_eth_carrier_on(sidev->iface);
+#endif
 
 	siwx917_on_join_ipv4(sidev);
 	siwx917_on_join_ipv6(sidev);
@@ -124,6 +130,9 @@ static int siwx917_disconnect(const struct device *dev)
 	if (ret) {
 		return -EIO;
 	}
+#ifndef CONFIG_WIFI_SIWX917_NET_STACK_OFFLOAD
+	net_eth_carrier_off(sidev->iface);
+#endif
 	sidev->state = WIFI_STATE_INACTIVE;
 	return 0;
 }
@@ -220,6 +229,83 @@ static int siwx917_status(const struct device *dev, struct wifi_iface_status *st
 	return 0;
 }
 
+#ifndef CONFIG_WIFI_SIWX917_NET_STACK_OFFLOAD
+
+static int siwx917_send(const struct device *dev, struct net_pkt *pkt)
+{
+	size_t pkt_len = net_pkt_get_len(pkt);
+	struct net_buf *buf = NULL;
+	int ret;
+
+	if (net_pkt_get_len(pkt) > NET_ETH_MTU) {
+		LOG_ERR("unexpected buffer size");
+		return -ENOBUFS;
+	}
+	buf = net_buf_alloc(&siwx917_tx_pool, K_FOREVER);
+	if (!buf) {
+		return -ENOBUFS;
+	}
+	if (net_pkt_read(pkt, buf->data, pkt_len)) {
+		net_buf_unref(buf);
+		return -ENOBUFS;
+	}
+	net_buf_add(buf, pkt_len);
+
+	ret = sl_wifi_send_raw_data_frame(SL_WIFI_CLIENT_INTERFACE, buf->data, pkt_len);
+	if (ret) {
+		return -EIO;
+	}
+
+	net_pkt_unref(pkt);
+	net_buf_unref(buf);
+
+	return 0;
+}
+
+/* Receive callback. Keep the name as it is declared weak in WiseConnect */
+sl_status_t sl_si91x_host_process_data_frame(sl_wifi_interface_t interface,
+					     sl_wifi_buffer_t *buffer)
+{
+	sl_si91x_packet_t *si_pkt = sl_si91x_host_get_buffer_data(buffer, 0, NULL);
+	struct net_if *iface = net_if_get_default();
+	struct net_pkt *pkt;
+	int ret;
+
+	pkt = net_pkt_rx_alloc_with_buffer(iface, buffer->length, AF_UNSPEC, 0, K_NO_WAIT);
+	if (!pkt) {
+		LOG_ERR("net_pkt_rx_alloc_with_buffer() failed");
+		return SL_STATUS_FAIL;
+	}
+	ret = net_pkt_write(pkt, si_pkt->data, si_pkt->length);
+	if (ret < 0) {
+		LOG_ERR("net_pkt_write(): %d", ret);
+		goto unref;
+	}
+	ret = net_recv_data(iface, pkt);
+	if (ret < 0) {
+		LOG_ERR("net_recv_data((): %d", ret);
+		goto unref;
+	}
+	return 0;
+
+unref:
+	net_pkt_unref(pkt);
+	return SL_STATUS_FAIL;
+}
+
+#endif
+
+static void siwx917_ethernet_init(struct net_if *iface)
+{
+#ifndef CONFIG_WIFI_SIWX917_NET_STACK_OFFLOAD
+	struct ethernet_context *eth_ctx;
+
+	eth_ctx = net_if_l2_data(iface);
+	eth_ctx->eth_if_type = L2_ETH_IF_TYPE_WIFI;
+	ethernet_init(iface);
+#endif
+}
+
 static void siwx917_iface_init(struct net_if *iface)
 {
 	struct siwx917_dev *sidev = iface->if_dev->dev->data;
@@ -228,7 +314,6 @@ static void siwx917_iface_init(struct net_if *iface)
 	sidev->state = WIFI_STATE_INTERFACE_DISABLED;
 	sidev->iface = iface;
 
-	siwx917_sock_init(iface);
 	sl_wifi_set_scan_callback(siwx917_on_scan, sidev);
 	sl_wifi_set_join_callback(siwx917_on_join, sidev);
 
@@ -239,6 +324,8 @@ static void siwx917_iface_init(struct net_if *iface)
 	}
 	net_if_set_link_addr(iface, sidev->macaddr.octet, sizeof(sidev->macaddr.octet),
 			     NET_LINK_ETHERNET);
+	siwx917_sock_init(iface);
+	siwx917_ethernet_init(iface);
 
 	sidev->state = WIFI_STATE_INACTIVE;
 }
@@ -257,10 +344,19 @@ static const struct wifi_mgmt_ops siwx917_mgmt = {
 
 static const struct net_wifi_mgmt_offload siwx917_api = {
 	.wifi_iface.iface_api.init = siwx917_iface_init,
+#ifdef CONFIG_WIFI_SIWX917_NET_STACK_OFFLOAD
 	.wifi_iface.get_type = siwx917_get_type,
+#else
+	.wifi_iface.send = siwx917_send,
+#endif
 	.wifi_mgmt_api = &siwx917_mgmt,
 };
 
 static struct siwx917_dev siwx917_dev;
+#ifdef CONFIG_WIFI_SIWX917_NET_STACK_OFFLOAD
 NET_DEVICE_DT_INST_OFFLOAD_DEFINE(0, siwx917_dev_init, NULL, &siwx917_dev, NULL,
 				  CONFIG_WIFI_INIT_PRIORITY, &siwx917_api, NET_ETH_MTU);
+#else
+ETH_NET_DEVICE_DT_INST_DEFINE(0, siwx917_dev_init, NULL, &siwx917_dev, NULL,
+			      CONFIG_WIFI_INIT_PRIORITY, &siwx917_api, NET_ETH_MTU);
+#endif

drivers/wifi/siwx917/siwx917_wifi.h

@@ -20,13 +20,15 @@ struct siwx917_dev {
 	enum wifi_iface_state state;
 	scan_result_cb_t scan_res_cb;
 
+#ifdef CONFIG_WIFI_SIWX917_NET_STACK_OFFLOAD
 	struct k_event fds_recv_event;
 	sl_si91x_fd_set fds_watch;
 	struct {
 		net_context_recv_cb_t cb;
 		void *user_data;
 		struct net_context *context;
 	} fds_cb[NUMBER_OF_BSD_SOCKETS];
+#endif
 };
 
 #endif

drivers/wifi/siwx917/siwx917_wifi_socket.h

@@ -8,12 +8,36 @@
 
 #include <zephyr/net/net_if.h>
 #include <zephyr/net/offloaded_netdev.h>
+#include <assert.h>
 
 struct siwx917_dev;
 
+#ifdef CONFIG_WIFI_SIWX917_NET_STACK_OFFLOAD
+
 enum offloaded_net_if_types siwx917_get_type(void);
 void siwx917_on_join_ipv4(struct siwx917_dev *sidev);
 void siwx917_on_join_ipv6(struct siwx917_dev *sidev);
+void siwx917_sock_init(struct net_if *iface);
+
+#else /* CONFIG_WIFI_SIWX917_NET_STACK_OFFLOAD */
+
+enum offloaded_net_if_types siwx917_get_type(void)
+{
+	assert(0);
+}
+
+void siwx917_on_join_ipv4(struct siwx917_dev *sidev)
+{
+}
+
+void siwx917_on_join_ipv6(struct siwx917_dev *sidev)
+{
+}
+
 void siwx917_sock_init(struct net_if *iface)
+{
+}
+
+#endif /* CONFIG_WIFI_SIWX917_NET_STACK_OFFLOAD */
 
 #endif

soc/silabs/silabs_siwx917/siwg917/nwp_init.c

@@ -54,6 +54,9 @@ static int silabs_siwx917_nwp_init(void)
 	cfg->tcp_ip_feature_bit_map |=
 #ifdef CONFIG_NET_IPV6
 		SL_SI91X_TCP_IP_FEAT_DHCPV6_CLIENT | SL_SI91X_TCP_IP_FEAT_IPV6 |
+#endif
+#ifndef CONFIG_WIFI_SIWX917_NET_STACK_OFFLOAD
+		SL_SI91X_TCP_IP_FEAT_BYPASS |
 #endif
 		SL_SI91X_TCP_IP_FEAT_DHCPV4_CLIENT | SL_SI91X_TCP_IP_FEAT_DNS_CLIENT |
 		SL_SI91X_TCP_IP_FEAT_SSL | SL_SI91X_TCP_IP_FEAT_MDNSD | SL_SI91X_TCP_IP_FEAT_ICMP;