michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: controller: split: Tx cleanup and comments

Browse source 
Post Tx pool corruption fix, clean up code and add comments
explaining the use of Tx node next field used to indicate
the Tx node's allocation from Control or Data pool.

Signed-off-by: Vinayak Kariappa Chettimada <vich@nordicsemi.no>
This commit is contained in:
Vinayak Kariappa Chettimada 2019-08-22 09:58:50 +05:30 • committed by Carles Cufí
commit 73f0fa3727
3 changed files with 19 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

5
subsys/bluetooth/controller/ll_sw/nordic/lll/lll_conn.c
View file

@ -746,7 +746,10 @@ static int isr_rx_pdu(struct lll_conn *lll, struct pdu_data *pdu_data_rx,
memq_dequeue(lll->memq_tx.tail,
&lll->memq_tx.head, NULL);
link->next = tx->next;
/* TX node UPSTREAM, i.e. Tx node ack path */
link->next = tx->next; /* Indicates ctrl or data
* pool.
*/
tx->next = link;
*tx_release = tx;

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

@ -1227,12 +1227,12 @@ static inline void *done_release(memq_link_t *link,
{
u8_t idx;
done->hdr.link = link;
if (!MFIFO_ENQUEUE_IDX_GET(done, &idx)) {
return NULL;
}
done->hdr.link = link;
MFIFO_BY_IDX_ENQUEUE(done, idx, done);
return done;

17
subsys/bluetooth/controller/ll_sw/ull_conn.c
View file

@ -1147,8 +1147,8 @@ void ull_conn_done(struct node_rx_event_done *done)
void ull_conn_tx_demux(u8_t count)
{
do {
struct ll_conn *conn;
struct lll_tx *lll_tx;
struct ll_conn *conn;
lll_tx = MFIFO_DEQUEUE_GET(conn_tx);
if (!lll_tx) {
@ -1234,6 +1234,9 @@ void ull_conn_tx_lll_enqueue(struct ll_conn *conn, u8_t count)
conn->tx_data = conn->tx_data->next;
}
conn->tx_head = conn->tx_head->next;
/* point to NULL to indicate a Data PDU mem alloc */
tx_lll->next = NULL;
}
link = mem_acquire(&mem_link_tx.free);
@ -1324,8 +1327,10 @@ void ull_conn_lll_tx_flush(void *param)
lll_tx->handle = 0xFFFF;
lll_tx->node = tx;
link->next = tx->next;
tx->link = link;
/* TX node UPSTREAM, i.e. Tx node ack path */
link->next = tx->next; /* Indicates ctrl pool or data pool */
tx->next = link;
MFIFO_ENQUEUE(conn_ack, idx);
@ -1352,11 +1357,15 @@ struct ll_conn *ull_conn_tx_ack(u16_t handle, memq_link_t *link,
/* release mem if points to itself */
if (link->next == (void *)tx) {
mem_release(tx, &mem_conn_tx_ctrl.free);
LL_ASSERT(link->next);
mem_release(tx, &mem_conn_tx_ctrl.free);
return conn;
} else if (!tx) {
return conn;
} else {
LL_ASSERT(!link->next);
}
} else if (handle != 0xFFFF) {
conn = ll_conn_get(handle);