Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bluetooth: controller: split: Fix central assert on multiple reconnections #22005

Merged
merged 3 commits into from
Jan 27, 2020
Merged

Bluetooth: controller: split: Fix central assert on multiple reconnections #22005

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bd7236e
Bluetooth: controller: split: Revert conn handle invalidation
cvinayak Jan 17, 2020
72f7eac
Bluetooth: controller: split: Revert Move invalidation of connection …
cvinayak Jan 17, 2020
782fadb
Bluetooth: controller: split: Update lll_conn_flush interface
cvinayak Jan 17, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion subsys/bluetooth/controller/ll_sw/lll_conn.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ void lll_conn_isr_abort(void *param);
void lll_conn_rx_pkt_set(struct lll_conn *lll);
void lll_conn_tx_pkt_set(struct lll_conn *lll, struct pdu_data *pdu_data_tx);
void lll_conn_pdu_tx_prep(struct lll_conn *lll, struct pdu_data **pdu_data_tx);
void lll_conn_flush(struct lll_conn *lll);
void lll_conn_flush(u16_t handle, struct lll_conn *lll);

extern void ull_conn_lll_ack_enqueue(u16_t handle, struct node_tx *tx);
extern u16_t ull_conn_lll_max_tx_octets_get(struct lll_conn *lll);
2 changes: 1 addition & 1 deletion subsys/bluetooth/controller/ll_sw/nordic/lll/lll_conn.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -801,7 +801,7 @@ static struct pdu_data *empty_tx_enqueue(struct lll_conn *lll)
return p;
}

void lll_conn_flush(struct lll_conn *lll)
void lll_conn_flush(u16_t handle, struct lll_conn *lll)
{
/* Nothing to be flushed */
}
2 changes: 1 addition & 1 deletion subsys/bluetooth/controller/ll_sw/openisa/lll/lll_conn.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -798,7 +798,7 @@ static struct pdu_data *empty_tx_enqueue(struct lll_conn *lll)
return p;
}

void lll_conn_flush(struct lll_conn *lll)
void lll_conn_flush(u16_t handle, struct lll_conn *lll)
{
/* Nothing to be flushed */
}
21 changes: 4 additions & 17 deletions subsys/bluetooth/controller/ll_sw/ull.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -828,29 +828,16 @@ void ll_rx_mem_release(void **node_rx)
case NODE_RX_TYPE_TERMINATE:
{
struct ll_conn *conn;
struct lll_conn *lll;
memq_link_t *link;

/* Get the connection context */
conn = ll_conn_get(rx_free->handle);
lll = &conn->lll;

/* Invalidate the connection context */
lll->handle = 0xFFFF;

/* Demux and flush Tx PDUs that remain enqueued in
* thread context
*/
ull_conn_tx_demux(UINT8_MAX);

/* De-initialize tx memq and release the used link */
LL_ASSERT(!lll->link_tx_free);
link = memq_deinit(&lll->memq_tx.head,
&lll->memq_tx.tail);
LL_ASSERT(!conn->lll.link_tx_free);
link = memq_deinit(&conn->lll.memq_tx.head,
&conn->lll.memq_tx.tail);
LL_ASSERT(link);
lll->link_tx_free = link;
conn->lll.link_tx_free = link;

/* Release the connection context to free pool */
ll_conn_release(conn);
}
break;
Expand Down
9 changes: 8 additions & 1 deletion subsys/bluetooth/controller/ll_sw/ull_conn.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1713,6 +1713,12 @@ static void conn_cleanup(struct ll_conn *conn, u8_t reason)
ticker_op_stop_cb, (void *)lll);
LL_ASSERT((ticker_status == TICKER_STATUS_SUCCESS) ||
(ticker_status == TICKER_STATUS_BUSY));

/* Invalidate the connection context */
lll->handle = 0xFFFF;

/* Demux and flush Tx PDUs that remain enqueued in thread context */
ull_conn_tx_demux(UINT8_MAX);
}

static void tx_ull_flush(struct ll_conn *conn)
Expand All @@ -1733,12 +1739,13 @@ static void tx_ull_flush(struct ll_conn *conn)
static void tx_lll_flush(void *param)
{
struct ll_conn *conn = (void *)HDR_LLL2EVT(param);
u16_t handle = ll_conn_handle_get(conn);
struct lll_conn *lll = param;
struct node_rx_pdu *rx;
struct node_tx *tx;
memq_link_t *link;

lll_conn_flush(lll);
lll_conn_flush(handle, lll);

link = memq_dequeue(lll->memq_tx.tail, &lll->memq_tx.head,
(void **)&tx);
Expand Down