Bluetooth: controller: remove refs to LLCP_LEGACY after rebase

Some recent PRs included conditional compilation for
KCONFIG_BT_LL_SW_LLCP_LEGACY, which must be removed.

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

Author: Andries Kruithof

samples/bluetooth/hci_rpmsg/nrf5340_cpunet_bis-bt_ll_sw_split.conf

@@ -70,7 +70,6 @@ CONFIG_BT_CTLR_SCAN_UNRESERVED=y
 CONFIG_BT_TICKER_NEXT_SLOT_GET_MATCH=y
 
 # Control Procedure
-CONFIG_BT_LL_SW_LLCP=y
 CONFIG_BT_CTLR_LLCP_LOCAL_PROC_CTX_BUF_NUM=6
 
 # ISO Broadcaster Controller

samples/bluetooth/hci_rpmsg/nrf5340_cpunet_cis-bt_ll_sw_split.conf

@@ -67,7 +67,6 @@ CONFIG_BT_CTLR_SCAN_UNRESERVED=y
 CONFIG_BT_TICKER_NEXT_SLOT_GET_MATCH=y
 
 # Control Procedure
-CONFIG_BT_LL_SW_LLCP=y
 CONFIG_BT_CTLR_LLCP_LOCAL_PROC_CTX_BUF_NUM=6
 
 # ISO Connection Oriented

samples/bluetooth/hci_rpmsg/nrf5340_cpunet_df-bt_ll_sw_split.conf

@@ -60,7 +60,6 @@ CONFIG_BT_CTLR_SCAN_UNRESERVED=y
 CONFIG_BT_TICKER_NEXT_SLOT_GET_MATCH=y
 
 # Control Procedure
-CONFIG_BT_LL_SW_LLCP=y
 CONFIG_BT_CTLR_LLCP_LOCAL_PROC_CTX_BUF_NUM=6
 
 # Direction Finding

samples/bluetooth/hci_rpmsg/nrf5340_cpunet_df_cis-bt_ll_sw_split.conf

@@ -69,7 +69,6 @@ CONFIG_BT_CTLR_SCAN_UNRESERVED=y
 CONFIG_BT_TICKER_NEXT_SLOT_GET_MATCH=y
 
 # Control Procedure
-CONFIG_BT_LL_SW_LLCP=y
 CONFIG_BT_CTLR_LLCP_LOCAL_PROC_CTX_BUF_NUM=6
 
 # Direction Finding

samples/bluetooth/hci_rpmsg/nrf5340_cpunet_iso-bt_ll_sw_split.conf

@@ -70,7 +70,6 @@ CONFIG_BT_CTLR_SCAN_UNRESERVED=y
 CONFIG_BT_TICKER_NEXT_SLOT_GET_MATCH=y
 
 # Control Procedure
-CONFIG_BT_LL_SW_LLCP=y
 CONFIG_BT_CTLR_LLCP_LOCAL_PROC_CTX_BUF_NUM=6
 
 # ISO Broadcaster Controller

subsys/bluetooth/controller/ll_sw/ull.c

@@ -2784,8 +2784,7 @@ static inline int rx_demux_rx(memq_link_t *link, struct node_rx_hdr *rx)
 #endif /* CONFIG_BT_CTLR_ADV_EXT */
 #endif /* CONFIG_BT_OBSERVER */
 
-#if !defined(CONFIG_BT_LL_SW_LLCP_LEGACY) && \
-	defined(CONFIG_BT_CTLR_PERIPHERAL_ISO)
+#if defined(CONFIG_BT_CTLR_PERIPHERAL_ISO)
 	case NODE_RX_TYPE_CIS_ESTABLISHED:
 	{
 		struct ll_conn *conn;
@@ -2801,7 +2800,7 @@ static inline int rx_demux_rx(memq_link_t *link, struct node_rx_hdr *rx)
 		ll_rx_put_sched(link, rx);
 	}
 	break;
-#endif /* !CONFIG_BT_LL_SW_LLCP_LEGACY && CONFIG_BT_CTLR_PERIPHERAL_ISO */
+#endif /* CONFIG_BT_CTLR_PERIPHERAL_ISO */
 
 #if defined(CONFIG_BT_CTLR_DF_SCAN_CTE_RX) || defined(CONFIG_BT_CTLR_DF_CONN_CTE_RX) || \
 	defined(CONFIG_BT_CTLR_DTM_HCI_DF_IQ_REPORT)

subsys/bluetooth/controller/ll_sw/ull_central.c

@@ -337,9 +337,7 @@ uint8_t ll_create_connection(uint16_t scan_interval, uint16_t scan_window,
 	ready_delay_us = lll_radio_tx_ready_delay_get(0, 0);
 #endif
 
-	/* TODO(thoh-ot): Not entirely sure this is correct */
 #if defined(CONFIG_BT_CTLR_DATA_LENGTH)
-	/* TODO: do we need to do the following? */
 #if defined(CONFIG_BT_CTLR_ADV_EXT)
 	conn_lll->dle.eff.max_tx_time = MAX(conn_lll->dle.eff.max_tx_time,
 					    PDU_DC_MAX_US(PDU_DC_PAYLOAD_SIZE_MIN,

subsys/bluetooth/controller/ll_sw/ull_conn.c

@@ -119,41 +119,12 @@ static uint8_t force_md_cnt_calc(struct lll_conn *lll_conn, uint32_t tx_rate);
 				(LL_LENGTH_OCTETS_TX_MAX + \
 				BT_CTLR_USER_TX_BUFFER_OVERHEAD))
 
-/* Encryption request is enqueued in thread context from the Tx buffer pool,
- * so that it is serialized alongwith the already enqueued data buffers ensuring
- * they are transmitted out to peer before encryption is setup.
- * Allocate additional Tx buffers to accommodate simultaneous encryption setup
- * across active connections.
- * TODO: verify that we don't need this for the refactored LLCP
- */
-#define CONN_ENC_REQ_BUFFERS 0
-#define CONN_DATA_BUFFERS (CONFIG_BT_BUF_ACL_TX_COUNT + CONN_ENC_REQ_BUFFERS)
-
-/**
- * One connection may take up to 4 TX buffers for procedures
- * simultaneously, for example 2 for encryption, 1 for termination,
- * and 1 one that is in flight and has not been returned to the pool
- */
-#define CONN_TX_CTRL_BUFFERS LLCP_TX_CTRL_BUF_COUNT
-#define CONN_TX_CTRL_BUF_SIZE MROUND(offsetof(struct node_tx, pdu) + \
-				     offsetof(struct pdu_data, llctrl) + \
-				     PDU_DC_CTRL_TX_SIZE_MAX)
-
-/* Terminate procedure state values */
-#define TERM_REQ   1
-#define TERM_ACKED 3
-
-/* CIS Establishment procedure state values */
-#define CIS_REQUEST_AWAIT_HOST 2
+#define CONN_DATA_BUFFERS CONFIG_BT_BUF_ACL_TX_COUNT
 
-/*
- * TODO: when the legacy LLCP is removed we can replace 'CONN_TX_CTRL_BUFFERS'
- * with 'LLCP_TX_CTRL_BUF_COUNT'
- */
 static MFIFO_DEFINE(conn_tx, sizeof(struct lll_tx), CONN_DATA_BUFFERS);
 static MFIFO_DEFINE(conn_ack, sizeof(struct lll_tx),
 		    (CONN_DATA_BUFFERS +
-		     CONN_TX_CTRL_BUFFERS));
+		     LLCP_TX_CTRL_BUF_COUNT));
 
 static struct {
 	void *free;
@@ -164,7 +135,7 @@ static struct {
 	void *free;
 	uint8_t pool[sizeof(memq_link_t) *
 		     (CONN_DATA_BUFFERS +
-		      CONN_TX_CTRL_BUFFERS)];
+		      LLCP_TX_CTRL_BUF_COUNT)];
 } mem_link_tx;
 
 #if defined(CONFIG_BT_CTLR_DATA_LENGTH)
@@ -984,14 +955,6 @@ void ull_conn_done(struct node_rx_event_done *done)
 	}
 #endif /* CONFIG_BT_CTLR_LE_ENC */
 
-	/* Legacy LLCP:
-	 * Peripheral received terminate ind or
-	 * Central received ack for the transmitted terminate ind or
-	 * Central transmitted ack for the received terminate ind or
-	 * there has been MIC failure
-	 * Refactored LLCP:
-	 * reason_final is set exactly under the above conditions
-	 */
 	reason_final = conn->llcp_terminate.reason_final;
 	if (reason_final) {
 		conn_cleanup(conn, reason_final);
@@ -1568,7 +1531,7 @@ static int init_reset(void)
 	/* Initialize tx link pool. */
 	mem_init(mem_link_tx.pool, sizeof(memq_link_t),
 		 (CONN_DATA_BUFFERS +
-		  CONN_TX_CTRL_BUFFERS),
+		  LLCP_TX_CTRL_BUF_COUNT),
 		 &mem_link_tx.free);
 
 	/* Initialize control procedure system. */
@@ -1756,10 +1719,8 @@ static void conn_cleanup_iso_cis_released_cb(struct ll_conn *conn)
 static void conn_cleanup_finalize(struct ll_conn *conn)
 {
 	struct lll_conn *lll = &conn->lll;
-	struct node_rx_pdu *rx;
 	uint32_t ticker_status;
 
-	ARG_UNUSED(rx);
 	ull_cp_state_set(conn, ULL_CP_DISCONNECTED);
 
 	/* Update tx buffer queue handling */
@@ -1921,13 +1882,13 @@ static void tx_lll_flush(void *param)
 			    (void **)&tx);
 	while (link) {
 		uint8_t idx;
-		struct lll_tx *lll_tx2;
+		struct lll_tx *tx_buf;
 
-		idx = MFIFO_ENQUEUE_GET(conn_ack, (void **)&lll_tx2);
-		LL_ASSERT(lll_tx2);
+		idx = MFIFO_ENQUEUE_GET(conn_ack, (void **)&tx_buf);
+		LL_ASSERT(tx_buf);
 
-		lll_tx2->handle = LLL_HANDLE_INVALID;
-		lll_tx2->node = tx;
+		tx_buf->handle = LLL_HANDLE_INVALID;
+		tx_buf->node = tx;
 
 		/* TX node UPSTREAM, i.e. Tx node ack path */
 		link->next = tx->next; /* Indicates ctrl pool or data pool */
@@ -1949,8 +1910,7 @@ static void tx_lll_flush(void *param)
 	rx->hdr.link = NULL;
 
 	/* Enqueue the terminate towards ULL context */
-	ull_rx_put(link, rx);
-	ull_rx_sched();
+	ull_rx_put_sched(link, rx);
 }
 
 #if defined(CONFIG_BT_CTLR_LLID_DATA_START_EMPTY)
@@ -2484,11 +2444,6 @@ void ull_dle_local_tx_update(struct ll_conn *conn, uint16_t tx_octets, uint16_t
 
 void ull_dle_init(struct ll_conn *conn, uint8_t phy)
 {
-	/*
-	 * TODO:
-	 * legacy code uses the maximum of the time for 1M phy and actual phy
-	 * for max_time_min, to be verified if that is required here as well
-	 */
 #if defined(CONFIG_BT_CTLR_PHY)
 	const uint16_t max_time_min = PDU_DC_MAX_US(PDU_DC_PAYLOAD_SIZE_MIN, phy);
 	const uint16_t max_time_max = PDU_DC_MAX_US(LL_LENGTH_OCTETS_RX_MAX, phy);

subsys/bluetooth/controller/ll_sw/ull_conn_iso.c

@@ -299,29 +299,6 @@ void ull_conn_iso_lll_cis_established(struct lll_conn_iso_stream *cis_lll)
 		return;
 	}
 
-#if defined(CONFIG_BT_LL_SW_LLCP_LEGACY)
-	struct node_rx_conn_iso_estab *est;
-	struct node_rx_pdu *node_rx;
-
-	node_rx = ull_pdu_rx_alloc();
-	if (!node_rx) {
-		/* No node available - try again later */
-		return;
-	}
-
-	node_rx->hdr.type = NODE_RX_TYPE_CIS_ESTABLISHED;
-
-	/* TODO: Send CIS_ESTABLISHED with status != 0 in error scenarios */
-	node_rx->hdr.handle = 0xFFFF;
-	node_rx->hdr.rx_ftr.param = cis;
-
-	est = (void *)node_rx->pdu;
-	est->status = 0;
-	est->cis_handle = cis_lll->handle;
-
-	ll_rx_put_sched(node_rx->hdr.link, node_rx);
-#endif /* !CONFIG_BT_LL_SW_LLCP_LEGACY */
-
 	cis->established = 1;
 }
 
@@ -1074,15 +1051,13 @@ static void cis_disabled_cb(void *param)
 				*((uint8_t *)node_terminate->pdu) = cis->terminate_reason;
 
 				ll_rx_put_sched(node_terminate->hdr.link, node_terminate);
-#if !defined(CONFIG_BT_LL_SW_LLCP_LEGACY)
 			} else {
 				conn = ll_conn_get(cis->lll.acl_handle);
 
 				/* CIS was not established - complete the procedure with error */
 				if (ull_cp_cc_awaiting_established(conn)) {
 					ull_cp_cc_established(conn, cis->terminate_reason);
 				}
-#endif /* CONFIG_BT_LL_SW_LLCP_LEGACY */
 			}
 
 			if (cig->lll.resume_cis == cis->lll.handle) {

subsys/bluetooth/controller/ll_sw/ull_conn_types.h

@@ -33,8 +33,6 @@ enum llcp {
 };
 
 /*
- * This is for the refactored LLCP
- *
  * to reduce length and unreadability of the ll_conn struct the
  * structures inside it have been defined first
  */