Skip to contentSkip to conversation

Bluetooth: Report extended adv capabilities to userspace

PATCH In review Daniel Winkler 2 participants 4 messages Aug 25, 2020 – Sep 11, 2020

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

cover Bluetooth: Report extended adv capabilities to userspace

Hi Maintainers,

This series improves the kernel/controller support that is reported to userspace for the following extended advertising features:

1. If extended advertising is available, the number of hardware slots is used and reported, rather than the fixed default of 5. If no hardware support is available, default is used as before for software rotation.

2. New flags indicating general hardware offloading and ability to set tx power level. These are kept as two separate flags because in the future vendor commands may allow tx power to be set without hardware offloading support.

Daniel Winkler (2):
bluetooth: Report num supported adv instances for hw offloading
bluetooth: Add MGMT capability flags for tx power and ext advertising

 include/net/bluetooth/mgmt.h | 2 ++
 net/bluetooth/hci_core.c     | 2 +-
 net/bluetooth/mgmt.c         | 8 +++++---
 3 files changed, 8 insertions(+), 4 deletions(-)
Signature · 1 line
2.28.0.297.g1956fa8f8d-goog
#1 lore raw

PATCH 1/2 bluetooth: Report num supported adv instances for hw offloading

Here we make sure we properly report the number of supported advertising slots when we are using hardware offloading. If no hardware offloading is available, we default this value to HCI_MAX_ADV_INSTANCES for use in software rotation as before.

This change has been tested on kukui (no ext adv) and hatch (ext adv) chromebooks by verifying "SupportedInstances" shows 5 (the default) and 6 (slots supported by controller), respectively.

---

 net/bluetooth/hci_core.c | 2 +-
 net/bluetooth/mgmt.c     | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)
net/bluetooth/hci_core.c +1 -1
index 68bfe57b66250f..500ab478769508 100644
@@ -2963,7 +2963,7 @@ int hci_add_adv_instance(struct hci_dev *hdev, u8 instance, u32 flags,
 		       sizeof(adv_instance->scan_rsp_data));
 	} else {
 		if (hdev->adv_instance_cnt >= hdev->le_num_of_adv_sets ||
-		    instance < 1 || instance > HCI_MAX_ADV_INSTANCES)
+		    instance < 1 || instance > hdev->le_num_of_adv_sets)
 			return -EOVERFLOW;
 
 		adv_instance = kzalloc(sizeof(*adv_instance), GFP_KERNEL);
net/bluetooth/mgmt.c +3 -3
index 5bbe71002fb950..8041c9cebd5cf6 100644
@@ -7250,7 +7250,7 @@ static int read_adv_features(struct sock *sk, struct hci_dev *hdev,
 	rp->supported_flags = cpu_to_le32(supported_flags);
 	rp->max_adv_data_len = HCI_MAX_AD_LENGTH;
 	rp->max_scan_rsp_len = HCI_MAX_AD_LENGTH;
-	rp->max_instances = HCI_MAX_ADV_INSTANCES;
+	rp->max_instances = hdev->le_num_of_adv_sets;
 	rp->num_instances = hdev->adv_instance_cnt;
 
 	instance = rp->instance;
@@ -7446,7 +7446,7 @@ static int add_advertising(struct sock *sk, struct hci_dev *hdev,
 		return mgmt_cmd_status(sk, hdev->id, MGMT_OP_SET_ADVERTISING,
 				       MGMT_STATUS_NOT_SUPPORTED);
 
-	if (cp->instance < 1 || cp->instance > HCI_MAX_ADV_INSTANCES)
+	if (cp->instance < 1 || cp->instance > hdev->le_num_of_adv_sets)
 		return mgmt_cmd_status(sk, hdev->id, MGMT_OP_ADD_ADVERTISING,
 				       MGMT_STATUS_INVALID_PARAMS);
 
@@ -7699,7 +7699,7 @@ static int get_adv_size_info(struct sock *sk, struct hci_dev *hdev,
 		return mgmt_cmd_status(sk, hdev->id, MGMT_OP_GET_ADV_SIZE_INFO,
 				       MGMT_STATUS_REJECTED);
 
-	if (cp->instance < 1 || cp->instance > HCI_MAX_ADV_INSTANCES)
+	if (cp->instance < 1 || cp->instance > hdev->le_num_of_adv_sets)
 		return mgmt_cmd_status(sk, hdev->id, MGMT_OP_GET_ADV_SIZE_INFO,
 				       MGMT_STATUS_INVALID_PARAMS);
 
Signature · 1 line
2.28.0.297.g1956fa8f8d-goog
#2 lore raw

PATCH 2/2 bluetooth: Add MGMT capability flags for tx power and ext advertising

In reply to Daniel Winkler

For new advertising features, it will be important for userspace to know the capabilities of the controller and kernel. If the controller and kernel support extended advertising, we include flags indicating hardware offloading support and support for setting tx power of adv instances.

In the future, vendor-specific commands may allow the setting of tx power in advertising instances, but for now this feature is only marked available if extended advertising is supported.

This change is manually verified in userspace by ensuring the advertising manager's supported_flags field is updated with new flags on hatch chromebook (ext advertising supported).

---

 include/net/bluetooth/mgmt.h | 2 ++
 net/bluetooth/mgmt.c         | 2 ++
 2 files changed, 4 insertions(+)
include/net/bluetooth/mgmt.h +2 -0
index beae5c3980f03b..9ad505b9e694e4 100644
@@ -572,6 +572,8 @@ struct mgmt_rp_add_advertising {
 #define MGMT_ADV_FLAG_SEC_1M 		BIT(7)
 #define MGMT_ADV_FLAG_SEC_2M 		BIT(8)
 #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_FLAG_SEC_MASK	(MGMT_ADV_FLAG_SEC_1M | MGMT_ADV_FLAG_SEC_2M | \
 				 MGMT_ADV_FLAG_SEC_CODED)
net/bluetooth/mgmt.c +2 -0
index 8041c9cebd5cf6..c5d128f331c6dc 100644
@@ -7202,6 +7202,8 @@ static u32 get_supported_adv_flags(struct hci_dev *hdev)
 
 	if (ext_adv_capable(hdev)) {
 		flags |= MGMT_ADV_FLAG_SEC_1M;
+		flags |= MGMT_ADV_FLAG_HW_OFFLOAD;
+		flags |= MGMT_ADV_FLAG_CAN_SET_TX_POWER;
 
 		if (hdev->le_features[1] & HCI_LE_PHY_2M)
 			flags |= MGMT_ADV_FLAG_SEC_2M;
Signature · 1 line
2.28.0.297.g1956fa8f8d-goog
maintainer
#3 lore raw
In reply to Daniel Winkler

Hi Daniel,

Quoted 13 lines

This series improves the kernel/controller support that is reported to userspace for the following extended advertising features:

1. If extended advertising is available, the number of hardware slots is used and reported, rather than the fixed default of 5. If no hardware support is available, default is used as before for software rotation.

2. New flags indicating general hardware offloading and ability to set tx power level. These are kept as two separate flags because in the future vendor commands may allow tx power to be set without hardware offloading support.

Quoted 8 lines

Daniel Winkler (2):
bluetooth: Report num supported adv instances for hw offloading
bluetooth: Add MGMT capability flags for tx power and ext advertising

include/net/bluetooth/mgmt.h | 2 ++
net/bluetooth/hci_core.c     | 2 +-
net/bluetooth/mgmt.c         | 8 +++++---
3 files changed, 8 insertions(+), 4 deletions(-)

both patches have been applied to bluetooth-next tree.

Regards

Marcel