Bluetooth: HCI: Add initial support for Short Connection Interval feature
Subsystems (2)
Luiz Augusto von Dentz
maintainerPATCH v4 1/2 Bluetooth: HCI: Add initial support for Short Connection Interval feature
From: Luiz Augusto von Dentz <[email protected]>
This adds initial support for SCI related commands, command bits, event event mask bit and feature bits:
Events:
HCI_LE_Connection_Rate_Change(0x37)
Commands:
HCI_LE_Connection_Rate_Request(0x20a1) HCI_LE_Set_Default_Rate_Parameters(0x20a2) HCI_LE_Read_Minimum_Supported_Connection_Interval(0x20a3)
Also update the init sequence to incorporte support for reading SCI groups and then setting the Default Rate
--- include/net/bluetooth/hci.h | 52 ++++++++++++++++++++ include/net/bluetooth/hci_core.h | 15 ++++++ net/bluetooth/hci_core.c | 14 +++++- net/bluetooth/hci_event.c | 60 +++++++++++++++++++++++ net/bluetooth/hci_sync.c | 83 +++++++++++++++++++++++++++++++- 5 files changed, 222 insertions(+), 2 deletions(-)
include/net/bluetooth/hci.h +52 -0
@@ -656,6 +656,7 @@ enum {#define HCI_LE_LL_EXT_FEATURE 0x80#define HCI_LE_CS 0x40#define HCI_LE_CS_HOST 0x80 +#define HCI_LE_SCI 0x01/* Connection modes */ #define HCI_CM_ACTIVE 0x0000
@@ -2486,6 +2487,46 @@ struct hci_rp_le_cs_test {#define HCI_OP_LE_CS_TEST_END 0x2096 +#define HCI_OP_LE_CONN_RATE 0x20a1 +struct hci_cp_le_conn_rate { +__le16 handle; +__le16 interval_min; +__le16 interval_max; +__le16 subrate_min; +__le16 subrate_max; +__le16 max_latency; +__le16 cont_num; +__le16 supv_timeout; +__le16 min_ce_len; +__le16 max_ce_len; +} __packed; + +#define HCI_OP_LE_SET_DEF_RATE 0x20a2 +struct hci_cp_le_set_def_rate { +__le16 interval_min; +__le16 interval_max; +__le16 subrate_min; +__le16 subrate_max; +__le16 max_latency; +__le16 cont_num; +__le16 supv_timeout; +__le16 min_ce_len; +__le16 max_ce_len; +} __packed; + +#define HCI_OP_LE_READ_CONN_INTERVAL 0x20a3 +struct hci_le_conn_interval_group { +__le16 min; +__le16 max; +__le16 stride; +} __packed; + +struct hci_rp_le_read_conn_interval { +__u8 status; +__u8 num_grps; + struct hci_le_conn_interval_group grps[] __counted_by(num_grps); +} __packed; +/* ---- HCI Events ---- */ struct hci_ev_status {__u8 status;
@@ -3300,6 +3341,17 @@ struct hci_evt_le_cs_test_end_complete {__u8 status; } __packed; +#define HCI_EVT_LE_CONN_RATE_CHANGE 0x37 +struct hci_evt_le_conn_rate_change { +__u8 status; +__le16 handle; +__le16 interval; +__le16 subrate; +__le16 latency; +__le16 cont_number; +__le16 supv_timeout; +} __packed; +#define HCI_EV_VENDOR 0xff/* Internal events generated by Bluetooth stack */
include/net/bluetooth/hci_core.h +15 -0
@@ -333,6 +333,14 @@ struct adv_monitor {#define HCI_ADV_MONITOR_EXT_NONE 1#define HCI_ADV_MONITOR_EXT_MSFT 2 + +struct sci_group { +struct list_head list; +__u16 min; +__u16 max; +__u16 stride; +}; +#define HCI_MAX_SHORT_NAME_LENGTH 10#define HCI_CONN_HANDLE_MAX 0x0eff
@@ -572,6 +580,7 @@ struct hci_dev {struct list_head pend_le_reports;struct list_head blocked_keys;struct list_head local_codecs; +struct list_head sci_groups;struct hci_dev_stats stat;
@@ -2082,6 +2091,12 @@ void hci_conn_del_sysfs(struct hci_conn *conn);#define mws_transport_config_capable (dev) (((dev)->commands[30] & 0x08) && \ (!hci_test_quirk((dev), HCI_QUIRK_BROKEN_MWS_TRANSPORT_CONFIG))) +/* Shorter Connection Intervals support */ +#define le_sci_capable (dev) \ + ((dev)->le_features[9] & HCI_LE_SCI) + +void hci_sci_groups_clear (struct hci_dev *hdev); +/* ----- HCI protocols ----- */ #define HCI_PROTO_DEFER 0x01
net/bluetooth/hci_core.c +13 -1
@@ -2543,8 +2543,9 @@ struct hci_dev *hci_alloc_dev_priv(int sizeof_priv)INIT_LIST_HEAD (&hdev->adv_instances);INIT_LIST_HEAD (&hdev->blocked_keys);INIT_LIST_HEAD (&hdev->monitored_devices); -INIT_LIST_HEAD (&hdev->local_codecs); +INIT_LIST_HEAD (&hdev->sci_groups); +INIT_WORK (&hdev->rx_work, hci_rx_work);INIT_WORK (&hdev->cmd_work, hci_cmd_work);INIT_WORK (&hdev->tx_work, hci_tx_work);
@@ -2740,6 +2741,16 @@ void hci_unregister_dev(struct hci_dev *hdev) }EXPORT_SYMBOL (hci_unregister_dev); +void hci_sci_groups_clear (struct hci_dev *hdev) +{ +struct sci_group *grp, *tmp; + +list_for_each_entry_safe (grp, tmp, &hdev->sci_groups, list) { +list_del (&grp->list); +kfree (grp); + } +} +/* Release HCI device */ void hci_release_dev (struct hci_dev *hdev) {
@@ -2766,6 +2777,7 @@ void hci_release_dev(struct hci_dev *hdev)hci_discovery_filter_clear (hdev);hci_blocked_keys_clear (hdev);hci_codec_list_clear (&hdev->local_codecs); +hci_sci_groups_clear (hdev);msft_release (hdev);hci_dev_unlock (hdev);
net/bluetooth/hci_event.c +60 -0
84 lines not on this page · raw message
net/bluetooth/hci_sync.c +82 -1
108 lines not on this page · raw message
Signature · 1 line
2.53.0
Luiz Augusto von Dentz
maintainerPATCH v4 2/2 Bluetooth: MGMT: Add SCI setting bit(25)
From: Luiz Augusto von Dentz <[email protected]>
This adds MGMT_SETTING_SCI(25) which indicates that the controller is support SCI feature.
--- include/net/bluetooth/hci_core.h | 2 ++ include/net/bluetooth/mgmt.h | 1 + net/bluetooth/mgmt.c | 6 ++++++ 3 files changed, 9 insertions(+)
include/net/bluetooth/hci_core.h +2 -0
@@ -2094,6 +2094,8 @@ void hci_conn_del_sysfs(struct hci_conn *conn);/* Shorter Connection Intervals support */ #define le_sci_capable (dev) \ ((dev)->le_features[9] & HCI_LE_SCI) +#define le_sci_enabled (dev) \ + (le_enabled(dev) && le_sci_capable(dev))void hci_sci_groups_clear (struct hci_dev *hdev);
include/net/bluetooth/mgmt.h +1 -0
@@ -121,6 +121,7 @@ struct mgmt_rp_read_index_list {#define MGMT_SETTING_LL_PRIVACY BIT(22)#define MGMT_SETTING_PAST_SENDER BIT(23)#define MGMT_SETTING_PAST_RECEIVER BIT(24) +#define MGMT_SETTING_SCI BIT(25)#define MGMT_OP_READ_INFO 0x0004#define MGMT_READ_INFO_SIZE 0
net/bluetooth/mgmt.c +6 -0
@@ -864,6 +864,9 @@ static u32 get_supported_settings(struct hci_dev *hdev)if (past_receiver_capable (hdev)) settings |=MGMT_SETTING_PAST_RECEIVER ; +if (le_sci_capable (hdev)) + settings |=MGMT_SETTING_SCI ; + settings |=MGMT_SETTING_PHY_CONFIGURATION ;return settings;
@@ -955,6 +958,9 @@ static u32 get_current_settings(struct hci_dev *hdev)if (past_receiver_enabled (hdev)) settings |=MGMT_SETTING_PAST_RECEIVER ; +if (le_sci_enabled (hdev)) + settings |=MGMT_SETTING_SCI ; +return settings; }
Signature · 1 line
2.53.0
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=1091208
---Test result---
Test Summary:
CheckPatch PASS 2.66 seconds GitLint FAIL 0.57 seconds SubjectPrefix PASS 0.22 seconds BuildKernel PASS 26.44 seconds CheckAllWarning PASS 28.96 seconds CheckSparse PASS 27.68 seconds BuildKernel32 PASS 25.19 seconds TestRunnerSetup PASS 560.65 seconds TestRunner_l2cap-tester PASS 377.96 seconds TestRunner_iso-tester PASS 593.01 seconds TestRunner_bnep-tester PASS 18.45 seconds TestRunner_mgmt-tester PASS 2034.02 seconds TestRunner_rfcomm-tester PASS 74.65 seconds TestRunner_sco-tester PASS 141.23 seconds TestRunner_ioctl-tester PASS 133.55 seconds TestRunner_mesh-tester PASS 59.86 seconds TestRunner_smp-tester PASS 17.97 seconds TestRunner_userchan-tester PASS 19.24 seconds TestRunner_6lowpan-tester PASS 51.22 seconds IncrementalBuild PASS 42.05 seconds
Details
##############################
Test: GitLint - FAIL
Desc: Run gitlint
Output:
[v4,1/2] Bluetooth: HCI: Add initial support for Short Connection Interval feature
WARNING: I3 - ignore-body-lines: gitlint will be switching from using Python regex 'match' (match beginning) to 'search' (match anywhere) semantics. Please review your ignore-body-lines.regex option accordingly. To remove this warning, set general.regex-style-search=True. More details: https://jorisroovers.github.io/gitlint/configuration/#regex-style-search
1: T1 Title exceeds max length (82>80): "[v4,1/2] Bluetooth: HCI: Add initial support for Short Connection Interval feature"
https://github.com/bluez/bluetooth-next/pull/154
---
Regards,
Linux Bluetooth