[nrf fromlist] Bluetooth: Tester: Unify L2CAP and ACL bufs configuration

This should all be unified so that tests run with similar setup on all boards. Upstream PR #: 80911
nrfconnect · Nov 6, 2024 · 5a8813b · 5a8813b
1 parent 75e6788
commit 5a8813b
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 20 deletions.
diff --git a/tests/bluetooth/tester/nrf5340_hci_ipc.conf b/tests/bluetooth/tester/nrf5340_hci_ipc.conf
@@ -1,9 +1 @@
 # Apply this overlay at tester build, not hci_ipc build
-CONFIG_BT_MAX_CONN=3
-CONFIG_BT_MAX_PAIRED=3
-# Those have to be the same as in the controller (hci_ipc)
-CONFIG_BT_BUF_EVT_RX_COUNT=16
-CONFIG_BT_BUF_EVT_RX_SIZE=255
-CONFIG_BT_BUF_CMD_TX_SIZE=255
-CONFIG_BT_BUF_ACL_TX_SIZE=251
-CONFIG_BT_BUF_ACL_RX_SIZE=255
diff --git a/tests/bluetooth/tester/overlay-le-audio.conf b/tests/bluetooth/tester/overlay-le-audio.conf
@@ -12,13 +12,6 @@ CONFIG_BT_AUDIO_CODEC_CFG_MAX_METADATA_SIZE=22
 # Ring buffer for streaming ISO data
 CONFIG_RING_BUFFER=y
 
-# These have to be the same as in the controller (hci_ipc)
-CONFIG_BT_MAX_CONN=3
-CONFIG_BT_MAX_PAIRED=3
-CONFIG_BT_BUF_EVT_RX_COUNT=16
-CONFIG_BT_BUF_EVT_RX_SIZE=255
-CONFIG_BT_BUF_CMD_TX_SIZE=255
-
 # When initiating Codec Config by server for 3 ASEs one by one, MTU buffers
 # were freed too slow. The bt_bap_stream_ops.configured callback comes earlier.
 CONFIG_BT_L2CAP_TX_BUF_COUNT=10
@@ -49,9 +42,6 @@ CONFIG_BT_BAP_BROADCAST_SNK_SUBGROUP_COUNT=2
 CONFIG_BT_PER_ADV_SYNC_TRANSFER_SENDER=y
 CONFIG_BT_AUDIO_CODEC_CFG_MAX_METADATA_SIZE=255
 CONFIG_BT_PER_ADV_SYNC_TRANSFER_RECEIVER=y
-# BASS notifications need higher MTU
-CONFIG_BT_L2CAP_TX_MTU=255
-CONFIG_BT_BUF_ACL_RX_SIZE=255
 
 # ASCS
 CONFIG_BT_ASCS=y

diff --git a/tests/bluetooth/tester/prj.conf b/tests/bluetooth/tester/prj.conf
@@ -16,6 +16,7 @@ CONFIG_BT_BONDABLE=y
 CONFIG_BT_ATT_PREPARE_COUNT=12
 CONFIG_BT_GATT_CLIENT=y
 CONFIG_BT_L2CAP_DYNAMIC_CHANNEL=y
+CONFIG_BT_L2CAP_TX_MTU=255
 CONFIG_BT_L2CAP_SEG_RECV=y
 CONFIG_BT_L2CAP_RECONFIGURE_EXPLICIT=y
 CONFIG_BT_DEVICE_NAME="Tester"
@@ -27,8 +28,8 @@ CONFIG_BT_L2CAP_ECRED=y
 CONFIG_BT_EATT_MAX=5
 CONFIG_BT_FILTER_ACCEPT_LIST=y
 CONFIG_BT_EATT_AUTO_CONNECT=n
-CONFIG_BT_MAX_CONN=2
-CONFIG_BT_MAX_PAIRED=2
+CONFIG_BT_MAX_CONN=3
+CONFIG_BT_MAX_PAIRED=3
 CONFIG_BT_GATT_NOTIFY_MULTIPLE=y
 CONFIG_BT_ATT_RETRY_ON_SEC_ERR=n
 CONFIG_BT_GATT_DYNAMIC_DB=y
@@ -55,3 +56,9 @@ CONFIG_BT_DIS_SERIAL_NUMBER=y
 CONFIG_BT_DIS_FW_REV=y
 CONFIG_BT_DIS_HW_REV=y
 CONFIG_BT_DIS_SW_REV=y
+
+CONFIG_BT_BUF_EVT_RX_COUNT=16
+CONFIG_BT_BUF_EVT_RX_SIZE=255
+CONFIG_BT_BUF_CMD_TX_SIZE=255
+CONFIG_BT_BUF_ACL_TX_SIZE=251
+CONFIG_BT_BUF_ACL_RX_SIZE=255