2023-06-20 22:55:30

by Luiz Augusto von Dentz

[permalink] [raw]
Subject: [PATCH] Bluetooth: hci_event: Fix parsing of CIS Established Event

From: Luiz Augusto von Dentz <[email protected]>

The ISO Interval on CIS Established Event uses 1.25 ms slots:

BLUETOOTH CORE SPECIFICATION Version 5.3 | Vol 4, Part E
page 2304:

Time = N * 1.25 ms

Signed-off-by: Luiz Augusto von Dentz <[email protected]>
---
net/bluetooth/hci_event.c | 16 +++++++---------
1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
index b1aefe4bb751..5040aa66cd57 100644
--- a/net/bluetooth/hci_event.c
+++ b/net/bluetooth/hci_event.c
@@ -6847,16 +6847,14 @@ static void hci_le_cis_estabilished_evt(struct hci_dev *hdev, void *data,
pending = test_and_clear_bit(HCI_CONN_CREATE_CIS, &conn->flags);

if (conn->role == HCI_ROLE_SLAVE) {
- __le32 interval;
+ struct bt_iso_qos *qos = &conn->iso_qos;

- memset(&interval, 0, sizeof(interval));
-
- memcpy(&interval, ev->c_latency, sizeof(ev->c_latency));
- conn->iso_qos.ucast.in.interval = le32_to_cpu(interval);
- memcpy(&interval, ev->p_latency, sizeof(ev->p_latency));
- conn->iso_qos.ucast.out.interval = le32_to_cpu(interval);
- conn->iso_qos.ucast.in.latency = le16_to_cpu(ev->interval);
- conn->iso_qos.ucast.out.latency = le16_to_cpu(ev->interval);
+ qos->ucast.in.interval = get_unaligned_le24(ev->c_latency);
+ qos->ucast.out.interval = get_unaligned_le24(ev->p_latency);
+ /* Convert ISO Interval (1.25 ms slots) to latency (ms) */
+ qos->ucast.in.latency = le16_to_cpu(ev->interval) * 125 / 100;
+ /* Convert ISO Interval (1.25 ms slots) to latency (ms) */
+ qos->ucast.out.latency = le16_to_cpu(ev->interval) * 125 / 100;
conn->iso_qos.ucast.in.sdu = le16_to_cpu(ev->c_mtu);
conn->iso_qos.ucast.out.sdu = le16_to_cpu(ev->p_mtu);
conn->iso_qos.ucast.in.phy = ev->c_phy;
--
2.40.1



2023-06-20 23:38:36

by bluez.test.bot

[permalink] [raw]
Subject: RE: Bluetooth: hci_event: Fix parsing of CIS Established Event

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=758878

---Test result---

Test Summary:
CheckPatch PASS 0.72 seconds
GitLint PASS 0.33 seconds
SubjectPrefix PASS 0.11 seconds
BuildKernel PASS 38.03 seconds
CheckAllWarning PASS 42.85 seconds
CheckSparse WARNING 47.74 seconds
CheckSmatch WARNING 130.04 seconds
BuildKernel32 PASS 37.36 seconds
TestRunnerSetup PASS 533.03 seconds
TestRunner_l2cap-tester PASS 19.68 seconds
TestRunner_iso-tester FAIL 28.80 seconds
TestRunner_bnep-tester PASS 6.94 seconds
TestRunner_mgmt-tester PASS 147.73 seconds
TestRunner_rfcomm-tester PASS 10.72 seconds
TestRunner_sco-tester PASS 9.86 seconds
TestRunner_ioctl-tester PASS 11.62 seconds
TestRunner_mesh-tester PASS 8.60 seconds
TestRunner_smp-tester PASS 9.75 seconds
TestRunner_userchan-tester PASS 7.17 seconds
IncrementalBuild PASS 34.54 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 - WARNING
Desc: Run smatch tool with source
Output:
net/bluetooth/hci_event.c: note: in included file (through include/net/bluetooth/hci_core.h):
##############################
Test: TestRunner_iso-tester - FAIL
Desc: Run iso-tester with test-runner
Output:
Total: 80, Passed: 76 (95.0%), Failed: 4, Not Run: 0

Failed Test Cases
ISO Receive - Success Failed 0.242 seconds
ISO Receive Timestamped - Success Failed 0.236 seconds
ISO Defer Receive - Success Failed 0.238 seconds
ISO 48_2_1 Defer Receive - Success Failed 0.229 seconds


---
Regards,
Linux Bluetooth