The latency parameter of the broadcast qos is calculated wrongly.
In fact, no calculation should be made. For broadcast sink the
latency should be taken directly from the BIG Sync Established
event and for the source it should be taken from the Create BIG
Complete event.
The interval parameter of the broadcast qos reffers to the SDU
Interval and shouldn't be set based on the latency. The Host will
read this value from the BASE.
Signed-off-by: Vlad Pruteanu <[email protected]>
---
net/bluetooth/hci_event.c | 17 +++++++++++------
1 file changed, 11 insertions(+), 6 deletions(-)
diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
index 868ffccff773..f34775059c17 100644
--- a/net/bluetooth/hci_event.c
+++ b/net/bluetooth/hci_event.c
@@ -6983,6 +6983,11 @@ static void hci_le_create_big_complete_evt(struct hci_dev *hdev, void *data,
if (!ev->status) {
conn->state = BT_CONNECTED;
+ /* The transport_delay field of this event contains the transport latency
+ * expressed in us, convert it to ms for consistency.
+ */
+ conn->iso_qos.bcast.out.latency =
+ DIV_ROUND_CLOSEST(get_unaligned_le24(ev->transport_delay), 1000);
set_bit(HCI_CONN_BIG_CREATED, &conn->flags);
rcu_read_unlock();
hci_debugfs_create_conn(conn);
@@ -7029,7 +7034,6 @@ static void hci_le_big_sync_established_evt(struct hci_dev *hdev, void *data,
for (i = 0; i < ev->num_bis; i++) {
u16 handle = le16_to_cpu(ev->bis[i]);
- __le32 interval;
bis = hci_conn_hash_lookup_handle(hdev, handle);
if (!bis) {
@@ -7044,11 +7048,12 @@ static void hci_le_big_sync_established_evt(struct hci_dev *hdev, void *data,
set_bit(HCI_CONN_PA_SYNC, &bis->flags);
bis->iso_qos.bcast.big = ev->handle;
- memset(&interval, 0, sizeof(interval));
- memcpy(&interval, ev->latency, sizeof(ev->latency));
- bis->iso_qos.bcast.in.interval = le32_to_cpu(interval);
- /* Convert ISO Interval (1.25 ms slots) to latency (ms) */
- bis->iso_qos.bcast.in.latency = le16_to_cpu(ev->interval) * 125 / 100;
+ /* The latency field of this event contains the transport latency
+ * expressed in us, convert it to ms for consistency.
+ */
+ bis->iso_qos.bcast.in.latency =
+ DIV_ROUND_CLOSEST(get_unaligned_le24(ev->latency),
+ 1000);
bis->iso_qos.bcast.in.sdu = le16_to_cpu(ev->max_pdu);
if (!ev->status) {
--
2.40.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=845090
---Test result---
Test Summary:
CheckPatch PASS 0.60 seconds
GitLint PASS 0.28 seconds
SubjectPrefix PASS 0.10 seconds
BuildKernel PASS 31.09 seconds
CheckAllWarning PASS 33.45 seconds
CheckSparse WARNING 39.75 seconds
CheckSmatch FAIL 37.59 seconds
BuildKernel32 PASS 30.11 seconds
TestRunnerSetup PASS 538.19 seconds
TestRunner_l2cap-tester PASS 18.54 seconds
TestRunner_iso-tester PASS 33.52 seconds
TestRunner_bnep-tester PASS 4.79 seconds
TestRunner_mgmt-tester FAIL 114.34 seconds
TestRunner_rfcomm-tester PASS 7.35 seconds
TestRunner_sco-tester PASS 18.63 seconds
TestRunner_ioctl-tester PASS 7.74 seconds
TestRunner_mesh-tester PASS 5.83 seconds
TestRunner_smp-tester PASS 6.80 seconds
TestRunner_userchan-tester PASS 4.89 seconds
IncrementalBuild PASS 28.41 seconds
Details
##############################
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: CheckSmatch - FAIL
Desc: Run smatch tool with source
Output:
Segmentation fault (core dumped)
make[4]: *** [scripts/Makefile.build:244: net/bluetooth/hci_core.o] Error 139
make[4]: *** Deleting file 'net/bluetooth/hci_core.o'
make[3]: *** [scripts/Makefile.build:485: net/bluetooth] Error 2
make[2]: *** [scripts/Makefile.build:485: net] Error 2
make[2]: *** Waiting for unfinished jobs....
Segmentation fault (core dumped)
make[4]: *** [scripts/Makefile.build:244: drivers/bluetooth/bcm203x.o] Error 139
make[4]: *** Deleting file 'drivers/bluetooth/bcm203x.o'
make[4]: *** Waiting for unfinished jobs....
Segmentation fault (core dumped)
make[4]: *** [scripts/Makefile.build:244: drivers/bluetooth/bpa10x.o] Error 139
make[4]: *** Deleting file 'drivers/bluetooth/bpa10x.o'
make[3]: *** [scripts/Makefile.build:485: drivers/bluetooth] Error 2
make[2]: *** [scripts/Makefile.build:485: drivers] Error 2
make[1]: *** [/github/workspace/src/src/Makefile:1919: .] Error 2
make: *** [Makefile:240: __sub-make] Error 2
##############################
Test: TestRunner_mgmt-tester - FAIL
Desc: Run mgmt-tester with test-runner
Output:
Total: 492, Passed: 489 (99.4%), Failed: 1, Not Run: 2
Failed Test Cases
LL Privacy - Remove Device 4 (Disable Adv) Timed out 2.750 seconds
---
Regards,
Linux Bluetooth