michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: controller: Fix rx_demux scheduling for LOW_LAT_ULL

Browse source 
Fix the mayfly callee id for the rx_demux scheduling under
the LOW_LAT_ULL implementation. This could be causing
undefined mayfly execution behavior in nRF51x SoC.

Signed-off-by: Vinayak Kariappa Chettimada <vich@nordicsemi.no>
This commit is contained in:
Vinayak Kariappa Chettimada 2021-01-29 18:08:59 +05:30 • committed by Anas Nashif
commit b8b946f37f
1 changed files with 17 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

19
subsys/bluetooth/controller/ll_sw/ull.c
View file

@ -323,6 +323,9 @@ static inline void *mark_get(void *m);
static inline void done_alloc(void);
static inline void rx_alloc(uint8_t max);
static void rx_demux(void *param);
#if defined(CONFIG_BT_CTLR_LOW_LAT_ULL)
static void rx_demux_yield(void);
#endif /* CONFIG_BT_CTLR_LOW_LAT_ULL */
#if defined(CONFIG_BT_CONN)
static uint8_t tx_cmplt_get(uint16_t *handle, uint8_t *first, uint8_t last);
static inline void rx_demux_conn_tx_ack(uint8_t ack_last, uint16_t handle,
@ -1853,7 +1856,7 @@ static void rx_demux(void *param)
#if defined(CONFIG_BT_CTLR_LOW_LAT_ULL)
if (!nack) {
ull_rx_sched();
rx_demux_yield();
}
#else /* !CONFIG_BT_CTLR_LOW_LAT_ULL */
if (nack) {
@ -1873,7 +1876,7 @@ static void rx_demux(void *param)
link, node_tx);
#if defined(CONFIG_BT_CTLR_LOW_LAT_ULL)
ull_rx_sched();
rx_demux_yield();
#endif /* CONFIG_BT_CTLR_LOW_LAT_ULL */
}
@ -1885,6 +1888,18 @@ static void rx_demux(void *param)
#endif /* CONFIG_BT_CTLR_LOW_LAT_ULL */
}
#if defined(CONFIG_BT_CTLR_LOW_LAT_ULL)
static void rx_demux_yield(void)
{
static memq_link_t link;
static struct mayfly mfy = {0, 0, &link, NULL, rx_demux};
/* Kick the ULL (using the mayfly, tailchain it) */
mayfly_enqueue(TICKER_USER_ID_ULL_HIGH, TICKER_USER_ID_ULL_HIGH, 1,
&mfy);
}
#endif /* CONFIG_BT_CTLR_LOW_LAT_ULL */
#if defined(CONFIG_BT_CONN)
static uint8_t tx_cmplt_get(uint16_t *handle, uint8_t *first, uint8_t last)
{