Bluetooth: hci_conn: Fix not setting conn_timeout for Broadcast Receiver
Subsystems (2)
Luiz Augusto von Dentz
maintainerPATCH v2 1/1 Bluetooth: hci_conn: Fix not setting conn_timeout for Broadcast Receiver
From: Luiz Augusto von Dentz <[email protected]>
Broadcast Receiver requires creating PA sync but the command just generates a status so this makes use of __hci_cmd_sync_status_sk to wait for HCI_EV_LE_PA_SYNC_ESTABLISHED, also because of this chance it is not longer necessary to use a custom method to serialize the process of creating the PA sync since the cmd_work_sync itself ensures only one command would be pending which now awaits for HCI_EV_LE_PA_SYNC_ESTABLISHED before proceeding to next connection.
--- include/net/bluetooth/hci.h | 2 + include/net/bluetooth/hci_core.h | 13 +++-- include/net/bluetooth/hci_sync.h | 2 + net/bluetooth/hci_conn.c | 92 +------------------------------- net/bluetooth/hci_event.c | 6 +-- net/bluetooth/hci_sync.c | 87 ++++++++++++++++++++++++++++-- 6 files changed, 95 insertions(+), 107 deletions(-)
include/net/bluetooth/hci.h +2 -0
@@ -1931,6 +1931,8 @@ struct hci_cp_le_pa_create_sync {__u8 sync_cte_type; } __packed; +#define HCI_OP_LE_PA_CREATE_SYNC_CANCEL 0x2045 +#define HCI_OP_LE_PA_TERM_SYNC 0x2046struct hci_cp_le_pa_term_sync {__le16 handle;
include/net/bluetooth/hci_core.h +6 -7
@@ -1113,10 +1113,8 @@ static inline struct hci_conn *hci_conn_hash_lookup_bis(struct hci_dev *hdev,return NULL ; } -static inline struct hci_conn *hci_conn_hash_lookup_sid (struct hci_dev *hdev, -__u8 sid, -bdaddr_t *dst, -__u8 dst_type) +static inline struct hci_conn * +hci_conn_hash_lookup_create_pa_sync (struct hci_dev *hdev) {struct hci_conn_hash *h = &hdev->conn_hash;struct hci_conn *c;
@@ -1124,8 +1122,10 @@ static inline struct hci_conn *hci_conn_hash_lookup_sid(struct hci_dev *hdev,rcu_read_lock ();list_for_each_entry_rcu (c, &h->list, list) { -if (c->type !=ISO_LINK ||bacmp (&c->dst, dst) || - c->dst_type != dst_type || c->sid != sid) +if (c->type !=ISO_LINK ) +continue ; + +if (!test_bit (HCI_CONN_CREATE_PA_SYNC , &c->flags))continue ;rcu_read_unlock ();
@@ -1524,7 +1524,6 @@ bool hci_setup_sync(struct hci_conn *conn, __u16 handle);void hci_sco_setup (struct hci_conn *conn,__u8 status);bool hci_iso_setup_path (struct hci_conn *conn);int hci_le_create_cis_pending (struct hci_dev *hdev); -int hci_pa_create_sync_pending (struct hci_dev *hdev);int hci_le_big_create_sync_pending (struct hci_dev *hdev);int hci_conn_check_create_cis (struct hci_conn *conn);
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_connect_pa_sync (struct hci_dev *hdev,struct hci_conn *conn);
net/bluetooth/hci_conn.c +2 -90
107 lines not on this page · raw message
net/bluetooth/hci_event.c +1 -5
@@ -6378,8 +6378,7 @@ static void hci_le_pa_sync_estabilished_evt(struct hci_dev *hdev, void *data,hci_dev_clear_flag (hdev,HCI_PA_SYNC ); - conn =hci_conn_hash_lookup_sid (hdev, ev->sid, &ev->bdaddr, - ev->bdaddr_type); + conn =hci_conn_hash_lookup_create_pa_sync (hdev);if (!conn) { bt_dev_err(hdev, "Unable to find connection for dst %pMR sid 0x%2.2x",
@@ -6418,9 +6417,6 @@ static void hci_le_pa_sync_estabilished_evt(struct hci_dev *hdev, void *data, } unlock: -/* Handle any other pending PA sync command */ -hci_pa_create_sync_pending (hdev); -hci_dev_unlock (hdev); }
net/bluetooth/hci_sync.c +82 -5
101 lines not on this page · raw message
Signature · 1 line
2.49.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=952120
---Test result---
Test Summary:
CheckPatch PENDING 0.31 seconds GitLint PENDING 0.64 seconds SubjectPrefix PASS 0.11 seconds BuildKernel PASS 25.00 seconds CheckAllWarning PASS 26.84 seconds CheckSparse WARNING 30.58 seconds BuildKernel32 PASS 24.49 seconds TestRunnerSetup PASS 463.22 seconds TestRunner_l2cap-tester PASS 21.19 seconds TestRunner_iso-tester PASS 35.83 seconds TestRunner_bnep-tester PASS 4.84 seconds TestRunner_mgmt-tester FAIL 121.36 seconds TestRunner_rfcomm-tester PASS 7.89 seconds TestRunner_sco-tester PASS 12.68 seconds TestRunner_ioctl-tester PASS 8.34 seconds TestRunner_mesh-tester PASS 6.15 seconds TestRunner_smp-tester PASS 7.93 seconds TestRunner_userchan-tester PASS 7.38 seconds IncrementalBuild PENDING 0.97 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.194 seconds
##############################
Test: IncrementalBuild - PENDING
Desc: Incremental build with the patches in the series Output:
---
Regards,
Linux Bluetooth