bluetooth: controller: Add experimental support for fsu and efs

Add in the required changes to be able to enable frame space
update and extended feature set support to the controller.

Signed-off-by: Sean Madigan <[email protected]>

Author: sean-madigan

subsys/bluetooth/controller/Kconfig

@@ -41,6 +41,8 @@ config BT_LL_SOFTDEVICE
 	select BT_CTLR_LE_POWER_CONTROL_SUPPORT
 	select BT_CTLR_LE_PATH_LOSS_MONITORING_SUPPORT
 	select BT_CTLR_SUBRATING_SUPPORT
+	select BT_CTLR_EXTENDED_FEAT_SET_SUPPORT
+	select BT_CTLR_FRAME_SPACE_UPDATE_SUPPORT
 	select BT_LL_SOFTDEVICE_HEADERS_INCLUDE
 	select MRAM_LATENCY if (SOC_NRF54H20_CPURAD && !MPSL_PM_USE_MRAM_LATENCY_SERVICE)
 	select MRAM_LATENCY_AUTO_REQ if (SOC_NRF54H20_CPURAD && !MPSL_PM_USE_MRAM_LATENCY_SERVICE)
@@ -319,6 +321,8 @@ choice BT_LL_SOFTDEVICE_VARIANT
 						     BT_CTLR_SDC_PAWR_SYNC || \
 						     BT_ISO || \
 						     BT_CTLR_CHANNEL_SOUNDING || \
+						     BT_CTLR_EXTENDED_FEAT_SET || \
+						     BT_CTLR_FRAME_SPACE_UPDATE || \
 						     SOC_COMPATIBLE_NRF5340_CPUNET || \
 						     SOC_NRF54H20_CPURAD || \
 						     (SOC_COMPATIBLE_NRF54LX && TRUSTED_EXECUTION_NONSECURE) || \
@@ -544,6 +548,12 @@ config BT_CTLR_SDC_CIS_SUBEVENT_LENGTH_US
 	  If this parameter is set to zero, the subevent length
 	  is chosen by the controller.
 
+config BT_CTLR_EXTENDED_FEAT_SET
+	select EXPERIMENTAL
+
+config BT_CTLR_FRAME_SPACE_UPDATE
+	select EXPERIMENTAL
+
 config BT_CTLR_CHANNEL_SOUNDING
 	bool "Channel Sounding support"
 	help

subsys/bluetooth/controller/hci_driver.c

@@ -198,6 +198,20 @@ BUILD_ASSERT(!IS_ENABLED(CONFIG_BT_PERIPHERAL) ||
 #define SDC_SYNC_TRANSFER_MEM_SIZE 0
 #endif
 
+#if defined(CONFIG_BT_CTLR_FRAME_SPACE_UPDATE)
+#define SDC_FRAME_SPACE_UPDATE_MEM_SIZE \
+	SDC_MEM_FRAME_SPACE_UPDATE(SDC_CENTRAL_COUNT + PERIPHERAL_COUNT)
+#else
+#define SDC_FRAME_SPACE_UPDATE_MEM_SIZE 0
+#endif
+
+#if defined(CONFIG_BT_CTLR_EXTENDED_FEAT_SET)
+#define SDC_EXTENDED_FEAT_SET_MEM_SIZE \
+	SDC_MEM_EXTENDED_FEATURE_SET(SDC_CENTRAL_COUNT + PERIPHERAL_COUNT)
+#else
+#define SDC_EXTENDED_FEAT_SET_MEM_SIZE 0
+#endif
+
 #if defined(CONFIG_BT_CTLR_CONN_ISO)
 #define SDC_MEM_CIG SDC_MEM_PER_CIG(CONFIG_BT_CTLR_CONN_ISO_GROUPS)
 #define SDC_MEM_CIS \
@@ -278,6 +292,8 @@ BUILD_ASSERT(!IS_ENABLED(CONFIG_BT_PERIPHERAL) ||
 		      (SDC_LE_POWER_CONTROL_MEM_SIZE) + \
 		      (SDC_SUBRATING_MEM_SIZE) + \
 		      (SDC_SYNC_TRANSFER_MEM_SIZE) + \
+		      (SDC_FRAME_SPACE_UPDATE_MEM_SIZE) + \
+		      (SDC_EXTENDED_FEAT_SET_MEM_SIZE) + \
 		      (SDC_PERIODIC_ADV_MEM_SIZE) + \
 		      (SDC_PERIODIC_ADV_RSP_MEM_SIZE) + \
 		      (SDC_PERIODIC_SYNC_MEM_SIZE) + \
@@ -979,6 +995,28 @@ static int configure_supported_features(void)
 		}
 	}
 
+	if (IS_ENABLED(CONFIG_BT_CTLR_FRAME_SPACE_UPDATE)) {
+		if (IS_ENABLED(CONFIG_BT_CENTRAL)) {
+			err = sdc_support_frame_space_update_central();
+			if (err) {
+				return -ENOTSUP;
+			}
+		}
+		if (IS_ENABLED(CONFIG_BT_PERIPHERAL)) {
+			err = sdc_support_frame_space_update_peripheral();
+			if (err) {
+				return -ENOTSUP;
+			}
+		}
+	}
+
+	if (IS_ENABLED(CONFIG_BT_CTLR_EXTENDED_FEAT_SET)) {
+		err = sdc_support_extended_feature_set();
+		if (err) {
+			return -ENOTSUP;
+		}
+	}
+
 	if (IS_ENABLED(CONFIG_BT_CTLR_CHANNEL_SOUNDING_TEST)) {
 		err = sdc_support_channel_sounding_test();
 		if (err) {

subsys/bluetooth/controller/hci_internal.c

@@ -75,6 +75,12 @@ static bool command_generates_command_complete_event(uint16_t hci_opcode)
 	case SDC_HCI_OPCODE_CMD_LE_CS_TEST_END:
 #endif /* CONFIG_BT_CTLR_CHANNEL_SOUNDING_TEST */
 #endif /* CONFIG_BT_CTLR_CHANNEL_SOUNDING */
+#if defined(CONFIG_BT_CTLR_EXTENDED_FEAT_SET)
+	case SDC_HCI_OPCODE_CMD_LE_READ_ALL_REMOTE_FEATURES:
+#endif /* CONFIG_BT_CTLR_EXTENDED_FEAT_SET */
+#if defined(CONFIG_BT_CTLR_FRAME_SPACE_UPDATE)
+	case SDC_HCI_OPCODE_CMD_LE_FRAME_SPACE_UPDATE:
+#endif /* CONFIG_BT_CTLR_FRAME_SPACE_UPDATE */
 		return false;
 	default:
 		return true;
@@ -643,6 +649,13 @@ void hci_internal_supported_commands(sdc_hci_ip_supported_commands_t *cmds)
 	cmds->hci_le_cs_set_procedure_parameters = 1;
 	cmds->hci_le_cs_procedure_enable = 1;
 #endif /* CONFIG_BT_CTLR_CHANNEL_SOUNDING */
+#if defined(CONFIG_BT_CTLR_EXTENDED_FEAT_SET)
+	cmds->hci_le_read_all_local_supported_features = 1;
+	cmds->hci_le_read_all_remote_features = 1;
+#endif /* CONFIG_BT_CTLR_EXTENDED_FEAT_SET */
+#if defined(CONFIG_BT_CTLR_FRAME_SPACE_UPDATE)
+	cmds->hci_le_frame_space_update = 1;
+#endif /* CONFIG_BT_CTLR_FRAME_SPACE_UPDATE */
 }
 
 #if defined(CONFIG_BT_HCI_VS)
@@ -778,6 +791,10 @@ void hci_internal_le_supported_features(
 	features->params.channel_sounding_tone_quality_indication = 1;
 #endif /* CONFIG_BT_CTLR_CHANNEL_SOUNDING */
 
+#if defined(CONFIG_BT_CTLR_EXTENDED_FEAT_SET)
+	features->params.ll_extended_feature_set = 1;
+#endif /* CONFIG_BT_CTLR_EXTENDED_FEAT_SET */
+
 #if defined(CONFIG_BT_CTLR_SDC_LE_POWER_CLASS_1)
 	features->params.le_Power_class_1 = 1;
 #endif /* CONFIG_BT_CTLR_SDC_LE_POWER_CLASS_1 */
@@ -1580,6 +1597,21 @@ static uint8_t le_controller_cmd_put(uint8_t const * const cmd,
 #endif /* CONFIG_BT_CTLR_CHANNEL_SOUNDING_TEST */
 #endif /* CONFIG_BT_CTLR_CHANNEL_SOUNDING */
 
+#if defined(CONFIG_BT_CTLR_EXTENDED_FEAT_SET)
+	case SDC_HCI_OPCODE_CMD_LE_READ_ALL_REMOTE_FEATURES:
+		return sdc_hci_cmd_le_read_all_remote_features((void *)cmd_params);
+	case SDC_HCI_OPCODE_CMD_LE_READ_ALL_LOCAL_SUPPORTED_FEATURES:
+		*param_length_out +=
+			sizeof(sdc_hci_cmd_le_read_all_local_supported_features_return_t);
+		return sdc_hci_cmd_le_read_all_local_supported_features(
+			(void *)event_out_params);
+#endif /* CONFIG_BT_CTLR_EXTENDED_FEAT_SET */
+
+#if defined(CONFIG_BT_CTLR_FRAME_SPACE_UPDATE)
+	case SDC_HCI_OPCODE_CMD_LE_FRAME_SPACE_UPDATE:
+		return sdc_hci_cmd_le_frame_space_update((void *)cmd_params);
+#endif /* CONFIG_BT_CTLR_FRAME_SPACE_UPDATE */
+
 	default:
 		return BT_HCI_ERR_UNKNOWN_CMD;
 	}