Bluetooth: Add supported features page 2 support
Subsystems (2)
cover Bluetooth: Add supported features page 2 support
Hi,
CSA4 introduces a new features page 2 in addition to the LMP features (page 0) and host features (page 1). The handling of these pages (especially if more will come in future core spec versions) becomes much simpler if we just store them in a single table indexed by the page number.
Johan
----------------------------------------------------------------
Johan Hedberg (2):
Bluetooth: Track feature pages in a single table
Bluetooth: Add reading of all local feature pages
include/net/bluetooth/hci_core.h | 50 ++++++++++++++++--------------- net/bluetooth/hci_core.c | 10 +++++++ net/bluetooth/hci_event.c | 60 ++++++++++++++++++++------------------ net/bluetooth/hci_sysfs.c | 16 +++++----- 4 files changed, 76 insertions(+), 60 deletions(-)
PATCH 1/2 Bluetooth: Track feature pages in a single table
From: Johan Hedberg <[email protected]>
The local and remote features are organized by page number. Page 0 are the LMP features, page 1 the host features, and any pages beyond 1 features that future core specification versions may define. So far we've only had the first two pages and two separate variables has been convenient enough, however with the introduction of Core Specification Addendum 4 there are features defined on page 2.
Instead of requiring the addition of a new variable each time a new page number is defined, this patch refactors the code to use a single table for the features. The patch needs to update both the hci_dev and hci_conn structures since there are macros that depend on the features being represented in the same way in both of them.
--- include/net/bluetooth/hci_core.h | 49 ++++++++++++++++---------------- net/bluetooth/hci_event.c | 58 ++++++++++++++++++++------------------ net/bluetooth/hci_sysfs.c | 16 +++++------ 3 files changed, 63 insertions(+), 60 deletions(-)
include/net/bluetooth/hci_core.h +25 -24
@@ -134,6 +134,8 @@ struct amp_assoc {__u8 data[HCI_MAX_AMP_ASSOC_SIZE ]; }; +#define HCI_MAX_PAGES 2 +#define NUM_REASSEMBLY 4struct hci_dev {struct list_head list;
@@ -151,8 +153,7 @@ struct hci_dev {__u8 dev_class[3 ];__u8 major_class;__u8 minor_class; -__u8 features[8 ]; -__u8 host_features[8 ]; +__u8 features[HCI_MAX_PAGES ][8 ];__u8 le_features[8 ];__u8 le_white_list_size;__u8 le_states[8 ];
@@ -313,7 +314,7 @@ struct hci_conn {bool out;__u8 attempt;__u8 dev_class[3 ]; -__u8 features[8 ]; +__u8 features[HCI_MAX_PAGES ][8 ];__u16 interval;__u16 pkt_type;__u16 link_policy;
@@ -760,29 +761,29 @@ void hci_conn_del_sysfs(struct hci_conn *conn);#define SET_HCIDEV_DEV (hdev, pdev) ((hdev)->dev.parent = (pdev))/* ----- LMP capabilities ----- */ -#define lmp_encrypt_capable (dev) ((dev)->features[0] & LMP_ENCRYPT) -#define lmp_rswitch_capable (dev) ((dev)->features[0] & LMP_RSWITCH) -#define lmp_hold_capable (dev) ((dev)->features[0] & LMP_HOLD) -#define lmp_sniff_capable (dev) ((dev)->features[0] & LMP_SNIFF) -#define lmp_park_capable (dev) ((dev)->features[1] & LMP_PARK) -#define lmp_inq_rssi_capable (dev) ((dev)->features[3] & LMP_RSSI_INQ) -#define lmp_esco_capable (dev) ((dev)->features[3] & LMP_ESCO) -#define lmp_bredr_capable (dev) (!((dev)->features[4] & LMP_NO_BREDR)) -#define lmp_le_capable (dev) ((dev)->features[4] & LMP_LE) -#define lmp_sniffsubr_capable (dev) ((dev)->features[5] & LMP_SNIFF_SUBR) -#define lmp_pause_enc_capable (dev) ((dev)->features[5] & LMP_PAUSE_ENC) -#define lmp_ext_inq_capable (dev) ((dev)->features[6] & LMP_EXT_INQ) -#define lmp_le_br_capable (dev) !!((dev)->features[6] & LMP_SIMUL_LE_BR) -#define lmp_ssp_capable (dev) ((dev)->features[6] & LMP_SIMPLE_PAIR) -#define lmp_no_flush_capable (dev) ((dev)->features[6] & LMP_NO_FLUSH) -#define lmp_lsto_capable (dev) ((dev)->features[7] & LMP_LSTO) -#define lmp_inq_tx_pwr_capable (dev) ((dev)->features[7] & LMP_INQ_TX_PWR) -#define lmp_ext_feat_capable (dev) ((dev)->features[7] & LMP_EXTFEATURES) +#define lmp_encrypt_capable (dev) ((dev)->features[0][0] & LMP_ENCRYPT) +#define lmp_rswitch_capable (dev) ((dev)->features[0][0] & LMP_RSWITCH) +#define lmp_hold_capable (dev) ((dev)->features[0][0] & LMP_HOLD) +#define lmp_sniff_capable (dev) ((dev)->features[0][0] & LMP_SNIFF) +#define lmp_park_capable (dev) ((dev)->features[0][1] & LMP_PARK) +#define lmp_inq_rssi_capable (dev) ((dev)->features[0][3] & LMP_RSSI_INQ) +#define lmp_esco_capable (dev) ((dev)->features[0][3] & LMP_ESCO) +#define lmp_bredr_capable (dev) (!((dev)->features[0][4] & LMP_NO_BREDR)) +#define lmp_le_capable (dev) ((dev)->features[0][4] & LMP_LE) +#define lmp_sniffsubr_capable (dev) ((dev)->features[0][5] & LMP_SNIFF_SUBR) +#define lmp_pause_enc_capable (dev) ((dev)->features[0][5] & LMP_PAUSE_ENC) +#define lmp_ext_inq_capable (dev) ((dev)->features[0][6] & LMP_EXT_INQ) +#define lmp_le_br_capable (dev) (!!((dev)->features[0][6] & LMP_SIMUL_LE_BR)) +#define lmp_ssp_capable (dev) ((dev)->features[0][6] & LMP_SIMPLE_PAIR) +#define lmp_no_flush_capable (dev) ((dev)->features[0][6] & LMP_NO_FLUSH) +#define lmp_lsto_capable (dev) ((dev)->features[0][7] & LMP_LSTO) +#define lmp_inq_tx_pwr_capable (dev) ((dev)->features[0][7] & LMP_INQ_TX_PWR) +#define lmp_ext_feat_capable (dev) ((dev)->features[0][7] & LMP_EXTFEATURES)/* ----- Extended LMP capabilities ----- */ -#define lmp_host_ssp_capable (dev) ((dev)->host_features[0] & LMP_HOST_SSP) -#define lmp_host_le_capable (dev) !!((dev)->host_features[0] & LMP_HOST_LE) -#define lmp_host_le_br_capable (dev) !!((dev)->host_features[0] & LMP_HOST_LE_BREDR) +#define lmp_host_ssp_capable (dev) ((dev)->features[1][0] & LMP_HOST_SSP) +#define lmp_host_le_capable (dev) (!!((dev)->features[1][0] & LMP_HOST_LE)) +#define lmp_host_le_br_capable (dev) (!!((dev)->features[1][0] & LMP_HOST_LE_BREDR))/* returns true if at least one AMP active */ static inline bool hci_amp_capable (void )
net/bluetooth/hci_event.c +30 -28
135 lines not on this page · raw message
net/bluetooth/hci_sysfs.c +8 -8
@@ -48,10 +48,10 @@ static ssize_t show_link_features(struct device *dev,struct hci_conn *conn =to_hci_conn (dev);return sprintf (buf,"0x%02x%02x%02x%02x%02x%02x%02x%02x\n" , - conn->features[0 ], conn->features[1 ], - conn->features[2 ], conn->features[3 ], - conn->features[4 ], conn->features[5 ], - conn->features[6 ], conn->features[7 ]); + conn->features[0 ][0 ], conn->features[0 ][1 ], + conn->features[0 ][2 ], conn->features[0 ][3 ], + conn->features[0 ][4 ], conn->features[0 ][5 ], + conn->features[0 ][6 ], conn->features[0 ][7 ]); }#define LINK_ATTR (_name, _mode, _show, _store) \
@@ -234,10 +234,10 @@ static ssize_t show_features(struct device *dev,struct hci_dev *hdev =to_hci_dev (dev);return sprintf (buf,"0x%02x%02x%02x%02x%02x%02x%02x%02x\n" , - hdev->features[0 ], hdev->features[1 ], - hdev->features[2 ], hdev->features[3 ], - hdev->features[4 ], hdev->features[5 ], - hdev->features[6 ], hdev->features[7 ]); + hdev->features[0 ][0 ], hdev->features[0 ][1 ], + hdev->features[0 ][2 ], hdev->features[0 ][3 ], + hdev->features[0 ][4 ], hdev->features[0 ][5 ], + hdev->features[0 ][6 ], hdev->features[0 ][7 ]); } static ssize_t show_manufacturer(struct device *dev,
Signature · 1 line
1.7.10.4
PATCH 2/2 Bluetooth: Add reading of all local feature pages
In reply to Johan HedbergFrom: Johan Hedberg <[email protected]>
With the introduction of CSA4 there is now also a features page number 2 available. This patch increments the maximum supported page number to 2 and adds code for reading all available pages (as long as we have support for them - indicated by HCI_MAX_PAGES).
--- include/net/bluetooth/hci_core.h | 3 ++- net/bluetooth/hci_core.c | 10 ++++++++++ net/bluetooth/hci_event.c | 2 ++ 3 files changed, 14 insertions(+), 1 deletion(-)
include/net/bluetooth/hci_core.h +2 -1
@@ -134,7 +134,7 @@ struct amp_assoc {__u8 data[HCI_MAX_AMP_ASSOC_SIZE ]; }; -#define HCI_MAX_PAGES 2 +#define HCI_MAX_PAGES 3#define NUM_REASSEMBLY 4struct hci_dev {
@@ -153,6 +153,7 @@ struct hci_dev {__u8 dev_class[3 ];__u8 major_class;__u8 minor_class; +__u8 max_page;__u8 features[HCI_MAX_PAGES ][8 ];__u8 le_features[8 ];__u8 le_white_list_size;
net/bluetooth/hci_core.c +10 -0
@@ -589,6 +589,7 @@ static void hci_set_le_support(struct hci_request *req)static void hci_init3_req (struct hci_request *req,unsigned long opt) {struct hci_dev *hdev = req->hdev; +u8 p;if (hdev->commands[5 ] &0x10 )hci_setup_link_policy (req);
@@ -597,6 +598,15 @@ static void hci_init3_req(struct hci_request *req, unsigned long opt)hci_set_le_support (req);hci_update_ad (req); } + +/* Read features beyond page 1 if available */ +for (p =2 ; p <HCI_MAX_PAGES && p <= hdev->max_page; p++) { +struct hci_cp_read_local_ext_features cp; + + cp.page = p; +hci_req_add (req,HCI_OP_READ_LOCAL_EXT_FEATURES , +sizeof (cp), &cp); + } }static int __hci_init (struct hci_dev *hdev)
net/bluetooth/hci_event.c +2 -0
@@ -544,6 +544,8 @@ static void hci_cc_read_local_ext_features(struct hci_dev *hdev,if (rp->status)return ; + hdev->max_page = rp->max_page; +if (rp->page <HCI_MAX_PAGES )memcpy (hdev->features[rp->page], rp->features,8 ); }
Signature · 1 line
1.7.10.4
Re: [PATCH 2/2] Bluetooth: Add reading of all local feature pages
Hi Johan,
Quoted 7 lines · Johan Hedberg
From: Johan Hedberg <[email protected]>
With the introduction of CSA4 there is now also a features page number 2 available. This patch increments the maximum supported page number to 2 and adds code for reading all available pages (as long as we have support for them - indicated by
HCI_MAX_PAGES).
Quoted 6 lines
Signed-off-by Johan Hedberg <[email protected]>--- include/net/bluetooth/hci_core.h | 3 ++- net/bluetooth/hci_core.c | 10 ++++++++++ net/bluetooth/hci_event.c | 2 ++ 3 files changed, 14 insertions(+), 1 deletion(-)
Both patches have been applied to bluetooth-next. Thanks.
Gustavo