Bluetooth: hci_sync: Use address filtering when HCI_PA_SYNC is set
Subsystems (2)
Luiz Augusto von Dentz
maintainerPATCH v2 1/2 Bluetooth: hci_sync: Use address filtering when HCI_PA_SYNC is set
From: Luiz Augusto von Dentz <[email protected]>
If HCI_PA_SYNC flag is set it means there is a Periodic Advertising Synchronization pending, so this attempts to locate the address passed to HCI_OP_LE_PA_CREATE_SYNC and program it in the accept list so only reports with that address are processed.
--- net/bluetooth/hci_sync.c | 45 +++++++++++++++++++++++++++++++--------- 1 file changed, 35 insertions(+), 10 deletions(-)
net/bluetooth/hci_sync.c +35 -10
@@ -2566,6 +2566,16 @@ static struct conn_params *conn_params_copy(struct list_head *list, size_t *n)return p; } +/* Clear LE Accept List */ +static int hci_le_clear_accept_list_sync (struct hci_dev *hdev) +{ +if (!(hdev->commands[26 ] &0x80 )) +return 0 ; + +return __hci_cmd_sync_status (hdev,HCI_OP_LE_CLEAR_ACCEPT_LIST ,0 ,NULL , +HCI_CMD_TIMEOUT ); +} +/* Device must not be scanning when updating the accept list. * * Update is done using the following sequence:
@@ -2614,6 +2624,31 @@ static u8 hci_update_accept_list_sync(struct hci_dev *hdev) goto done; } +/* Force address filtering if PA Sync is in progress */ +if (hci_dev_test_flag (hdev,HCI_PA_SYNC )) { +struct hci_cp_le_pa_create_sync *sent; + + sent =hci_sent_cmd_data (hdev,HCI_OP_LE_PA_CREATE_SYNC ); +if (sent) { +struct conn_params pa; + +memset (&pa,0 ,sizeof (pa)); + +bacpy (&pa.addr, &sent->addr); + pa.addr_type = sent->addr_type; + +/* Clear first since there could be addresses left +* behind. +*/ +hci_le_clear_accept_list_sync (hdev); + + num_entries =1 ; + err =hci_le_add_accept_list_sync (hdev, &pa, + &num_entries); + goto done; + } + } +/* Go through the current accept list programmed into the * controller one by one and check if that address is connected or is * still in the list of pending connections or list of devices to
@@ -4220,16 +4255,6 @@ static int hci_le_read_accept_list_size_sync(struct hci_dev *hdev) 0, NULL, HCI_CMD_TIMEOUT); } -/* Clear LE Accept List */ -static int hci_le_clear_accept_list_sync (struct hci_dev *hdev) -{ -if (!(hdev->commands[26 ] &0x80 )) -return 0 ; - -return __hci_cmd_sync_status (hdev,HCI_OP_LE_CLEAR_ACCEPT_LIST ,0 ,NULL , -HCI_CMD_TIMEOUT ); -} -/* Read LE Resolving List Size */ static int hci_le_read_resolv_list_size_sync (struct hci_dev *hdev) {
Signature · 1 line
2.43.0
Luiz Augusto von Dentz
maintainerPATCH v2 2/2 Bluetooth: hci_sync: Don't scan on Coded PHY when HCI_PA_SYNC is set
From: Luiz Augusto von Dentz <[email protected]>
This disables Coded PHY when HCI_PA_SYNC is enabled.
--- net/bluetooth/hci_sync.c | 65 +++++++++++++++++++++++++++++++++------- 1 file changed, 54 insertions(+), 11 deletions(-)
net/bluetooth/hci_sync.c +54 -11
@@ -2758,6 +2758,14 @@ static u8 hci_update_accept_list_sync(struct hci_dev *hdev)return filter_policy; } +static void hci_le_scan_phy_params (struct hci_cp_le_scan_phy_params *cp, +u8 type,u16 interval,u16 window) +{ + cp->type = type; + cp->interval =cpu_to_le16 (interval); + cp->window =cpu_to_le16 (window); +} +static int hci_le_set_ext_scan_param_sync (struct hci_dev *hdev,u8 type,u16 interval,u16 window,u8 own_addr_type,u8 filter_policy)
@@ -2765,7 +2773,7 @@ static int hci_le_set_ext_scan_param_sync(struct hci_dev *hdev, u8 type,struct hci_cp_le_set_ext_scan_params *cp;struct hci_cp_le_scan_phy_params *phy;u8 data[sizeof (*cp) +sizeof (*phy) *2 ]; -u8 num_phy =0 ; +u8 num_phy =0x00 ; cp = (void *)data; phy = (void *)cp->data;
@@ -2775,28 +2783,63 @@ static int hci_le_set_ext_scan_param_sync(struct hci_dev *hdev, u8 type, cp->own_addr_type = own_addr_type; cp->filter_policy = filter_policy; +/* Check if PA Sync is in progress then select the PHY based on the +* hci_conn.iso_qos. +*/ +if (hci_dev_test_flag (hdev,HCI_PA_SYNC )) { +struct hci_cp_le_add_to_accept_list *sent; + + sent =hci_sent_cmd_data (hdev,HCI_OP_LE_ADD_TO_ACCEPT_LIST ); +if (sent) { +struct hci_conn *conn; + + conn =hci_conn_hash_lookup_ba (hdev,ISO_LINK , + &sent->bdaddr); +if (conn) { +struct bt_iso_qos *qos = &conn->iso_qos; + +if (qos->bcast.in.phy &BT_ISO_PHY_1M || + qos->bcast.in.phy &BT_ISO_PHY_2M ) { + cp->scanning_phys |=LE_SCAN_PHY_1M ; +hci_le_scan_phy_params (phy, type, + interval, + window); + num_phy++; + phy++; + } + +if (qos->bcast.in.phy &BT_ISO_PHY_CODED ) { + cp->scanning_phys |=LE_SCAN_PHY_CODED ; +hci_le_scan_phy_params (phy, type, + interval, + window); + num_phy++; + phy++; + } + + goto done; + } + } + } +if (scan_1m (hdev) ||scan_2m (hdev)) { cp->scanning_phys |=LE_SCAN_PHY_1M ; - - phy->type = type; - phy->interval =cpu_to_le16 (interval); - phy->window =cpu_to_le16 (window); - +hci_le_scan_phy_params (phy, type, interval, window); num_phy++; phy++; }if (scan_coded (hdev)) { cp->scanning_phys |=LE_SCAN_PHY_CODED ; - - phy->type = type; - phy->interval =cpu_to_le16 (interval); - phy->window =cpu_to_le16 (window); - +hci_le_scan_phy_params (phy, type, interval, window); num_phy++; phy++; } +done: +if (!num_phy) +return -EINVAL ; +return __hci_cmd_sync_status (hdev,HCI_OP_LE_SET_EXT_SCAN_PARAMS ,sizeof (*cp) +sizeof (*phy) * num_phy, data,HCI_CMD_TIMEOUT );
Signature · 1 line
2.43.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=830022
---Test result---
Test Summary:
CheckPatch PASS 1.34 seconds GitLint PASS 0.61 seconds SubjectPrefix PASS 0.23 seconds BuildKernel PASS 27.68 seconds CheckAllWarning PASS 30.38 seconds CheckSparse PASS 35.78 seconds CheckSmatch PASS 98.42 seconds BuildKernel32 PASS 26.86 seconds TestRunnerSetup PASS 496.81 seconds TestRunner_l2cap-tester FAIL 24.36 seconds TestRunner_iso-tester FAIL 44.93 seconds TestRunner_bnep-tester PASS 4.81 seconds TestRunner_mgmt-tester PASS 116.50 seconds TestRunner_rfcomm-tester PASS 7.38 seconds TestRunner_sco-tester PASS 15.01 seconds TestRunner_ioctl-tester PASS 7.93 seconds TestRunner_mesh-tester PASS 5.93 seconds TestRunner_smp-tester PASS 6.90 seconds TestRunner_userchan-tester PASS 5.00 seconds IncrementalBuild PASS 31.07 seconds
Details
##############################
Test: TestRunner_l2cap-tester - FAIL
Desc: Run l2cap-tester with test-runner Output:
Total: 51, Passed: 50 (98.0%), Failed: 1, Not Run: 0
Failed Test Cases
L2CAP LE Client - Close socket 2 Timed out 2.155 seconds
##############################
Test: TestRunner_iso-tester - FAIL
Desc: Run iso-tester with test-runner
Output:
Total: 117, Passed: 116 (99.1%), Failed: 1, Not Run: 0
Failed Test Cases
ISO Connect Suspend - Success Timed out 10.248 seconds
---
Regards,
Linux Bluetooth