Skip to content

mcumgr/grp/os_mgmt: hook for disabling BT on nrf54Lx #26118

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
carlescufi merged 2 commits into from
Dec 5, 2025
Merged

mcumgr/grp/os_mgmt: hook for disabling BT on nrf54Lx #26118

carlescufi merged 2 commits into from
Dec 5, 2025

Conversation

@nvlsianpu
Copy link
Contributor

@nvlsianpu nvlsianpu commented Dec 5, 2025 •
edited
Loading

Added hook implementation for disabling Bluetooth in the hook of MCUmgr OS reboot command.
Disabling of bluetooth allow to restart it properly after the warm boot.

Replacement to nrfconnect/sdk-zephyr#3609

Ref: NCSDK-36564

@nvlsianpu nvlsianpu requested review from a team as code owners December 5, 2025 11:03
@NordicBuilder NordicBuilder added the changelog-entry-required Update changelog before merge. Remove label if entry is not needed or already added. label Dec 5, 2025
@nvlsianpu nvlsianpu mentioned this pull request Dec 5, 2025
Closed
nordicjm
nordicjm requested changes Dec 5, 2025
View reviewed changes
subsys/mgmt/mcumgr/grp/os_mgmt/src/os_mgmt_reboot_bt.c Outdated
Comment on lines 15 to 16
int32_t *rc, uint16_t *group, bool *abort_more,
void *data, size_t data_size)
Copy link
Contributor

@nordicjm nordicjm Dec 5, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

wrong indent

subsys/mgmt/mcumgr/grp/os_mgmt/src/os_mgmt_reboot_bt.c Outdated
Comment on lines 19 to 23
struct os_mgmt_reset_data *reboot_data =
(struct os_mgmt_reset_data *)data;

if (event != MGMT_EVT_OP_OS_MGMT_RESET || data_size !=
sizeof(*reboot_data)) {
Copy link
Contributor

@nordicjm nordicjm Dec 5, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the line size is 100 chars, fix this because these can go on one line, etc. in whole PR

subsys/mgmt/mcumgr/grp/os_mgmt/src/os_mgmt_reboot_bt.c Outdated
}

#ifdef CONFIG_BT
err_rc = bt_disable();
Copy link
Contributor

@nordicjm nordicjm Dec 5, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

indent is off

subsys/mgmt/mcumgr/grp/os_mgmt/src/os_mgmt_reboot_bt.c Outdated
#ifdef CONFIG_BT
err_rc = bt_disable();
if (err_rc) {
LOG_ERR("BT disable failed before reboot: %d\n", err_rc);
Copy link
Contributor

@nordicjm nordicjm Dec 5, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

logging appends \n for you, remove

subsys/mgmt/mcumgr/grp/os_mgmt/src/os_mgmt_reboot_bt.c Outdated

static int os_mgmt_register_reboot_bt(void)
{
mgmt_callback_register(&cmd_reboot_bt_info_cb );
Copy link
Contributor

@nordicjm nordicjm Dec 5, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

extra space before )

@NordicBuilder
Copy link
Contributor

NordicBuilder commented Dec 5, 2025 •
edited
Loading

CI Information

To view the history of this post, click the 'edited' button above
Build number: 6

Inputs:

Sources:

sdk-nrf: PR head: 2b03595d21ad7a869ef2a189f45396850bb25496

more details

sdk-nrf:

PR head: 2b03595d21ad7a869ef2a189f45396850bb25496
merge base: 5a565744dc7d6ea525129aa2509351713fbe212e
target head (v3.2-branch): 2031889e1b0d1e3d19cd405a91674c02d860bab6
Diff

Github labels

Enabled Name Description
ci-disabled Disable the ci execution
ci-all-test Run all of ci, no test spec filtering will be done
ci-force-downstream Force execution of downstream even if twister fails
ci-run-twister Force run twister
ci-run-zephyr-twister Force run zephyr twister
List of changed files detected by CI (3) 
subsys
│  ├── mgmt
│  │  ├── mcumgr
│  │  │  ├── grp
│  │  │  │  ├── os_mgmt
│  │  │  │  │  ├── CMakeLists.txt
│  │  │  │  │  ├── Kconfig
│  │  │  │  │  ├── src
│  │  │  │  │  │  │ os_mgmt_reboot_bt.c

Outputs:

Toolchain

Version: 43683a87ea
Build docker image: docker-dtr.nordicsemi.no/sw-production/ncs-build:43683a87ea_5ea73affbf

Test Spec & Results: ✅ Success; ❌ Failure; 🟠 Queued; 🟡 Progress; ◻️ Skipped; ⚠️ Quarantine

  • ◻️ Toolchain - Skipped: existing toolchain is used
  • ✅ Build twister
    • sdk-nrf test count: 307
  • ❌ Integration tests
    • ❌ test-sdk-mcuboot
    • ✅ test-sdk-dfu
Disabled integration tests
    • test-fw-nrfconnect-nrf_lrcs_mosh
    • test-fw-nrfconnect-nrf_lrcs_positioning
    • test_ble_nrf_config
    • test-fw-nrfconnect-apps
    • test-fw-nrfconnect-ble_mesh
    • test-fw-nrfconnect-ble_samples
    • test-fw-nrfconnect-chip
    • test-fw-nrfconnect-fem
    • test-fw-nrfconnect-nfc
    • test-fw-nrfconnect-nrf-iot_cloud
    • test-fw-nrfconnect-nrf-iot_libmodem-nrf
    • test-fw-nrfconnect-nrf-iot_lwm2m
    • test-fw-nrfconnect-nrf-iot_samples
    • test-fw-nrfconnect-nrf-iot_thingy91
    • test-fw-nrfconnect-nrf-iot_zephyr_lwm2m
    • test-fw-nrfconnect-nrf_crypto
    • test-fw-nrfconnect-ps-main
    • test-fw-nrfconnect-rpc
    • test-fw-nrfconnect-rs
    • test-fw-nrfconnect-tfm
    • test-fw-nrfconnect-thread-main
    • test-low-level
    • test-sdk-audio
    • test-sdk-find-my
    • test-sdk-wifi
    • test-secdom-samples-public

Note: This message is automatically posted and updated by the CI

@github-actions
Copy link

github-actions bot commented Dec 5, 2025

You can find the documentation preview for this PR here.

@nvlsianpu nvlsianpu force-pushed the reset/NCSDK-36564-v2 branch from b823da5 to 738f547 Compare December 5, 2025 12:08
@nvlsianpu nvlsianpu added this to the 3.2.0 milestone Dec 5, 2025
@nvlsianpu nvlsianpu added the bugfix Fixes a known bug label Dec 5, 2025
@nvlsianpu
mcumgr/grp/os_mgmt: hook for disabling BT on nrf54Lx
25c3197 
Added hook implementation for disabling Bluetooth in the hook
of MCUmgr OS reboot command.
Disabling of bluetooth allow to restart it properly after the
warm boot.

Ref: NCSDK-36564

Signed-off-by: Andrzej Puzdrowski <[email protected]>
@nvlsianpu nvlsianpu force-pushed the reset/NCSDK-36564-v2 branch 2 times, most recently from 13d4623 to 2e6d069 Compare December 5, 2025 13:18
@nvlsianpu nvlsianpu requested a review from nordicjm December 5, 2025 13:48
@nvlsianpu
mcumgr/grp/os_mgmt: hook for disabling BT on nrf54Lx
2b03595 
Postpone disabling till half of waiting of reset time.

Ref: NCSDK-36564

Signed-off-by: Andrzej Puzdrowski <[email protected]>
@nvlsianpu nvlsianpu force-pushed the reset/NCSDK-36564-v2 branch from 2e6d069 to 2b03595 Compare December 5, 2025 13:58
@NordicBuilder
Copy link
Contributor

NordicBuilder commented Dec 5, 2025

Memory footprint analysis revealed the following potential issues

applications.nrf_desktop.zdebug_fast_pair.gmouse.uart[nrf54l15dk/nrf54l15/cpuapp]: ROM size increased by 1484[B] in comparison to the main[4f99b6c] branch. - link (cc: @nrfconnect/ncs-si-bluebagel)
applications.nrf_desktop.zdebug_fast_pair.gmouse.uart[nrf54l15dk/nrf54l10/cpuapp]: ROM size increased by 1484[B] in comparison to the main[4f99b6c] branch. - link (cc: @nrfconnect/ncs-si-bluebagel)

Note: This message is automatically posted and updated by the CI (latest/sdk-nrf/PR-26118/6)

@carlescufi carlescufi mentioned this pull request Dec 5, 2025
Closed
@carlescufi carlescufi merged commit 8ab7dca into nrfconnect:v3.2-branch Dec 5, 2025
18 of 19 checks passed
@tomchy tomchy mentioned this pull request Dec 8, 2025
Closed
@nvlsianpu nvlsianpu mentioned this pull request Dec 9, 2025
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@jnsgsr jnsgsr jnsgsr approved these changes

@nordicjm nordicjm nordicjm approved these changes

@ppryga-nordic ppryga-nordic Awaiting requested review from ppryga-nordic

@de-nordic de-nordic Awaiting requested review from de-nordic

Assignees

No one assigned

Labels

bugfix Fixes a known bug changelog-entry-required Update changelog before merge. Remove label if entry is not needed or already added.

Projects

None yet

Milestone

3.2.0

Development

Successfully merging this pull request may close these issues.

5 participants

@nvlsianpu @NordicBuilder @jnsgsr @nordicjm @carlescufi