[SL-UP] Refactor Platform WiFi events by rosahay-silabs · Pull Request #1191 · SiliconLabsSoftware/matter_sdk

Rohan Sahay (rosahay-silabs) · 2026-09-12T22:23:57Z

Summary

Move WiFi reconnect/retry out of WifiInterface into ConnectivityManagerImpl, so station connect/disconnect/reconnect is driven by one state machine.
Rename Silabs platform WiFi events (kWFXSystemEvent → kPlatformSLEvent, add public kSLSystemEvent) and replace ConfigureStationMode() with EnableStationMode().
Track last disconnect reason and map SiWx status codes to NetworkCommissioningStatusEnum (NC status reporting still has TODOs to use it).

Related issues

N/A

Testing

manually tested commissioning
reconnection of access point due to loss of access point
reconnection due to device reboot

…improved error handling and clarity. Simplify exit logic by removing unnecessary exit label.

…instead of hardcoded.

… handling to streamline the connection process.

…tials if the station is provisioned before connecting to a new network. Add comments for clarity on the connection process.

…essages for WiFi events and streamline state transitions by removing unnecessary checks. Enhance error handling in setting WiFi station mode and improve clarity in DriveStationState logic.

…itialize mLastDisconnectionReason to kUnknownError for improved error tracking.

Map join/disconnect failures to disconnection reasons and let ConnectivityManager drive station state.

…ation state management

…e-based handling and disconnection logic

…NetworkCommissioningStatusEnum and enhance disconnection notification logic

Junior Martinez (jmartinez-silabs) · 2026-09-14T18:30:34Z

+        WifiInterfaceImpl & self      = WifiInterfaceImpl::GetInstance();
+        self.mLastDisconnectionReason = reason;
+        self.NotifyDisconnection(self.mLastDisconnectionReason);


would this. work here or is this a static function? If so, does it need to be static?

Suggested change

WifiInterfaceImpl & self = WifiInterfaceImpl::GetInstance();

self.mLastDisconnectionReason = reason;

self.NotifyDisconnection(self.mLastDisconnectionReason);

this.mLastDisconnectionReason = reason;

this.NotifyDisconnection(self.mLastDisconnectionReason);

Junior Martinez (jmartinez-silabs) · 2026-09-14T18:33:50Z

+CHIP_ERROR WifiInterfaceImpl::EnableStationMode()
 {
    wfx_rsi.dev_state.Set(WifiState::kStationMode);
+    return CHIP_NO_ERROR;


if it can't fail why do we need a return code?

Typically going by implementation of us and peers, we should have a way to enable and disable station mode, which should be a platform API call and not just setting a state, hence changing it to a CHIP_ERROR return instead of a void, we do have an API on SiWx917 platform as well but I have not explored that yet.

Junior Martinez (jmartinez-silabs) · 2026-09-14T18:35:39Z

    return CHIP_NO_ERROR;
 }

+chip::app::Clusters::NetworkCommissioning::NetworkCommissioningStatusEnum


you have a using namespace chip::app::Clusters::NetworkCommissioning; in this file. You should be able to shorthen this to

Suggested change

chip::app::Clusters::NetworkCommissioning::NetworkCommissioningStatusEnum

NetworkCommissioningStatusEnum

Junior Martinez (jmartinez-silabs) · 2026-09-14T18:37:48Z

+    kIPBindFailed
+    kUnknownError
+    */
+    using Status = chip::app::Clusters::NetworkCommissioning::NetworkCommissioningStatusEnum;


For the same reason stated above. I think

NetworkCommissioningStatusEnum::kSuccess; NetworkCommissioningStatusEnum::kNetworkNotFound; ...

would work if you want to keep the using Status it can be shortened too

Junior Martinez (jmartinez-silabs) · 2026-09-14T20:13:00Z

-    GetWiFiStationMode();
+    // if the station mode is application controlled or disabled, return
+    VerifyOrReturn(stationMode != kWiFiStationMode_ApplicationControlled,
+                   ChipLogError(DeviceLayer, "WiFi station mode is application controlled"));


similar comment than before. Is this an Error? Also it seems this would be printed a lot. DriveStationState runs often no?

Junior Martinez (jmartinez-silabs) · 2026-09-14T20:14:49Z

+        WifiInterface::GetInstance().TriggerDisconnection();
+        ChangeWiFiStationState(kWiFiStationState_Disconnecting);


like i mentioned before. Should be regrouped.

Junior Martinez (jmartinez-silabs) · 2026-09-14T20:22:38Z

-        // Cannot use the driver if the instance is not initialized.
-        VerifyOrDie(nwDriver != nullptr); // should never be null
-        nwDriver->UpdateNetworkingStatus();
+    case kWiFiStationState_Connecting_Succeeded:


Why is kWiFiStationState_Connecting_Succeeded needed? Can't just go to Connected?

Yes I have the same doubt kWiFiStationState_Connecting_Succeeded vs kWiFiStationState_Connected, but I did not find any concrete documentation for the differences in those states.
My initial impressions were that maybe kWiFiStationState_Connecting_Succeeded would be for the WiFi connection on the access point level, where we are connected but the IP stack is negotiating, but that logic fails since we have a connectivity event to track that state.
I will look into how others are using it and infer from there.

Junior Martinez (jmartinez-silabs) · 2026-09-14T20:26:08Z

+        break;
+
+    default:
+        ChipLogDetail(DeviceLayer, "WiFi station state not driving: %s", WiFiStationStateToStr(newState));


We will still schedule a DriveStationState for an unkown state

Added this log to verify that we are scheduling for all known state, more of a verification log rather than anything else.

Junior Martinez (jmartinez-silabs) · 2026-09-14T20:27:42Z

+        ChipLogDetail(DeviceLayer, "WiFi station state not driving: %s", WiFiStationStateToStr(newState));
+        break;
    }
+    TEMPORARY_RETURN_IGNORED DeviceLayer::SystemLayer().ScheduleWork(DriveStationState, NULL);


The sequence seems odd to me.
DriveStationState calls ChangeWiFiStationState in most situation. And ChangeWiFiStationState will then call DriveStationState again.

Right now, we are doing it for the TriggerDisconnection is not having a callback to show the disconnecting state, same for the connecting state, adding the ChangeWiFiStationState instead of a mStationState because the former would not process the same state twice. The only place I have prefer not doing this is the reconnection logic, where though it will work, we will end of queuing the DriveStationState twice, once by ChangeWiFiStationState another time with the delay of timer.

The retry logic is the only place I would not call ChangeWiFiStationState, other places I would still prefer invoking the ChangeWiFiStationState.

…thod to streamline reconnection logic in WiFi station state management

…ect status in notifications and improving reason retrieval

…disconnection handling into a single method

…use direct enum references for improved clarity

…tion setup

…RROR

… clarity

…i station mode

…ods for WiFi driver

…work scanning

Co-authored-by: Junior Martinez <67972863+jmartinez-silabs@users.noreply.github.com>

…ed method for improved clarity and maintainability

…management

…nnection status

…hance connection state checks

…ialization

… reset function

Rohan Sahay (rosahay-silabs) added 16 commits September 10, 2026 08:38

Update the event message

fb35177

Rename kWFXSystemEvent to kPlatformSLEvent

3517942

Add kSLSystemEvent to PublicPlatformSpecificEventTypes enum

dcdaaf3

TEMP: commit code

6b2d9a4

bugfix name

2e773bf

Replace direct call to EnableStationMode with SetWiFiStationMode for …

d2edeae

…improved error handling and clarity. Simplify exit logic by removing unnecessary exit label.

revert to val

ab29dcb

Adds fix to make SL_ONNETWORK_PAIRING work as default SSID and PSK …

a879333

…instead of hardcoded.

Remove temporary commit configuration call in WiFi network connection…

e44d5d0

… handling to streamline the connection process.

Adding comments for variables

ee46c17

Enhance WiFi connection handling by disconnecting and clearing creden…

f815f0b

…tials if the station is provisioned before connecting to a new network. Add comments for clarity on the connection process.

Refactor WiFi event handling in ConnectivityManagerImpl. Update log m…

478f5c2

…essages for WiFi events and streamline state transitions by removing unnecessary checks. Enhance error handling in setting WiFi station mode and improve clarity in DriveStationState logic.

Add method to retrieve last disconnection reason in WifiInterface. In…

77978db

…itialize mLastDisconnectionReason to kUnknownError for improved error tracking.

Improve readability

c6aca24

refactor(silabs-wifi): move reconnect to ConnectivityMgr

9d61b3e

Map join/disconnect failures to disconnection reasons and let ConnectivityManager drive station state.

refactor(silabs-wifi): move reconnect to ConnectivityMgr

2fcfdf2

Map join/disconnect failures to disconnection reasons and let ConnectivityManager drive station state.

silabs-matter-ci-bot Bot added the sl-up This TAG indicates that this commit needs to be upstreamed to CSA before its next release. label Sep 12, 2026

Rohan Sahay (rosahay-silabs) added 3 commits September 13, 2026 21:27

refactor(silabs-wifi): simplify logging and error handling in WiFi st…

d969a55

…ation state management

refactor(silabs-wifi): enhance WiFi station mode management with stat…

e1cf814

…e-based handling and disconnection logic

refactor(silabs-wifi): implement mapping of disconnection reasons to …

779f031

…NetworkCommissioningStatusEnum and enhance disconnection notification logic

Rohan Sahay (rosahay-silabs) self-assigned this Sep 14, 2026

Junior Martinez (jmartinez-silabs) reviewed Sep 14, 2026

View reviewed changes

Rohan Sahay (rosahay-silabs) added 8 commits September 15, 2026 14:00

refactor(silabs-wifi): introduce ResetReconnectionWiFiStationState me…

aeffd16

…thod to streamline reconnection logic in WiFi station state management

refactor(silabs-wifi): add stub for disabling station mode

058fb86

clean up comments

fe95232

refactor(silabs-wifi): streamline disconnection handling by using dir…

1279dc2

…ect status in notifications and improving reason retrieval

refactor(silabs-wifi): simplify disconnection logic by consolidating …

d7bdf7e

…disconnection handling into a single method

refactor(silabs-wifi): update MapToNetworkCommissioningStatusEnum to …

7f96497

…use direct enum references for improved clarity

Adds fix for #26861

2048dde

Adds fix for #26861

b8a63c9

Rohan Sahay (rosahay-silabs) and others added 11 commits September 15, 2026 22:08

refactor(silabs-wifi): enable WiFi station mode during network connec…

c5385f8

…tion setup

fix(silabs-wifi): return error from _Init method instead of CHIP_NO_E…

79682c9

…RROR

refactor(silabs-wifi): update log messages for WiFi events to improve…

eb843fa

… clarity

refactor(silabs-wifi): enhance logging for application-controlled WiF…

4b91112

…i station mode

refactor(silabs-wifi): implement configuration commit and revert meth…

ad12e09

…ods for WiFi driver

refactor(silabs-wifi): improve error handling and logging in WiFi net…

7be8879

…work scanning

Apply suggestion from @jmartinez-silabs

a5e473e

Co-authored-by: Junior Martinez <67972863+jmartinez-silabs@users.noreply.github.com>

refactor(silabs-wifi): consolidate disconnection logic into a dedicat…

50183fe

…ed method for improved clarity and maintainability

feat(silabs-wifi): implement auto-reconnect feature for WiFi station …

c37c0ff

…management

feat(silabs-wifi): update WiFi station state management to reflect co…

6623e29

…nnection status

refactor(silabs-wifi): streamline WiFi network joining process and en…

9c97214

…hance connection state checks

Rohan Sahay (rosahay-silabs) force-pushed the refactor/platform-wifi-events branch from e488796 to 9c97214 Compare September 16, 2026 10:15

Rohan Sahay (rosahay-silabs) added 2 commits September 16, 2026 17:14

feat(silabs-wifi): integrate WiFi driver setup into Matter shell init…

592e0e7

…ialization

refactor(silabs-wifi): remove redundant event posting in connectivity…

432a3d2

… reset function

	chip::app::Clusters::NetworkCommissioning::NetworkCommissioningStatusEnum
	NetworkCommissioningStatusEnum

		WifiInterface::GetInstance().TriggerDisconnection();
		ChangeWiFiStationState(kWiFiStationState_Disconnecting);

Uh oh!

Conversation

Rohan Sahay (rosahay-silabs) commented Sep 12, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary

Related issues

Testing

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Rohan Sahay (rosahay-silabs) commented Sep 12, 2026 •

edited

Loading