Bluetooth: hci_core: Enable buffer flow control for SCO/eSCO
Subsystems (2)
Luiz Augusto von Dentz
maintainerPATCH v6 1/1 Bluetooth: hci_core: Enable buffer flow control for SCO/eSCO
From: Luiz Augusto von Dentz <[email protected]>
This enables buffer flow control for SCO/eSCO
(see: Bluetooth Core 6.0 spec: 6.22. Synchronous Flow Control Enable), recently this has caused the following problem and is actually a nice addition for the likes of Socket TX complete:
< HCI Command: Read Buffer Size (0x04|0x0005) plen 0
Quoted 1 line
HCI Event: Command Complete (
0x0e) plen 11
Read Buffer Size (0x04|0x0005) ncmd 1
Status: Success (0x00)
ACL MTU: 1021 ACL max packet: 5
SCO MTU: 240 SCO max packet: 8
...
< SCO Data TX: Handle 257 flags 0x00 dlen 120
< SCO Data TX: Handle 257 flags 0x00 dlen 120
< SCO Data TX: Handle 257 flags 0x00 dlen 120
< SCO Data TX: Handle 257 flags 0x00 dlen 120
< SCO Data TX: Handle 257 flags 0x00 dlen 120
< SCO Data TX: Handle 257 flags 0x00 dlen 120
< SCO Data TX: Handle 257 flags 0x00 dlen 120
< SCO Data TX: Handle 257 flags 0x00 dlen 120
< SCO Data TX: Handle 257 flags 0x00 dlen 120
Quoted 1 line
HCI Event: Hardware Error (
0x10) plen 1
Code: 0x0a
To fix the code will now attempt to enable buffer flow control:
< HCI Command: Write Sync Fl.. (0x03|0x002f) plen 1
Flow control: Enabled (0x01)
Quoted 1 line
HCI Event: Command Complete (
0x0e) plen 4
Write Sync Flow Control Enable (0x03|0x002f) ncmd 1
Status: Success (0x00)And then test it by sending an empty packet to confirm the controller will generate HCI_EV_NUM_COMP_PKTS events:
sco-tester[40]: < SCO Data TX:.. flags 0x00 dlen 9
Quoted 1 line
HCI Event: Number of Completed P.. (
0x13) plen 5
Num handles: 1
Handle: 42 Address: 00:AA:01:01:00:00 (Intel Corporation)
Count: 1
#103: len 10 (40 Kb/s)
Latency: 2 msec (2-2 msec ~2 msec)--- include/net/bluetooth/hci.h | 6 +++ include/net/bluetooth/hci_core.h | 1 + include/net/bluetooth/hci_sync.h | 2 + net/bluetooth/hci_core.c | 80 ++++++++++++++++---------------- net/bluetooth/hci_event.c | 27 ++++++++++- net/bluetooth/hci_sync.c | 41 ++++++++++++++++ 6 files changed, 117 insertions(+), 40 deletions(-)
include/net/bluetooth/hci.h +6 -0
@@ -448,6 +448,7 @@ enum {HCI_WIDEBAND_SPEECH_ENABLED ,HCI_EVENT_FILTER_CONFIGURED ,HCI_PA_SYNC , +HCI_SCO_FLOWCTL ,HCI_DUT_MODE , HCI_VENDOR_DIAG,
@@ -1544,6 +1545,11 @@ struct hci_rp_read_tx_power {__s8 tx_power; } __packed; +#define HCI_OP_WRITE_SYNC_FLOWCTL 0x0c2f +struct hci_cp_write_sync_flowctl { +__u8 enable; +} __packed; +#define HCI_OP_READ_PAGE_SCAN_TYPE 0x0c46struct hci_rp_read_page_scan_type {__u8 status;
include/net/bluetooth/hci_core.h +1 -0
@@ -1857,6 +1857,7 @@ void hci_conn_del_sysfs(struct hci_conn *conn);#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_sco_capable (dev) ((dev)->features[0][1] & LMP_SCO)#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))
include/net/bluetooth/hci_sync.h +2 -0
@@ -185,3 +185,5 @@ int hci_connect_le_sync(struct hci_dev *hdev, struct hci_conn *conn);int hci_cancel_connect_sync (struct hci_dev *hdev,struct hci_conn *conn);int hci_le_conn_update_sync (struct hci_dev *hdev,struct hci_conn *conn,struct hci_conn_params *params); + +int hci_sco_flowctl_test_sync (struct hci_dev *hdev,struct hci_conn *conn);
net/bluetooth/hci_core.c +41 -39
134 lines not on this page · raw message
net/bluetooth/hci_event.c +26 -1
@@ -4448,6 +4448,7 @@ static void hci_num_comp_pkts_evt(struct hci_dev *hdev, void *data, hdev->sco_cnt += count;if (hdev->sco_cnt > hdev->sco_pkts) hdev->sco_cnt = hdev->sco_pkts; +break ;case ISO_LINK :
@@ -4916,6 +4917,23 @@ static void hci_remote_ext_features_evt(struct hci_dev *hdev, void *data,hci_dev_unlock (hdev); } +static int hci_sco_flowctl_test (struct hci_dev *hdev,void *data) +{ +struct hci_conn *conn = data; +int err; + +if (!hci_conn_valid (hdev, conn)) +return -ECANCELED ; + + err =hci_sco_flowctl_test_sync (hdev, conn); +if (err) +hci_dev_clear_flag (hdev,HCI_SCO_FLOWCTL ); + +hci_connect_cfm (conn,0x00 ); + +return err; +} +static void hci_sync_conn_complete_evt (struct hci_dev *hdev,void *data,struct sk_buff *skb) {
@@ -5021,7 +5039,14 @@ static void hci_sync_conn_complete_evt(struct hci_dev *hdev, void *data, } } -hci_connect_cfm (conn, status); +/* If SCO flow control is enable attempt to generate +* HCI_EV_NUM_COMP_PKTS by sending an empty packet. +*/ +if (!status &&hci_dev_test_flag (hdev,HCI_SCO_FLOWCTL )) +hci_cmd_sync_queue (hdev, hci_sco_flowctl_test, conn,NULL ); +else +hci_connect_cfm (conn, status); +if (status)hci_conn_del (conn);
net/bluetooth/hci_sync.c +41 -0
56 lines not on this page · raw message
Signature · 1 line
2.48.1
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=940675
---Test result---
Test Summary:
CheckPatch PENDING 0.44 seconds GitLint PENDING 0.27 seconds SubjectPrefix PASS 0.07 seconds BuildKernel PASS 24.53 seconds CheckAllWarning PASS 27.07 seconds CheckSparse WARNING 30.65 seconds BuildKernel32 PASS 24.29 seconds TestRunnerSetup PASS 433.82 seconds TestRunner_l2cap-tester PASS 21.04 seconds TestRunner_iso-tester PASS 37.80 seconds TestRunner_bnep-tester PASS 4.76 seconds TestRunner_mgmt-tester FAIL 122.37 seconds TestRunner_rfcomm-tester PASS 7.82 seconds TestRunner_sco-tester PASS 11.76 seconds TestRunner_ioctl-tester PASS 8.47 seconds TestRunner_mesh-tester PASS 6.12 seconds TestRunner_smp-tester PASS 7.20 seconds TestRunner_userchan-tester PASS 4.98 seconds IncrementalBuild PENDING 0.71 seconds
Details
##############################
Test: CheckPatch - PENDING
Desc: Run checkpatch.pl script Output:
##############################
Test: GitLint - PENDING
Desc: Run gitlint
Output:
##############################
Test: CheckSparse - WARNING
Desc: Run sparse tool with linux kernel
Output:net/bluetooth/hci_event.c: note: in included file (through include/net/bluetooth/hci_core.h):
##############################
Test: TestRunner_mgmt-tester - FAIL
Desc: Run mgmt-tester with test-runner
Output:
Total: 490, Passed: 485 (99.0%), Failed: 1, Not Run: 4
Failed Test Cases
LL Privacy - Add Device 3 (AL is full) Failed 0.213 seconds
##############################
Test: IncrementalBuild - PENDING
Desc: Incremental build with the patches in the series Output:
---
Regards,
Linux Bluetooth