michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: Add BUILD_ASSERT to check Tx and Rx thread priorities

Browse source 
Added BUILD_ASSERT check for Tx and Rx thread priorities.

The Tx thread priority shall be higher than Rx thread
priority in order to correctly detect transaction violations
in ATT and SMP protocols. The Number of Completed Packets
for a connection shall be processed before any new data is
received and processed for that connection.

The Controller's priority receive thread priority shall be
higher than the Host's Tx and the Controller's Rx thread
priority.

Signed-off-by: Vinayak Kariappa Chettimada <vich@nordicsemi.no>
This commit is contained in:
Vinayak Kariappa Chettimada 2017-07-11 09:47:08 +02:00 • committed by Johan Hedberg
commit 9a13a0c732
8 changed files with 59 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

6
drivers/bluetooth/hci/h4.c
View file

@ -440,8 +440,10 @@ static int h4_open(void)
uart_irq_callback_set(h4_dev, bt_uart_isr);
k_thread_create(&rx_thread_data, rx_thread_stack,
K_THREAD_STACK_SIZEOF(rx_thread_stack), rx_thread,
NULL, NULL, NULL, K_PRIO_COOP(8), 0, K_NO_WAIT);
K_THREAD_STACK_SIZEOF(rx_thread_stack),
rx_thread, NULL, NULL, NULL,
K_PRIO_COOP(CONFIG_BLUETOOTH_RX_PRIO),
0, K_NO_WAIT);
return 0;
}

10
drivers/bluetooth/hci/h5.c
View file

@ -719,14 +719,16 @@ static void h5_init(void)
k_fifo_init(&h5.tx_queue);
k_thread_create(&tx_thread_data, tx_stack,
K_THREAD_STACK_SIZEOF(tx_stack),
(k_thread_entry_t)tx_thread,
NULL, NULL, NULL, K_PRIO_COOP(7), 0, K_NO_WAIT);
(k_thread_entry_t)tx_thread, NULL, NULL, NULL,
K_PRIO_COOP(CONFIG_BLUETOOTH_HCI_TX_PRIO),
0, K_NO_WAIT);
k_fifo_init(&h5.rx_queue);
k_thread_create(&rx_thread_data, rx_stack,
K_THREAD_STACK_SIZEOF(rx_stack),
(k_thread_entry_t)rx_thread,
NULL, NULL, NULL, K_PRIO_COOP(8), 0, K_NO_WAIT);
(k_thread_entry_t)rx_thread, NULL, NULL, NULL,
K_PRIO_COOP(CONFIG_BLUETOOTH_RX_PRIO),
0, K_NO_WAIT);
/* Unack queue */
k_fifo_init(&h5.unack_queue);

5
drivers/bluetooth/hci/spi.c
View file

@ -327,8 +327,9 @@ static int bt_spi_open(void)
/* Start RX thread */
k_thread_create(&rx_thread_data, rx_stack,
K_THREAD_STACK_SIZEOF(rx_stack),
(k_thread_entry_t)bt_spi_rx_thread,
NULL, NULL, NULL, K_PRIO_COOP(8), 0, K_NO_WAIT);
(k_thread_entry_t)bt_spi_rx_thread, NULL, NULL, NULL,
K_PRIO_COOP(CONFIG_BLUETOOTH_RX_PRIO),
0, K_NO_WAIT);
/* Take BLE out of reset */
gpio_pin_write(rst_dev, GPIO_RESET_PIN, 1);

17
subsys/bluetooth/common/dummy.c
View file

@ -17,3 +17,20 @@
* and that the system workqueue priority is negative (cooperative).
*/
BUILD_ASSERT(CONFIG_SYSTEM_WORKQUEUE_PRIORITY < 0);
/* The Bluetooth subsystem requires the Tx thread to execute at higher priority
* than the Rx thread as the Tx thread needs to process the acknowledgements
* before new Rx data is processed. This is a necessity to correctly detect
* transaction violations in ATT and SMP protocols.
*/
BUILD_ASSERT(CONFIG_BLUETOOTH_HCI_TX_PRIO < CONFIG_BLUETOOTH_RX_PRIO);
#if defined(CONFIG_BLUETOOTH_CONTROLLER)
/* The Bluetooth Controller's priority receive thread priority shall be higher
* than the Bluetooth Host's Tx and the Controller's receive thread priority.
* This is required in order to dispatch Number of Completed Packets event
* before any new data arrives on a connection to the Host threads.
*/
BUILD_ASSERT(CONFIG_BLUETOOTH_CONTROLLER_RX_PRIO <
CONFIG_BLUETOOTH_HCI_TX_PRIO);
#endif /* CONFIG_BLUETOOTH_CONTROLLER */

6
subsys/bluetooth/controller/Kconfig
View file

@ -95,6 +95,12 @@ config BLUETOOTH_CONTROLLER_RX_PRIO_STACK_SIZE
int
default 448
config BLUETOOTH_CONTROLLER_RX_PRIO
# Hidden option for Controller's Co-Operative high priority Rx thread
# priority.
int
default 6
comment "BLE Controller features"
if BLUETOOTH_CONN

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

@ -402,12 +402,15 @@ static int hci_driver_open(void)
k_thread_create(&prio_recv_thread_data, prio_recv_thread_stack,
K_THREAD_STACK_SIZEOF(prio_recv_thread_stack),
prio_recv_thread,
NULL, NULL, NULL, K_PRIO_COOP(6), 0, K_NO_WAIT);
prio_recv_thread, NULL, NULL, NULL,
K_PRIO_COOP(CONFIG_BLUETOOTH_CONTROLLER_RX_PRIO),
0, K_NO_WAIT);
k_thread_create(&recv_thread_data, recv_thread_stack,
K_THREAD_STACK_SIZEOF(recv_thread_stack), recv_thread,
NULL, NULL, NULL, K_PRIO_COOP(8), 0, K_NO_WAIT);
K_THREAD_STACK_SIZEOF(recv_thread_stack),
recv_thread, NULL, NULL, NULL,
K_PRIO_COOP(CONFIG_BLUETOOTH_RX_PRIO),
0, K_NO_WAIT);
BT_DBG("Success.");

11
subsys/bluetooth/host/Kconfig
View file

@ -57,6 +57,11 @@ config BLUETOOTH_HCI_TX_STACK_SIZE
default 256 if BLUETOOTH_SPI
default 640 if BLUETOOTH_CONTROLLER
config BLUETOOTH_HCI_TX_PRIO
# Hidden option for Co-Operative Tx thread priority
int
default 7
config BLUETOOTH_RECV_IS_RX_THREAD
# Virtual option set by the HCI driver to indicate that there's
# no need for the host to have its own RX thread, rather the
@ -80,6 +85,12 @@ config BLUETOOTH_RX_STACK_SIZE
require extra stack space, this value can be increased to
accommodate for that.
config BLUETOOTH_RX_PRIO
# Hidden option for Co-Operative Rx thread priority
int
depends on BLUETOOTH_HCI_HOST || BLUETOOTH_RECV_IS_RX_THREAD
default 8
if BLUETOOTH_HCI_HOST
config BLUETOOTH_HOST_CRYPTO
# Hidden option that compiles in random number generation and AES

8
subsys/bluetooth/host/hci_core.c
View file

@ -4067,15 +4067,17 @@ int bt_enable(bt_ready_cb_t cb)
/* TX thread */
k_thread_create(&tx_thread_data, tx_thread_stack,
K_THREAD_STACK_SIZEOF(tx_thread_stack),
hci_tx_thread, NULL, NULL,
NULL, K_PRIO_COOP(7), 0, K_NO_WAIT);
hci_tx_thread, NULL, NULL, NULL,
K_PRIO_COOP(CONFIG_BLUETOOTH_HCI_TX_PRIO),
0, K_NO_WAIT);
#if !defined(CONFIG_BLUETOOTH_RECV_IS_RX_THREAD)
/* RX thread */
k_thread_create(&rx_thread_data, rx_thread_stack,
K_THREAD_STACK_SIZEOF(rx_thread_stack),
(k_thread_entry_t)hci_rx_thread, NULL, NULL, NULL,
K_PRIO_COOP(8), 0, K_NO_WAIT);
K_PRIO_COOP(CONFIG_BLUETOOTH_RX_PRIO),
0, K_NO_WAIT);
#endif
if (IS_ENABLED(CONFIG_BLUETOOTH_TINYCRYPT_ECC)) {