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.

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

samples: Fix Wi-Fi and BLE combo radio test for 54H #19149

Merged
merged 1 commit into from
Dec 4, 2024

Conversation

krish2718
Copy link
Contributor

When a combo radio test is used for 54H, the peripheral radio test uses the same console as Wi-Fi radio test causing UICR conflicts and failing to boot both APP and RAD.

Fix the conflicts by adding an overlay to use a separate console and also not to use APP RAM in RAD.

Fixes SHEL-3287.

@krish2718 krish2718 added this to the 2.9.0 milestone Nov 28, 2024
@krish2718 krish2718 requested a review from 57300 November 28, 2024 19:55
@github-actions github-actions bot added the changelog-entry-required Update changelog before merge. Remove label if entry is not needed or already added. label Nov 28, 2024
@krish2718
Copy link
Contributor Author

@57300 for combo build I reverted your changes, but not sure if the SR radio test still works with using DMA region of RAD, please review.

@NordicBuilder
Copy link
Contributor

NordicBuilder commented Nov 28, 2024

CI Information

To view the history of this post, clich the 'edited' button above
Build number: 4

Inputs:

Sources:

sdk-nrf: PR head: 499427d45a8a27aec52cba13a0166b98c4651a2c

more details

sdk-nrf:

PR head: 499427d45a8a27aec52cba13a0166b98c4651a2c
merge base: 2b8929bc698fa8102baca4175e767f3d86439492
target head (main): a793d8821e430c920ef132878f78d91387374cce
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 (2)
samples
│  ├── peripheral
│  │  ├── radio_test
│  │  │  ├── boards
│  │  │  │  │ nrf54h20dk_nrf54h20_cpurad_wifi_combo.overlay
│  ├── wifi
│  │  ├── radio_test
│  │  │  │ sample.yaml

Outputs:

Toolchain

Version: b77d8c1312
Build docker image: docker-dtr.nordicsemi.no/sw-production/ncs-build:b77d8c1312_912848a074

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

  • ◻️ Toolchain - Skipped: existing toolchain is used
  • ✅ Build twister
    • sdk-nrf test count: 149
  • ✅ Integration tests
    • ✅ test-fw-nrfconnect-ble_samples
    • ✅ test-sdk-wifi
Disabled integration tests
    • desktop52_verification
    • doc-internal
    • test_ble_nrf_config
    • test-fw-nrfconnect-apps
    • test-fw-nrfconnect-ble_mesh
    • test-fw-nrfconnect-boot
    • test-fw-nrfconnect-chip
    • test-fw-nrfconnect-fem
    • test-fw-nrfconnect-nfc
    • test-fw-nrfconnect-nrf-iot_libmodem-nrf
    • test-fw-nrfconnect-nrf-iot_lwm2m
    • test-fw-nrfconnect-nrf-iot_mosh
    • test-fw-nrfconnect-nrf-iot_nrf_provisioning
    • test-fw-nrfconnect-nrf-iot_positioning
    • test-fw-nrfconnect-nrf-iot_samples
    • test-fw-nrfconnect-nrf-iot_serial_lte_modem
    • test-fw-nrfconnect-nrf-iot_thingy91
    • test-fw-nrfconnect-nrf-iot_zephyr_lwm2m
    • test-fw-nrfconnect-nrf_crypto
    • test-fw-nrfconnect-ps
    • test-fw-nrfconnect-rpc
    • test-fw-nrfconnect-rs
    • test-fw-nrfconnect-tfm
    • test-fw-nrfconnect-thread
    • test-fw-nrfconnect-zigbee
    • test-low-level
    • test-sdk-audio
    • test-sdk-dfu
    • test-sdk-find-my
    • test-sdk-mcuboot
    • test-sdk-pmic-samples
    • test-sdk-sidewalk
    • test-secdom-samples-public

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

@krish2718 krish2718 force-pushed the fix_radio_test_combo branch from ca9c9c2 to 19437ac Compare November 28, 2024 20:03
@NordicBuilder
Copy link
Contributor

You can find the documentation preview for this PR at this link. It will be updated about 10 minutes after the documentation build succeeds.

Note: This comment is automatically posted by the Documentation Publish GitHub Action.

Copy link
Contributor

@57300 57300 left a comment

Choose a reason for hiding this comment

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

@57300 for combo build I reverted your changes, but not sure if the SR radio test still works with using DMA region of RAD, please review.

I can't really comment on that. I assume you're referring to the changes in a9543c9, which I added as a replacement for 2ec2653. Maybe someone else can elaborate on potential issues with the DMA region being too small (cc @nordic-piks) or why the peripheral radio test sample needs to use uart136, as opposed to uart135, which is default for cpurad.

@nordic-piks
Copy link
Contributor

@57300 for combo build I reverted your changes, but not sure if the SR radio test still works with using DMA region of RAD, please review.

I can't really comment on that. I assume you're referring to the changes in a9543c9, which I added as a replacement for 2ec2653. Maybe someone else can elaborate on potential issues with the DMA region being too small (cc @nordic-piks) or why the peripheral radio test sample needs to use uart136, as opposed to uart135, which is default for cpurad.

Regarding DMA regions - please ask @nika-nordic - he proposed solution at [2ec2653]

@krish2718 krish2718 force-pushed the fix_radio_test_combo branch from 19437ac to 20c8d49 Compare November 30, 2024 15:21
When a combo radio test is used for 54H, the peripheral radio test uses
the same console as Wi-Fi radio test causing UICR conflicts and failing
to boot both APP and RAD.

Fix the conflicts by adding an overlay that uses defaults.

Fixes SHEL-3287.

Signed-off-by: Chaitanya Tata <[email protected]>
@krish2718 krish2718 force-pushed the fix_radio_test_combo branch from 20c8d49 to 499427d Compare November 30, 2024 15:26
@krish2718 krish2718 requested a review from 57300 December 2, 2024 16:02
@krish2718
Copy link
Contributor Author

@nrfconnect/ncs-si-muffin ping.

@krish2718
Copy link
Contributor Author

@nrfconnect/ncs-si-muffin ping.

@pdunaj can someone from Muffin please review this PR?

@shanthanordic shanthanordic modified the milestones: 2.9.0, 2.9.0-nRF54H20 Dec 4, 2024
@pdunaj
Copy link
Contributor

pdunaj commented Dec 4, 2024

Done, I wonder if muffin should at all be engaged in this samples if these are wifi related.

@nordicjm nordicjm merged commit 5354fbd into nrfconnect:main Dec 4, 2024
13 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
changelog-entry-required Update changelog before merge. Remove label if entry is not needed or already added.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

10 participants