Bluetooth: controller: removing legacy LLCP code

This commit removes the legacy LLCP code including the
Kconfig option
It also updates the babblesim tests, and removes the
tests for the legacy controller

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

Author: Andries Kruithof

samples/bluetooth/direction_finding_central/boards/nrf52833dk_nrf52820.conf

@@ -7,9 +7,6 @@
 CONFIG_BT_CTLR=y
 CONFIG_BT_LL_SW_SPLIT=y
 
-# Enable new implementation of LLCPs
-CONFIG_BT_LL_SW_LLCP=y
-
 # Enable Direction Finding Feature including AoA and AoD
 CONFIG_BT_CTLR_DF=y
 

samples/bluetooth/direction_finding_central/boards/nrf52833dk_nrf52833.conf

@@ -7,9 +7,6 @@
 CONFIG_BT_CTLR=y
 CONFIG_BT_LL_SW_SPLIT=y
 
-# Enable new implementation of LLCPs
-CONFIG_BT_LL_SW_LLCP=y
-
 # Enable Direction Finding Feature including AoA and AoD
 CONFIG_BT_CTLR_DF=y
 

samples/bluetooth/direction_finding_peripheral/boards/nrf52833dk_nrf52820.conf

@@ -7,9 +7,6 @@
 CONFIG_BT_CTLR=y
 CONFIG_BT_LL_SW_SPLIT=y
 
-# Enable new implementation of LLCPs
-CONFIG_BT_LL_SW_LLCP=y
-
 # Enable Direction Finding Feature including AoA and AoD
 CONFIG_BT_CTLR_DF=y
 

samples/bluetooth/direction_finding_peripheral/boards/nrf52833dk_nrf52833.conf

@@ -7,9 +7,6 @@
 CONFIG_BT_CTLR=y
 CONFIG_BT_LL_SW_SPLIT=y
 
-# Enable new implementation of LLCPs
-CONFIG_BT_LL_SW_LLCP=y
-
 # Enable Direction Finding Feature including AoA and AoD
 CONFIG_BT_CTLR_DF=y
 

samples/bluetooth/hci_uart/overlay-all-bt_ll_sw_split.conf

@@ -56,7 +56,6 @@ CONFIG_BT_CTLR_DF=y
 CONFIG_BT_CTLR_DF_PER_ADV_CTE_NUM_MAX=3
 CONFIG_BT_CTLR_DF_PER_SCAN_CTE_NUM_MAX=3
 
-CONFIG_BT_LL_SW_LLCP=y
 CONFIG_BT_CTLR_LLCP_LOCAL_PROC_CTX_BUF_NUM=6
 
 CONFIG_BT_CTLR_DF_CTE_TX=y

subsys/bluetooth/controller/CMakeLists.txt

@@ -68,33 +68,30 @@ if(CONFIG_BT_LL_SW_SPLIT)
     zephyr_library_sources(
       ll_sw/ull_conn.c
       )
-    if(CONFIG_BT_LL_SW_LLCP_LEGACY)
-    else()
-      zephyr_library_sources_ifdef(
-        CONFIG_BT_CTLR_PHY
-        ll_sw/ull_llcp_phy.c
-        )
-      zephyr_library_sources_ifdef(
-        CONFIG_BT_CTLR_LE_ENC
-        ll_sw/ull_llcp_enc.c
-        )
-      if (CONFIG_BT_CTLR_PERIPHERAL_ISO OR
-          CONFIG_BT_CTLR_CENTRAL_ISO)
-        zephyr_library_sources(
-          ll_sw/ull_llcp_cc.c
-        )
-	  endif()
+    zephyr_library_sources_ifdef(
+      CONFIG_BT_CTLR_PHY
+      ll_sw/ull_llcp_phy.c
+      )
+    zephyr_library_sources_ifdef(
+      CONFIG_BT_CTLR_LE_ENC
+      ll_sw/ull_llcp_enc.c
+      )
+    if (CONFIG_BT_CTLR_PERIPHERAL_ISO OR
+        CONFIG_BT_CTLR_CENTRAL_ISO)
       zephyr_library_sources(
-        ll_sw/ull_tx_queue.c
-        ll_sw/ull_llcp.c
-        ll_sw/ull_llcp_common.c
-        ll_sw/ull_llcp_local.c
-        ll_sw/ull_llcp_pdu.c
-        ll_sw/ull_llcp_conn_upd.c
-        ll_sw/ull_llcp_chmu.c
-        ll_sw/ull_llcp_remote.c
-        )
+        ll_sw/ull_llcp_cc.c
+      )
     endif()
+    zephyr_library_sources(
+      ll_sw/ull_tx_queue.c
+      ll_sw/ull_llcp.c
+      ll_sw/ull_llcp_common.c
+      ll_sw/ull_llcp_local.c
+      ll_sw/ull_llcp_pdu.c
+      ll_sw/ull_llcp_conn_upd.c
+      ll_sw/ull_llcp_chmu.c
+      ll_sw/ull_llcp_remote.c
+      )
     if(CONFIG_BT_PERIPHERAL)
       zephyr_library_sources(
         ll_sw/ull_peripheral.c

subsys/bluetooth/controller/Kconfig.ll_sw_split

@@ -37,7 +37,7 @@ config BT_LLL_VENDOR_NORDIC
 	select BT_CTLR_CTEINLINE_SUPPORT if HAS_HW_NRF_RADIO_DFE
 	select BT_CTLR_CHAN_SEL_2_SUPPORT
 	select BT_CTLR_MIN_USED_CHAN_SUPPORT
-	select BT_CTLR_SCA_UPDATE_SUPPORT if !BT_LL_SW_LLCP_LEGACY
+	select BT_CTLR_SCA_UPDATE_SUPPORT
 	select BT_CTLR_DTM_HCI_SUPPORT
 	select BT_CTLR_CONN_RSSI_SUPPORT
 
@@ -85,27 +85,6 @@ config BT_CTLR_TIFS_HW_SUPPORT
 config BT_CTLR_ULL_LLL_PRIO_SUPPORT
 	bool
 
-choice BT_LL_SW_LLCP_IMPL
-	prompt "Bluetooth Low Energy Software Link Layer Control Procedure Implementation"
-	default BT_LL_SW_LLCP
-	help
-	  Select the Bluetooth Low Energy Software Link Layer Control Procedure implementation.
-
-config BT_LL_SW_LLCP_LEGACY
-	bool "Legacy implementation (DEPRECATED)"
-	depends on !BT_CTLR_DF_CONN_CTE_RX && !BT_CTLR_DF_CONN_CTE_TX
-	select DEPRECATED
-	help
-	  Use the Bluetooth Low Energy Software Link Layer Legacy Control Procedure implementation.
-
-config BT_LL_SW_LLCP
-	bool "State-machine based implementation, replacing the legacy one"
-	help
-	  Use the new Bluetooth Low Energy Software Link Layer Control Procedure implementation.
-
-endchoice
-
-
 config BT_CTLR_RX_PRIO_STACK_SIZE
 	# Controller's Co-Operative high priority Rx thread stack size.
 	int "High priority Rx thread stack size"
@@ -622,7 +601,6 @@ config BT_CTLR_LLCP_CONN
 	  more than this number of connections simultaneously may cause
 	  instabilities.
 
-if !BT_LL_SW_LLCP_LEGACY
 config BT_CTLR_LLCP_TX_PER_CONN_TX_CTRL_BUF_NUM_MAX
 	int
 	default 4
@@ -674,23 +652,12 @@ config BT_CTLR_LLCP_REMOTE_PROC_CTX_BUF_NUM
 	  for handling remote initiated control procedures.
 	  This pool is shared across all connections, with allocation through a queue.
 
-endif #!BT_LL_SW_LLCP_LEGACY
-
-
 config BT_CTLR_LLID_DATA_START_EMPTY
 	bool "Handle zero length L2CAP start frame"
 	default y if BT_HCI_RAW
 	help
 	  Handle zero length L2CAP start frame.
 
-config BT_CTLR_RX_ENQUEUE_HOLD
-	bool "Procedure Complete after on-air instant"
-	depends on BT_LL_SW_LLCP_LEGACY
-	default y if BT_HCI_RAW
-	help
-	  Hold enqueue of Procedure Complete events with instant until after the
-	  on-air instant is reached.
-
 config BT_CTLR_TX_RETRY_DISABLE
 	bool "Disable Tx Retry"
 	help

subsys/bluetooth/controller/hci/hci.c

@@ -53,9 +53,7 @@
 
 #include "ll_sw/isoal.h"
 
-#if !defined(CONFIG_BT_LL_SW_LLCP_LEGACY)
 #include "ll_sw/ull_tx_queue.h"
-#endif
 
 #include "ll_sw/ull_adv_types.h"
 #include "ll_sw/ull_scan_types.h"
@@ -4866,7 +4864,7 @@ static void vs_read_key_hierarchy_roots(struct net_buf *buf,
 	rp->status = 0x00;
 	hci_vendor_read_key_hierarchy_roots(rp->ir, rp->er);
 }
-#if !defined(CONFIG_BT_LL_SW_LLCP_LEGACY)
+
 #if defined(CONFIG_BT_CTLR_MIN_USED_CHAN) && defined(CONFIG_BT_PERIPHERAL)
 static void vs_set_min_used_chans(struct net_buf *buf, struct net_buf **evt)
 {
@@ -4879,7 +4877,7 @@ static void vs_set_min_used_chans(struct net_buf *buf, struct net_buf **evt)
 	*evt = cmd_complete_status(status);
 }
 #endif /* CONFIG_BT_CTLR_MIN_USED_CHAN && CONFIG_BT_PERIPHERAL */
-#endif /* !CONFIG_BT_LL_SW_LLCP_LEGACY */
+
 #if defined(CONFIG_BT_CTLR_TX_PWR_DYNAMIC_CONTROL)
 static void vs_write_tx_power_level(struct net_buf *buf, struct net_buf **evt)
 {
@@ -5450,13 +5448,6 @@ int hci_vendor_cmd_handle_common(uint16_t ocf, struct net_buf *cmd,
 		vs_read_tx_power_level(cmd, evt);
 		break;
 #endif /* CONFIG_BT_CTLR_TX_PWR_DYNAMIC_CONTROL */
-#if !defined(CONFIG_BT_LL_SW_LLCP_LEGACY)
-#if defined(CONFIG_BT_CTLR_MIN_USED_CHAN) && defined(CONFIG_BT_PERIPHERAL)
-	case BT_OCF(BT_HCI_OP_VS_SET_MIN_NUM_USED_CHANS):
-		vs_set_min_used_chans(cmd, evt);
-		break;
-#endif /* CONFIG_BT_CTLR_MIN_USED_CHAN && CONFIG_BT_PERIPHERAL */
-#endif /* !CONFIG_BT_LL_SW_LLCP_LEGACY */
 #endif /* CONFIG_BT_HCI_VS_EXT */
 
 #if defined(CONFIG_BT_HCI_MESH_EXT)
@@ -5465,6 +5456,12 @@ int hci_vendor_cmd_handle_common(uint16_t ocf, struct net_buf *cmd,
 		break;
 #endif /* CONFIG_BT_HCI_MESH_EXT */
 
+#if defined(CONFIG_BT_CTLR_MIN_USED_CHAN) && defined(CONFIG_BT_PERIPHERAL)
+	case BT_OCF(BT_HCI_OP_VS_SET_MIN_NUM_USED_CHANS):
+		vs_set_min_used_chans(cmd, evt);
+		break;
+#endif /* CONFIG_BT_CTLR_MIN_USED_CHAN && CONFIG_BT_PERIPHERAL */
+
 	default:
 		return -EINVAL;
 	}

subsys/bluetooth/controller/ll_sw/ll_tx_pwr.c

@@ -31,9 +31,7 @@
 #include "lll/lll_df_types.h"
 #include "lll_conn.h"
 
-#if !defined(CONFIG_BT_LL_SW_LLCP_LEGACY)
-#include "ull_tx_queue.h"
-#endif
+#include "ll_sw/ull_tx_queue.h"
 
 #include "ull_adv_types.h"
 #include "ull_scan_types.h"

subsys/bluetooth/controller/ll_sw/lll_conn.h

@@ -87,17 +87,6 @@ struct lll_conn {
 	};
 
 #if defined(CONFIG_BT_CTLR_DATA_LENGTH)
-
-#ifdef CONFIG_BT_LL_SW_LLCP_LEGACY
-	uint16_t max_tx_octets;
-	uint16_t max_rx_octets;
-
-#if defined(CONFIG_BT_CTLR_PHY)
-	uint16_t max_tx_time;
-	uint16_t max_rx_time;
-#endif /* CONFIG_BT_CTLR_PHY */
-
-#else /* CONFIG_BT_LL_SW_LLCP_LEGACY */
 	struct {
 		struct data_pdu_length local;
 		struct data_pdu_length remote;
@@ -109,7 +98,6 @@ struct lll_conn {
 		uint8_t update;
 	} dle;
 #endif /* CONFIG_BT_CTLR_DATA_LENGTH */
-#endif/* CONFIG_BT_LL_SW_LLCP_LEGACY */
 
 #if defined(CONFIG_BT_CTLR_PHY)
 	uint8_t phy_tx:3;