soc: silabs: siwx91x: Transform silabs network coprocessor (NWP) SoC files into a driver. #97554

Martinhoff-maker · 2025-10-14T14:46:11Z

The goal of this PR is to transform the SoC files for the NWP (Network coprocessor) into a driver.

The node for the NWP already exists, but declaring it as a driver allows us to have a device and check device health during initialization and when other components (like WiFi or Bluetooth) need it.
I also renamed the Kconfig option from "CONFIG_WISECONNECT_NETWORK_STACK" to "CONFIG_SILABS_SIWX91X_NWP" to make it more explicit.

Currently, we don't have "default=y" for the Kconfig option because we don't want to boot up the NWP if no component will use it. Components that need it must select this option.

The first commit is quite large, but I couldn't find a way to split it while maintaining successful compilation between individual commits. Any suggestions are welcome.

I will do some cleanup of the siwx91x SoC folder on an upcoming PR.

jerome-pouiller · 2025-10-14T17:16:37Z

soc/silabs/silabs_siwx91x/siwg917/soc_siwx91x_power_pmgr.c

 			goto out;
 		}
-		if (IS_ENABLED(CONFIG_WISECONNECT_NETWORK_STACK)) {
+		if (IS_ENABLED(CONFIG_SILABS_SIWX91X_NWP)) {


Maybe this could be done in a further PR, but I believe the idea is to move this code in the nwp driver in the PM_ACTIONS.

dts/bindings/net/wireless/silabs,siwx91x-nwp.yaml

Martinhoff-maker · 2025-10-15T08:20:43Z

Will be moved back to the SoC folder but still as a driver. I was not aware that we can have driver outside of the driver folder.

jhedberg · 2025-10-15T11:20:12Z

drivers/bluetooth/hci/hci_silabs_siwx91x.c


 #define HCI_DEVICE_INIT(inst)                                                                      \
+	static struct hci_config hci_config_##inst = {                                             \
+		.nwp_dev = DEVICE_DT_GET(DT_INST_PARENT(0))                                        \


For correctness, shouldn't you use inst instead of 0 here?

absolutely, that's a miss after some copy/paste.

Martinhoff-maker · 2025-10-15T12:57:42Z

V2:

Rebased with latest upstream commit for the CI problem
used inst for nwp_dev init in bt_hci driver

jerome-pouiller · 2025-10-15T13:29:13Z

soc/silabs/silabs_siwx91x/siwg917/siwx91x_nwp.c

 				SL_SI91X_EXT_FEAT_XTAL_CLK,
-		}
-	};
+		}};


Original indentation was better.

jerome-pouiller · 2025-10-15T13:29:58Z

soc/silabs/silabs_siwx91x/siwg917/siwx91x_nwp.c

-			if (memcmp(country_code, region_maps[i].codes[j],
-				   WIFI_COUNTRY_CODE_LEN) == 0) {
+			if (memcmp(country_code, region_maps[i].codes[j], WIFI_COUNTRY_CODE_LEN) ==
+			    0) {


Original indentation was better

jerome-pouiller · 2025-10-15T13:33:42Z

soc/silabs/silabs_siwx91x/siwg917/nwp.c

-	"VI", "VN", "VU", "00"
-	/* Map "00" (world domain) to US region,
-	 * as using the world domain is not recommended
-	 */


hmm... maybe we should keep this comment.:

"SG", "MX", "SV", "TC", "TH", "TT", "US", "UY", "VE", "VI", "VN", "VU", /* Map World Domain ("00") to US region */ "00"

jerome-pouiller · 2025-10-15T13:35:17Z

soc/silabs/silabs_siwx91x/siwg917/siwx91x_nwp.c

+	static const struct siwx91x_nwp_config siwx91x_nwp_config_##inst = {                       \
+		.config_irq = silabs_siwx91x_nwp_irq_configure_##inst,                             \
+		.power_profile = DT_ENUM_IDX(DT_DRV_INST(inst), power_profile),                    \
+		.stack_size = DT_INST_PROP(inst, stack_size)};                                     \


New line before the closing brace.

jerome-pouiller · 2025-10-15T13:35:45Z

soc/silabs/silabs_siwx91x/siwg917/siwx91x_nwp.c

+	static void silabs_siwx91x_nwp_irq_configure_##inst(const struct device *dev)              \
+	{                                                                                          \
+		ARG_UNUSED(dev);                                                                   \
+		SIWX91X_NWP_IRQ_CONNECT(inst);                                                     \


Any reason to not inline the SIWX91X_NWP_IRQ_CONNECT macro?

no i've done it.

jerome-pouiller · 2025-10-15T13:39:15Z

soc/silabs/silabs_siwx91x/siwg917/siwx91x_nwp.c

-	       &expected_version.build_num);
+	       &expected_version.rom_id, &expected_version.major, &expected_version.minor,
+	       &expected_version.security_version, &expected_version.patch_num,
+	       &expected_version.customer_id, &expected_version.build_num);


Original indentation was not so bad (aren't you the author of the original code BTW?)

done (yeah but clang-format didn't like it)

The goal of this patch is to switch from the nwp.c and nwp.h soc files to the new nwp driver. During this transition, we also renamed CONFIG_WISECONNECT_NETWORK_STACK to CONFIG_SILABS_SIWX91X_NWP which are a better naming to let the user knows that the network coprocessor files will be added to the compilation. The switch from a soc file to a driver device introduce a notion of nwp device that allows us to check for good initialization and ressources allocation. Before this patch, it is not possible to know if the nwp have booted successfully or not. We can now check if the device driver is ready or not before trying to do operation related to the nwp. Signed-off-by: Martin Hoff <[email protected]>

The bluetooth hci on silabs siwx91x depends on the nwp (network coprocessor). This patch allows to check for the correct initialization of the nwp before using bt hci on siwx91x. Signed-off-by: Martin Hoff <[email protected]>

sonarqubecloud · 2025-10-15T15:42:57Z

Quality Gate passed

Issues
1 New issue
0 Accepted issues

Measures
0 Security Hotspots
0.0% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarQube Cloud

Martinhoff-maker requested review from jerome-pouiller and smalae October 14, 2025 14:46

Martinhoff-maker force-pushed the siwx91x-nwp-driver branch 2 times, most recently from 6d023f1 to 6064d22 Compare October 14, 2025 15:40

jerome-pouiller reviewed Oct 14, 2025

View reviewed changes

dts/bindings/net/wireless/silabs,siwx91x-nwp.yaml Show resolved Hide resolved

Martinhoff-maker marked this pull request as ready for review October 15, 2025 07:49

zephyrbot added area: Devicetree Bindings area: Boards/SoCs area: Wi-Fi Wi-Fi area: Bluetooth area: Flash platform: Silabs Silicon Labs area: Bluetooth HCI Bluetooth HCI Driver labels Oct 15, 2025

zephyrbot requested review from HaavardRei, HoZHel, PavelVPV, Thalley, alwa-nordic, asmellby, cvinayak, de-nordic, hermabe, jhedberg, rghaddab and sjanc October 15, 2025 07:51

zephyrbot assigned jhedberg and alwa-nordic Oct 15, 2025

jerome-pouiller approved these changes Oct 15, 2025

View reviewed changes

jerome-pouiller previously approved these changes Oct 15, 2025

View reviewed changes

Martinhoff-maker dismissed jerome-pouiller’s stale review via 6117c80 October 15, 2025 09:51

Martinhoff-maker force-pushed the siwx91x-nwp-driver branch from 6064d22 to 6117c80 Compare October 15, 2025 09:51

Martinhoff-maker changed the title ~~drivers: misc: Transform silabs network coprocessor SoC files into a misc driver.~~ soc: silabs: siwx91x: Transform silabs network coprocessor (NWP) SoC files into a driver. Oct 15, 2025

zephyrbot requested a review from jukkar October 15, 2025 09:53

Martinhoff-maker force-pushed the siwx91x-nwp-driver branch from 6117c80 to f3d8971 Compare October 15, 2025 10:07

hermabe removed their request for review October 15, 2025 10:28

jhedberg reviewed Oct 15, 2025

View reviewed changes

Martinhoff-maker force-pushed the siwx91x-nwp-driver branch from f3d8971 to bc8eef9 Compare October 15, 2025 12:56

zephyrbot requested a review from jhedberg October 15, 2025 12:58

jhedberg previously approved these changes Oct 15, 2025

View reviewed changes

jerome-pouiller reviewed Oct 15, 2025

View reviewed changes

Martinhoff-maker added 2 commits October 15, 2025 17:38

drivers: bluetooth: hci: siwx91x: create dependency with nwp

508b8f2

The bluetooth hci on silabs siwx91x depends on the nwp (network coprocessor). This patch allows to check for the correct initialization of the nwp before using bt hci on siwx91x. Signed-off-by: Martin Hoff <[email protected]>

Martinhoff-maker dismissed jhedberg’s stale review via 508b8f2 October 15, 2025 15:38

Martinhoff-maker force-pushed the siwx91x-nwp-driver branch from bc8eef9 to 508b8f2 Compare October 15, 2025 15:38

zephyrbot requested a review from jhedberg October 15, 2025 15:40

jhedberg approved these changes Oct 15, 2025

View reviewed changes

jerome-pouiller approved these changes Oct 15, 2025

View reviewed changes

de-nordic approved these changes Oct 16, 2025

View reviewed changes

henrikbrixandersen merged commit ccd505f into zephyrproject-rtos:main Oct 17, 2025
28 checks passed

soc: silabs: siwx91x: Transform silabs network coprocessor (NWP) SoC files into a driver. #97554

soc: silabs: siwx91x: Transform silabs network coprocessor (NWP) SoC files into a driver. #97554

Uh oh!

Conversation

Martinhoff-maker commented Oct 14, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Martinhoff-maker commented Oct 15, 2025

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Martinhoff-maker commented Oct 15, 2025

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!

sonarqubecloud bot commented Oct 15, 2025

Quality Gate passed

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

Martinhoff-maker commented Oct 14, 2025 •

edited

Loading