Skip to content

Commit 59ae559

Browse files
cvinayaknordicjm
authored andcommitted
[nrf fromtree] Bluetooth: Controller: Fix BT_CTLR_LOW_LAT_ULL conditional code
Fix BT_CTLR_LOW_LAT_ULL conditional compilation code by decoupling it from BT_CTLR_LOW_LAT code. BT_CTLR_LOW_LAT_ULL makes ULL execution context to tailchain in comparison to continuously process in a while loop. Signed-off-by: Vinayak Kariappa Chettimada <[email protected]> (cherry picked from commit 5119896) Signed-off-by: Vinayak Kariappa Chettimada <[email protected]>
1 parent 855ecdb commit 59ae559

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

subsys/bluetooth/controller/ll_sw/nordic/lll/lll_conn.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -771,9 +771,9 @@ void lll_conn_isr_tx(void *param)
771771

772772
radio_isr_set(lll_conn_isr_rx, param);
773773

774-
#if defined(CONFIG_BT_CTLR_LOW_LAT_ULL)
774+
#if defined(CONFIG_BT_CTLR_LOW_LAT)
775775
ull_conn_lll_tx_demux_sched(lll);
776-
#endif /* CONFIG_BT_CTLR_LOW_LAT_ULL */
776+
#endif /* CONFIG_BT_CTLR_LOW_LAT */
777777
}
778778

779779
void lll_conn_rx_pkt_set(struct lll_conn *lll)

subsys/bluetooth/controller/ll_sw/ull_conn.c

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -82,9 +82,9 @@
8282
LOG_MODULE_REGISTER(bt_ctlr_ull_conn);
8383

8484
static int init_reset(void);
85-
#if !defined(CONFIG_BT_CTLR_LOW_LAT_ULL)
85+
#if !defined(CONFIG_BT_CTLR_LOW_LAT)
8686
static void tx_demux_sched(struct ll_conn *conn);
87-
#endif /* CONFIG_BT_CTLR_LOW_LAT_ULL */
87+
#endif /* CONFIG_BT_CTLR_LOW_LAT */
8888
static void tx_demux(void *param);
8989
static struct node_tx *tx_ull_dequeue(struct ll_conn *conn, struct node_tx *tx);
9090

@@ -240,7 +240,7 @@ int ll_tx_mem_enqueue(uint16_t handle, void *tx)
240240

241241
MFIFO_ENQUEUE(conn_tx, idx);
242242

243-
#if !defined(CONFIG_BT_CTLR_LOW_LAT_ULL)
243+
#if !defined(CONFIG_BT_CTLR_LOW_LAT)
244244
if (ull_ref_get(&conn->ull)) {
245245
#if defined(CONFIG_BT_CTLR_FORCE_MD_AUTO)
246246
if (tx_cnt >= CONFIG_BT_BUF_ACL_TX_COUNT) {
@@ -261,7 +261,7 @@ int ll_tx_mem_enqueue(uint16_t handle, void *tx)
261261
lll_conn_force_md_cnt_set(0U);
262262
#endif /* CONFIG_BT_CTLR_FORCE_MD_AUTO */
263263
}
264-
#endif /* !CONFIG_BT_CTLR_LOW_LAT_ULL */
264+
#endif /* !CONFIG_BT_CTLR_LOW_LAT */
265265

266266
if (IS_ENABLED(CONFIG_BT_PERIPHERAL) && conn->lll.role) {
267267
ull_periph_latency_cancel(conn, handle);
@@ -1395,7 +1395,7 @@ void ull_conn_done(struct node_rx_event_done *done)
13951395
}
13961396
}
13971397

1398-
#if defined(CONFIG_BT_CTLR_LOW_LAT_ULL)
1398+
#if defined(CONFIG_BT_CTLR_LOW_LAT)
13991399
void ull_conn_lll_tx_demux_sched(struct lll_conn *lll)
14001400
{
14011401
static memq_link_t link;
@@ -1405,7 +1405,7 @@ void ull_conn_lll_tx_demux_sched(struct lll_conn *lll)
14051405

14061406
mayfly_enqueue(TICKER_USER_ID_LLL, TICKER_USER_ID_ULL_HIGH, 1U, &mfy);
14071407
}
1408-
#endif /* CONFIG_BT_CTLR_LOW_LAT_ULL */
1408+
#endif /* CONFIG_BT_CTLR_LOW_LAT */
14091409

14101410
void ull_conn_tx_demux(uint8_t count)
14111411
{
@@ -1702,7 +1702,7 @@ static int init_reset(void)
17021702
return 0;
17031703
}
17041704

1705-
#if !defined(CONFIG_BT_CTLR_LOW_LAT_ULL)
1705+
#if !defined(CONFIG_BT_CTLR_LOW_LAT)
17061706
static void tx_demux_sched(struct ll_conn *conn)
17071707
{
17081708
static memq_link_t link;
@@ -1712,7 +1712,7 @@ static void tx_demux_sched(struct ll_conn *conn)
17121712

17131713
mayfly_enqueue(TICKER_USER_ID_THREAD, TICKER_USER_ID_ULL_HIGH, 0U, &mfy);
17141714
}
1715-
#endif /* !CONFIG_BT_CTLR_LOW_LAT_ULL */
1715+
#endif /* !CONFIG_BT_CTLR_LOW_LAT */
17161716

17171717
static void tx_demux(void *param)
17181718
{

0 commit comments

Comments
 (0)