bluetooth_tester_nrf54h20_hci_ipc

samples/bluetooth/hci_ipc/nrf54h20_cpurad-bt_ll_softdevice.conf

@@ -0,0 +1,33 @@
+CONFIG_IPC_SERVICE=y
+CONFIG_MBOX=y
+
+CONFIG_ISR_STACK_SIZE=1024
+CONFIG_IDLE_STACK_SIZE=256
+CONFIG_MAIN_STACK_SIZE=512
+CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=512
+CONFIG_IPC_SERVICE_BACKEND_RPMSG_WQ_STACK_SIZE=512
+CONFIG_HEAP_MEM_POOL_SIZE=8192
+
+CONFIG_BT=y
+CONFIG_BT_HCI_RAW=y
+
+CONFIG_BT_BUF_EVT_RX_COUNT=16
+CONFIG_BT_BUF_EVT_RX_SIZE=255
+CONFIG_BT_BUF_ACL_RX_SIZE=255
+CONFIG_BT_BUF_ACL_TX_SIZE=251
+CONFIG_BT_BUF_CMD_TX_SIZE=255
+
+# Host
+CONFIG_BT_BROADCASTER=y
+CONFIG_BT_PERIPHERAL=y
+CONFIG_BT_OBSERVER=y
+CONFIG_BT_CENTRAL=y
+CONFIG_BT_EXT_ADV=y
+CONFIG_BT_PER_ADV=y
+CONFIG_BT_PER_ADV_SYNC=y
+
+# Controller
+CONFIG_BT_LL_SW_SPLIT=n
+CONFIG_BT_LL_SOFTDEVICE=y
+CONFIG_BT_CTLR_DATA_LENGTH_MAX=251
+CONFIG_BT_CTLR_SCAN_DATA_LEN_MAX=191

tests/bluetooth/shell/testcase.yaml

@@ -53,7 +53,7 @@ tests:
     build_only: true
   bluetooth.shell.cdc_acm:
     extra_args:
-      - OVERLAY_CONFIG=cdc_acm.conf
+      - EXTRA_CONF_FILE=cdc_acm.conf
       - DTC_OVERLAY_FILE="usb.overlay"
     depends_on: usb_device
     platform_allow:

tests/bluetooth/tester/Kconfig.sysbuild

@@ -0,0 +1,15 @@
+# Copyright 2023-2024 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+source "share/sysbuild/Kconfig"
+
+config NET_CORE_BOARD
+	string
+	default "nrf54h20dk/nrf54h20/cpurad" if "$(BOARD)" = "nrf54h20dk"
+	default "nrf5340dk/nrf5340/cpunet" if "$(BOARD)" = "nrf5340dk"
+	default "nrf5340_audio_dk/nrf5340/cpunet" if "$(BOARD)" = "nrf5340_audio_dk"
+
+config NET_CORE_IMAGE_HCI_IPC
+	bool "HCI IPC image on network core"
+	default y
+	depends on NET_CORE_BOARD != ""

tests/bluetooth/tester/boards/nrf5340_audio_dk_nrf5340_cpuapp.conf

@@ -0,0 +1,25 @@
+# CONFIG_TEST enforces minimal logging, which we don't want
+CONFIG_TEST=n
+
+CONFIG_ASSERT=y
+# Enable the option below to measure stack usage
+#CONFIG_INIT_STACKS=y
+CONFIG_THREAD_NAME=y
+CONFIG_HW_STACK_PROTECTION=y
+
+CONFIG_LOG=y
+CONFIG_LOG_BUFFER_SIZE=4096
+CONFIG_RTT_CONSOLE=y
+CONFIG_LOG_BACKEND_RTT=y
+CONFIG_LOG_BACKEND_RTT_MODE_DROP=y
+CONFIG_USE_SEGGER_RTT=y
+CONFIG_SEGGER_RTT_BUFFER_SIZE_UP=4096
+CONFIG_LOG_BACKEND_SHOW_COLOR=n
+CONFIG_LOG_PROCESS_THREAD_STACK_SIZE=1024
+
+CONFIG_LOG_DEFAULT_LEVEL=3
+CONFIG_BTTESTER_LOG_LEVEL_DBG=y
+
+CONFIG_UART_INTERRUPT_DRIVEN=y
+
+CONFIG_BT_TINYCRYPT_ECC=y

tests/bluetooth/tester/boards/nrf5340_audio_dk_nrf5340_cpuapp.overlay

@@ -0,0 +1,14 @@
+/* SPDX-License-Identifier: Apache-2.0 */
+
+/ {
+	chosen {
+		zephyr,uart-pipe = &uart0;
+	};
+};
+
+&uart0 {
+	compatible = "nordic,nrf-uarte";
+	current-speed = <115200>;
+	status = "okay";
+	hw-flow-control;
+};

tests/bluetooth/tester/nrf5340_hci_ipc_cpunet.conf → tests/bluetooth/tester/hci_ipc_cpunet.conf

@@ -1,5 +1,11 @@
 # Apply this overlay at hci_ipc controller build
-CONFIG_BT_CTLR_CONN_ISO_LOW_LATENCY_POLICY=y
+
+# Changes towards reduced RAM usage, in order to fit the tweaks
+CONFIG_HEAP_MEM_POOL_SIZE=7168
+
+# PTS required counts
+CONFIG_BT_MAX_CONN=3
+
+# PTS tests specific tweaks
 CONFIG_BT_CTLR_PERIPHERAL_ISO_EARLY_CIG_START=y
 CONFIG_BT_CTLR_ISOAL_PSN_IGNORE=y
-CONFIG_BT_MAX_CONN=3

tests/bluetooth/tester/sysbuild.cmake

@@ -0,0 +1,40 @@
+# Copyright (c) 2023-2024 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+if(SB_CONFIG_NET_CORE_IMAGE_HCI_IPC)
+	set(NET_APP hci_ipc)
+	set(NET_APP_SRC_DIR ${ZEPHYR_BASE}/samples/bluetooth/${NET_APP})
+
+	ExternalZephyrProject_Add(
+		APPLICATION ${NET_APP}
+		SOURCE_DIR  ${NET_APP_SRC_DIR}
+		BOARD       ${SB_CONFIG_NET_CORE_BOARD}
+	)
+
+	if(SB_CONFIG_SOC_NRF5340_CPUAPP)
+		set(${NET_APP}_CONF_FILE
+		${NET_APP_SRC_DIR}/nrf5340_cpunet_iso-bt_ll_sw_split.conf
+		CACHE INTERNAL ""
+		)
+		set(${NET_APP}_SNIPPET
+		"bt-ll-sw-split"
+		CACHE INTERNAL ""
+		)
+	endif()
+
+	if(SB_CONFIG_SOC_NRF54H20_CPUAPP)
+		set(${NET_APP}_CONF_FILE
+		${NET_APP_SRC_DIR}/nrf54h20_cpurad-bt_ll_softdevice.conf
+		CACHE INTERNAL ""
+		)
+	endif()
+
+	set(${NET_APP}_EXTRA_CONF_FILE
+	 ${APP_DIR}/hci_ipc_cpunet.conf
+	 CACHE INTERNAL ""
+	)
+
+	native_simulator_set_child_images(${DEFAULT_IMAGE} ${NET_APP})
+endif()
+
+native_simulator_set_final_executable(${DEFAULT_IMAGE})

tests/bluetooth/tester/testcase.yaml

@@ -24,16 +24,22 @@ tests:
       - native_posix
       - native_sim
       - nrf5340dk/nrf5340/cpuapp
-    extra_args: OVERLAY_CONFIG="overlay-le-audio.conf"
+      - nrf5340_audio_dk/nrf5340/cpuapp
+    integration_platforms:
+      - nrf5340dk/nrf5340/cpuapp
+      - nrf5340_audio_dk/nrf5340/cpuapp
+    extra_args:
+      - EXTRA_CONF_FILE="overlay-le-audio.conf"
     tags: bluetooth
     harness: bluetooth
+    sysbuild: true
   bluetooth.general.tester_mesh:
     build_only: true
     platform_allow:
       - qemu_x86
       - native_posix
       - native_sim
       - nrf52840dk/nrf52840
-    extra_args: OVERLAY_CONFIG="overlay-mesh.conf"
+    extra_args: EXTRA_CONF_FILE="overlay-mesh.conf"
     tags: bluetooth
     harness: bluetooth

tests/bsim/bluetooth/ll/bis/testcase.yaml

@@ -19,7 +19,7 @@ tests:
     harness_config:
       bsim_exe_name: tests_bsim_bluetooth_ll_bis_prj_conf
   bluetooth.ll.bis_ticker_expire_info:
-    extra_args: OVERLAY_CONFIG=overlay-ticker_expire_info.conf
+    extra_args: EXTRA_CONF_FILE=overlay-ticker_expire_info.conf
     platform_allow:
       - nrf52_bsim
       - nrf5340bsim/nrf5340/cpunet