[EFR32]Added connectivity for RS9116 when AP has WPA3 security mode (#…

…21589) * Added connectivity for RS9116 when AP has WPA3 security mode * Formatting to get it aligned correctly
project-chip · Aug 4, 2022 · 22921b0 · 22921b0
1 parent ce65402
commit 22921b0
Show file tree

Hide file tree

Showing 6 changed files with 45 additions and 1 deletion.
diff --git a/examples/light-switch-app/efr32/BUILD.gn b/examples/light-switch-app/efr32/BUILD.gn
@@ -63,6 +63,9 @@ declare_args() {
 
   # Argument to Disable IPv4 for wifi(rs911)
   chip_enable_wifi_ipv4 = false
+
+  # Argument to force enable WPA3 security
+  wifi_enable_security_wpa3 = false
 }
 
 declare_args() {
@@ -227,6 +230,10 @@ efr32_executable("light_switch_app") {
     defines += [ "CHIP_DEVICE_CONFIG_ENABLE_IPV4" ]
   }
 
+  if (wifi_enable_security_wpa3) {
+    defines += [ "WIFI_ENABLE_SECURITY_WPA3=1" ]
+  }
+
   # WiFi Settings
   if (chip_enable_wifi) {
     if (use_rs911x) {

diff --git a/examples/lighting-app/efr32/BUILD.gn b/examples/lighting-app/efr32/BUILD.gn
@@ -63,6 +63,9 @@ declare_args() {
 
   # Argument to Disable IPv4 for wifi(rs911)
   chip_enable_wifi_ipv4 = false
+
+  # Argument to force enable WPA3 security
+  wifi_enable_security_wpa3 = false
 }
 
 declare_args() {
@@ -227,6 +230,10 @@ efr32_executable("lighting_app") {
     defines += [ "CHIP_DEVICE_CONFIG_ENABLE_IPV4" ]
   }
 
+  if (wifi_enable_security_wpa3) {
+    defines += [ "WIFI_ENABLE_SECURITY_WPA3=1" ]
+  }
+
   # WiFi Settings
   if (chip_enable_wifi) {
     if (use_rs911x) {

diff --git a/examples/lock-app/efr32/BUILD.gn b/examples/lock-app/efr32/BUILD.gn
@@ -63,6 +63,9 @@ declare_args() {
 
   # Argument to Disable IPv4 for wifi(rs911)
   chip_enable_wifi_ipv4 = false
+
+  # Argument to force enable WPA3 security
+  wifi_enable_security_wpa3 = false
 }
 
 declare_args() {
@@ -224,6 +227,10 @@ efr32_executable("lock_app") {
     defines += [ "CHIP_DEVICE_CONFIG_ENABLE_IPV4" ]
   }
 
+  if (wifi_enable_security_wpa3) {
+    defines += [ "WIFI_ENABLE_SECURITY_WPA3=1" ]
+  }
+
   # WiFi Settings
   if (chip_enable_wifi) {
     if (use_rs911x) {

diff --git a/examples/window-app/efr32/BUILD.gn b/examples/window-app/efr32/BUILD.gn
@@ -56,6 +56,9 @@ declare_args() {
 
   # Argument to Disable IPv4 for wifi(rs911)
   chip_enable_wifi_ipv4 = false
+
+  # Argument to force enable WPA3 security
+  wifi_enable_security_wpa3 = false
 }
 
 declare_args() {
@@ -210,6 +213,10 @@ efr32_executable("window_app") {
     defines += [ "CHIP_DEVICE_CONFIG_ENABLE_IPV4" ]
   }
 
+  if (wifi_enable_security_wpa3) {
+    defines += [ "WIFI_ENABLE_SECURITY_WPA3=1" ]
+  }
+
   # WiFi Settings
   if (chip_enable_wifi) {
     if (use_rs911x) {

diff --git a/scripts/examples/gn_efr32_example.sh b/scripts/examples/gn_efr32_example.sh
@@ -143,6 +143,22 @@ else
                 optArgs+="chip_enable_wifi_ipv4=true "
                 shift
                 ;;
+            --rs91x_setSecurityType)
+                if [ -z "$2" ]; then
+                    echo "--rs911x_setSecurityType requires WPA_WPA2 or WPA3_ONLY"
+                    exit 1
+                fi
+                if [ "$2" = "WPA_WPA2" ]; then
+                    optArgs+="wifi_enable_security_wpa3=false "
+                elif [ "$2" = "WPA3_ONLY" ]; then
+                    optArgs+="wifi_enable_security_wpa3=true "
+                else
+                    echo "Set security usage: --rs911x_setSecurityType WPA_WPA2|WPA3_ONLY"
+                    exit 1
+                fi
+                shift
+                shift
+                ;;
             --additional_data_advertising)
                 optArgs+="chip_enable_additional_data_advertising=true chip_enable_rotating_device_id=true "
                 shift

diff --git a/third_party/silabs/matter_support b/third_party/silabs/matter_support
+3 −0		matter/wifi/rs911x/rsi_if.c
+12 −0		matter/wifi/rs911x/rsi_wlan_config.h