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

2023-06-23 21:44:01

Subject: [PATCH v5] 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 | 45 ++++++++++++++++++++++++++++-----------
1 file changed, 32 insertions(+), 13 deletions(-)

diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
index b1aefe4bb751..77cbf13037b3 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,39 @@ 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 SDU Interval (us) */
+ qos->ucast.in.interval = le16_to_cpu(ev->interval) * 1250;
+ qos->ucast.out.interval = qos->ucast.in.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);
- 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:
+ /* Convert Transport Latency (us) to Latency (msec) */
+ qos->ucast.in.latency =
+ DIV_ROUND_CLOSEST(get_unaligned_le24(ev->c_latency),
+ 1000);
+ qos->ucast.out.latency =
+ DIV_ROUND_CLOSEST(get_unaligned_le24(ev->p_latency),
+ 1000);
+ 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:
+ /* Convert Transport Latency (us) to Latency (msec) */
+ qos->ucast.out.latency =
+ DIV_ROUND_CLOSEST(get_unaligned_le24(ev->c_latency),
+ 1000);
+ qos->ucast.in.latency =
+ DIV_ROUND_CLOSEST(get_unaligned_le24(ev->p_latency),
+ 1000);
+ 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-23 22:07:40

by bluez.test.bot

[permalink] [raw]

Subject: RE: [v5] 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=759915
PASS 0.91 seconds
PASS 0.40 seconds
PASS 0.14 seconds
PASS 45.47 seconds
PASS 48.19 seconds
WARNING 55.80 seconds
WARNING 135.44 seconds
PASS 41.15 seconds
PASS 532.88 seconds
PASS 20.47 seconds
FAIL 29.96 seconds
PASS 7.28 seconds
PASS 154.03 seconds
PASS 11.33 seconds
PASS 10.17 seconds
PASS 12.01 seconds
PASS 9.08 seconds
PASS 10.73 seconds
PASS 8.11 seconds
PASS 39.36 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
54 (67.5%), Failed: 26, Not Run: 0
Failed 0.268 seconds
Failed 0.272 seconds
Failed 0.268 seconds
Failed 0.256 seconds
Failed 0.276 seconds
Failed 0.264 seconds
Failed 0.264 seconds
Failed 0.272 seconds
Failed 0.260 seconds
Failed 0.280 seconds
Failed 0.256 seconds
Failed 0.252 seconds
Failed 0.256 seconds
Failed 0.260 seconds
Failed 0.256 seconds
Failed 0.260 seconds
Failed 0.256 seconds
Failed 0.268 seconds
Failed 0.252 seconds
Failed 0.276 seconds
Failed 0.268 seconds
Failed 0.252 seconds
Failed 0.256 seconds
Failed 0.268 seconds
Failed 0.268 seconds
Failed 0.216 seconds

2023-06-26 20:46:23

by patchwork-bot+bluetooth

[permalink] [raw]

Subject: Re: [PATCH v5] Bluetooth: hci_event: Fix parsing of CIS Established Event

Hello:

This patch was applied to bluetooth/bluetooth-next.git (master)
by Luiz Augusto von Dentz <[email protected]>:

On Fri, 23 Jun 2023 14:24:39 -0700 you wrote:
> 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:
>
> [...]

Here is the summary with links:
- [v5] Bluetooth: hci_event: Fix parsing of CIS Established Event
https://git.kernel.org/bluetooth/bluetooth-next/c/5f68122ac282

You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html