LinuxLists.cc - [PATCH v3] Bluetooth: hci_event: Fix parsing of CIS Established Event

2023-06-21 20:55:46

Subject: [PATCH v3] 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

In addition to that this always update the QoS settings based on CIS
Established Event.

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

diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
index b1aefe4bb751..049aa7f6a7c5 100644
--- a/net/bluetooth/hci_event.c
+++ b/net/bluetooth/hci_event.c
@@ -6822,6 +6822,7 @@ static void hci_le_cis_estabilished_evt(struct hci_dev *hdev, void *data,
{
struct hci_evt_le_cis_established *ev = data;
struct hci_conn *conn;
+ struct bt_iso_qos *qos;
bool pending = false;
u16 handle = __le16_to_cpu(ev->handle);

@@ -6846,21 +6847,30 @@ 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;
+ qos = &conn->iso_qos;

- memset(&interval, 0, sizeof(interval));
+ /* Convert ISO Interval (1.25 ms slots) to latency (ms) */
+ qos->ucast.in.latency = DIV_ROUND_CLOSEST(le16_to_cpu(ev->interval) *
+ 125, 100);
+ qos->ucast.out.latency = qos->ucast.in.latency;

- 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);
- 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;
- conn->iso_qos.ucast.out.phy = ev->p_phy;
+ switch (conn->role) {
+ case HCI_ROLE_SLAVE:
+ qos->ucast.in.interval = get_unaligned_le24(ev->c_latency);
+ qos->ucast.out.interval = get_unaligned_le24(ev->p_latency);
+ qos->ucast.in.sdu = le16_to_cpu(ev->c_mtu);
+ qos->ucast.out.sdu = le16_to_cpu(ev->p_mtu);
+ qos->ucast.in.phy = ev->c_phy;
+ qos->ucast.out.phy = ev->p_phy;
+ break;
+ case HCI_ROLE_MASTER:
+ qos->ucast.out.interval = get_unaligned_le24(ev->c_latency);
+ qos->ucast.in.interval = get_unaligned_le24(ev->p_latency);
+ qos->ucast.out.sdu = le16_to_cpu(ev->c_mtu);
+ qos->ucast.in.sdu = le16_to_cpu(ev->p_mtu);
+ qos->ucast.out.phy = ev->c_phy;
+ qos->ucast.in.phy = ev->p_phy;
+ break;
}

if (!ev->status) {
--
2.40.1

2023-06-21 21:36:34

by bluez.test.bot

[permalink] [raw]

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

This is automated
Dear submitter,

Thank you for submitting This is a CI test PW Link:https://patchwork.kernel.org/project/bluetooth/list/?series=759272
PASS 0.57 seconds
PASS 0.24 seconds
PASS 0.07 seconds
PASS 32.63 seconds
PASS 35.81 seconds
WARNING 41.19 seconds
WARNING 110.78 seconds
PASS 31.94 seconds
PASS 456.21 seconds
PASS 17.69 seconds
FAIL 32.80 seconds
PASS 5.89 seconds
PASS 136.43 seconds
PASS 9.36 seconds
PASS 8.65 seconds
PASS 10.05 seconds
PASS 7.41 seconds
PASS 8.56 seconds
PASS 6.15 seconds
PASS 29.84 seconds
tool with linux kernel
note: in included file (through include/net/bluetooth/hci_core.h):
note: in included file (through include/net/bluetooth/hci_core.h):
- FAIL
with test-runner
17 (21.2%), Failed: 63, Not Run: 0
Failed 1.134 seconds
Failed 0.217 seconds
Failed 0.216 seconds
Failed 0.216 seconds
Failed 0.217 seconds
CIG 0x01 CIS 0x01 - Success Failed 0.215 seconds
Failed 0.217 seconds
Failed 0.214 seconds
Failed 0.216 seconds
Failed 0.213 seconds
Failed 0.218 seconds
Failed 0.218 seconds
Failed 0.218 seconds
Failed 0.217 seconds
Failed 0.212 seconds
Failed 0.215 seconds
Failed 0.216 seconds
Failed 0.217 seconds
Failed 0.212 seconds
Failed 0.212 seconds
Failed 0.215 seconds
Failed 0.213 seconds
Failed 0.213 seconds
Failed 0.210 seconds
Failed 0.212 seconds
Failed 0.214 seconds
Failed 0.216 seconds
Failed 0.220 seconds
Failed 0.220 seconds
Failed 0.215 seconds
Failed 0.222 seconds
Failed 0.220 seconds
Failed 0.221 seconds
Failed 0.220 seconds
Failed 0.216 seconds
Failed 0.206 seconds
Failed 0.193 seconds
Failed 0.217 seconds
CIG 0x01 - Success Failed 0.306 seconds
Failed 0.218 seconds
Failed 0.219 seconds
Failed 0.201 seconds
Failed 0.198 seconds
Failed 0.214 seconds
Failed 0.216 seconds
Failed 0.215 seconds
Failed 0.219 seconds
Failed 0.220 seconds
Failed 0.217 seconds
Failed 0.248 seconds
Failed 0.308 seconds
Failed 0.245 seconds
Failed 0.300 seconds
Failed 0.245 seconds
Failed 0.299 seconds
Failed 0.247 seconds
Failed 0.307 seconds
Failed 0.250 seconds
Failed 0.307 seconds
Failed 4.317 seconds
Failed 4.319 seconds
Failed 0.310 seconds
Failed 0.309 seconds