michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: Controller: Fix regression in BT_RX_STACK_SIZE use

Browse source 
Fix regression in BT_RX_STACK_SIZE use due to
commit b91728619c ("Bluetooth: host: remove
`CONFIG_BT_RECV_BLOCKING`").

Profiling of Controller Rx thread has been mentioned in
commit 586ba9fd13 ("Bluetooth: Controller: Increase
BT_RX_STACK_SIZE for BT_HCI_RAW enabled").

Also, move the TX_STACK_SIZE value as default in Kconfig
from the explicit value being set in hci_ipc sample.

Signed-off-by: Vinayak Kariappa Chettimada <vich@nordicsemi.no>
This commit is contained in:
Vinayak Kariappa Chettimada 2024-04-03 13:46:16 +02:00 • committed by Carles Cufí
commit 7ece6aed16
13 changed files with 9 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

6
samples/bluetooth/hci_ipc/nrf5340_cpunet_bis-bt_ll_sw_split.conf
View file

@ -24,12 +24,6 @@ CONFIG_BT_BUF_ACL_RX_SIZE=255
CONFIG_BT_BUF_ACL_TX_SIZE=251 CONFIG_BT_BUF_ACL_TX_SIZE=251
CONFIG_BT_BUF_CMD_TX_SIZE=255 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=1152
CONFIG_BT_RX_STACK_SIZE=640
CONFIG_BT_CTLR_RX_PRIO_STACK_SIZE=448
# Host features # Host features
CONFIG_BT_EXT_ADV=y CONFIG_BT_EXT_ADV=y
CONFIG_BT_PER_ADV=y CONFIG_BT_PER_ADV=y

6
samples/bluetooth/hci_ipc/nrf5340_cpunet_cis-bt_ll_sw_split.conf
View file

@ -24,12 +24,6 @@ CONFIG_BT_BUF_ACL_RX_SIZE=255
CONFIG_BT_BUF_ACL_TX_SIZE=251 CONFIG_BT_BUF_ACL_TX_SIZE=251
CONFIG_BT_BUF_CMD_TX_SIZE=255 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=1152
CONFIG_BT_RX_STACK_SIZE=640
CONFIG_BT_CTLR_RX_PRIO_STACK_SIZE=448
# Host features # Host features
CONFIG_BT_EXT_ADV=y CONFIG_BT_EXT_ADV=y
CONFIG_BT_PER_ADV=n CONFIG_BT_PER_ADV=n

6
samples/bluetooth/hci_ipc/nrf5340_cpunet_df-bt_ll_sw_split.conf
View file

@ -24,12 +24,6 @@ CONFIG_BT_BUF_ACL_RX_SIZE=255
CONFIG_BT_BUF_ACL_TX_SIZE=251 CONFIG_BT_BUF_ACL_TX_SIZE=251
CONFIG_BT_BUF_CMD_TX_SIZE=255 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=1152
CONFIG_BT_RX_STACK_SIZE=640
CONFIG_BT_CTLR_RX_PRIO_STACK_SIZE=448
# Host features # Host features
CONFIG_BT_EXT_ADV=y CONFIG_BT_EXT_ADV=y
CONFIG_BT_PER_ADV=y CONFIG_BT_PER_ADV=y

6
samples/bluetooth/hci_ipc/nrf5340_cpunet_iso-bt_ll_sw_split.conf
View file

@ -25,12 +25,6 @@ CONFIG_BT_BUF_ACL_RX_SIZE=255
CONFIG_BT_BUF_ACL_TX_SIZE=251 CONFIG_BT_BUF_ACL_TX_SIZE=251
CONFIG_BT_BUF_CMD_TX_SIZE=255 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=1152
CONFIG_BT_RX_STACK_SIZE=640
CONFIG_BT_CTLR_RX_PRIO_STACK_SIZE=448
# Host features # Host features
CONFIG_BT_EXT_ADV=y CONFIG_BT_EXT_ADV=y
CONFIG_BT_PER_ADV=y CONFIG_BT_PER_ADV=y

6
samples/bluetooth/hci_ipc/nrf5340_cpunet_iso_broadcast-bt_ll_sw_split.conf
View file

@ -16,12 +16,6 @@ CONFIG_BT_HCI_RAW_RESERVE=1
# Host number of completed commands does not follow normal flow control. # Host number of completed commands does not follow normal flow control.
CONFIG_BT_BUF_CMD_TX_COUNT=10 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=1152
CONFIG_BT_RX_STACK_SIZE=640
CONFIG_BT_CTLR_RX_PRIO_STACK_SIZE=448
# Host # Host
CONFIG_BT_BROADCASTER=y CONFIG_BT_BROADCASTER=y
CONFIG_BT_PERIPHERAL=n CONFIG_BT_PERIPHERAL=n

6
samples/bluetooth/hci_ipc/nrf5340_cpunet_iso_central-bt_ll_sw_split.conf
View file

@ -21,12 +21,6 @@ CONFIG_BT_BUF_ACL_RX_SIZE=255
CONFIG_BT_BUF_ACL_TX_SIZE=251 CONFIG_BT_BUF_ACL_TX_SIZE=251
CONFIG_BT_BUF_CMD_TX_SIZE=255 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=1152
CONFIG_BT_RX_STACK_SIZE=640
CONFIG_BT_CTLR_RX_PRIO_STACK_SIZE=448
# Host # Host
CONFIG_BT_BROADCASTER=n CONFIG_BT_BROADCASTER=n
CONFIG_BT_PERIPHERAL=n CONFIG_BT_PERIPHERAL=n

6
samples/bluetooth/hci_ipc/nrf5340_cpunet_iso_peripheral-bt_ll_sw_split.conf
View file

@ -21,12 +21,6 @@ CONFIG_BT_BUF_ACL_RX_SIZE=255
CONFIG_BT_BUF_ACL_TX_SIZE=251 CONFIG_BT_BUF_ACL_TX_SIZE=251
CONFIG_BT_BUF_CMD_TX_SIZE=255 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=1152
CONFIG_BT_RX_STACK_SIZE=640
CONFIG_BT_CTLR_RX_PRIO_STACK_SIZE=448
# Host # Host
CONFIG_BT_BROADCASTER=y CONFIG_BT_BROADCASTER=y
CONFIG_BT_PERIPHERAL=y CONFIG_BT_PERIPHERAL=y

6
samples/bluetooth/hci_ipc/nrf5340_cpunet_iso_receive-bt_ll_sw_split.conf
View file

@ -16,12 +16,6 @@ CONFIG_BT_HCI_RAW_RESERVE=1
# Host number of completed commands does not follow normal flow control. # Host number of completed commands does not follow normal flow control.
CONFIG_BT_BUF_CMD_TX_COUNT=10 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=1152
CONFIG_BT_RX_STACK_SIZE=640
CONFIG_BT_CTLR_RX_PRIO_STACK_SIZE=448
# Host # Host
CONFIG_BT_BROADCASTER=n CONFIG_BT_BROADCASTER=n
CONFIG_BT_PERIPHERAL=n CONFIG_BT_PERIPHERAL=n

1
samples/bluetooth/peripheral_hr/prj_minimal.conf
View file

@ -69,7 +69,6 @@ CONFIG_ARM_MPU=n
# idle 00 : STACK: unused 208 usage 48 / 256 (18 %); CPU: 97 % # idle 00 : STACK: unused 208 usage 48 / 256 (18 %); CPU: 97 %
# main : STACK: unused 576 usage 448 / 1024 (43 %); CPU: 0 % # main : STACK: unused 576 usage 448 / 1024 (43 %); CPU: 0 %
CONFIG_BT_RX_STACK_SIZE=1024 CONFIG_BT_RX_STACK_SIZE=1024
CONFIG_BT_CTLR_RX_PRIO_STACK_SIZE=448
CONFIG_BT_HCI_TX_STACK_SIZE_WITH_PROMPT=y CONFIG_BT_HCI_TX_STACK_SIZE_WITH_PROMPT=y
CONFIG_BT_HCI_TX_STACK_SIZE=640 CONFIG_BT_HCI_TX_STACK_SIZE=640
CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=512 CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=512

9
subsys/bluetooth/controller/Kconfig.ll_sw_split
View file

@ -99,10 +99,15 @@ config BT_CTLR_ULL_LLL_PRIO_SUPPORT
bool bool
config BT_CTLR_RX_PRIO_STACK_SIZE config BT_CTLR_RX_PRIO_STACK_SIZE
# Controller's Co-Operative high priority Rx thread stack size. # Hidden, Controller's Co-Operative high priority Rx thread stack size.
int "High priority Rx thread stack size" int
default 448 default 448
config BT_CTLR_RX_STACK_SIZE
# Hidden, Controller's Co-Operative Rx thread stack size.
int
default 768
config BT_CTLR_SETTINGS config BT_CTLR_SETTINGS
bool "Settings System" bool "Settings System"
depends on SETTINGS depends on SETTINGS

2
subsys/bluetooth/controller/hci/hci_driver.c
View file

@ -73,7 +73,7 @@ struct k_thread prio_recv_thread_data;
static K_KERNEL_STACK_DEFINE(prio_recv_thread_stack, static K_KERNEL_STACK_DEFINE(prio_recv_thread_stack,
CONFIG_BT_CTLR_RX_PRIO_STACK_SIZE); CONFIG_BT_CTLR_RX_PRIO_STACK_SIZE);
struct k_thread recv_thread_data; struct k_thread recv_thread_data;
static K_KERNEL_STACK_DEFINE(recv_thread_stack, CONFIG_BT_CTLR_RX_PRIO_STACK_SIZE); static K_KERNEL_STACK_DEFINE(recv_thread_stack, CONFIG_BT_CTLR_RX_STACK_SIZE);
#if defined(CONFIG_BT_HCI_ACL_FLOW_CONTROL) #if defined(CONFIG_BT_HCI_ACL_FLOW_CONTROL)
static struct k_poll_signal hbuf_signal; static struct k_poll_signal hbuf_signal;

2
subsys/bluetooth/host/Kconfig
View file

@ -48,7 +48,7 @@ config BT_HCI_TX_STACK_SIZE
default 512 if BT_H4 default 512 if BT_H4
default 512 if BT_H5 default 512 if BT_H5
default 416 if BT_SPI default 416 if BT_SPI
default 940 if BT_CTLR && BT_LL_SW_SPLIT && (NO_OPTIMIZATIONS || BT_ISO_BROADCAST) default 1152 if BT_CTLR && BT_LL_SW_SPLIT && (NO_OPTIMIZATIONS || BT_ISO_BROADCAST)
default 1024 if BT_CTLR && BT_LL_SW_SPLIT && BT_CENTRAL default 1024 if BT_CTLR && BT_LL_SW_SPLIT && BT_CENTRAL
default 768 if BT_CTLR && BT_LL_SW_SPLIT default 768 if BT_CTLR && BT_LL_SW_SPLIT
default 512 if BT_USERCHAN default 512 if BT_USERCHAN

6
tests/bsim/bluetooth/ll/cis/sysbuild/hci_ipc/nrf5340_cpunet_iso_acl_group-bt_ll_sw_split.conf
View file

@ -25,12 +25,6 @@ CONFIG_BT_BUF_ACL_RX_SIZE=255
CONFIG_BT_BUF_ACL_TX_SIZE=251 CONFIG_BT_BUF_ACL_TX_SIZE=251
CONFIG_BT_BUF_CMD_TX_SIZE=255 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=1152
CONFIG_BT_RX_STACK_SIZE=640
CONFIG_BT_CTLR_RX_PRIO_STACK_SIZE=448
# Host features # Host features
CONFIG_BT_EXT_ADV=y CONFIG_BT_EXT_ADV=y
CONFIG_BT_PER_ADV=y CONFIG_BT_PER_ADV=y