Blueotooth: controller: removed delayed notification code

The code that was added for delaying notifications to the host,
which was only implemented for legacy controller, is removed
in this commit

Signed-off-by: Andries Kruithof <[email protected]>

Author: Andries Kruithof

subsys/bluetooth/controller/ll_sw/lll_conn.h

@@ -139,14 +139,6 @@ struct lll_conn {
 #endif /* CONFIG_BT_CTLR_CONN_RSSI_EVENT */
 #endif /* CONFIG_BT_CTLR_CONN_RSSI */
 
-#if defined(CONFIG_BT_CTLR_RX_ENQUEUE_HOLD)
-#define RX_HOLD_MASK 3U
-#define RX_HOLD_REQ  1U
-#define RX_HOLD_ACK  2U
-	uint8_t rx_hold_req;
-	uint8_t rx_hold_ack;
-#endif /* CONFIG_BT_CTLR_RX_ENQUEUE_HOLD */
-
 #if defined(CONFIG_BT_CTLR_CONN_META)
 	struct lll_conn_meta conn_meta;
 #endif /* CONFIG_BT_CTLR_CONN_META */

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

@@ -410,13 +410,6 @@ void lll_conn_isr_rx(void *param)
 
 	is_ull_rx = 0U;
 
-#if defined(CONFIG_BT_CTLR_RX_ENQUEUE_HOLD)
-	if (((lll->rx_hold_req - lll->rx_hold_ack) & RX_HOLD_MASK) ==
-	    RX_HOLD_REQ) {
-		lll->rx_hold_ack--;
-	}
-#endif /* CONFIG_BT_CTLR_RX_ENQUEUE_HOLD */
-
 	if (tx_release) {
 		LL_ASSERT(lll->handle != 0xFFFF);
 

subsys/bluetooth/controller/ll_sw/ull_central.c

@@ -283,13 +283,6 @@ uint8_t ll_create_connection(uint16_t scan_interval, uint16_t scan_window,
 			     conn->apto_reload;
 #endif /* CONFIG_BT_CTLR_LE_PING */
 
-/* TODO: verify if we need to enable CTLR_RX_ENQUEUE_HOLD */
-#if defined(CONFIG_BT_CTLR_RX_ENQUEUE_HOLD)
-	conn->llcp_rx_hold = NULL;
-	conn_lll->rx_hold_req = 0U;
-	conn_lll->rx_hold_ack = 0U;
-#endif /* CONFIG_BT_CTLR_RX_ENQUEUE_HOLD */
-
 	/* Re-initialize the control procedure data structures */
 	ull_llcp_init(conn);
 

subsys/bluetooth/controller/ll_sw/ull_conn.c

@@ -74,10 +74,6 @@
 LOG_MODULE_REGISTER(bt_ctlr_ull_conn);
 
 static int init_reset(void);
-#if defined(CONFIG_BT_CTLR_RX_ENQUEUE_HOLD)
-static bool rx_hold_is_done(struct ll_conn *conn);
-static void rx_hold_flush(struct ll_conn *conn);
-#endif /* CONFIG_BT_CTLR_RX_ENQUEUE_HOLD */
 #if !defined(CONFIG_BT_CTLR_LOW_LAT_ULL)
 static void tx_demux_sched(struct ll_conn *conn);
 #endif /* CONFIG_BT_CTLR_LOW_LAT_ULL */
@@ -850,13 +846,6 @@ int ull_conn_rx(memq_link_t *link, struct node_rx_pdu **rx)
 		return 0;
 	}
 
-#if defined(CONFIG_BT_CTLR_RX_ENQUEUE_HOLD)
-	/* TODO: is this required for refactored LLCP? */
-	if (conn->llcp_rx_hold && rx_hold_is_done(conn)) {
-		rx_hold_flush(conn);
-	}
-#endif /* CONFIG_BT_CTLR_RX_ENQUEUE_HOLD */
-
 	ull_cp_tx_ntf(conn);
 
 	pdu_rx = (void *)(*rx)->pdu;
@@ -952,19 +941,6 @@ void ull_conn_done(struct node_rx_event_done *done)
 		return;
 	}
 
-#if defined(CONFIG_BT_CTLR_RX_ENQUEUE_HOLD)
-	if (conn->llcp_rx_hold && rx_hold_is_done(conn)) {
-		rx_hold_flush(conn);
-
-		/* For both CONFIG_BT_CTLR_LOW_LAT_ULL or when done events have
-		 * separate mayfly, explicitly trigger rx_demux mayfly. In the
-		 * later we could be here without any node rx or tx ack being
-		 * processed hence an explicit ll_rx_sched call is necessary.
-		 */
-		ll_rx_sched();
-	}
-#endif /* CONFIG_BT_CTLR_RX_ENQUEUE_HOLD */
-
 	ull_cp_tx_ntf(conn);
 
 #if defined(CONFIG_BT_CTLR_LE_ENC)
@@ -1470,12 +1446,6 @@ void ull_conn_tx_ack(uint16_t handle, memq_link_t *link, struct node_tx *tx)
 		if (handle != LLL_HANDLE_INVALID) {
 			struct ll_conn *conn = ll_conn_get(handle);
 
-#if defined(CONFIG_BT_CTLR_RX_ENQUEUE_HOLD)
-			if (conn->llcp_rx_hold && rx_hold_is_done(conn)) {
-				rx_hold_flush(conn);
-			}
-#endif /* CONFIG_BT_CTLR_RX_ENQUEUE_HOLD */
-
 			ull_cp_tx_ack(conn, tx);
 		}
 
@@ -1496,14 +1466,6 @@ void ull_conn_tx_ack(uint16_t handle, memq_link_t *link, struct node_tx *tx)
 		pdu_tx->ll_id = PDU_DATA_LLID_RESV;
 	} else {
 		LL_ASSERT(handle != LLL_HANDLE_INVALID);
-
-#if defined(CONFIG_BT_CTLR_RX_ENQUEUE_HOLD)
-		struct ll_conn *conn = ll_conn_get(handle);
-
-		if (conn->llcp_rx_hold && rx_hold_is_done(conn)) {
-			rx_hold_flush(conn);
-		}
-#endif /* CONFIG_BT_CTLR_RX_ENQUEUE_HOLD */
 	}
 
 	ll_tx_ack_put(handle, tx);
@@ -1642,63 +1604,6 @@ static int init_reset(void)
 	return 0;
 }
 
-#if defined(CONFIG_BT_CTLR_RX_ENQUEUE_HOLD)
-static void rx_hold_put(struct ll_conn *conn, memq_link_t *link,
-			struct node_rx_pdu *rx)
-{
-	struct node_rx_pdu *rx_last;
-	struct lll_conn *lll;
-
-	link->mem = NULL;
-	rx->hdr.link = link;
-
-	rx_last = conn->llcp_rx_hold;
-	while (rx_last && rx_last->hdr.link && rx_last->hdr.link->mem) {
-		rx_last = rx_last->hdr.link->mem;
-	}
-
-	if (rx_last) {
-		rx_last->hdr.link->mem = rx;
-	} else {
-		conn->llcp_rx_hold = rx;
-	}
-
-	lll = &conn->lll;
-	if (lll->rx_hold_req == lll->rx_hold_ack) {
-		lll->rx_hold_req++;
-	}
-}
-
-static bool rx_hold_is_done(struct ll_conn *conn)
-{
-	return ((conn->lll.rx_hold_req -
-		 conn->lll.rx_hold_ack) & RX_HOLD_MASK) == RX_HOLD_ACK;
-}
-
-static void rx_hold_flush(struct ll_conn *conn)
-{
-	struct node_rx_pdu *rx;
-	struct lll_conn *lll;
-
-	rx = conn->llcp_rx_hold;
-	do {
-		struct node_rx_hdr *hdr;
-
-		/* traverse to next rx node */
-		hdr = &rx->hdr;
-		rx = hdr->link->mem;
-
-		/* enqueue rx node towards Thread */
-		ll_rx_put(hdr->link, hdr);
-	} while (rx);
-
-	conn->llcp_rx_hold = NULL;
-	lll = &conn->lll;
-	lll->rx_hold_req = 0U;
-	lll->rx_hold_ack = 0U;
-}
-#endif /* CONFIG_BT_CTLR_RX_ENQUEUE_HOLD */
-
 #if !defined(CONFIG_BT_CTLR_LOW_LAT_ULL)
 static void tx_demux_sched(struct ll_conn *conn)
 {