diff mbox series

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

Message ID 20230621205230.1006939-1-luiz.dentz@gmail.com (mailing list archive)
State Superseded
Headers show
Series [v3] Bluetooth: hci_event: Fix parsing of CIS Established Event | expand

Checks

Context Check Description
tedd_an/pre-ci_am success Success
tedd_an/CheckPatch success CheckPatch PASS
tedd_an/GitLint success Gitlint PASS
tedd_an/SubjectPrefix success Gitlint PASS
tedd_an/BuildKernel success BuildKernel PASS
tedd_an/CheckAllWarning success CheckAllWarning PASS
tedd_an/CheckSparse warning CheckSparse WARNING net/bluetooth/hci_event.c: note: in included file (through include/net/bluetooth/hci_core.h):
tedd_an/CheckSmatch warning CheckSparse WARNING net/bluetooth/hci_event.c: note: in included file (through include/net/bluetooth/hci_core.h):
tedd_an/BuildKernel32 success BuildKernel32 PASS
tedd_an/TestRunnerSetup success TestRunnerSetup PASS
tedd_an/TestRunner_l2cap-tester success TestRunner PASS
tedd_an/TestRunner_iso-tester fail TestRunner_iso-tester: Total: 80, Passed: 17 (21.2%), Failed: 63, Not Run: 0
tedd_an/TestRunner_bnep-tester success TestRunner PASS
tedd_an/TestRunner_mgmt-tester success TestRunner PASS
tedd_an/TestRunner_rfcomm-tester success TestRunner PASS
tedd_an/TestRunner_sco-tester success TestRunner PASS
tedd_an/TestRunner_ioctl-tester success TestRunner PASS
tedd_an/TestRunner_mesh-tester success TestRunner PASS
tedd_an/TestRunner_smp-tester success TestRunner PASS
tedd_an/TestRunner_userchan-tester success TestRunner PASS
tedd_an/IncrementalBuild success Incremental Build PASS

Commit Message

Luiz Augusto von Dentz June 21, 2023, 8:52 p.m. UTC 
From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>

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 <luiz.von.dentz@intel.com>
---
 net/bluetooth/hci_event.c | 36 +++++++++++++++++++++++-------------
 1 file changed, 23 insertions(+), 13 deletions(-)

Comments

bluez.test.bot@gmail.com June 21, 2023, 9:33 p.m. UTC | #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=759272

---Test result---

Test Summary:
CheckPatch                    PASS      0.57 seconds
GitLint                       PASS      0.24 seconds
SubjectPrefix                 PASS      0.07 seconds
BuildKernel                   PASS      32.63 seconds
CheckAllWarning               PASS      35.81 seconds
CheckSparse                   WARNING   41.19 seconds
CheckSmatch                   WARNING   110.78 seconds
BuildKernel32                 PASS      31.94 seconds
TestRunnerSetup               PASS      456.21 seconds
TestRunner_l2cap-tester       PASS      17.69 seconds
TestRunner_iso-tester         FAIL      32.80 seconds
TestRunner_bnep-tester        PASS      5.89 seconds
TestRunner_mgmt-tester        PASS      136.43 seconds
TestRunner_rfcomm-tester      PASS      9.36 seconds
TestRunner_sco-tester         PASS      8.65 seconds
TestRunner_ioctl-tester       PASS      10.05 seconds
TestRunner_mesh-tester        PASS      7.41 seconds
TestRunner_smp-tester         PASS      8.56 seconds
TestRunner_userchan-tester    PASS      6.15 seconds
IncrementalBuild              PASS      29.84 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: 17 (21.2%), Failed: 63, Not Run: 0

Failed Test Cases
ISO QoS 8_1_1 - Success                              Failed       1.134 seconds
ISO QoS 8_2_1 - Success                              Failed       0.217 seconds
ISO QoS 16_1_1 - Success                             Failed       0.216 seconds
ISO QoS 16_2_1 - Success                             Failed       0.216 seconds
ISO QoS 16_2_1 CIG 0x01 - Success                    Failed       0.217 seconds
ISO QoS 16_2_1 CIG 0x01 CIS 0x01 - Success           Failed       0.215 seconds
ISO QoS 24_1_1 - Success                             Failed       0.217 seconds
ISO QoS 24_2_1 - Success                             Failed       0.214 seconds
ISO QoS 32_1_1 - Success                             Failed       0.216 seconds
ISO QoS 32_2_1 - Success                             Failed       0.213 seconds
ISO QoS 44_1_1 - Success                             Failed       0.218 seconds
ISO QoS 44_2_1 - Success                             Failed       0.218 seconds
ISO QoS 48_1_1 - Success                             Failed       0.218 seconds
ISO QoS 48_2_1 - Success                             Failed       0.217 seconds
ISO QoS 48_3_1 - Success                             Failed       0.212 seconds
ISO QoS 48_4_1 - Success                             Failed       0.215 seconds
ISO QoS 48_5_1 - Success                             Failed       0.216 seconds
ISO QoS 48_6_1 - Success                             Failed       0.217 seconds
ISO QoS 8_1_2 - Success                              Failed       0.212 seconds
ISO QoS 8_2_2 - Success                              Failed       0.212 seconds
ISO QoS 16_1_2 - Success                             Failed       0.215 seconds
ISO QoS 16_2_2 - Success                             Failed       0.213 seconds
ISO QoS 24_1_2 - Success                             Failed       0.213 seconds
ISO QoS 24_2_2 - Success                             Failed       0.210 seconds
ISO QoS 32_1_2 - Success                             Failed       0.212 seconds
ISO QoS 32_2_2 - Success                             Failed       0.214 seconds
ISO QoS 44_1_2 - Success                             Failed       0.216 seconds
ISO QoS 44_2_2 - Success                             Failed       0.220 seconds
ISO QoS 48_1_2 - Success                             Failed       0.220 seconds
ISO QoS 48_2_2 - Success                             Failed       0.215 seconds
ISO QoS 48_3_2 - Success                             Failed       0.222 seconds
ISO QoS 48_4_2 - Success                             Failed       0.220 seconds
ISO QoS 48_5_2 - Success                             Failed       0.221 seconds
ISO QoS 48_6_2 - Success                             Failed       0.220 seconds
ISO Send - Success                                   Failed       0.216 seconds
ISO Receive - Success                                Failed       0.206 seconds
ISO Receive Timestamped - Success                    Failed       0.193 seconds
ISO Defer Connect - Success                          Failed       0.217 seconds
ISO Defer Connect2 CIG 0x01 - Success                Failed       0.306 seconds
ISO Defer Send - Success                             Failed       0.218 seconds
ISO 48_2_1 Defer Send - Success                      Failed       0.219 seconds
ISO Defer Receive - Success                          Failed       0.201 seconds
ISO 48_2_1 Defer Receive - Success                   Failed       0.198 seconds
ISO Send and Receive - Success                       Failed       0.214 seconds
ISO Disconnect - Success                             Failed       0.216 seconds
ISO Reconnect - Success                              Failed       0.215 seconds
ISO AC 1 & 4 - Success                               Failed       0.219 seconds
ISO AC 2 & 10 - Success                              Failed       0.220 seconds
ISO AC 3 & 5 - Success                               Failed       0.217 seconds
ISO AC 6(i) - Success                                Failed       0.248 seconds
ISO AC 6(ii) - Success                               Failed       0.308 seconds
ISO AC 7(i) - Success                                Failed       0.245 seconds
ISO AC 7(ii) - Success                               Failed       0.300 seconds
ISO AC 8(i) - Success                                Failed       0.245 seconds
ISO AC 8(ii) - Success                               Failed       0.299 seconds
ISO AC 9(i) - Success                                Failed       0.247 seconds
ISO AC 9(ii) - Success                               Failed       0.307 seconds
ISO AC 11(i) - Success                               Failed       0.250 seconds
ISO AC 11(ii) - Success                              Failed       0.307 seconds
ISO AC 1 + 2 - Success                               Failed       4.317 seconds
ISO AC 1 + 2 CIG 0x01/0x02 - Success                 Failed       4.319 seconds
ISO Reconnect AC 6(i) - Success                      Failed       0.310 seconds
ISO Reconnect AC 6(ii) - Success                     Failed       0.309 seconds


---
Regards,
Linux Bluetooth
diff mbox series

Patch

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) {