From 3f7fa919d94fd319bde8bce3c46e505eedd3dbc4 Mon Sep 17 00:00:00 2001 From: Vinayak Kariappa Chettimada Date: Wed, 5 Apr 2023 21:46:36 +0530 Subject: [PATCH] samples: Bluetooth: hci_rpmsg: Fix RAM overflow building for DF feature Fix RAM overflow building for direction finding feature on nRF53 Series, by reducing thread stack sizes. And move building DF plus CIS feature to hci_uart sample from hci_rpmsg sample. Signed-off-by: Vinayak Kariappa Chettimada --- .../nrf5340_cpunet_bis-bt_ll_sw_split.conf | 10 +- .../nrf5340_cpunet_cis-bt_ll_sw_split.conf | 16 ++- .../nrf5340_cpunet_df-bt_ll_sw_split.conf | 10 +- .../nrf5340_cpunet_df_cis-bt_ll_sw_split.conf | 104 ------------------ .../nrf5340_cpunet_iso-bt_ll_sw_split.conf | 16 ++- ...0_cpunet_iso_broadcast-bt_ll_sw_split.conf | 11 +- ...340_cpunet_iso_central-bt_ll_sw_split.conf | 21 +++- ..._cpunet_iso_peripheral-bt_ll_sw_split.conf | 12 +- ...340_cpunet_iso_receive-bt_ll_sw_split.conf | 11 +- samples/bluetooth/hci_rpmsg/sample.yaml | 9 -- .../hci_uart/overlay-all-bt_ll_sw_split.conf | 74 ++++++++++--- 11 files changed, 152 insertions(+), 142 deletions(-) delete mode 100644 samples/bluetooth/hci_rpmsg/nrf5340_cpunet_df_cis-bt_ll_sw_split.conf diff --git a/samples/bluetooth/hci_rpmsg/nrf5340_cpunet_bis-bt_ll_sw_split.conf b/samples/bluetooth/hci_rpmsg/nrf5340_cpunet_bis-bt_ll_sw_split.conf index 173e2286f1c..822f79f741d 100644 --- a/samples/bluetooth/hci_rpmsg/nrf5340_cpunet_bis-bt_ll_sw_split.conf +++ b/samples/bluetooth/hci_rpmsg/nrf5340_cpunet_bis-bt_ll_sw_split.conf @@ -2,8 +2,10 @@ CONFIG_IPC_SERVICE=y CONFIG_MBOX=y CONFIG_ISR_STACK_SIZE=1024 +CONFIG_IDLE_STACK_SIZE=128 CONFIG_MAIN_STACK_SIZE=512 -CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=512 +CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=256 +CONFIG_IPC_SERVICE_BACKEND_RPMSG_WQ_STACK_SIZE=512 CONFIG_HEAP_MEM_POOL_SIZE=8192 CONFIG_BT=y @@ -22,6 +24,12 @@ CONFIG_BT_BUF_ACL_RX_SIZE=255 CONFIG_BT_BUF_ACL_TX_SIZE=251 CONFIG_BT_BUF_CMD_TX_SIZE=255 +# Tx/Rx Thread Stack Sizes +CONFIG_BT_HCI_TX_STACK_SIZE_WITH_PROMPT=y +CONFIG_BT_HCI_TX_STACK_SIZE=768 +CONFIG_BT_RX_STACK_SIZE=512 +CONFIG_BT_CTLR_RX_PRIO_STACK_SIZE=256 + # Host features CONFIG_BT_EXT_ADV=y CONFIG_BT_PER_ADV=y diff --git a/samples/bluetooth/hci_rpmsg/nrf5340_cpunet_cis-bt_ll_sw_split.conf b/samples/bluetooth/hci_rpmsg/nrf5340_cpunet_cis-bt_ll_sw_split.conf index f11609aebf6..8184ab6745e 100644 --- a/samples/bluetooth/hci_rpmsg/nrf5340_cpunet_cis-bt_ll_sw_split.conf +++ b/samples/bluetooth/hci_rpmsg/nrf5340_cpunet_cis-bt_ll_sw_split.conf @@ -2,8 +2,10 @@ CONFIG_IPC_SERVICE=y CONFIG_MBOX=y CONFIG_ISR_STACK_SIZE=1024 +CONFIG_IDLE_STACK_SIZE=128 CONFIG_MAIN_STACK_SIZE=512 -CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=512 +CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=256 +CONFIG_IPC_SERVICE_BACKEND_RPMSG_WQ_STACK_SIZE=512 CONFIG_HEAP_MEM_POOL_SIZE=8192 CONFIG_BT=y @@ -22,6 +24,12 @@ CONFIG_BT_BUF_ACL_RX_SIZE=255 CONFIG_BT_BUF_ACL_TX_SIZE=251 CONFIG_BT_BUF_CMD_TX_SIZE=255 +# Tx/Rx Thread Stack Sizes +CONFIG_BT_HCI_TX_STACK_SIZE_WITH_PROMPT=y +CONFIG_BT_HCI_TX_STACK_SIZE=768 +CONFIG_BT_RX_STACK_SIZE=512 +CONFIG_BT_CTLR_RX_PRIO_STACK_SIZE=256 + # Host features CONFIG_BT_EXT_ADV=y CONFIG_BT_PER_ADV=n @@ -63,8 +71,12 @@ CONFIG_BT_CTLR_ADV_DATA_BUF_MAX=6 CONFIG_BT_CTLR_SCAN_AUX_SET=1 CONFIG_BT_CTLR_ADV_RESERVE_MAX=n +CONFIG_BT_CTLR_CENTRAL_RESERVE_MAX=n +CONFIG_BT_CTLR_SLOT_RESERVATION_UPDATE=n CONFIG_BT_CTLR_SCAN_UNRESERVED=y CONFIG_BT_TICKER_NEXT_SLOT_GET_MATCH=y +CONFIG_BT_TICKER_EXT=y +CONFIG_BT_TICKER_EXT_SLOT_WINDOW_YIELD=y # Control Procedure CONFIG_BT_CTLR_LLCP_LOCAL_PROC_CTX_BUF_NUM=6 @@ -77,7 +89,7 @@ CONFIG_BT_CTLR_CONN_ISO_PDU_LEN_MAX=251 # ISO Transmissions CONFIG_BT_CTLR_ISO_TX_BUFFERS=8 -CONFIG_BT_CTLR_ISO_TX_BUFFER_SIZE=251 +CONFIG_BT_CTLR_ISO_TX_BUFFER_SIZE=259 CONFIG_BT_CTLR_ISOAL_SOURCES=2 # ISO Receptions diff --git a/samples/bluetooth/hci_rpmsg/nrf5340_cpunet_df-bt_ll_sw_split.conf b/samples/bluetooth/hci_rpmsg/nrf5340_cpunet_df-bt_ll_sw_split.conf index 0950e01f284..aeefec1432d 100644 --- a/samples/bluetooth/hci_rpmsg/nrf5340_cpunet_df-bt_ll_sw_split.conf +++ b/samples/bluetooth/hci_rpmsg/nrf5340_cpunet_df-bt_ll_sw_split.conf @@ -2,8 +2,10 @@ CONFIG_IPC_SERVICE=y CONFIG_MBOX=y CONFIG_ISR_STACK_SIZE=1024 +CONFIG_IDLE_STACK_SIZE=128 CONFIG_MAIN_STACK_SIZE=512 -CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=512 +CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=256 +CONFIG_IPC_SERVICE_BACKEND_RPMSG_WQ_STACK_SIZE=512 CONFIG_HEAP_MEM_POOL_SIZE=8192 CONFIG_BT=y @@ -22,6 +24,12 @@ CONFIG_BT_BUF_ACL_RX_SIZE=255 CONFIG_BT_BUF_ACL_TX_SIZE=251 CONFIG_BT_BUF_CMD_TX_SIZE=255 +# Tx/Rx Thread Stack Sizes +CONFIG_BT_HCI_TX_STACK_SIZE_WITH_PROMPT=y +CONFIG_BT_HCI_TX_STACK_SIZE=768 +CONFIG_BT_RX_STACK_SIZE=512 +CONFIG_BT_CTLR_RX_PRIO_STACK_SIZE=256 + # Host features CONFIG_BT_EXT_ADV=y CONFIG_BT_PER_ADV=y diff --git a/samples/bluetooth/hci_rpmsg/nrf5340_cpunet_df_cis-bt_ll_sw_split.conf b/samples/bluetooth/hci_rpmsg/nrf5340_cpunet_df_cis-bt_ll_sw_split.conf deleted file mode 100644 index d811c1e461a..00000000000 --- a/samples/bluetooth/hci_rpmsg/nrf5340_cpunet_df_cis-bt_ll_sw_split.conf +++ /dev/null @@ -1,104 +0,0 @@ -CONFIG_IPC_SERVICE=y -CONFIG_MBOX=y - -CONFIG_ISR_STACK_SIZE=1024 -CONFIG_MAIN_STACK_SIZE=512 -CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=512 -CONFIG_HEAP_MEM_POOL_SIZE=8192 - -CONFIG_BT=y -CONFIG_BT_HCI_RAW=y -CONFIG_BT_HCI_RAW_RESERVE=1 -CONFIG_BT_MAX_CONN=2 - -# Workaround: Unable to allocate command buffer when using K_NO_WAIT since -# Host number of completed commands does not follow normal flow control. -CONFIG_BT_BUF_CMD_TX_COUNT=10 - -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 - -CONFIG_BT_EXT_ADV=y -CONFIG_BT_PER_ADV=y -CONFIG_BT_PER_ADV_SYNC=y -CONFIG_BT_PER_ADV_SYNC_MAX=2 - -# Broadcast and Connected ISO -CONFIG_BT_ISO_BROADCASTER=n -CONFIG_BT_ISO_SYNC_RECEIVER=n -CONFIG_BT_ISO_CENTRAL=y -CONFIG_BT_ISO_PERIPHERAL=y - -# ISO Streams -CONFIG_BT_ISO_MAX_CHAN=2 - -# Controller -CONFIG_BT_LL_SW_SPLIT=y -CONFIG_BT_CTLR_ASSERT_HANDLER=y -CONFIG_BT_CTLR_DTM_HCI=y - -# Rx ACL and Adv Reports -CONFIG_BT_CTLR_RX_BUFFERS=9 -CONFIG_BT_CTLR_DATA_LENGTH_MAX=251 - -# Coded PHY support -CONFIG_BT_CTLR_PHY_CODED=y - -# Advertising Sets and Extended Scanning -CONFIG_BT_CTLR_ADV_EXT=y -CONFIG_BT_CTLR_ADV_SET=3 -CONFIG_BT_CTLR_ADV_DATA_LEN_MAX=191 -CONFIG_BT_CTLR_SCAN_DATA_LEN_MAX=1650 - -CONFIG_BT_CTLR_ADVANCED_FEATURES=y -CONFIG_BT_CTLR_ADV_AUX_SET=3 -CONFIG_BT_CTLR_ADV_AUX_PDU_BACK2BACK=y -CONFIG_BT_CTLR_ADV_SYNC_SET=3 -CONFIG_BT_CTLR_ADV_SYNC_PDU_BACK2BACK=y -CONFIG_BT_CTLR_ADV_DATA_BUF_MAX=6 - -# Increase the below to receive interleaved advertising chains -CONFIG_BT_CTLR_SCAN_AUX_SET=1 - -CONFIG_BT_CTLR_ADV_RESERVE_MAX=n -CONFIG_BT_CTLR_SCAN_UNRESERVED=y -CONFIG_BT_TICKER_NEXT_SLOT_GET_MATCH=y - -# Control Procedure -CONFIG_BT_CTLR_LLCP_LOCAL_PROC_CTX_BUF_NUM=6 - -# Direction Finding -CONFIG_BT_CTLR_DF=y -CONFIG_BT_CTLR_DF_PER_ADV_CTE_NUM_MAX=3 -CONFIG_BT_CTLR_DF_PER_SCAN_CTE_NUM_MAX=3 - -# Direction Finding Tx -CONFIG_BT_CTLR_DF_CTE_TX=y -CONFIG_BT_CTLR_DF_CONN_CTE_TX=y -CONFIG_BT_CTLR_DF_ANT_SWITCH_TX=y -CONFIG_BT_CTLR_DF_CONN_CTE_RSP=y - -# Direction Finding Rx -CONFIG_BT_CTLR_DF_CTE_RX=y -CONFIG_BT_CTLR_DF_CONN_CTE_RX=y -CONFIG_BT_CTLR_DF_ANT_SWITCH_RX=y -CONFIG_BT_CTLR_DF_CONN_CTE_REQ=y - -# ISO Connection Oriented -CONFIG_BT_CTLR_CENTRAL_ISO=y -CONFIG_BT_CTLR_PERIPHERAL_ISO=n -CONFIG_BT_CTLR_CONN_ISO_SDU_LEN_MAX=251 -CONFIG_BT_CTLR_CONN_ISO_PDU_LEN_MAX=251 - -# ISO Transmissions -CONFIG_BT_CTLR_ISO_TX_BUFFERS=8 -CONFIG_BT_CTLR_ISO_TX_BUFFER_SIZE=251 -CONFIG_BT_CTLR_ISOAL_SOURCES=2 - -# ISO Receptions -CONFIG_BT_CTLR_ISO_RX_BUFFERS=8 -CONFIG_BT_CTLR_ISOAL_SINKS=2 diff --git a/samples/bluetooth/hci_rpmsg/nrf5340_cpunet_iso-bt_ll_sw_split.conf b/samples/bluetooth/hci_rpmsg/nrf5340_cpunet_iso-bt_ll_sw_split.conf index d307d868f0f..2e7b04e562a 100644 --- a/samples/bluetooth/hci_rpmsg/nrf5340_cpunet_iso-bt_ll_sw_split.conf +++ b/samples/bluetooth/hci_rpmsg/nrf5340_cpunet_iso-bt_ll_sw_split.conf @@ -2,8 +2,10 @@ CONFIG_IPC_SERVICE=y CONFIG_MBOX=y CONFIG_ISR_STACK_SIZE=1024 +CONFIG_IDLE_STACK_SIZE=128 CONFIG_MAIN_STACK_SIZE=512 -CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=512 +CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=256 +CONFIG_IPC_SERVICE_BACKEND_RPMSG_WQ_STACK_SIZE=512 CONFIG_HEAP_MEM_POOL_SIZE=8192 CONFIG_BT=y @@ -22,6 +24,12 @@ CONFIG_BT_BUF_ACL_RX_SIZE=255 CONFIG_BT_BUF_ACL_TX_SIZE=251 CONFIG_BT_BUF_CMD_TX_SIZE=255 +# Tx/Rx Thread Stack Sizes +CONFIG_BT_HCI_TX_STACK_SIZE_WITH_PROMPT=y +CONFIG_BT_HCI_TX_STACK_SIZE=768 +CONFIG_BT_RX_STACK_SIZE=512 +CONFIG_BT_CTLR_RX_PRIO_STACK_SIZE=256 + # Host features CONFIG_BT_EXT_ADV=y CONFIG_BT_PER_ADV=y @@ -66,8 +74,12 @@ CONFIG_BT_CTLR_ADV_DATA_BUF_MAX=6 CONFIG_BT_CTLR_SCAN_AUX_SET=1 CONFIG_BT_CTLR_ADV_RESERVE_MAX=n +CONFIG_BT_CTLR_CENTRAL_RESERVE_MAX=n +CONFIG_BT_CTLR_SLOT_RESERVATION_UPDATE=n CONFIG_BT_CTLR_SCAN_UNRESERVED=y CONFIG_BT_TICKER_NEXT_SLOT_GET_MATCH=y +CONFIG_BT_TICKER_EXT=y +CONFIG_BT_TICKER_EXT_SLOT_WINDOW_YIELD=y # Control Procedure CONFIG_BT_CTLR_LLCP_LOCAL_PROC_CTX_BUF_NUM=6 @@ -94,7 +106,7 @@ CONFIG_BT_CTLR_CONN_ISO_PDU_LEN_MAX=251 # ISO Transmissions CONFIG_BT_CTLR_ISO_TX_BUFFERS=8 -CONFIG_BT_CTLR_ISO_TX_BUFFER_SIZE=251 +CONFIG_BT_CTLR_ISO_TX_BUFFER_SIZE=259 CONFIG_BT_CTLR_ISOAL_SOURCES=2 # ISO Receptions diff --git a/samples/bluetooth/hci_rpmsg/nrf5340_cpunet_iso_broadcast-bt_ll_sw_split.conf b/samples/bluetooth/hci_rpmsg/nrf5340_cpunet_iso_broadcast-bt_ll_sw_split.conf index da6e6606bda..16fbf3ecd34 100644 --- a/samples/bluetooth/hci_rpmsg/nrf5340_cpunet_iso_broadcast-bt_ll_sw_split.conf +++ b/samples/bluetooth/hci_rpmsg/nrf5340_cpunet_iso_broadcast-bt_ll_sw_split.conf @@ -2,8 +2,10 @@ CONFIG_IPC_SERVICE=y CONFIG_MBOX=y CONFIG_ISR_STACK_SIZE=1024 +CONFIG_IDLE_STACK_SIZE=128 CONFIG_MAIN_STACK_SIZE=512 -CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=512 +CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=256 +CONFIG_IPC_SERVICE_BACKEND_RPMSG_WQ_STACK_SIZE=512 CONFIG_HEAP_MEM_POOL_SIZE=8192 CONFIG_BT=y @@ -14,6 +16,13 @@ CONFIG_BT_HCI_RAW_RESERVE=1 # Host number of completed commands does not follow normal flow control. CONFIG_BT_BUF_CMD_TX_COUNT=10 +# Tx/Rx Thread Stack Sizes +CONFIG_BT_HCI_TX_STACK_SIZE_WITH_PROMPT=y +CONFIG_BT_HCI_TX_STACK_SIZE=768 +CONFIG_BT_RX_STACK_SIZE=512 +CONFIG_BT_CTLR_RX_PRIO_STACK_SIZE=256 + +# Host CONFIG_BT_BROADCASTER=y CONFIG_BT_PERIPHERAL=n CONFIG_BT_OBSERVER=n diff --git a/samples/bluetooth/hci_rpmsg/nrf5340_cpunet_iso_central-bt_ll_sw_split.conf b/samples/bluetooth/hci_rpmsg/nrf5340_cpunet_iso_central-bt_ll_sw_split.conf index 2f3dadd24ea..994771eece9 100644 --- a/samples/bluetooth/hci_rpmsg/nrf5340_cpunet_iso_central-bt_ll_sw_split.conf +++ b/samples/bluetooth/hci_rpmsg/nrf5340_cpunet_iso_central-bt_ll_sw_split.conf @@ -2,8 +2,10 @@ CONFIG_IPC_SERVICE=y CONFIG_MBOX=y CONFIG_ISR_STACK_SIZE=1024 +CONFIG_IDLE_STACK_SIZE=128 CONFIG_MAIN_STACK_SIZE=512 -CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=512 +CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=256 +CONFIG_IPC_SERVICE_BACKEND_RPMSG_WQ_STACK_SIZE=512 CONFIG_HEAP_MEM_POOL_SIZE=8192 CONFIG_BT=y @@ -19,6 +21,12 @@ CONFIG_BT_BUF_ACL_RX_SIZE=255 CONFIG_BT_BUF_ACL_TX_SIZE=251 CONFIG_BT_BUF_CMD_TX_SIZE=255 +# Tx/Rx Thread Stack Sizes +CONFIG_BT_HCI_TX_STACK_SIZE_WITH_PROMPT=y +CONFIG_BT_HCI_TX_STACK_SIZE=768 +CONFIG_BT_RX_STACK_SIZE=512 +CONFIG_BT_CTLR_RX_PRIO_STACK_SIZE=256 + # Host CONFIG_BT_BROADCASTER=n CONFIG_BT_PERIPHERAL=n @@ -48,9 +56,18 @@ CONFIG_BT_CTLR_CONN_ISO_PDU_LEN_MAX=251 # ISO Transmissions CONFIG_BT_CTLR_ISO_TX_BUFFERS=16 -CONFIG_BT_CTLR_ISO_TX_BUFFER_SIZE=251 +CONFIG_BT_CTLR_ISO_TX_BUFFER_SIZE=259 CONFIG_BT_CTLR_ISOAL_SOURCES=2 # ISO Receptions CONFIG_BT_CTLR_ISO_RX_BUFFERS=16 CONFIG_BT_CTLR_ISOAL_SINKS=2 + +# Controller with minimum ACL event length and unreserved scanning +CONFIG_BT_CTLR_ADVANCED_FEATURES=y +CONFIG_BT_CTLR_CENTRAL_RESERVE_MAX=n +CONFIG_BT_CTLR_SLOT_RESERVATION_UPDATE=n +CONFIG_BT_CTLR_SCAN_UNRESERVED=y +CONFIG_BT_TICKER_NEXT_SLOT_GET_MATCH=y +CONFIG_BT_TICKER_EXT=y +CONFIG_BT_TICKER_EXT_SLOT_WINDOW_YIELD=y diff --git a/samples/bluetooth/hci_rpmsg/nrf5340_cpunet_iso_peripheral-bt_ll_sw_split.conf b/samples/bluetooth/hci_rpmsg/nrf5340_cpunet_iso_peripheral-bt_ll_sw_split.conf index a1ed9542c7b..78c09aa35fe 100644 --- a/samples/bluetooth/hci_rpmsg/nrf5340_cpunet_iso_peripheral-bt_ll_sw_split.conf +++ b/samples/bluetooth/hci_rpmsg/nrf5340_cpunet_iso_peripheral-bt_ll_sw_split.conf @@ -2,8 +2,10 @@ CONFIG_IPC_SERVICE=y CONFIG_MBOX=y CONFIG_ISR_STACK_SIZE=1024 +CONFIG_IDLE_STACK_SIZE=128 CONFIG_MAIN_STACK_SIZE=512 -CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=512 +CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=256 +CONFIG_IPC_SERVICE_BACKEND_RPMSG_WQ_STACK_SIZE=512 CONFIG_HEAP_MEM_POOL_SIZE=8192 CONFIG_BT=y @@ -19,6 +21,12 @@ CONFIG_BT_BUF_ACL_RX_SIZE=255 CONFIG_BT_BUF_ACL_TX_SIZE=251 CONFIG_BT_BUF_CMD_TX_SIZE=255 +# Tx/Rx Thread Stack Sizes +CONFIG_BT_HCI_TX_STACK_SIZE_WITH_PROMPT=y +CONFIG_BT_HCI_TX_STACK_SIZE=768 +CONFIG_BT_RX_STACK_SIZE=512 +CONFIG_BT_CTLR_RX_PRIO_STACK_SIZE=256 + # Host CONFIG_BT_BROADCASTER=y CONFIG_BT_PERIPHERAL=y @@ -48,7 +56,7 @@ CONFIG_BT_CTLR_CONN_ISO_PDU_LEN_MAX=251 # ISO Transmissions CONFIG_BT_CTLR_ISO_TX_BUFFERS=16 -CONFIG_BT_CTLR_ISO_TX_BUFFER_SIZE=251 +CONFIG_BT_CTLR_ISO_TX_BUFFER_SIZE=259 CONFIG_BT_CTLR_ISOAL_SOURCES=2 # ISO Receptions diff --git a/samples/bluetooth/hci_rpmsg/nrf5340_cpunet_iso_receive-bt_ll_sw_split.conf b/samples/bluetooth/hci_rpmsg/nrf5340_cpunet_iso_receive-bt_ll_sw_split.conf index 0863ba573a3..b4da7dd392d 100644 --- a/samples/bluetooth/hci_rpmsg/nrf5340_cpunet_iso_receive-bt_ll_sw_split.conf +++ b/samples/bluetooth/hci_rpmsg/nrf5340_cpunet_iso_receive-bt_ll_sw_split.conf @@ -2,8 +2,10 @@ CONFIG_IPC_SERVICE=y CONFIG_MBOX=y CONFIG_ISR_STACK_SIZE=1024 +CONFIG_IDLE_STACK_SIZE=128 CONFIG_MAIN_STACK_SIZE=512 -CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=512 +CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=256 +CONFIG_IPC_SERVICE_BACKEND_RPMSG_WQ_STACK_SIZE=512 CONFIG_HEAP_MEM_POOL_SIZE=8192 CONFIG_BT=y @@ -14,6 +16,13 @@ CONFIG_BT_HCI_RAW_RESERVE=1 # Host number of completed commands does not follow normal flow control. CONFIG_BT_BUF_CMD_TX_COUNT=10 +# Tx/Rx Thread Stack Sizes +CONFIG_BT_HCI_TX_STACK_SIZE_WITH_PROMPT=y +CONFIG_BT_HCI_TX_STACK_SIZE=768 +CONFIG_BT_RX_STACK_SIZE=512 +CONFIG_BT_CTLR_RX_PRIO_STACK_SIZE=256 + +# Host CONFIG_BT_BROADCASTER=n CONFIG_BT_PERIPHERAL=n CONFIG_BT_OBSERVER=y diff --git a/samples/bluetooth/hci_rpmsg/sample.yaml b/samples/bluetooth/hci_rpmsg/sample.yaml index 7381cc297f7..84a261e12dd 100644 --- a/samples/bluetooth/hci_rpmsg/sample.yaml +++ b/samples/bluetooth/hci_rpmsg/sample.yaml @@ -68,12 +68,3 @@ tests: platform_allow: nrf5340dk_nrf5340_cpunet integration_platforms: - nrf5340dk_nrf5340_cpunet - sample.bluetooth.hci_rpmsg.df_cis.bt_ll_sw_split: - harness: bluetooth - tags: bluetooth - extra_args: CONF_FILE="nrf5340_cpunet_df_cis-bt_ll_sw_split.conf" - DTC_OVERLAY_FILE="nrf5340_cpunet_df-bt_ll_sw_split.overlay" - platform_allow: nrf5340dk_nrf5340_cpunet nrf5340_audio_dk_nrf5340_cpunet - integration_platforms: - - nrf5340dk_nrf5340_cpunet - - nrf5340_audio_dk_nrf5340_cpunet diff --git a/samples/bluetooth/hci_uart/overlay-all-bt_ll_sw_split.conf b/samples/bluetooth/hci_uart/overlay-all-bt_ll_sw_split.conf index c1815fa52f7..0c62bddb498 100644 --- a/samples/bluetooth/hci_uart/overlay-all-bt_ll_sw_split.conf +++ b/samples/bluetooth/hci_uart/overlay-all-bt_ll_sw_split.conf @@ -5,40 +5,39 @@ CONFIG_BT_BUF_ACL_RX_SIZE=255 CONFIG_BT_BUF_ACL_TX_SIZE=251 CONFIG_BT_BUF_CMD_TX_SIZE=255 +# Host and Controller common dependencies CONFIG_BT_EXT_ADV=y CONFIG_BT_PER_ADV=y -CONFIG_BT_ISO_BROADCASTER=y - CONFIG_BT_PER_ADV_SYNC=y CONFIG_BT_PER_ADV_SYNC_MAX=2 -CONFIG_BT_ISO_SYNC_RECEIVER=y +# Broadcast and Connected ISO +CONFIG_BT_ISO_BROADCASTER=y +CONFIG_BT_ISO_SYNC_RECEIVER=y +CONFIG_BT_ISO_CENTRAL=y +CONFIG_BT_ISO_PERIPHERAL=y + +# ISO Streams CONFIG_BT_ISO_MAX_CHAN=2 +# Controller CONFIG_BT_LL_SW_SPLIT=y CONFIG_BT_CTLR_ASSERT_HANDLER=y CONFIG_BT_CTLR_DTM_HCI=y +# Rx ACL and Adv Reports CONFIG_BT_CTLR_RX_BUFFERS=9 CONFIG_BT_CTLR_DATA_LENGTH_MAX=251 +# Coded PHY support CONFIG_BT_CTLR_PHY_CODED=y +# Advertising Sets and Extended Scanning +CONFIG_BT_CTLR_ADV_EXT=y CONFIG_BT_CTLR_ADV_SET=3 CONFIG_BT_CTLR_ADV_DATA_LEN_MAX=191 CONFIG_BT_CTLR_SCAN_DATA_LEN_MAX=1650 -CONFIG_BT_CTLR_ADV_ISO=y -CONFIG_BT_CTLR_ADV_ISO_PDU_LEN_MAX=251 -CONFIG_BT_CTLR_ISO_TX_BUFFERS=16 -CONFIG_BT_CTLR_ISO_TX_BUFFER_SIZE=251 -CONFIG_BT_CTLR_ADV_ISO_STREAM_MAX=2 - -CONFIG_BT_CTLR_SYNC_ISO=y -CONFIG_BT_CTLR_SYNC_ISO_PDU_LEN_MAX=251 -CONFIG_BT_CTLR_SYNC_ISO_STREAM_MAX=2 -CONFIG_BT_CTLR_ISOAL_SINKS=2 - CONFIG_BT_CTLR_ADVANCED_FEATURES=y CONFIG_BT_CTLR_ADV_AUX_SET=3 CONFIG_BT_CTLR_ADV_AUX_PDU_BACK2BACK=y @@ -46,24 +45,65 @@ CONFIG_BT_CTLR_ADV_SYNC_SET=3 CONFIG_BT_CTLR_ADV_SYNC_PDU_BACK2BACK=y CONFIG_BT_CTLR_ADV_DATA_BUF_MAX=6 -# Increase the below to receive multiple interleaved advertising chains +# Increase the below to receive interleaved advertising chains CONFIG_BT_CTLR_SCAN_AUX_SET=1 +CONFIG_BT_CTLR_ADV_RESERVE_MAX=n +CONFIG_BT_CTLR_CENTRAL_RESERVE_MAX=n +CONFIG_BT_CTLR_SLOT_RESERVATION_UPDATE=n CONFIG_BT_CTLR_SCAN_UNRESERVED=y CONFIG_BT_TICKER_NEXT_SLOT_GET_MATCH=y +CONFIG_BT_TICKER_EXT=y +CONFIG_BT_TICKER_EXT_SLOT_WINDOW_YIELD=y +# Use 10 ms Central Connection Spacing for 10 ms ISO Interval +CONFIG_BT_CTLR_CENTRAL_SPACING=10000 + +# Control Procedure +CONFIG_BT_CTLR_LLCP_LOCAL_PROC_CTX_BUF_NUM=6 + +# Direction Finding CONFIG_BT_CTLR_DF=y CONFIG_BT_CTLR_DF_PER_ADV_CTE_NUM_MAX=3 CONFIG_BT_CTLR_DF_PER_SCAN_CTE_NUM_MAX=3 -CONFIG_BT_CTLR_LLCP_LOCAL_PROC_CTX_BUF_NUM=6 - +# Direction Finding Tx CONFIG_BT_CTLR_DF_CTE_TX=y CONFIG_BT_CTLR_DF_CONN_CTE_TX=y CONFIG_BT_CTLR_DF_ANT_SWITCH_TX=y CONFIG_BT_CTLR_DF_CONN_CTE_RSP=y +# Direction Finding Rx CONFIG_BT_CTLR_DF_CTE_RX=y CONFIG_BT_CTLR_DF_CONN_CTE_RX=y CONFIG_BT_CTLR_DF_ANT_SWITCH_RX=y CONFIG_BT_CTLR_DF_CONN_CTE_REQ=y + +# ISO Broadcaster Controller +CONFIG_BT_CTLR_ADV_EXT=y +CONFIG_BT_CTLR_ADV_PERIODIC=y +CONFIG_BT_CTLR_ADV_ISO=y +CONFIG_BT_CTLR_ADV_ISO_PDU_LEN_MAX=251 +CONFIG_BT_CTLR_ADV_ISO_STREAM_MAX=2 + +# ISO Receive Controller +CONFIG_BT_CTLR_ADV_EXT=y +CONFIG_BT_CTLR_SYNC_PERIODIC=y +CONFIG_BT_CTLR_SYNC_ISO=y +CONFIG_BT_CTLR_SYNC_ISO_PDU_LEN_MAX=251 +CONFIG_BT_CTLR_SYNC_ISO_STREAM_MAX=2 + +# ISO Connection Oriented +CONFIG_BT_CTLR_CENTRAL_ISO=y +CONFIG_BT_CTLR_PERIPHERAL_ISO=y +CONFIG_BT_CTLR_CONN_ISO_SDU_LEN_MAX=251 +CONFIG_BT_CTLR_CONN_ISO_PDU_LEN_MAX=251 + +# ISO Transmissions +CONFIG_BT_CTLR_ISO_TX_BUFFERS=8 +CONFIG_BT_CTLR_ISO_TX_BUFFER_SIZE=259 +CONFIG_BT_CTLR_ISOAL_SOURCES=2 + +# ISO Receptions +CONFIG_BT_CTLR_ISO_RX_BUFFERS=8 +CONFIG_BT_CTLR_ISOAL_SINKS=2