Skip to content
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

Never disable bluetooth on nRF53 - workaround post up-merge issue #555

Closed
wants to merge 1 commit into from
Closed

Never disable bluetooth on nRF53 - workaround post up-merge issue #555

wants to merge 1 commit into from

Conversation

ktaborowski
Copy link
Contributor

@ktaborowski ktaborowski commented Apr 30, 2024 •
edited
Loading

CI parameters

Github_actions:
  #(branch, hash, pull/XXX/head)
  NRF_revision: main

  # Do not change after creating PR
  Create_NRF_PR: false
Jenkins:
  test-sdk-sidewalk: master

Description

JIRA ticket:

Self review

  • There is no commented code.
  • There are no TODO/FIXME comments without associated issue ticket.
  • Commits are properly organized.
  • Change has been tested.
  • Tests were updated (if applicable).

@ktaborowski ktaborowski added bug Something isn't working DNM Do Not Merge labels Apr 30, 2024
@ktaborowski ktaborowski requested a review from gmarull April 30, 2024 14:00
@github-actions github-actions bot added doc-required PR must not be merged without tech writer approval. scripts source PR changing src files tests labels Apr 30, 2024
@ktaborowski
pal: workaround: never disable ble on nrf53
5e2d9eb 
[NCSDK-27294]
The last zephyr upmerge causes ble to fail disable
The simple stupid workaround for the issue
may impact sidewalk perfromacne and current consumption

Signed-off-by: Krzysztof Taborowski <[email protected]>
@github-actions github-actions bot removed scripts tests doc-required PR must not be merged without tech writer approval. labels Apr 30, 2024
@ktaborowski ktaborowski changed the title Upmerge 25032024 - hack for bluetooth issue ? Never disable bluetooth on nRF53 - workaround post up-merge issue Apr 30, 2024
@github-actions GitHub Actions
Copy link

github-actions bot commented May 6, 2024 •
edited
Loading

Sample diff used total
thingy53/nrf5340/cpuapp:sample.sidewalk.demo.ble_only RAM 0 B 102.34 KB 440 KB
ROM -540 B 391.46 KB 975.5 KB
nrf5340dk/nrf5340/cpuapp:sample.sidewalk.demo RAM 0 B 108.05 KB 440 KB
ROM -544 B 433.78 KB 975.5 KB
nrf5340dk/nrf5340/cpuapp:sample.sidewalk.demo.ble_only RAM 0 B 92.88 KB 440 KB
ROM -540 B 355.16 KB 975.5 KB
nrf5340dk/nrf5340/cpuapp:sample.sidewalk.dut RAM 0 B 131.53 KB 440 KB
ROM -572 B 492.24 KB 975.5 KB
nrf5340dk/nrf5340/cpuapp:sample.sidewalk.hello RAM 0 B 98.14 KB 440 KB
ROM -540 B 433.48 KB 975.5 KB
nrf5340dk/nrf5340/cpuapp:sample.sidewalk.hello.ble_only RAM 0 B 82.95 KB 440 KB
ROM -528 B 354.83 KB 975.5 KB
nrf5340dk/nrf5340/cpuapp:sample.sidewalk.hello.ble_only.release RAM 0 B 78.27 KB 440 KB
ROM -336 B 290.81 KB 975.5 KB
nrf5340dk/nrf5340/cpuapp:sample.sidewalk.hello.release RAM 0 B 93.45 KB 440 KB
ROM -336 B 366.2 KB 975.5 KB
.config diff

.config change: https://github.com/nrfconnect/sdk-sidewalk/actions/runs/8981973321/artifacts/1479363934


./manual-tests-artifacts/twister-out/nrf52840dk_nrf52840/log/sidewalk.test.log/zephyr/.config
old                                                           | new
							      >	CONFIG_SUIT_ENVELOPE_OUTPUT_ARTIFACT="merged.hex"
							      >	CONFIG_SUIT_ENVELOPE_OUTPUT_MPI_MERGE=y

./manual-tests-artifacts/twister-out/nrf52840dk_nrf52840/ble/sidewalk.test.ble/zephyr/.config
old                                                           | new
							      >	CONFIG_SUIT_ENVELOPE_OUTPUT_ARTIFACT="merged.hex"
							      >	CONFIG_SUIT_ENVELOPE_OUTPUT_MPI_MERGE=y

./manual-tests-artifacts/twister-out/nrf52840dk_nrf52840/simple_bootloader/sidewalk.test.simple_bootloader/zephyr/.config
old                                                           | new
							      >	CONFIG_SUIT_ENVELOPE_OUTPUT_ARTIFACT="merged.hex"
							      >	CONFIG_SUIT_ENVELOPE_OUTPUT_MPI_MERGE=y

./manual-tests-artifacts/twister-out/nrf5340dk_nrf5340_cpuapp/log/sidewalk.test.log/zephyr/.config
old                                                           | new
							      >	CONFIG_SUIT_ENVELOPE_OUTPUT_ARTIFACT="merged.hex"
							      >	CONFIG_SUIT_ENVELOPE_OUTPUT_MPI_MERGE=y

./manual-tests-artifacts/twister-out/nrf5340dk_nrf5340_cpuapp/ble/sidewalk.test.ble/zephyr/.config
old                                                           | new
							      >	CONFIG_SUIT_ENVELOPE_OUTPUT_ARTIFACT="merged.hex"
							      >	CONFIG_SUIT_ENVELOPE_OUTPUT_MPI_MERGE=y

./manual-tests-artifacts/twister-out/nrf5340dk_nrf5340_cpuapp/simple_bootloader/sidewalk.test.simple_bootloader/zephyr/.config
old                                                           | new
							      >	CONFIG_SUIT_ENVELOPE_OUTPUT_ARTIFACT="merged.hex"
							      >	CONFIG_SUIT_ENVELOPE_OUTPUT_MPI_MERGE=y

./manual-tests-artifacts/twister-out/nrf54l15pdk_nrf54l15_cpuapp/log/sidewalk.test.log/zephyr/.config
old                                                           | new
							      >	CONFIG_SUIT_ENVELOPE_OUTPUT_ARTIFACT="merged.hex"
							      >	CONFIG_SUIT_ENVELOPE_OUTPUT_MPI_MERGE=y

./manual-tests-artifacts/twister-out/nrf54l15pdk_nrf54l15_cpuapp/ble/sidewalk.test.ble/zephyr/.config
old                                                           | new
							      >	CONFIG_SUIT_ENVELOPE_OUTPUT_ARTIFACT="merged.hex"
							      >	CONFIG_SUIT_ENVELOPE_OUTPUT_MPI_MERGE=y

./manual-tests-artifacts/twister-out/nrf54l15pdk_nrf54l15_cpuapp/simple_bootloader/sidewalk.test.simple_bootloader/zephyr/.config
old                                                           | new
							      >	CONFIG_SUIT_ENVELOPE_OUTPUT_ARTIFACT="merged.hex"
							      >	CONFIG_SUIT_ENVELOPE_OUTPUT_MPI_MERGE=y

./sample-artifacts-meta/twister-out/nrf52840dk_nrf52840/sid_end_device/sample.sidewalk.hello.release/mcuboot/zephyr/.config
old                                                           | new
							      >	CONFIG_SUIT_ENVELOPE_OUTPUT_ARTIFACT="merged.hex"
							      >	CONFIG_SUIT_ENVELOPE_OUTPUT_MPI_MERGE=y

./sample-artifacts-meta/twister-out/nrf52840dk_nrf52840/sid_end_device/sample.sidewalk.hello.release/zephyr/.config
old                                                           | new
							      >	CONFIG_SUIT_ENVELOPE_OUTPUT_ARTIFACT="merged.hex"
							      >	CONFIG_SUIT_ENVELOPE_OUTPUT_MPI_MERGE=y

./sample-artifacts-meta/twister-out/nrf52840dk_nrf52840/sid_end_device/sample.sidewalk.hello.ble_only.release/mcuboot/zephyr/.config
old                                                           | new
							      >	CONFIG_SUIT_ENVELOPE_OUTPUT_ARTIFACT="merged.hex"
							      >	CONFIG_SUIT_ENVELOPE_OUTPUT_MPI_MERGE=y

./sample-artifacts-meta/twister-out/nrf52840dk_nrf52840/sid_end_device/sample.sidewalk.hello.ble_only.release/zephyr/.config
old                                                           | new
							      >	CONFIG_SUIT_ENVELOPE_OUTPUT_ARTIFACT="merged.hex"
							      >	CONFIG_SUIT_ENVELOPE_OUTPUT_MPI_MERGE=y

./sample-artifacts-meta/twister-out/nrf52840dk_nrf52840/sid_end_device/sample.sidewalk.demo.ble_only/mcuboot/zephyr/.config
old                                                           | new
							      >	CONFIG_SUIT_ENVELOPE_OUTPUT_ARTIFACT="merged.hex"
							      >	CONFIG_SUIT_ENVELOPE_OUTPUT_MPI_MERGE=y

./sample-artifacts-meta/twister-out/nrf52840dk_nrf52840/sid_end_device/sample.sidewalk.demo.ble_only/zephyr/.config
old                                                           | new
							      >	CONFIG_SUIT_ENVELOPE_OUTPUT_ARTIFACT="merged.hex"
							      >	CONFIG_SUIT_ENVELOPE_OUTPUT_MPI_MERGE=y

./sample-artifacts-meta/twister-out/nrf52840dk_nrf52840/sid_end_device/sample.sidewalk.dut/mcuboot/zephyr/.config
old                                                           | new
							      >	CONFIG_SUIT_ENVELOPE_OUTPUT_ARTIFACT="merged.hex"
							      >	CONFIG_SUIT_ENVELOPE_OUTPUT_MPI_MERGE=y

./sample-artifacts-meta/twister-out/nrf52840dk_nrf52840/sid_end_device/sample.sidewalk.dut/zephyr/.config
old                                                           | new
							      >	CONFIG_SUIT_ENVELOPE_OUTPUT_ARTIFACT="merged.hex"
							      >	CONFIG_SUIT_ENVELOPE_OUTPUT_MPI_MERGE=y

./sample-artifacts-meta/twister-out/nrf52840dk_nrf52840/sid_end_device/sample.sidewalk.hello.ble_only/mcuboot/zephyr/.config
old                                                           | new
							      >	CONFIG_SUIT_ENVELOPE_OUTPUT_ARTIFACT="merged.hex"
							      >	CONFIG_SUIT_ENVELOPE_OUTPUT_MPI_MERGE=y

./sample-artifacts-meta/twister-out/nrf52840dk_nrf52840/sid_end_device/sample.sidewalk.hello.ble_only/zephyr/.config
old                                                           | new
							      >	CONFIG_SUIT_ENVELOPE_OUTPUT_ARTIFACT="merged.hex"
							      >	CONFIG_SUIT_ENVELOPE_OUTPUT_MPI_MERGE=y

./sample-artifacts-meta/twister-out/nrf52840dk_nrf52840/sid_end_device/sample.sidewalk.hello/mcuboot/zephyr/.config
old                                                           | new
							      >	CONFIG_SUIT_ENVELOPE_OUTPUT_ARTIFACT="merged.hex"
							      >	CONFIG_SUIT_ENVELOPE_OUTPUT_MPI_MERGE=y

./sample-artifacts-meta/twister-out/nrf52840dk_nrf52840/sid_end_device/sample.sidewalk.hello/zephyr/.config
old                                                           | new
							      >	CONFIG_SUIT_ENVELOPE_OUTPUT_ARTIFACT="merged.hex"
							      >	CONFIG_SUIT_ENVELOPE_OUTPUT_MPI_MERGE=y

./sample-artifacts-meta/twister-out/nrf52840dk_nrf52840/sid_end_device/sample.sidewalk.demo/mcuboot/zephyr/.config
old                                                           | new
							      >	CONFIG_SUIT_ENVELOPE_OUTPUT_ARTIFACT="merged.hex"
							      >	CONFIG_SUIT_ENVELOPE_OUTPUT_MPI_MERGE=y

./sample-artifacts-meta/twister-out/nrf52840dk_nrf52840/sid_end_device/sample.sidewalk.demo/zephyr/.config
old                                                           | new
							      >	CONFIG_SUIT_ENVELOPE_OUTPUT_ARTIFACT="merged.hex"
							      >	CONFIG_SUIT_ENVELOPE_OUTPUT_MPI_MERGE=y

./sample-artifacts-meta/twister-out/thingy53_nrf5340_cpuapp/sid_end_device/sample.sidewalk.demo.ble_only/mcuboot/zephyr/.config
old                                                           | new
							      >	CONFIG_SUIT_ENVELOPE_OUTPUT_ARTIFACT="merged.hex"
							      >	CONFIG_SUIT_ENVELOPE_OUTPUT_MPI_MERGE=y

./sample-artifacts-meta/twister-out/thingy53_nrf5340_cpuapp/sid_end_device/sample.sidewalk.demo.ble_only/hci_ipc/b0n/zephyr/.config
old                                                           | new
							      >	CONFIG_SUIT_ENVELOPE_OUTPUT_ARTIFACT="merged.hex"
							      >	CONFIG_SUIT_ENVELOPE_OUTPUT_MPI_MERGE=y

./sample-artifacts-meta/twister-out/thingy53_nrf5340_cpuapp/sid_end_device/sample.sidewalk.demo.ble_only/hci_ipc/zephyr/.config
old                                                           | new
							      >	CONFIG_SUIT_ENVELOPE_OUTPUT_ARTIFACT="merged.hex"
							      >	CONFIG_SUIT_ENVELOPE_OUTPUT_MPI_MERGE=y

./sample-artifacts-meta/twister-out/thingy53_nrf5340_cpuapp/sid_end_device/sample.sidewalk.demo.ble_only/zephyr/.config
old                                                           | new
							      >	CONFIG_SUIT_ENVELOPE_OUTPUT_ARTIFACT="merged.hex"
							      >	CONFIG_SUIT_ENVELOPE_OUTPUT_MPI_MERGE=y

./sample-artifacts-meta/twister-out/nrf5340dk_nrf5340_cpuapp/sid_end_device/sample.sidewalk.hello.release/mcuboot/zephyr/.config
old                                                           | new
							      >	CONFIG_SUIT_ENVELOPE_OUTPUT_ARTIFACT="merged.hex"
							      >	CONFIG_SUIT_ENVELOPE_OUTPUT_MPI_MERGE=y

./sample-artifacts-meta/twister-out/nrf5340dk_nrf5340_cpuapp/sid_end_device/sample.sidewalk.hello.release/hci_ipc/b0n/zephyr/.config
old                                                           | new
							      >	CONFIG_SUIT_ENVELOPE_OUTPUT_ARTIFACT="merged.hex"
							      >	CONFIG_SUIT_ENVELOPE_OUTPUT_MPI_MERGE=y

./sample-artifacts-meta/twister-out/nrf5340dk_nrf5340_cpuapp/sid_end_device/sample.sidewalk.hello.release/hci_ipc/zephyr/.config
old                                                           | new
							      >	CONFIG_SUIT_ENVELOPE_OUTPUT_ARTIFACT="merged.hex"
							      >	CONFIG_SUIT_ENVELOPE_OUTPUT_MPI_MERGE=y

./sample-artifacts-meta/twister-out/nrf5340dk_nrf5340_cpuapp/sid_end_device/sample.sidewalk.hello.release/zephyr/.config
old                                                           | new
							      >	CONFIG_SUIT_ENVELOPE_OUTPUT_ARTIFACT="merged.hex"
							      >	CONFIG_SUIT_ENVELOPE_OUTPUT_MPI_MERGE=y

./sample-artifacts-meta/twister-out/nrf5340dk_nrf5340_cpuapp/sid_end_device/sample.sidewalk.hello.ble_only.release/mcuboot/zephyr/.config
old                                                           | new
							      >	CONFIG_SUIT_ENVELOPE_OUTPUT_ARTIFACT="merged.hex"
							      >	CONFIG_SUIT_ENVELOPE_OUTPUT_MPI_MERGE=y

./sample-artifacts-meta/twister-out/nrf5340dk_nrf5340_cpuapp/sid_end_device/sample.sidewalk.hello.ble_only.release/hci_ipc/b0n/zephyr/.config
old                                                           | new
							      >	CONFIG_SUIT_ENVELOPE_OUTPUT_ARTIFACT="merged.hex"
							      >	CONFIG_SUIT_ENVELOPE_OUTPUT_MPI_MERGE=y

./sample-artifacts-meta/twister-out/nrf5340dk_nrf5340_cpuapp/sid_end_device/sample.sidewalk.hello.ble_only.release/hci_ipc/zephyr/.config
old                                                           | new
							      >	CONFIG_SUIT_ENVELOPE_OUTPUT_ARTIFACT="merged.hex"
							      >	CONFIG_SUIT_ENVELOPE_OUTPUT_MPI_MERGE=y

./sample-artifacts-meta/twister-out/nrf5340dk_nrf5340_cpuapp/sid_end_device/sample.sidewalk.hello.ble_only.release/zephyr/.config
old                                                           | new
							      >	CONFIG_SUIT_ENVELOPE_OUTPUT_ARTIFACT="merged.hex"
							      >	CONFIG_SUIT_ENVELOPE_OUTPUT_MPI_MERGE=y

./sample-artifacts-meta/twister-out/nrf5340dk_nrf5340_cpuapp/sid_end_device/sample.sidewalk.demo.ble_only/mcuboot/zephyr/.config
old                                                           | new
							      >	CONFIG_SUIT_ENVELOPE_OUTPUT_ARTIFACT="merged.hex"
							      >	CONFIG_SUIT_ENVELOPE_OUTPUT_MPI_MERGE=y

./sample-artifacts-meta/twister-out/nrf5340dk_nrf5340_cpuapp/sid_end_device/sample.sidewalk.demo.ble_only/hci_ipc/b0n/zephyr/.config
old                                                           | new
							      >	CONFIG_SUIT_ENVELOPE_OUTPUT_ARTIFACT="merged.hex"
							      >	CONFIG_SUIT_ENVELOPE_OUTPUT_MPI_MERGE=y

./sample-artifacts-meta/twister-out/nrf5340dk_nrf5340_cpuapp/sid_end_device/sample.sidewalk.demo.ble_only/hci_ipc/zephyr/.config
old                                                           | new
							      >	CONFIG_SUIT_ENVELOPE_OUTPUT_ARTIFACT="merged.hex"
							      >	CONFIG_SUIT_ENVELOPE_OUTPUT_MPI_MERGE=y

./sample-artifacts-meta/twister-out/nrf5340dk_nrf5340_cpuapp/sid_end_device/sample.sidewalk.demo.ble_only/zephyr/.config
old                                                           | new
							      >	CONFIG_SUIT_ENVELOPE_OUTPUT_ARTIFACT="merged.hex"
							      >	CONFIG_SUIT_ENVELOPE_OUTPUT_MPI_MERGE=y

./sample-artifacts-meta/twister-out/nrf5340dk_nrf5340_cpuapp/sid_end_device/sample.sidewalk.dut/mcuboot/zephyr/.config
old                                                           | new
							      >	CONFIG_SUIT_ENVELOPE_OUTPUT_ARTIFACT="merged.hex"

Configuration diff too long to fit. Check file in artifacts.

@ktaborowski ktaborowski marked this pull request as ready for review May 7, 2024 08:01
@ktaborowski
Copy link
Contributor Author

Seems to be fixed in nrfconnect/sdk-nrf#15202
no need for workaround

@ktaborowski ktaborowski closed this May 7, 2024
@ktaborowski ktaborowski deleted the upmerge-25032024 branch June 18, 2024 06:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@gmarull gmarull Awaiting requested review from gmarull

@RobertGalatNordic RobertGalatNordic Awaiting requested review from RobertGalatNordic

@totyz totyz Awaiting requested review from totyz

Assignees
No one assigned
Labels
bug Something isn't working DNM Do Not Merge source PR changing src files
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@ktaborowski