Bluetooth: Add support for experimental features configuration (a10c907c) · Commits · 戴 / test

include/net/bluetooth/hci.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -258,6 +258,7 @@ enum {
		HCI_MGMT_DEV_CLASS_EVENTS,
		HCI_MGMT_LOCAL_NAME_EVENTS,
		HCI_MGMT_OOB_DATA_EVENTS,
		HCI_MGMT_EXP_FEATURE_EVENTS,
		};

		/*

include/net/bluetooth/mgmt.h

+27 −0

Original line number	Diff line number	Diff line
		@@ -681,6 +681,27 @@ struct mgmt_rp_read_security_info {
		__u8 sec[];
		} __packed;

		#define MGMT_OP_READ_EXP_FEATURES_INFO 0x0049
		#define MGMT_READ_EXP_FEATURES_INFO_SIZE 0
		struct mgmt_rp_read_exp_features_info {
		__le16 feature_count;
		struct {
		__u8 uuid[16];
		__le32 flags;
		} features[];
		} __packed;

		#define MGMT_OP_SET_EXP_FEATURE 0x004a
		struct mgmt_cp_set_exp_feature {
		__u8 uuid[16];
		__u8 param[];
		} __packed;
		#define MGMT_SET_EXP_FEATURE_SIZE 16
		struct mgmt_rp_set_exp_feature {
		__u8 uuid[16];
		__le32 flags;
		} __packed;

		#define MGMT_EV_CMD_COMPLETE 0x0001
		struct mgmt_ev_cmd_complete {
		__le16 opcode;
		@@ -906,3 +927,9 @@ struct mgmt_ev_ext_info_changed {
		struct mgmt_ev_phy_configuration_changed {
		__le32 selected_phys;
		} __packed;

		#define MGMT_EV_EXP_FEATURE_CHANGED 0x0027
		struct mgmt_ev_exp_feature_changed {
		__u8 uuid[16];
		__le32 flags;
		} __packed;

net/bluetooth/mgmt.c

+58 −0

Original line number	Diff line number	Diff line
		@@ -109,6 +109,8 @@ static const u16 mgmt_commands[] = {
		MGMT_OP_SET_BLOCKED_KEYS,
		MGMT_OP_SET_WIDEBAND_SPEECH,
		MGMT_OP_READ_SECURITY_INFO,
		MGMT_OP_READ_EXP_FEATURES_INFO,
		MGMT_OP_SET_EXP_FEATURE,
		};

		static const u16 mgmt_events[] = {
		@@ -148,6 +150,7 @@ static const u16 mgmt_events[] = {
		MGMT_EV_ADVERTISING_REMOVED,
		MGMT_EV_EXT_INFO_CHANGED,
		MGMT_EV_PHY_CONFIGURATION_CHANGED,
		MGMT_EV_EXP_FEATURE_CHANGED,
		};

		static const u16 mgmt_untrusted_commands[] = {
		@@ -158,6 +161,7 @@ static const u16 mgmt_untrusted_commands[] = {
		MGMT_OP_READ_EXT_INDEX_LIST,
		MGMT_OP_READ_EXT_INFO,
		MGMT_OP_READ_SECURITY_INFO,
		MGMT_OP_READ_EXP_FEATURES_INFO,
		};

		static const u16 mgmt_untrusted_events[] = {
		@@ -172,6 +176,7 @@ static const u16 mgmt_untrusted_events[] = {
		MGMT_EV_EXT_INDEX_ADDED,
		MGMT_EV_EXT_INDEX_REMOVED,
		MGMT_EV_EXT_INFO_CHANGED,
		MGMT_EV_EXP_FEATURE_CHANGED,
		};

		#define CACHE_TIMEOUT msecs_to_jiffies(2 * 1000)
		@@ -3710,6 +3715,53 @@ static int read_security_info(struct sock sk, struct hci_dev hdev,
		rp, sizeof(*rp) + sec_len);
		}

		static int read_exp_features_info(struct sock sk, struct hci_dev hdev,
		void *data, u16 data_len)
		{
		char buf[42];
		struct mgmt_rp_read_exp_features_info rp = (void )buf;
		u16 idx = 0;

		bt_dev_dbg(hdev, "sock %p", sk);

		memset(&buf, 0, sizeof(buf));

		rp->feature_count = cpu_to_le16(idx);

		/* After reading the experimental features information, enable
		* the events to update client on any future change.
		*/
		hci_sock_set_flag(sk, HCI_MGMT_EXP_FEATURE_EVENTS);

		return mgmt_cmd_complete(sk, hdev ? hdev->id : MGMT_INDEX_NONE,
		MGMT_OP_READ_EXP_FEATURES_INFO,
		0, rp, sizeof(rp) + (20 idx));
		}

		static int set_exp_feature(struct sock sk, struct hci_dev hdev,
		void *data, u16 data_len)
		{
		struct mgmt_cp_set_exp_feature *cp = data;
		struct mgmt_rp_set_exp_feature rp;

		bt_dev_dbg(hdev, "sock %p", sk);

		if (!memcmp(cp->uuid, ZERO_KEY, 16)) {
		memset(rp.uuid, 0, 16);
		rp.flags = cpu_to_le32(0);

		hci_sock_set_flag(sk, HCI_MGMT_EXP_FEATURE_EVENTS);

		return mgmt_cmd_complete(sk, hdev ? hdev->id : MGMT_INDEX_NONE,
		MGMT_OP_SET_EXP_FEATURE, 0,
		&rp, sizeof(rp));
		}

		return mgmt_cmd_status(sk, hdev ? hdev->id : MGMT_INDEX_NONE,
		MGMT_OP_SET_EXP_FEATURE,
		MGMT_STATUS_NOT_SUPPORTED);
		}

		static void read_local_oob_data_complete(struct hci_dev *hdev, u8 status,
		u16 opcode, struct sk_buff *skb)
		{
		@@ -7152,6 +7204,12 @@ static const struct hci_mgmt_handler mgmt_handlers[] = {
		{ set_wideband_speech, MGMT_SETTING_SIZE },
		{ read_security_info, MGMT_READ_SECURITY_INFO_SIZE,
		HCI_MGMT_UNTRUSTED },
		{ read_exp_features_info, MGMT_READ_EXP_FEATURES_INFO_SIZE,
		HCI_MGMT_UNTRUSTED \|
		HCI_MGMT_HDEV_OPTIONAL },
		{ set_exp_feature, MGMT_SET_EXP_FEATURE_SIZE,
		HCI_MGMT_VAR_LEN \|
		HCI_MGMT_HDEV_OPTIONAL },
		};

		void mgmt_index_added(struct hci_dev *hdev)

Admin message