Bluetooth: Add new MGMT interface for advertising add
Subsystems (4)
v7 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 to set advertising parameters, the selected transmission power will be propagated in the reponse to alert userspace to the actual power used.
Additionally, to inform userspace of the controller LE Tx power capabilities for the client's benefit, this series also changes the security info MGMT command to more flexibly contain other capabilities, such as LE min and max tx power.
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 v7:
- Rebase onto bluetooth-next/master
Changes in v6:
- Only populate LE tx power range if controller reports it
Changes in v5:
- Ensure data/scan rsp length is returned for non-ext adv
Changes in v4:
- Add remaining data and scan response length to MGMT params response
- Moving optional params into 'flags' field of MGMT command
- Combine LE tx range into a single EIR field for MGMT capabilities cmd
Changes in v3:
- Adding selected tx power to adv params mgmt response, removing event
- Re-using security info MGMT command to carry controller capabilities
Changes in v2:
- Fixed sparse error in Capabilities MGMT command
Daniel Winkler (5):
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: Query LE tx power on startup
Bluetooth: Change MGMT security info CMD to be more generic
include/net/bluetooth/hci.h | 7 + include/net/bluetooth/hci_core.h | 12 +- include/net/bluetooth/mgmt.h | 49 +++- net/bluetooth/hci_core.c | 47 +++- net/bluetooth/hci_event.c | 19 ++ net/bluetooth/hci_request.c | 29 ++- net/bluetooth/mgmt.c | 430 +++++++++++++++++++++++++++++-- 7 files changed, 548 insertions(+), 45 deletions(-)
Signature · 1 line
2.29.2.576.ga3fc446d84-goog
PATCH v7 1/5 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 v7: None
Changes in v6: None
Changes in v5: None
Changes in v4: None
Changes in v3: None
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
@@ -1302,6 +1302,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.29.2.576.ga3fc446d84-goog
PATCH v7 2/5 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 v7: None
Changes in v6: None
Changes in v5:
- Ensure data/scan rsp length is returned for non-ext adv
Changes in v4:
- Add remaining data and scan response length to MGMT params response
- Moving optional params into 'flags' field of MGMT command
Changes in v3:
- Adding selected tx power to adv params mgmt response, removing event
Changes in v2: None
include/net/bluetooth/hci_core.h | 2 + include/net/bluetooth/mgmt.h | 34 +++ net/bluetooth/hci_event.c | 1 + net/bluetooth/mgmt.c | 381 ++++++++++++++++++++++++++++++- 4 files changed, 407 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 +34 -0
@@ -574,6 +574,10 @@ struct mgmt_rp_add_advertising {#define MGMT_ADV_FLAG_SEC_CODED BIT(9)#define MGMT_ADV_FLAG_CAN_SET_TX_POWER BIT(10)#define MGMT_ADV_FLAG_HW_OFFLOAD BIT(11) +#define MGMT_ADV_PARAM_DURATION BIT(12) +#define MGMT_ADV_PARAM_TIMEOUT BIT(13) +#define MGMT_ADV_PARAM_INTERVALS BIT(14) +#define MGMT_ADV_PARAM_TX_POWER BIT(15)#define MGMT_ADV_FLAG_SEC_MASK (MGMT_ADV_FLAG_SEC_1M | MGMT_ADV_FLAG_SEC_2M | \ MGMT_ADV_FLAG_SEC_CODED)
@@ -782,6 +786,36 @@ struct mgmt_rp_remove_adv_monitor {__le16 monitor_handle; } __packed; +#define MGMT_OP_ADD_EXT_ADV_PARAMS 0x0054 +struct mgmt_cp_add_ext_adv_params { +__u8 instance; +__le32 flags; +__le16 duration; +__le16 timeout; +__le32 min_interval; +__le32 max_interval; +__s8 tx_power; +} __packed; +#define MGMT_ADD_EXT_ADV_PARAMS_MIN_SIZE 18 +struct mgmt_rp_add_ext_adv_params { +__u8 instance; +__s8 tx_power; +__u8 max_adv_data_len; +__u8 max_scan_rsp_len; +} __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/hci_event.c +1 -0
@@ -1752,6 +1752,7 @@ 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); +hci_dev_unlock (hdev); }
net/bluetooth/mgmt.c +370 -11
435 lines not on this page · raw message
Signature · 1 line
2.29.2.576.ga3fc446d84-goog
PATCH v7 3/5 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 v7: None
Changes in v6: None
Changes in v5: None
Changes in v4: None
Changes in v3: None
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;
@@ -1303,7 +1305,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
@@ -1488,6 +1488,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;
@@ -1495,6 +1496,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.
@@ -1526,11 +1528,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 (adv_cur_instance_is_scannable (hdev)) cp.type =LE_ADV_SCAN_IND ;
@@ -1541,9 +1548,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; } }
@@ -2119,9 +2123,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 );
@@ -2144,7 +2154,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
@@ -7533,7 +7533,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 );
@@ -7741,7 +7744,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.29.2.576.ga3fc446d84-goog
PATCH v7 4/5 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 v7: None
Changes in v6: None
Changes in v5: None
Changes in v4: None
Changes in v3: None
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
@@ -384,6 +384,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,
@@ -3660,6 +3666,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);
@@ -3582,6 +3596,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.29.2.576.ga3fc446d84-goog
PATCH v7 5/5 Bluetooth: Change MGMT security info CMD to be more generic
In reply to Daniel WinklerFor advertising, we wish to know the LE tx power capabilities of the controller in userspace, so this patch edits the Security Info MGMT command to be more generic, such that other various controller capabilities can be included in the EIR data. This change also includes the LE min and max tx power into this newly-named command.
The change was tested by manually verifying that the MGMT command returns the tx power range as expected in userspace.
---
Changes in v7:
- Rebase onto bluetooth-next/master
Changes in v6:
- Only populate LE tx power range if controller reports it
Changes in v5: None
Changes in v4:
- Combine LE tx range into a single EIR field for MGMT capabilities cmd
Changes in v3:
- Re-using security info MGMT command to carry controller capabilities
Changes in v2:
- Fixed sparse error in Capabilities MGMT command
include/net/bluetooth/mgmt.h | 15 ++++++++----- net/bluetooth/mgmt.c | 43 ++++++++++++++++++++++++------------ 2 files changed, 39 insertions(+), 19 deletions(-)
include/net/bluetooth/mgmt.h +10 -5
@@ -686,11 +686,16 @@ struct mgmt_cp_set_blocked_keys {#define MGMT_OP_SET_WIDEBAND_SPEECH 0x0047 -#define MGMT_OP_READ_SECURITY_INFO 0x0048 -#define MGMT_READ_SECURITY_INFO_SIZE 0 -struct mgmt_rp_read_security_info { -__le16 sec_len; -__u8 sec[]; +#define MGMT_CAP_SEC_FLAGS 0x01 +#define MGMT_CAP_MAX_ENC_KEY_SIZE 0x02 +#define MGMT_CAP_SMP_MAX_ENC_KEY_SIZE 0x03 +#define MGMT_CAP_LE_TX_PWR 0x04 + +#define MGMT_OP_READ_CONTROLLER_CAP 0x0048 +#define MGMT_READ_CONTROLLER_CAP_SIZE 0 +struct mgmt_rp_read_controller_cap { +__le16 cap_len; +__u8 cap[0 ]; } __packed;#define MGMT_OP_READ_EXP_FEATURES_INFO 0x0049
net/bluetooth/mgmt.c +29 -14
86 lines not on this page · raw message
Signature · 1 line
2.29.2.576.ga3fc446d84-goog
This is automated email and please do not reply to this email!
Dear submitter,
Thank you for submitting the patches to the linux bluetooth mailing list. This is a CI test results with your patch series:
PW Link:https://patchwork.kernel.org/project/bluetooth/list/?series=395707
---Test result---
##############################
Test: CheckPatch - PASS
##############################
Test: CheckGitLint - PASS
##############################
Test: CheckBuildK - PASS
---
Regards,
Linux Bluetooth
Marcel Holtmann
maintainerHi Daniel,
Quoted 59 lines
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 to set advertising parameters, the selected transmission power will be propagated in the reponse to alert userspace to the actual power used.
Additionally, to inform userspace of the controller LE Tx power capabilities for the client's benefit, this series also changes the security info MGMT command to more flexibly contain other capabilities, such as LE min and max tx power.
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 v7:
- Rebase onto bluetooth-next/masterChanges in v6:
- Only populate LE tx power range if controller reports itChanges in v5:
- Ensure data/scan rsp length is returned for non-ext advChanges in v4:
- Add remaining data and scan response length to MGMT params response
- Moving optional params into 'flags' field of MGMT command
- Combine LE tx range into a single EIR field for MGMT capabilities cmdChanges in v3:
- Adding selected tx power to adv params mgmt response, removing event
- Re-using security info MGMT command to carry controller capabilitiesChanges in v2:
- Fixed sparse error in Capabilities MGMT commandDaniel Winkler (5):
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: Query LE tx power on startup
Bluetooth: Change MGMT security info CMD to be more generic
Quoted 8 lines
include/net/bluetooth/hci.h | 7 + include/net/bluetooth/hci_core.h | 12 +- include/net/bluetooth/mgmt.h | 49 +++- net/bluetooth/hci_core.c | 47 +++- net/bluetooth/hci_event.c | 19 ++ net/bluetooth/hci_request.c | 29 ++- net/bluetooth/mgmt.c | 430 +++++++++++++++++++++++++++++-- 7 files changed, 548 insertions(+), 45 deletions(-)
all 5 patches have been applied to bluetooth-next tree.
Regards
Marcel