[SL-TEMP] Revert "[SL-UP] Enabling the sockets for 917SoC (#462)" (#568)

Author: chirag-silabs

src/include/platform/CHIPDeviceEvent.h

@@ -257,11 +257,6 @@ enum PublicEventTypes
     kSecureSessionEstablished,
 
     /**
-     * Signals that socket select operation to be started.
-     */
-    kSocketSelectStart,
-
-	/**
      * Signals that factory reset has started.
      */
     kFactoryReset,
@@ -458,16 +453,6 @@ struct ChipDeviceEvent final
                 ConnectivityChange Result;
             } ViaThread;
         } ServiceConnectivityChange;
-#if CHIP_SYSTEM_CONFIG_USE_FREERTOS_SOCKETS
-        // TODO: check why linux is failing due to fd_set
-        struct
-        {
-            int FD;
-            fd_set ReadSet;
-            fd_set WriteSet;
-            fd_set ErrorSet;
-        } SocketSelectStart;
-#endif // CHIP_SYSTEM_CONFIG_USE_FREERTOS_SOCKETS
         struct
         {
             ConnectivityChange Result;

src/include/platform/internal/GenericPlatformManagerImpl_FreeRTOS.ipp

@@ -206,7 +206,7 @@ void GenericPlatformManagerImpl_FreeRTOS<ImplClass>::_RunEventLoop(void)
 
                 // Call into the system layer to dispatch the callback functions for all timers
                 // that have expired.
-                err = static_cast<System::LayerImpl &>(DeviceLayer::SystemLayer()).HandlePlatformTimer();
+                err = static_cast<System::LayerImplFreeRTOS &>(DeviceLayer::SystemLayer()).HandlePlatformTimer();
                 if (err != CHIP_NO_ERROR)
                 {
                     ChipLogError(DeviceLayer, "Error handling CHIP timers: %" CHIP_ERROR_FORMAT, err.Format());

src/inet/IPAddress.h

@@ -61,11 +61,11 @@
 #endif
 #endif // CHIP_SYSTEM_CONFIG_USE_OPENTHREAD_ENDPOINT
 
-#if CHIP_SYSTEM_CONFIG_USE_POSIX_SOCKETS || CHIP_SYSTEM_CONFIG_USE_FREERTOS_SOCKETS
+#if CHIP_SYSTEM_CONFIG_USE_POSIX_SOCKETS
 #include <net/if.h>
 #include <netinet/in.h>
 #include <sys/socket.h>
-#endif // CHIP_SYSTEM_CONFIG_USE_POSIX_SOCKETS || CHIP_SYSTEM_CONFIG_USE_FREERTOS_SOCKETS
+#endif // CHIP_SYSTEM_CONFIG_USE_POSIX_SOCKETS
 
 #if CHIP_SYSTEM_CONFIG_USE_ZEPHYR_SOCKETS
 #include "ZephyrSocket.h" // nogncheck

src/inet/UDPEndPointImplSockets.cpp

@@ -30,14 +30,14 @@
 #include <lib/support/SafeInt.h>
 #include <lib/support/logging/CHIPLogging.h>
 
-#if CHIP_SYSTEM_CONFIG_USE_POSIX_SOCKETS || CHIP_SYSTEM_CONFIG_USE_FREERTOS_SOCKETS
+#if CHIP_SYSTEM_CONFIG_USE_POSIX_SOCKETS
 #if HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
 #endif // HAVE_SYS_SOCKET_H
 #include <net/if.h>
 #include <netinet/in.h>
 #include <sys/ioctl.h>
-#endif // CHIP_SYSTEM_CONFIG_USE_POSIX_SOCKETS || CHIP_SYSTEM_CONFIG_USE_FREERTOS_SOCKETS
+#endif // CHIP_SYSTEM_CONFIG_USE_POSIX_SOCKETS
 
 #if CHIP_SYSTEM_CONFIG_USE_ZEPHYR_SOCKETS || CHIP_SYSTEM_CONFIG_USE_ZEPHYR_SOCKET_EXTENSIONS
 #include "ZephyrSocket.h" // nogncheck

src/lib/core/CHIPConfig.h

@@ -129,8 +129,8 @@
 #error "Please assert exactly one of CHIP_CONFIG_MEMORY_MGMT_PLATFORM or CHIP_CONFIG_MEMORY_MGMT_MALLOC."
 #endif // ((CHIP_CONFIG_MEMORY_MGMT_PLATFORM + CHIP_CONFIG_MEMORY_MGMT_MALLOC) != 1)
 
-#if !(CHIP_CONFIG_MEMORY_MGMT_MALLOC || CHIP_CONFIG_MEMORY_MGMT_PLATFORM) && CHIP_SYSTEM_CONFIG_USE_BSD_IFADDRS
-#error "!(CHIP_CONFIG_MEMORY_MGMT_MALLOC || CHIP_CONFIG_MEMORY_MGMT_PLATFORM) but getifaddrs() uses malloc()"
+#if !CHIP_CONFIG_MEMORY_MGMT_MALLOC && CHIP_SYSTEM_CONFIG_USE_BSD_IFADDRS
+#error "!CHIP_CONFIG_MEMORY_MGMT_MALLOC but getifaddrs() uses malloc()"
 #endif
 
 /**

src/platform/silabs/ConnectivityManagerImpl_WIFI.cpp

@@ -24,19 +24,11 @@
 #include <platform/internal/BLEManager.h>
 #include <platform/silabs/NetworkCommissioningWiFiDriver.h>
 
-#if CHIP_SYSTEM_CONFIG_USE_LWIP
 #include <lwip/dns.h>
 #include <lwip/ip_addr.h>
 #include <lwip/nd6.h>
 #include <lwip/netif.h>
-#endif // CHIP_SYSTEM_CONFIG_USE_LWIP
 
-#if CHIP_SYSTEM_CONFIG_USE_FREERTOS_SOCKETS
-#include <system/SystemLayerImpl.h>
-extern "C" {
-#include "sl_si91x_socket.h"
-}
-#endif // CHIP_SYSTEM_CONFIG_USE_FREERTOS_SOCKETS
 #include <platform/internal/GenericConnectivityManagerImpl_UDP.ipp>
 
 #if INET_CONFIG_ENABLE_TCP_ENDPOINT
@@ -61,23 +53,6 @@ namespace DeviceLayer {
 
 ConnectivityManagerImpl ConnectivityManagerImpl::sInstance;
 
-#if CHIP_SYSTEM_CONFIG_USE_FREERTOS_SOCKETS
-namespace {
-static void sl_wifi_async_select_cb(fd_set * readfds, fd_set * writefds, fd_set * errorfds, long int timeout)
-{
-    // Schedule work to handle the events
-    // This is a workaround for the fact that sl_si91x_select() is not thread-safe
-    // and cannot be called from the event loop context.
-    DeviceLayer::SystemLayer().ScheduleWork(
-        [](chip::System::Layer * aLayer, void * aAppState) {
-            auto & systemSocketLayer = static_cast<chip::System::LayerImplFreeRTOSSockets &>(*aLayer);
-            systemSocketLayer.HandleEvents();
-        },
-        nullptr);
-}
-} // namespace
-#endif // CHIP_SYSTEM_CONFIG_USE_FREERTOS_SOCKETS
-
 CHIP_ERROR ConnectivityManagerImpl::_Init()
 {
     CHIP_ERROR err;
@@ -105,20 +80,6 @@ void ConnectivityManagerImpl::_OnPlatformEvent(const ChipDeviceEvent * event)
 {
     // Forward the event to the generic base classes as needed.
     // Handle Wfx wifi events...
-#if CHIP_SYSTEM_CONFIG_USE_FREERTOS_SOCKETS
-    if (event->Type == DeviceEventType::kSocketSelectStart)
-    {
-        // Call sl_si91x_select() to start the select operation
-        // and pass the callback function to be called when the select operation is complete.
-        int result = sl_si91x_select(event->SocketSelectStart.FD, const_cast<fd_set *>(&event->SocketSelectStart.ReadSet),
-                                     const_cast<fd_set *>(&event->SocketSelectStart.WriteSet),
-                                     const_cast<fd_set *>(&event->SocketSelectStart.ErrorSet), nullptr, sl_wifi_async_select_cb);
-        if (result < 0)
-        {
-            ChipLogError(DeviceLayer, "sl_si91x_select() failed: %d", result);
-        }
-    }
-#endif // CHIP_SYSTEM_CONFIG_USE_FREERTOS_SOCKETS
     if (event->Type == DeviceEventType::kWFXSystemEvent)
     {
 

src/platform/silabs/DiagnosticDataProviderImpl.cpp

@@ -259,7 +259,7 @@ CHIP_ERROR DiagnosticDataProviderImpl::GetNetworkInterfaces(NetworkInterface **
     ifp->IPv6Addresses = app::DataModel::List<ByteSpan>(ifp->Ipv6AddressSpans, ipv6AddressesCount);
 
     *netifpp = ifp;
-#else // CHIP_SYSTEM_CONFIG_USE_LWIP || CHIP_SYSTEM_CONFIG_USE_SOCKETS
+#else
     NetworkInterface * head = NULL;
     for (Inet::InterfaceIterator interfaceIterator; interfaceIterator.HasCurrent(); interfaceIterator.Next())
     {

src/platform/silabs/rs911x/rsi_ble_config.h

@@ -288,35 +288,22 @@ extern "C" {
 #endif
 
 #ifdef SLI_SI917
-// Define common feature bits
-#define SL_COMMON_FEATURE_BITS (SL_SI91X_EXT_FEAT_LOW_POWER_MODE | SL_SI91X_CLK | FRONT_END_SWITCH_CTRL)
-// Define WPA3-specific feature bits
-#define SL_WPA3_FEATURE_BITS (SL_COMMON_FEATURE_BITS | SL_SI91X_EXT_FEAT_IEEE_80211W)
-// Define RAM level based on the MCU interface
-#if SLI_SI91X_MCU_INTERFACE
-#define SL_RAM_LEVEL SL_SI91X_RAM_LEVEL_NWP_BASIC_MCU_ADV
-#else // for NCP
-#define SL_RAM_LEVEL SL_SI91X_RAM_LEVEL_NWP_ALL_MCU_ZERO
-#endif // SLI_SI91X_MCU_INTERFACE
-// Define the custom feature bit map
-#if WIFI_ENABLE_SECURITY_WPA3_TRANSITION
-#define RSI_EXT_CUSTOM_FEATURE_BIT_MAP (SL_WPA3_FEATURE_BITS | SL_RAM_LEVEL)
+#if WIFI_ENABLE_SECURITY_WPA3_TRANSITION // Adding Support for WPA3 transition
+#define RSI_EXT_CUSTOM_FEATURE_BIT_MAP                                                                                             \
+    (SL_SI91X_EXT_FEAT_LOW_POWER_MODE | SL_SI91X_CLK | SL_SI91X_RAM_LEVEL_NWP_BASIC_MCU_ADV | FRONT_END_SWITCH_CTRL |              \
+     SL_SI91X_EXT_FEAT_IEEE_80211W)
 #else
-#define RSI_EXT_CUSTOM_FEATURE_BIT_MAP (SL_COMMON_FEATURE_BITS | SL_RAM_LEVEL)
-#endif // WIFI_ENABLE_SECURITY_WPA3_TRANSITION
+#define RSI_EXT_CUSTOM_FEATURE_BIT_MAP                                                                                             \
+    (SL_SI91X_EXT_FEAT_LOW_POWER_MODE | SL_SI91X_CLK | SL_SI91X_RAM_LEVEL_NWP_BASIC_MCU_ADV | FRONT_END_SWITCH_CTRL)
+#endif /* WIFI_ENABLE_SECURITY_WPA3_TRANSITION */
 #else  // EXP_BOARD
 #define RSI_EXT_CUSTOM_FEATURE_BIT_MAP (SL_SI91X_EXT_FEAT_LOW_POWER_MODE | SL_SI91X_EXT_FEAT_XTAL_CLK_ENABLE(2))
 #endif /* SLI_SI917 */
 
 #define RSI_EXT_TCPIP_FEATURE_BITMAP 0
 #define RSI_BT_FEATURE_BITMAP (SL_SI91X_BT_RF_TYPE | SL_SI91X_ENABLE_BLE_PROTOCOL)
 #define RSI_CONFIG_FEATURE_BITMAP 0
-#if SLI_SI91X_OFFLOAD_NETWORK_STACK
-//! TCP IP BYPASS feature checks
-#define RSI_TCP_IP_BYPASS RSI_DISABLE
-#else
-#define RSI_TCP_IP_BYPASS RSI_ENABLE
-#endif // SLI_SI91X_LWIP_HOSTED_NETWORK_STACK
+#define RSI_TCP_IP_BYPASS RSI_ENABLE //! TCP IP BYPASS feature checks
 #else
 #define RSI_BLE_MAX_NBR_MASTERS (1)
 #define RSI_HAND_SHAKE_TYPE GPIO_BASED