Cherry-pick from upstream#16
Merged
Aksel Mellbye (asmellby) merged 10 commits intoJun 9, 2026
Merged
Conversation
Removing the pointer cast on dev->api breaks building C++ files that include ethernet.h Upstream-status: available Signed-off-by: Jacob Schloss <jacob.schloss@suburbanmarine.io> (cherry picked from commit 4935080)
Improved the mapping from SL TWT events to Zephyr params. Upstream-status: available Signed-off-by: Muzaffar Ahmed <muzaffar.ahmed@silabs.com> (cherry picked from commit b2db30b)
Note in the Wi-Fi documentation that the twt_capable field of wifi_iface_status may report true in 802.11ax mode even when the AP has TWT disabled. Upstream-status: available Signed-off-by: Muzaffar Ahmed <muzaffar.ahmed@silabs.com> (cherry picked from commit f4ab779)
|
Jérôme Pouiller (@jerome-pouiller) There is a compliance check failure when taking downstream the shell test for siwg917 (CONFIG_MBEDTLS_SSL_IN_CONTENT_LEN) |
Add a build-only test for the siwx91x shell commands to ensure CONFIG_SIWX91X_FIRMWARE_UPGRADE_SHELL keeps compiling with its typical TLS/networking configuration. Tested by building for siwx917_rb4338a. Upstream-status: available Assisted-by: Copilot:claude-sonnet-4.6 Signed-off-by: Jérôme Pouiller <jerome.pouiller@silabs.com> (cherry picked from commit 1b3bdc4)
Add silabs_shell.c which owns the SHELL_SUBCMD_SET_CREATE and SHELL_CMD_REGISTER for the "silabs" top-level shell command. This allows multiple SoC-specific files to register subcommands independently using SHELL_SUBCMD_ADD without duplicating the namespace registration. Add a hidden Kconfig symbol SOC_SILABS_SHELL (selected by any feature that registers a subcommand) that controls compilation of silabs_shell.c. Convert siwx91x_fota_shell.c to use SHELL_SUBCMD_ADD, and make SIWX91X_FIRMWARE_UPGRADE select SOC_SILABS_SHELL. Upstream-status: available Assisted-by: Copilot:claude-sonnet-4.6 Signed-off-by: Jérôme Pouiller <jerome.pouiller@silabs.com> (cherry picked from commit c1d151c)
Add a "silabs nwp_version" shell command that prints the NWP firmware version (chip_id, rom_id, major, minor, security, patch, customer_id, build_num). With the optional -c flag, the command also checks the version against siwx91x_nwp_fw_expected_version and returns -EINVAL if major, minor or security_version do not match. The command is controlled by CONFIG_SIWX91X_VERSION_SHELL (default y) which depends on SILABS_SIWX91X_NWP and SHELL. Upstream-status: available Assisted-by: Copilot:claude-sonnet-4.6 Signed-off-by: Jérôme Pouiller <jerome.pouiller@silabs.com> (cherry picked from commit f9cff17)
pinctrl@46130000 and egpio@46130000 intentionally share the same address range because they map to the same hardware block. Suppress the resulting unique_unit_address_if_enabled DTC warning. Upstream-status: available Assisted-by: Copilot:claude-sonnet-4.6 Signed-off-by: Jérôme Pouiller <jerome.pouiller@silabs.com> (cherry picked from commit 4f3169b)
siwx91x-soc-pd is a power domain node with no memory-mapped registers; it has no reg property by design. Suppress the resulting simple_bus_reg DTC warning. Upstream-status: available Assisted-by: Copilot:claude-sonnet-4.6 Signed-off-by: Jérôme Pouiller <jerome.pouiller@silabs.com> (cherry picked from commit eb1f0dd)
Silabs siwx91x is referenced using several names. Unify them. Upstream-status: available Signed-off-by: Jérôme Pouiller <jerome.pouiller@silabs.com> (cherry picked from commit 797b7ca)
The Silicon Labs Link Layer allocates a connection context when PAwR with response discovers an advertiser to synchronize with. Since this procedure currently relies on connection resources, ensure that at least one connection is configured whenever PAwR responses are enabled. Upstream-status: available Signed-off-by: Petri Pitkanen <petri.pitkanen@silabs.com> (cherry picked from commit e9682ef)
Aksel Mellbye (asmellby)
force-pushed
the
feature/cherry-pick-fixes-20260609
branch
from
333323a to
801caaf
Compare
Martin Hoff (Martinhoff-maker)
approved these changes
Jun 9, 2026
Aksel Mellbye (asmellby)
merged commit 6531213
into
SiliconLabsSoftware:silabs/dev
2 checks passed
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Cherry-pick commits from 5 upstream merged PRs containing fixes for WiFi on SiWx917 and BLE on Series 2.