Skip to content

Commit 89bffb3

Browse files
cvinayakrlubos
authored andcommitted
[nrf fromtree] tests: Bluetooth: tester: Workaround Bus Fault in nRF53x using full RAM
Workaround failing autopts weekly run due to tester application having Bus Fault in the nRF53 NET core hci_ipc firmware at startup. Having atleast 32 bytes free in nRF53x hci_ipc sample to avoid Bus Fault when Zephyr Kernel does SYSINIT calls. Reduce supported ISO Broadcaster instance and ISO TX buffer counts in the Controller hci_ipc firmware. Add sysbuild support for tester application so that the build is CI verified. sysbuild commandline for LE audio PTS testing: # west build --sysbuild -b nrf5340_audio_dk/nrf5340/cpuapp -d build/tester tests/bluetooth/tester -DEXTRA_CONF_FILE="overlay-le-audio.conf" Signed-off-by: Vinayak Kariappa Chettimada <[email protected]> (cherry picked from commit 525ba38)
1 parent b342a34 commit 89bffb3

File tree

4 files changed

+57
-3
lines changed

4 files changed

+57
-3
lines changed
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
# Copyright 2023-2024 Nordic Semiconductor ASA
2+
# SPDX-License-Identifier: Apache-2.0
3+
4+
source "share/sysbuild/Kconfig"
5+
6+
config NET_CORE_BOARD
7+
string
8+
default "nrf5340dk/nrf5340/cpunet" if "$(BOARD)" = "nrf5340dk"
9+
default "nrf5340_audio_dk/nrf5340/cpunet" if "$(BOARD)" = "nrf5340_audio_dk"
10+
11+
config NET_CORE_IMAGE_HCI_IPC
12+
bool "HCI IPC image on network core"
13+
default y
14+
depends on NET_CORE_BOARD != ""

tests/bluetooth/tester/nrf5340_hci_ipc_cpunet.conf

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
# Apply this overlay at hci_ipc controller build
2-
CONFIG_BT_CTLR_CONN_ISO_LOW_LATENCY_POLICY=y
2+
3+
# Changes towards reduced RAM usage, in order to fit the tweaks
4+
CONFIG_HEAP_MEM_POOL_SIZE=7168
5+
6+
# PTS required counts
7+
CONFIG_BT_MAX_CONN=3
8+
9+
# PTS tests specific tweaks
310
CONFIG_BT_CTLR_PERIPHERAL_ISO_EARLY_CIG_START=y
411
CONFIG_BT_CTLR_ISOAL_PSN_IGNORE=y
5-
CONFIG_BT_MAX_CONN=3
Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
# Copyright (c) 2023-2024 Nordic Semiconductor ASA
2+
# SPDX-License-Identifier: Apache-2.0
3+
4+
if(SB_CONFIG_NET_CORE_IMAGE_HCI_IPC)
5+
# For builds in the nrf5340, we build the netcore image with the controller
6+
7+
set(NET_APP hci_ipc)
8+
set(NET_APP_SRC_DIR ${ZEPHYR_BASE}/samples/bluetooth/${NET_APP})
9+
10+
ExternalZephyrProject_Add(
11+
APPLICATION ${NET_APP}
12+
SOURCE_DIR ${NET_APP_SRC_DIR}
13+
BOARD ${SB_CONFIG_NET_CORE_BOARD}
14+
)
15+
16+
set(${NET_APP}_CONF_FILE
17+
${NET_APP_SRC_DIR}/nrf5340_cpunet_iso-bt_ll_sw_split.conf
18+
CACHE INTERNAL ""
19+
)
20+
21+
set(${NET_APP}_EXTRA_CONF_FILE
22+
${APP_DIR}/nrf5340_hci_ipc_cpunet.conf
23+
CACHE INTERNAL ""
24+
)
25+
26+
native_simulator_set_child_images(${DEFAULT_IMAGE} ${NET_APP})
27+
endif()
28+
29+
native_simulator_set_final_executable(${DEFAULT_IMAGE})

tests/bluetooth/tester/testcase.yaml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,14 @@ tests:
2525
- native_sim
2626
- nrf5340dk/nrf5340/cpuapp
2727
- nrf5340_audio_dk/nrf5340/cpuapp
28-
extra_args: EXTRA_CONF_FILE="overlay-le-audio.conf"
28+
integration_platforms:
29+
- nrf5340dk/nrf5340/cpuapp
30+
- nrf5340_audio_dk/nrf5340/cpuapp
31+
extra_args:
32+
- EXTRA_CONF_FILE="overlay-le-audio.conf"
2933
tags: bluetooth
3034
harness: bluetooth
35+
sysbuild: true
3136
bluetooth.general.tester_mesh:
3237
build_only: true
3338
platform_allow:

0 commit comments

Comments
 (0)