Bluetooth: Add new MGMT interface for advertising add
Subsystems (4)
v2 cover Bluetooth: Add new MGMT interface for advertising add
Hi Maintainers,
This patch series defines the new two-call MGMT interface for adding new advertising instances. Similarly to the hci advertising commands, a mgmt call to set parameters is expected to be first, followed by a mgmt call to set advertising data/scan response. The members of the parameters request are optional; the caller defines a "params" bitfield in the structure that indicates which parameters were intentionally set, and others are set to defaults.
The main feature here is the introduction of min/max parameters and tx power that can be requested by the client. Min/max parameters will be used both with and without extended advertising support, and tx power will be used with extended advertising support. After a call for hci advertising parameters, a new TX_POWER_SELECTED event will be emitted to alert userspace to the actual chosen tx power.
Additionally, to inform userspace of the controller LE Tx power capabilities for the client's benefit, this series also adds an MGMT command to query controller capabilities, which returns a flexible TLV format for future flexibility.
All changes have been tested on hatch (extended advertising) and kukui (no extended advertising) chromebooks with manual testing verifying correctness of parameters/data in btmon traces, and our automated test suite of 25 single- and multi-advertising usage scenarios.
A separate patch series will add support in bluetoothd. Thanks in advance for your feedback!
Daniel Winkler
Changes in v2:
- Fixed sparse error in Capabilities MGMT command
Daniel Winkler (6):
Bluetooth: Add helper to set adv data
Bluetooth: Break add adv into two mgmt commands
Bluetooth: Use intervals and tx power from mgmt cmds
Bluetooth: Emit tx power chosen on ext adv params completion
Bluetooth: Query LE tx power on startup
Bluetooth: Add MGMT command for controller capabilities
include/net/bluetooth/hci.h | 7 + include/net/bluetooth/hci_core.h | 14 +- include/net/bluetooth/mgmt.h | 48 ++++ net/bluetooth/hci_core.c | 47 +++- net/bluetooth/hci_event.c | 22 ++ net/bluetooth/hci_request.c | 29 ++- net/bluetooth/mgmt.c | 420 ++++++++++++++++++++++++++++++- 7 files changed, 561 insertions(+), 26 deletions(-)
Signature · 1 line
2.28.0.681.g6f77f65b4e-goog
PATCH v2 1/6 Bluetooth: Add helper to set adv data
We wish to handle advertising data separately from advertising parameters in our new MGMT requests. This change adds a helper that allows the advertising data and scan response to be updated for an existing advertising instance.
---
Changes in v2: None
include/net/bluetooth/hci_core.h | 3 +++ net/bluetooth/hci_core.c | 31 +++++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+)
include/net/bluetooth/hci_core.h +3 -0
@@ -1291,6 +1291,9 @@ int hci_add_adv_instance(struct hci_dev *hdev, u8 instance, u32 flags, u16 adv_data_len, u8 *adv_data, u16 scan_rsp_len, u8 *scan_rsp_data, u16 timeout, u16 duration); +int hci_set_adv_instance_data (struct hci_dev *hdev,u8 instance, +u16 adv_data_len,u8 *adv_data, +u16 scan_rsp_len,u8 *scan_rsp_data);int hci_remove_adv_instance (struct hci_dev *hdev,u8 instance);void hci_adv_instances_set_rpa_expired (struct hci_dev *hdev,bool rpa_expired);
net/bluetooth/hci_core.c +31 -0
@@ -3005,6 +3005,37 @@ int hci_add_adv_instance(struct hci_dev *hdev, u8 instance, u32 flags,return 0 ; } +/* This function requires the caller holds hdev->lock */ +int hci_set_adv_instance_data (struct hci_dev *hdev,u8 instance, +u16 adv_data_len,u8 *adv_data, +u16 scan_rsp_len,u8 *scan_rsp_data) +{ +struct adv_info *adv_instance; + + adv_instance =hci_find_adv_instance (hdev, instance); + +/* If advertisement doesn't exist, we can't modify its data */ +if (!adv_instance) +return -ENOENT ; + +if (adv_data_len) { +memset (adv_instance->adv_data,0 , +sizeof (adv_instance->adv_data)); +memcpy (adv_instance->adv_data, adv_data, adv_data_len); + adv_instance->adv_data_len = adv_data_len; + } + +if (scan_rsp_len) { +memset (adv_instance->scan_rsp_data,0 , +sizeof (adv_instance->scan_rsp_data)); +memcpy (adv_instance->scan_rsp_data, + scan_rsp_data, scan_rsp_len); + adv_instance->scan_rsp_len = scan_rsp_len; + } + +return 0 ; +} +/* This function requires the caller holds hdev->lock */ void hci_adv_monitors_clear (struct hci_dev *hdev) {
Signature · 1 line
2.28.0.681.g6f77f65b4e-goog
PATCH v2 2/6 Bluetooth: Break add adv into two mgmt commands
In reply to Daniel WinklerThis patch adds support for the new advertising add interface, with the first command setting advertising parameters and the second to set advertising data. The set parameters command allows the caller to leave some fields "unset", with a params bitfield defining which params were purposefully set. Unset parameters will be given defaults when calling hci_add_adv_instance. The data passed to the param mgmt command is allowed to be flexible, so in the future if bluetoothd passes a larger structure with new params, the mgmt command will ignore the unknown members at the end.
This change has been validated on both hatch (extended advertising) and kukui (no extended advertising) chromebooks running bluetoothd that support this new interface. I ran the following manual tests:
- Set several (3) advertisements using modified test_advertisement.py
- For each, validate correct data and parameters in btmon trace
- Verified both for software rotation and extended adv
Automatic test suite also run, testing many (25) scenarios of single and multi-advertising for data/parameter correctness.
---
Changes in v2: None
include/net/bluetooth/hci_core.h | 2 + include/net/bluetooth/mgmt.h | 33 +++ net/bluetooth/mgmt.c | 364 ++++++++++++++++++++++++++++++- 3 files changed, 388 insertions(+), 11 deletions(-)
include/net/bluetooth/hci_core.h +2 -0
@@ -238,6 +238,8 @@ struct adv_info {#define HCI_MAX_ADV_INSTANCES 5#define HCI_DEFAULT_ADV_DURATION 2 +#define HCI_ADV_TX_POWER_NO_PREFERENCE 0x7F +struct adv_pattern {struct list_head list;__u8 ad_type;
include/net/bluetooth/mgmt.h +33 -0
@@ -782,6 +782,39 @@ struct mgmt_rp_remove_adv_monitor {__le16 monitor_handle; } __packed; +#define MGMT_ADV_PARAM_DURATION BIT(0) +#define MGMT_ADV_PARAM_TIMEOUT BIT(1) +#define MGMT_ADV_PARAM_INTERVALS BIT(2) +#define MGMT_ADV_PARAM_TX_POWER BIT(3) + +#define MGMT_OP_ADD_EXT_ADV_PARAMS 0x0054 +struct mgmt_cp_add_ext_adv_params { +__u8 instance; +__le32 flags; +__le16 params; +__le16 duration; +__le16 timeout; +__le32 min_interval; +__le32 max_interval; +__s8 tx_power; +} __packed; +#define MGMT_ADD_EXT_ADV_PARAMS_MIN_SIZE 20 +struct mgmt_rp_add_ext_adv_params { +__u8 instance; +} __packed; + +#define MGMT_OP_ADD_EXT_ADV_DATA 0x0055 +struct mgmt_cp_add_ext_adv_data { +__u8 instance; +__u8 adv_data_len; +__u8 scan_rsp_len; +__u8 data[]; +} __packed; +#define MGMT_ADD_EXT_ADV_DATA_SIZE 3 +struct mgmt_rp_add_ext_adv_data { +__u8 instance; +} __packed; +#define MGMT_EV_CMD_COMPLETE 0x0001struct mgmt_ev_cmd_complete {__le16 opcode;
net/bluetooth/mgmt.c +353 -11
412 lines not on this page · raw message
Signature · 1 line
2.28.0.681.g6f77f65b4e-goog
PATCH v2 3/6 Bluetooth: Use intervals and tx power from mgmt cmds
In reply to Daniel WinklerThis patch takes the min/max intervals and tx power optionally provided in mgmt interface, stores them in the advertisement struct, and uses them when configuring the hci requests. While tx power is not used if extended advertising is unavailable, software rotation will use the min and max advertising intervals specified by the client.
This change is validated manually by ensuring the min/max intervals are propagated to the controller on both hatch (extended advertising) and kukui (no extended advertising) chromebooks, and that tx power is propagated correctly on hatch. These tests are performed with multiple advertisements simultaneously.
---
Changes in v2: None
include/net/bluetooth/hci_core.h | 5 ++++- net/bluetooth/hci_core.c | 8 +++++--- net/bluetooth/hci_request.c | 29 +++++++++++++++++++---------- net/bluetooth/mgmt.c | 8 ++++++-- 4 files changed, 34 insertions(+), 16 deletions(-)
include/net/bluetooth/hci_core.h +4 -1
@@ -230,6 +230,8 @@ struct adv_info {__u16 scan_rsp_len;__u8 scan_rsp_data[HCI_MAX_AD_LENGTH ];__s8 tx_power; +__u32 min_interval; +__u32 max_interval;bdaddr_t random_addr;bool rpa_expired;struct delayed_work rpa_expired_cb;
@@ -1292,7 +1294,8 @@ struct adv_info *hci_get_next_instance(struct hci_dev *hdev, u8 instance);int hci_add_adv_instance (struct hci_dev *hdev,u8 instance,u32 flags,u16 adv_data_len,u8 *adv_data,u16 scan_rsp_len,u8 *scan_rsp_data, -u16 timeout,u16 duration); +u16 timeout,u16 duration,s8 tx_power, +u32 min_interval,u32 max_interval);int hci_set_adv_instance_data (struct hci_dev *hdev,u8 instance,u16 adv_data_len,u8 *adv_data,u16 scan_rsp_len,u8 *scan_rsp_data);
net/bluetooth/hci_core.c +5 -3
@@ -2951,7 +2951,8 @@ static void adv_instance_rpa_expired(struct work_struct *work)int hci_add_adv_instance (struct hci_dev *hdev,u8 instance,u32 flags,u16 adv_data_len,u8 *adv_data,u16 scan_rsp_len,u8 *scan_rsp_data, -u16 timeout,u16 duration) +u16 timeout,u16 duration,s8 tx_power, +u32 min_interval,u32 max_interval) {struct adv_info *adv_instance;
@@ -2979,6 +2980,9 @@ int hci_add_adv_instance(struct hci_dev *hdev, u8 instance, u32 flags, adv_instance->flags = flags; adv_instance->adv_data_len = adv_data_len; adv_instance->scan_rsp_len = scan_rsp_len; + adv_instance->min_interval = min_interval; + adv_instance->max_interval = max_interval; + adv_instance->tx_power = tx_power;if (adv_data_len)memcpy (adv_instance->adv_data, adv_data, adv_data_len);
@@ -2995,8 +2999,6 @@ int hci_add_adv_instance(struct hci_dev *hdev, u8 instance, u32 flags,else adv_instance->duration = duration; - adv_instance->tx_power =HCI_TX_POWER_INVALID ; -INIT_DELAYED_WORK (&adv_instance->rpa_expired_cb, adv_instance_rpa_expired);
net/bluetooth/hci_request.c +19 -10
@@ -1425,6 +1425,7 @@ static bool is_advertising_allowed(struct hci_dev *hdev, bool connectable)void __hci_req_enable_advertising (struct hci_request *req) {struct hci_dev *hdev = req->hdev; +struct adv_info *adv_instance;struct hci_cp_le_set_adv_param cp;u8 own_addr_type, enable =0x01 ;bool connectable;
@@ -1432,6 +1433,7 @@ void __hci_req_enable_advertising(struct hci_request *req)u32 flags; flags =get_adv_instance_flags (hdev, hdev->cur_adv_instance); + adv_instance =hci_find_adv_instance (hdev, hdev->cur_adv_instance);/* If the "connectable" instance flag was not set, then choose between * ADV_IND and ADV_NONCONN_IND based on the global connectable setting.
@@ -1463,11 +1465,16 @@ void __hci_req_enable_advertising(struct hci_request *req)memset (&cp,0 ,sizeof (cp)); -if (connectable) { - cp.type =LE_ADV_IND ; - +if (adv_instance) { + adv_min_interval = adv_instance->min_interval; + adv_max_interval = adv_instance->max_interval; + }else { adv_min_interval = hdev->le_adv_min_interval; adv_max_interval = hdev->le_adv_max_interval; + } + +if (connectable) { + cp.type =LE_ADV_IND ; }else {if (get_cur_adv_instance_scan_rsp_len (hdev)) cp.type =LE_ADV_SCAN_IND ;
@@ -1478,9 +1485,6 @@ void __hci_req_enable_advertising(struct hci_request *req) hci_dev_test_flag(hdev, HCI_LIMITED_DISCOVERABLE)) { adv_min_interval =DISCOV_LE_FAST_ADV_INT_MIN ; adv_max_interval =DISCOV_LE_FAST_ADV_INT_MAX ; - } else { - adv_min_interval = hdev->le_adv_min_interval; - adv_max_interval = hdev->le_adv_max_interval; } }
@@ -1997,9 +2001,15 @@ int __hci_req_setup_ext_adv_instance(struct hci_request *req, u8 instance)memset (&cp,0 ,sizeof (cp)); -/* In ext adv set param interval is 3 octets */ -hci_cpu_to_le24 (hdev->le_adv_min_interval, cp.min_interval); -hci_cpu_to_le24 (hdev->le_adv_max_interval, cp.max_interval); +if (adv_instance) { +hci_cpu_to_le24 (adv_instance->min_interval, cp.min_interval); +hci_cpu_to_le24 (adv_instance->max_interval, cp.max_interval); + cp.tx_power = adv_instance->tx_power; + }else { +hci_cpu_to_le24 (hdev->le_adv_min_interval, cp.min_interval); +hci_cpu_to_le24 (hdev->le_adv_max_interval, cp.max_interval); + cp.tx_power =HCI_ADV_TX_POWER_NO_PREFERENCE ; + } secondary_adv = (flags &MGMT_ADV_FLAG_SEC_MASK );
@@ -2022,7 +2032,6 @@ int __hci_req_setup_ext_adv_instance(struct hci_request *req, u8 instance) cp.own_addr_type = own_addr_type; cp.channel_map = hdev->le_adv_channel_map; - cp.tx_power =127 ; cp.handle = instance;if (flags &MGMT_ADV_FLAG_SEC_2M ) {
net/bluetooth/mgmt.c +6 -2
@@ -7524,7 +7524,10 @@ static int add_advertising(struct sock *sk, struct hci_dev *hdev, cp->adv_data_len, cp->data, cp->scan_rsp_len, cp->data + cp->adv_data_len, - timeout, duration); + timeout, duration, +HCI_ADV_TX_POWER_NO_PREFERENCE , + hdev->le_adv_min_interval, + hdev->le_adv_max_interval);if (err <0 ) { err =mgmt_cmd_status (sk, hdev->id,MGMT_OP_ADD_ADVERTISING ,MGMT_STATUS_FAILED );
@@ -7722,7 +7725,8 @@ static int add_ext_adv_params(struct sock *sk, struct hci_dev *hdev,/* Create advertising instance with no advertising or response data */ err =hci_add_adv_instance (hdev, cp->instance, flags, -0 ,NULL ,0 ,NULL , timeout, duration); +0 ,NULL ,0 ,NULL , timeout, duration, + tx_power, min_interval, max_interval);if (err <0 ) { err = mgmt_cmd_status(sk, hdev->id, MGMT_OP_ADD_EXT_ADV_PARAMS,
Signature · 1 line
2.28.0.681.g6f77f65b4e-goog
PATCH v2 4/6 Bluetooth: Emit tx power chosen on ext adv params completion
In reply to Daniel WinklerOur hci call to set extended advertising parameters returns the actual tx power selected by the controller. This patch signals a new TX_POWER_SELECTED mgmt event to alert the caller of the actual tx power that is being used. This is important because the power selected will not necessarily match the power requested by the user.
This patch is manually verified by ensuring the tx power selected event is signalled and caught by bluetoothd.
---
Changes in v2: None
include/net/bluetooth/hci_core.h | 2 ++ include/net/bluetooth/mgmt.h | 6 ++++++ net/bluetooth/hci_event.c | 4 ++++ net/bluetooth/mgmt.c | 11 +++++++++++ 4 files changed, 23 insertions(+)
include/net/bluetooth/hci_core.h +2 -0
@@ -1781,6 +1781,8 @@ void mgmt_advertising_added(struct sock *sk, struct hci_dev *hdev, u8 instance);void mgmt_advertising_removed (struct sock *sk,struct hci_dev *hdev,u8 instance); +void mgmt_adv_tx_power_selected (struct hci_dev *hdev,u8 instance, +s8 tx_power);int mgmt_phy_configuration_changed (struct hci_dev *hdev,struct sock *skip); u8 hci_le_conn_update(struct hci_conn *conn, u16 min, u16 max, u16 latency,
include/net/bluetooth/mgmt.h +6 -0
@@ -1079,3 +1079,9 @@ struct mgmt_ev_controller_resume {#define MGMT_WAKE_REASON_NON_BT_WAKE 0x0#define MGMT_WAKE_REASON_UNEXPECTED 0x1#define MGMT_WAKE_REASON_REMOTE_WAKE 0x2 + +#define MGMT_EV_ADV_TX_POWER_SELECTED 0x002f +struct mgmt_ev_adv_tx_power_selected { +__u8 instance; +__s8 tx_power; +} __packed;
net/bluetooth/hci_event.c +4 -0
@@ -1749,6 +1749,10 @@ static void hci_cc_set_ext_adv_param(struct hci_dev *hdev, struct sk_buff *skb) }/* Update adv data as tx power is known now */ hci_req_update_adv_data (hdev, hdev->cur_adv_instance); + +if (cp->handle) +mgmt_adv_tx_power_selected (hdev, cp->handle, rp->tx_power); +hci_dev_unlock (hdev); }
net/bluetooth/mgmt.c +11 -0
@@ -167,6 +167,7 @@ static const u16 mgmt_events[] = {MGMT_EV_DEVICE_FLAGS_CHANGED ,MGMT_EV_CONTROLLER_SUSPEND ,MGMT_EV_CONTROLLER_RESUME , + MGMT_EV_ADV_TX_POWER_SELECTED, }; static const u16 mgmt_untrusted_commands[] = {
@@ -1152,6 +1153,16 @@ void mgmt_advertising_removed(struct sock *sk, struct hci_dev *hdev,mgmt_event (MGMT_EV_ADVERTISING_REMOVED , hdev, &ev,sizeof (ev), sk); } +void mgmt_adv_tx_power_selected (struct hci_dev *hdev,u8 instance,s8 tx_power) +{ +struct mgmt_ev_adv_tx_power_selected ev; + + ev.instance = instance; + ev.tx_power = tx_power; + +mgmt_event (MGMT_EV_ADV_TX_POWER_SELECTED , hdev, &ev,sizeof (ev),NULL ); +} +static void cancel_adv_timeout (struct hci_dev *hdev) {if (hdev->adv_instance_timeout) {
Signature · 1 line
2.28.0.681.g6f77f65b4e-goog
PATCH v2 5/6 Bluetooth: Query LE tx power on startup
In reply to Daniel WinklerQueries tx power via HCI_LE_Read_Transmit_Power command when the hci device is initialized, and stores resulting min/max LE power in hdev struct. If command isn't available (< BT5 support), min/max values both default to HCI_TX_POWER_INVALID.
This patch is manually verified by ensuring BT5 devices correctly query and receive controller tx power range.
---
Changes in v2: None
include/net/bluetooth/hci.h | 7 +++++++ include/net/bluetooth/hci_core.h | 2 ++ net/bluetooth/hci_core.c | 8 ++++++++ net/bluetooth/hci_event.c | 18 ++++++++++++++++++ 4 files changed, 35 insertions(+)
include/net/bluetooth/hci.h +7 -0
@@ -1797,6 +1797,13 @@ struct hci_cp_le_set_adv_set_rand_addr {bdaddr_t bdaddr; } __packed; +#define HCI_OP_LE_READ_TRANSMIT_POWER 0x204b +struct hci_rp_le_read_transmit_power { +__u8 status; +__s8 min_le_tx_power; +__s8 max_le_tx_power; +} __packed; +#define HCI_OP_LE_READ_BUFFER_SIZE_V2 0x2060struct hci_rp_le_read_buffer_size_v2 {__u8 status;
include/net/bluetooth/hci_core.h +2 -0
@@ -381,6 +381,8 @@ struct hci_dev {__u16 def_page_timeout;__u16 def_multi_adv_rotation_duration;__u16 def_le_autoconnect_timeout; +__s8 min_le_tx_power; +__s8 max_le_tx_power;__u16 pkt_type;__u16 esco_type;
net/bluetooth/hci_core.c +8 -0
@@ -741,6 +741,12 @@ static int hci_init3_req(struct hci_request *req, unsigned long opt)hci_req_add (req,HCI_OP_LE_READ_ADV_TX_POWER ,0 ,NULL ); } +if (hdev->commands[38 ] &0x80 ) { +/* Read LE Min/Max Tx Power*/ +hci_req_add (req,HCI_OP_LE_READ_TRANSMIT_POWER , +0 ,NULL ); + } +if (hdev->commands[26 ] &0x40 ) {/* Read LE White List Size */ hci_req_add(req, HCI_OP_LE_READ_WHITE_LIST_SIZE,
@@ -3654,6 +3660,8 @@ struct hci_dev *hci_alloc_dev(void) hdev->le_num_of_adv_sets =HCI_MAX_ADV_INSTANCES ; hdev->def_multi_adv_rotation_duration =HCI_DEFAULT_ADV_DURATION ; hdev->def_le_autoconnect_timeout =HCI_LE_AUTOCONN_TIMEOUT ; + hdev->min_le_tx_power =HCI_TX_POWER_INVALID ; + hdev->max_le_tx_power =HCI_TX_POWER_INVALID ; hdev->rpa_timeout =HCI_DEFAULT_RPA_TIMEOUT ; hdev->discov_interleaved_timeout =DISCOV_INTERLEAVED_TIMEOUT ;
net/bluetooth/hci_event.c +18 -0
@@ -1202,6 +1202,20 @@ static void hci_cc_le_set_adv_set_random_addr(struct hci_dev *hdev,hci_dev_unlock (hdev); } +static void hci_cc_le_read_transmit_power (struct hci_dev *hdev, +struct sk_buff *skb) +{ +struct hci_rp_le_read_transmit_power *rp = (void *)skb->data; + +BT_DBG ("%s status 0x%2.2x" , hdev->name, rp->status); + +if (rp->status) +return ; + + hdev->min_le_tx_power = rp->min_le_tx_power; + hdev->max_le_tx_power = rp->max_le_tx_power; +} +static void hci_cc_le_set_adv_enable (struct hci_dev *hdev,struct sk_buff *skb) {__u8 *sent, status = *((__u8 *) skb->data);
@@ -3577,6 +3591,10 @@ static void hci_cmd_complete_evt(struct hci_dev *hdev, struct sk_buff *skb,hci_cc_le_set_adv_set_random_addr (hdev, skb);break ; +case HCI_OP_LE_READ_TRANSMIT_POWER : +hci_cc_le_read_transmit_power (hdev, skb); +break ; +default :BT_DBG ("%s opcode 0x%4.4x" , hdev->name, *opcode);break ;
Signature · 1 line
2.28.0.681.g6f77f65b4e-goog
PATCH v2 6/6 Bluetooth: Add MGMT command for controller capabilities
In reply to Daniel WinklerFor advertising, we wish to know the LE tx power capabilities of the controller in userspace, so this patch adds a new MGMT command to query controller capabilities. The data returned is in TLV format, so it can be easily used to convey any data determined to be useful in the future, but for now it simply contains LE min and max tx power.
The change was tested by manually verifying that the new MGMT command returns the tx power range as expected in userspace.
---
Changes in v2:
- Fixed sparse error in Capabilities MGMT command
include/net/bluetooth/mgmt.h | 9 +++++++++ net/bluetooth/mgmt.c | 39 ++++++++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+)
include/net/bluetooth/mgmt.h +9 -0
@@ -815,6 +815,15 @@ struct mgmt_rp_add_ext_adv_data {__u8 instance; } __packed; +#define MGMT_CAP_LE_TX_PWR_MIN 0x0000 +#define MGMT_CAP_LE_TX_PWR_MAX 0x0001 + +#define MGMT_OP_READ_CONTROLLER_CAP 0x0056 +#define MGMT_OP_READ_CONTROLLER_CAP_SIZE 0 +struct mgmt_rp_read_controller_cap { +__u8 capabilities[0 ]; +} __packed; +#define MGMT_EV_CMD_COMPLETE 0x0001struct mgmt_ev_cmd_complete {__le16 opcode;
net/bluetooth/mgmt.c +39 -0
@@ -124,6 +124,7 @@ static const u16 mgmt_commands[] = {MGMT_OP_REMOVE_ADV_MONITOR ,MGMT_OP_ADD_EXT_ADV_PARAMS ,MGMT_OP_ADD_EXT_ADV_DATA , + MGMT_OP_READ_CONTROLLER_CAP, }; static const u16 mgmt_events[] = {
@@ -181,6 +182,7 @@ static const u16 mgmt_untrusted_commands[] = {MGMT_OP_READ_EXP_FEATURES_INFO ,MGMT_OP_READ_DEF_SYSTEM_CONFIG ,MGMT_OP_READ_DEF_RUNTIME_CONFIG , + MGMT_OP_READ_CONTROLLER_CAP, }; static const u16 mgmt_untrusted_events[] = {
@@ -4356,6 +4358,42 @@ static int remove_adv_monitor(struct sock *sk, struct hci_dev *hdev,return err; } +static int read_controller_cap (struct sock *sk,struct hci_dev *hdev, +void *data,u16 len) +{ +u8 i =0 ; + +/* This command will return its data in TVL format. Currently we only +* wish to include LE tx power parameters, so this struct can be given +* a fixed size as data types are not changing. +*/ +struct { +struct mgmt_tlv entry; +__s8 value; + } __packed cap[2]; + +BT_DBG ("request for %s" , hdev->name); +memset (cap,0 ,sizeof (cap)); + +hci_dev_lock (hdev); + +/* Append LE tx power bounds */ + cap[i].entry.type =cpu_to_le16 (MGMT_CAP_LE_TX_PWR_MIN ); + cap[i].entry.length =sizeof (__s8); + cap[i].value = hdev->min_le_tx_power; + i++; + + cap[i].entry.type =cpu_to_le16 (MGMT_CAP_LE_TX_PWR_MAX ); + cap[i].entry.length =sizeof (__s8); + cap[i].value = hdev->max_le_tx_power; + i++; + +hci_dev_unlock (hdev); + +return mgmt_cmd_complete (sk, hdev->id,MGMT_OP_READ_CONTROLLER_CAP , +MGMT_STATUS_SUCCESS , cap,sizeof (cap)); +} +static void read_local_oob_data_complete (struct hci_dev *hdev,u8 status,u16 opcode,struct sk_buff *skb) {
@@ -8208,6 +8246,7 @@ static const struct hci_mgmt_handler mgmt_handlers[] = { HCI_MGMT_VAR_LEN }, { add_ext_adv_data,MGMT_ADD_EXT_ADV_DATA_SIZE , HCI_MGMT_VAR_LEN }, + { read_controller_cap, MGMT_OP_READ_CONTROLLER_CAP_SIZE }, };void mgmt_index_added (struct hci_dev *hdev)
Signature · 1 line
2.28.0.681.g6f77f65b4e-goog