bluetooth: host: Add support for extended feature set feature

This commit adds support for the extended feature set
feature. This includes:
- hci boilerplate
- kconfigs, including one for a max supported feature page
- linking into the current auto feature exchange procedure

Signed-off-by: Sean Madigan <sean.madigan@nordicsemi.no>

Author: sean-madigan

include/zephyr/bluetooth/bluetooth.h

@@ -71,11 +71,16 @@ extern "C" {
 #define BT_ID_DEFAULT 0
 
 /**
- * @brief Number of octets for local supported
+ * @brief Number of octets for local and remote supported features
  *
- * The value of 8 correspond to page 0 in the LE Controller supported features
+ * The value of 8 correspond to page 0 in the LE Controller supported features.
+ * 24 bytes are required for all subsequent supported feature pages.
  */
-#define BT_LE_LOCAL_SUPPORTED_FEATURES_SIZE 8
+#ifdef CONFIG_BT_LE_MAX_SUPPORTED_FEATURE_PAGE
+#define BT_LE_LOCAL_SUPPORTED_FEATURES_SIZE (8 + (CONFIG_BT_LE_MAX_SUPPORTED_FEATURE_PAGE * 24))
+#else
+#define BT_LE_LOCAL_SUPPORTED_FEATURES_SIZE (8)
+#endif
 
 /** Opaque type representing an advertiser. */
 struct bt_le_ext_adv;

include/zephyr/bluetooth/hci_types.h

@@ -284,6 +284,8 @@ struct bt_hci_cmd_hdr {
 						  BT_LE_FEAT_BIT_CHANNEL_SOUNDING)
 #define BT_FEAT_LE_CHANNEL_SOUNDING_HOST(feat)    BT_LE_FEAT_TEST(feat, \
 						  BT_LE_FEAT_BIT_CHANNEL_SOUNDING_HOST)
+#define BT_FEAT_LE_LL_EXTENDED_FEAT_SET(feat)     BT_LE_FEAT_TEST(feat, \
+						  BT_LE_FEAT_BIT_LL_EXTENDED_FEAT_SET)
 
 #define BT_FEAT_LE_CIS(feat)            (BT_FEAT_LE_CIS_CENTRAL(feat) | \
 					BT_FEAT_LE_CIS_PERIPHERAL(feat))
@@ -2438,6 +2440,20 @@ struct bt_hci_cp_le_tx_test_v4 {
 	uint8_t  ant_ids[0];
 } __packed;
 
+#define BT_HCI_OP_LE_READ_ALL_LOCAL_SUPPORTED_FEATURES BT_OP(BT_OGF_LE, 0x0087) /* 0x2087 */
+struct bt_hci_rp_le_read_all_local_supported_features {
+	uint8_t  status;
+	uint8_t  max_page;
+	uint8_t  features[248];
+} __packed;
+
+
+#define BT_HCI_OP_LE_READ_ALL_REMOTE_FEATURES BT_OP(BT_OGF_LE, 0x0088) /* 0x2088 */
+struct bt_hci_cp_le_read_all_remote_features {
+	uint16_t handle;
+	uint8_t  pages_requested;
+} __packed;
+
 #define BT_HCI_TX_TEST_POWER_MIN -0x7F
 #define BT_HCI_TX_TEST_POWER_MAX 0x14
 
@@ -3552,6 +3568,16 @@ struct bt_hci_evt_le_cis_established_v2 {
 	uint8_t  framing;
 } __packed;
 
+#define BT_HCI_EVT_LE_READ_ALL_REMOTE_FEAT_COMPLETE 0x2b
+
+struct bt_hci_evt_le_read_all_remote_feat_complete {
+	uint8_t  status;
+	uint16_t handle;
+	uint8_t  max_remote_page;
+	uint8_t  max_valid_page;
+	uint8_t  features[248];
+} __packed;
+
 #define BT_HCI_LE_CS_INITIATOR_ROLE_MASK BIT(0)
 #define BT_HCI_LE_CS_REFLECTOR_ROLE_MASK BIT(1)
 
@@ -4024,6 +4050,8 @@ struct bt_hci_evt_le_cs_procedure_enable_complete {
 #define BT_EVT_MASK_LE_ENH_CONN_COMPLETE_V2        BT_EVT_BIT(40)
 #define BT_EVT_MASK_LE_CIS_ESTABLISHED_V2          BT_EVT_BIT(41)
 
+#define BT_EVT_MASK_LE_READ_ALL_REMOTE_FEAT_COMPLTETE BT_EVT_BIT(42)
+
 #define BT_EVT_MASK_LE_CS_READ_REMOTE_SUPPORTED_CAPABILITIES_COMPLETE BT_EVT_BIT(43)
 #define BT_EVT_MASK_LE_CS_READ_REMOTE_FAE_TABLE_COMPLETE              BT_EVT_BIT(44)
 #define BT_EVT_MASK_LE_CS_SECURITY_ENABLE_COMPLETE                    BT_EVT_BIT(45)

subsys/bluetooth/Kconfig

@@ -115,6 +115,21 @@ config BT_CONN_TX
 	help
 	  Hidden configuration that is true if ACL or broadcast ISO is enabled
 
+config BT_LE_MAX_SUPPORTED_FEATURE_PAGE
+	int "Maximum supported feature page"
+	default 0
+	range 0 10
+	help
+	  Maximum supported feature page that can be stored locally and fetched
+	  from the remote connection with the LL Extended Feature Set feature.
+
+config BT_LL_EXTENDED_FEAT_SET
+	bool "LL Extended Feature Set"
+	default y if BT_LE_MAX_SUPPORTED_FEATURE_PAGE > 0
+	depends on !HAS_BT_CTLR || BT_CTLR_LL_EXTENDED_FEAT_SET_SUPPORT
+	help
+	  Enable support for the LL Extended Feature Set feature.
+
 if BT_CONN
 config BT_HCI_ACL_FLOW_CONTROL
 	bool "Controller to Host ACL flow control support"

subsys/bluetooth/common/Kconfig

@@ -119,7 +119,7 @@ config BT_BUF_ACL_RX_COUNT
 
 config BT_BUF_EVT_RX_SIZE
 	int "Maximum supported HCI Event buffer length"
-	default $(UINT8_MAX) if (BT_EXT_ADV && BT_OBSERVER) || BT_PER_ADV_SYNC || BT_DF_CONNECTION_CTE_RX || BT_CLASSIC || BT_CHANNEL_SOUNDING
+	default $(UINT8_MAX) if (BT_EXT_ADV && BT_OBSERVER) || BT_PER_ADV_SYNC || BT_DF_CONNECTION_CTE_RX || BT_CLASSIC || BT_CHANNEL_SOUNDING || BT_LL_EXTENDED_FEAT_SET
 	# LE Read Supported Commands command complete event.
 	default 68
 	range 68 $(UINT8_MAX)

subsys/bluetooth/controller/Kconfig

@@ -128,6 +128,9 @@ config BT_CTLR_SUBRATING_SUPPORT
 config BT_CTLR_CHANNEL_SOUNDING_SUPPORT
 	bool
 
+config BT_CTLR_LL_EXTENDED_FEAT_SET_SUPPORT
+	bool
+
 # Virtual option that all local LL implementations should select
 config HAS_BT_CTLR
 	bool
@@ -1174,6 +1177,14 @@ config BT_CTLR_CHANNEL_SOUNDING
 	  Enable support for Bluetooth 6.0 Channel Sounding in the
 	  Controller.
 
+config BT_CTLR_LL_EXTENDED_FEAT_SET
+	bool "LL Extended Feature Set support"
+	depends on BT_CTLR_LL_EXTENDED_FEAT_SET_SUPPORT
+	default y if BT_LL_EXTENDED_FEAT_SET
+	help
+	  Enable support for Bluetooth 6.0 LL Extended Feature Set
+	  in the Controller.
+
 rsource "Kconfig.df"
 rsource "Kconfig.ll_sw_split"
 rsource "Kconfig.dtm"

subsys/bluetooth/host/conn.c

@@ -1706,7 +1706,12 @@ static bool can_initiate_feature_exchange(struct bt_conn *conn)
 		return true;
 	}
 
-	return BT_FEAT_LE_PER_INIT_FEAT_XCHG(bt_dev.le.features);
+	if (IS_ENABLED(CONFIG_HAS_BT_CTLR) && IS_ENABLED(CONFIG_BT_CTLR_LL_EXTENDED_FEAT_SET)) {
+		return true;
+	}
+
+	return BT_FEAT_LE_PER_INIT_FEAT_XCHG(bt_dev.le.features) ||
+	       BT_FEAT_LE_LL_EXTENDED_FEAT_SET(bt_dev.le.features);
 }
 
 static void perform_auto_initiated_procedures(struct bt_conn *conn, void *unused)
@@ -1732,9 +1737,18 @@ static void perform_auto_initiated_procedures(struct bt_conn *conn, void *unused
 
 	if (!atomic_test_bit(conn->flags, BT_CONN_LE_FEATURES_EXCHANGED) &&
 	    can_initiate_feature_exchange(conn)) {
-		err = bt_hci_le_read_remote_features(conn);
-		if (err) {
-			LOG_ERR("Failed read remote features (%d)", err);
+
+		if (IS_ENABLED(CONFIG_BT_LL_EXTENDED_FEAT_SET) &&
+		    BT_FEAT_LE_LL_EXTENDED_FEAT_SET(bt_dev.le.features)) {
+			err = bt_hci_le_read_all_remote_features(conn);
+			if (err) {
+				LOG_ERR("Failed all read remote features (%d)", err);
+			}
+		} else {
+			err = bt_hci_le_read_remote_features(conn);
+			if (err) {
+				LOG_ERR("Failed read remote features (%d)", err);
+			}
 		}
 		if (conn->state != BT_CONN_CONNECTED) {
 			return;

subsys/bluetooth/host/conn_internal.h

@@ -125,7 +125,7 @@ struct bt_conn_le {
 	 * Available after `atomic_test_bit(conn->flags, BT_CONN_LE_FEATURES_EXCHANGED)`.
 	 * Signaled by bt_conn_cb.remote_info_available().
 	 */
-	uint8_t features[8];
+	uint8_t features[BT_LE_LOCAL_SUPPORTED_FEATURES_SIZE];
 
 	struct bt_keys *keys;
 

subsys/bluetooth/host/hci_core.c

@@ -1117,6 +1117,23 @@ int bt_hci_le_read_remote_features(struct bt_conn *conn)
 	return bt_hci_cmd_send_sync(BT_HCI_OP_LE_READ_REMOTE_FEATURES, buf, NULL);
 }
 
+int bt_hci_le_read_all_remote_features(struct bt_conn *conn)
+{
+	struct bt_hci_cp_le_read_all_remote_features *cp;
+	struct net_buf *buf;
+
+	buf = bt_hci_cmd_alloc(K_FOREVER);
+	if (!buf) {
+		return -ENOBUFS;
+	}
+
+	cp = net_buf_add(buf, sizeof(*cp));
+	cp->handle = sys_cpu_to_le16(conn->handle);
+	cp->pages_requested = CONFIG_BT_LE_MAX_SUPPORTED_FEATURE_PAGE;
+
+	return bt_hci_cmd_send_sync(BT_HCI_OP_LE_READ_ALL_REMOTE_FEATURES, buf, NULL);
+}
+
 int bt_hci_read_remote_version(struct bt_conn *conn)
 {
 	struct bt_hci_cp_read_remote_version_info *cp;
@@ -1784,6 +1801,35 @@ static void le_remote_feat_complete(struct net_buf *buf)
 		return;
 	}
 
+	if (!evt->status) {
+		memcpy(conn->le.features, evt->features,
+		       sizeof(evt->features));
+	}
+
+	atomic_set_bit(conn->flags, BT_CONN_LE_FEATURES_EXCHANGED);
+
+	if (IS_ENABLED(CONFIG_BT_REMOTE_INFO) &&
+	    (!IS_ENABLED(CONFIG_BT_REMOTE_VERSION) ||
+	     atomic_test_bit(conn->flags, BT_CONN_AUTO_VERSION_INFO))) {
+		notify_remote_info(conn);
+	}
+
+	bt_conn_unref(conn);
+}
+
+#if defined(CONFIG_BT_LL_EXTENDED_FEAT_SET)
+static void le_read_all_remote_feat_complete(struct net_buf *buf)
+{
+	struct bt_hci_evt_le_read_all_remote_feat_complete *evt = (void *)buf->data;
+	uint16_t handle = sys_le16_to_cpu(evt->handle);
+	struct bt_conn *conn;
+
+	conn = bt_conn_lookup_handle(handle, BT_CONN_TYPE_LE);
+	if (!conn) {
+		LOG_ERR("Unable to lookup conn for handle %u", handle);
+		return;
+	}
+
 	if (!evt->status) {
 		memcpy(conn->le.features, evt->features,
 		       sizeof(conn->le.features));
@@ -1799,6 +1845,7 @@ static void le_remote_feat_complete(struct net_buf *buf)
 
 	bt_conn_unref(conn);
 }
+#endif /* CONFIG_BT_LL_EXTENDED_FEAT_SET */
 
 #if defined(CONFIG_BT_DATA_LEN_UPDATE)
 static void le_data_len_change(struct net_buf *buf)
@@ -2922,6 +2969,11 @@ static const struct event_handler meta_events[] = {
 	EVENT_HANDLER(BT_HCI_EVT_LE_ENH_CONN_COMPLETE_V2, le_enh_conn_complete_v2,
 		      sizeof(struct bt_hci_evt_le_enh_conn_complete_v2)),
 #endif /* CONFIG_BT_PER_ADV_RSP || CONFIG_BT_PER_ADV_SYNC_RSP */
+#if defined(CONFIG_BT_LL_EXTENDED_FEAT_SET)
+	EVENT_HANDLER(BT_HCI_EVT_LE_READ_ALL_REMOTE_FEAT_COMPLETE,
+		      le_read_all_remote_feat_complete,
+		      sizeof(struct bt_hci_evt_le_read_all_remote_feat_complete)),
+#endif /* CONFIG_BT_LL_EXTENDED_FEAT_SET */
 #endif /* CONFIG_BT_CONN */
 #if defined(CONFIG_BT_CHANNEL_SOUNDING)
 	EVENT_HANDLER(BT_HCI_EVT_LE_CS_READ_REMOTE_SUPPORTED_CAPABILITIES_COMPLETE,
@@ -3158,9 +3210,46 @@ static void read_le_features_complete(struct net_buf *buf)
 
 	LOG_DBG("status 0x%02x %s", rp->status, bt_hci_err_to_str(rp->status));
 
+	memcpy(bt_dev.le.features, rp->features, sizeof(rp->features));
+}
+
+static void read_le_all_supported_features_complete(struct net_buf *buf)
+{
+	struct bt_hci_rp_le_read_all_local_supported_features *rp = (void *)buf->data;
+
+	LOG_DBG("status 0x%02x %s", rp->status, bt_hci_err_to_str(rp->status));
+
 	memcpy(bt_dev.le.features, rp->features, sizeof(bt_dev.le.features));
 }
 
+static int read_le_local_supported_features(void)
+{
+	struct net_buf *rsp;
+	int err;
+
+	/* Read Low Energy Supported Features */
+	if (IS_ENABLED(CONFIG_BT_LL_EXTENDED_FEAT_SET)) {
+		err = bt_hci_cmd_send_sync(BT_HCI_OP_LE_READ_ALL_LOCAL_SUPPORTED_FEATURES, NULL,
+					   &rsp);
+		if (err) {
+			return err;
+		}
+
+		read_le_all_supported_features_complete(rsp);
+	} else {
+		err = bt_hci_cmd_send_sync(BT_HCI_OP_LE_READ_LOCAL_FEATURES, NULL,
+					   &rsp);
+		if (err) {
+			return err;
+		}
+
+		read_le_features_complete(rsp);
+	}
+
+	net_buf_unref(rsp);
+	return 0;
+}
+
 #if defined(CONFIG_BT_CONN)
 #if !defined(CONFIG_BT_CLASSIC)
 static void read_buffer_size_complete(struct net_buf *buf)
@@ -3445,6 +3534,11 @@ static int le_set_event_mask(void)
 		    BT_FEAT_LE_CONN_SUBRATING(bt_dev.le.features)) {
 			mask |= BT_EVT_MASK_LE_SUBRATE_CHANGE;
 		}
+
+		if (IS_ENABLED(CONFIG_BT_LL_EXTENDED_FEAT_SET) &&
+		    BT_FEAT_LE_LL_EXTENDED_FEAT_SET(bt_dev.le.features)) {
+			mask |= BT_EVT_MASK_LE_READ_ALL_REMOTE_FEAT_COMPLTETE;
+		}
 	}
 
 	if (IS_ENABLED(CONFIG_BT_SMP) &&
@@ -3583,16 +3677,11 @@ static int le_init(void)
 		return -ENODEV;
 	}
 
-	/* Read Low Energy Supported Features */
-	err = bt_hci_cmd_send_sync(BT_HCI_OP_LE_READ_LOCAL_FEATURES, NULL,
-				   &rsp);
+	err = read_le_local_supported_features();
 	if (err) {
 		return err;
 	}
 
-	read_le_features_complete(rsp);
-	net_buf_unref(rsp);
-
 	if (IS_ENABLED(CONFIG_BT_ISO) &&
 	    BT_FEAT_LE_ISO(bt_dev.le.features)) {
 		err = le_init_iso();

subsys/bluetooth/host/hci_core.h

@@ -577,6 +577,7 @@ void bt_hci_le_per_adv_response_report(struct net_buf *buf);
 
 int bt_hci_read_remote_version(struct bt_conn *conn);
 int bt_hci_le_read_remote_features(struct bt_conn *conn);
+int bt_hci_le_read_all_remote_features(struct bt_conn *conn);
 int bt_hci_le_read_max_data_len(uint16_t *tx_octets, uint16_t *tx_time);
 
 bool bt_drv_quirk_no_auto_dle(void);

subsys/bluetooth/host/shell/bt.c

@@ -934,7 +934,7 @@ static void remote_info_available(struct bt_conn *conn,
 	}
 
 	if (info.type == BT_CONN_TYPE_LE) {
-		uint8_t features[8];
+		uint8_t features[BT_LE_LOCAL_SUPPORTED_FEATURES_SIZE];
 		char features_str[2 * sizeof(features) + 1];
 
 		sys_memcpy_swap(features, remote_info->le.features,