bluetooth: Remove codec id field in vendor codec definition

PATCH Applied Kiran K 4 participants 14 messages Nov 4, 2022 – Dec 1, 2022

Subsystems (2)

Bluetooth drivers Bluetooth

lore

Share & tools

lore

Kiran K

author

2022-11-04 07:08 UTC #0 lore raw

PATCH 1/2 bluetooth: Remove codec id field in vendor codec definition

From: Chethan T N <[email protected]>

As per the specfication vendor codec id is defined. BLUETOOTH CORE SPECIFICATION Version 5.3 | Vol 4, Part E page 2127

Signed-off-by Chethan T N <[email protected]>

Signed-off-by Kiran K <[email protected]>

---
 include/net/bluetooth/hci.h | 1 -
 1 file changed, 1 deletion(-)

include/net/bluetooth/hci.h +0 -1

index e004ba04a9ae..581539cbb856 100644
@@ -1424,7 +1424,6 @@ struct hci_std_codecs_v2 {
 } __packed;
 
 struct hci_vnd_codec_v2 {
-	__u8	id;
 	__le16	cid;
 	__le16	vid;
 	__u8	transport;

Signature · 1 line

2.17.1

Kiran K

author

2022-11-04 07:08 UTC #1 lore raw

PATCH 2/2 bluetooth: Fix support for Read Local Supported Codecs V2

From: Chethan T N <[email protected]>

Handling of Read Local Supported Codecs was broken during the HCI serialization design change patches.

Fixes d0b137062b2d ("Bluetooth: hci_sync: Rework init stages")

Signed-off-by Chethan T N <[email protected]>

Signed-off-by Kiran K <[email protected]>

---
 net/bluetooth/hci_codec.c | 19 ++++++++++---------
 net/bluetooth/hci_sync.c  | 10 ++++++----
 2 files changed, 16 insertions(+), 13 deletions(-)

net/bluetooth/hci_codec.c +10 -9

index 38201532f58e..3cc135bb1d30 100644
@@ -72,9 +72,8 @@ static void hci_read_codec_capabilities(struct hci_dev *hdev, __u8 transport,
 				continue;
 			}
 
-			skb = __hci_cmd_sync(hdev, HCI_OP_READ_LOCAL_CODEC_CAPS,
-					     sizeof(*cmd), cmd,
-					     HCI_CMD_TIMEOUT);
+			skb = __hci_cmd_sync_sk(hdev, HCI_OP_READ_LOCAL_CODEC_CAPS,
+						sizeof(*cmd), cmd, 0, HCI_CMD_TIMEOUT, NULL);
 			if (IS_ERR(skb)) {
 				bt_dev_err(hdev, "Failed to read codec capabilities (%ld)",
 					   PTR_ERR(skb));

@@ -127,8 +126,8 @@ void hci_read_supported_codecs(struct hci_dev *hdev)
 	struct hci_op_read_local_codec_caps caps;
 	__u8 i;
 
-	skb = __hci_cmd_sync(hdev, HCI_OP_READ_LOCAL_CODECS, 0, NULL,
-			     HCI_CMD_TIMEOUT);
+	skb = __hci_cmd_sync_sk(hdev, HCI_OP_READ_LOCAL_CODECS, 0, NULL,
+				0, HCI_CMD_TIMEOUT, NULL);
 
 	if (IS_ERR(skb)) {
 		bt_dev_err(hdev, "Failed to read local supported codecs (%ld)",

@@ -158,7 +157,8 @@ void hci_read_supported_codecs(struct hci_dev *hdev)
 	for (i = 0; i < std_codecs->num; i++) {
 		caps.id = std_codecs->codec[i];
 		caps.direction = 0x00;
-		hci_read_codec_capabilities(hdev, LOCAL_CODEC_ACL_MASK, &caps);
+		hci_read_codec_capabilities(hdev,
+					    LOCAL_CODEC_ACL_MASK | LOCAL_CODEC_SCO_MASK, &caps);
 	}
 
 	skb_pull(skb, flex_array_size(std_codecs, codec, std_codecs->num)

@@ -178,7 +178,8 @@ void hci_read_supported_codecs(struct hci_dev *hdev)
 		caps.cid = vnd_codecs->codec[i].cid;
 		caps.vid = vnd_codecs->codec[i].vid;
 		caps.direction = 0x00;
-		hci_read_codec_capabilities(hdev, LOCAL_CODEC_ACL_MASK, &caps);
+		hci_read_codec_capabilities(hdev,
+					    LOCAL_CODEC_ACL_MASK | LOCAL_CODEC_SCO_MASK, &caps);
 	}
 
 error:

@@ -194,8 +195,8 @@ void hci_read_supported_codecs_v2(struct hci_dev *hdev)
 	struct hci_op_read_local_codec_caps caps;
 	__u8 i;
 
-	skb = __hci_cmd_sync(hdev, HCI_OP_READ_LOCAL_CODECS_V2, 0, NULL,
-			     HCI_CMD_TIMEOUT);
+	skb = __hci_cmd_sync_sk(hdev, HCI_OP_READ_LOCAL_CODECS_V2, 0, NULL,
+				0, HCI_CMD_TIMEOUT, NULL);
 
 	if (IS_ERR(skb)) {
 		bt_dev_err(hdev, "Failed to read local supported codecs (%ld)",

net/bluetooth/hci_sync.c +6 -4

index bd9eb713b26b..d09129ce2058 100644
@@ -12,6 +12,7 @@
 #include <net/bluetooth/mgmt.h>
 
 #include "hci_request.h"
+#include "hci_codec.h"
 #include "hci_debugfs.h"
 #include "smp.h"
 #include "eir.h"

@@ -4256,11 +4257,12 @@ static int hci_set_event_mask_page_2_sync(struct hci_dev *hdev)
 /* Read local codec list if the HCI command is supported */
 static int hci_read_local_codecs_sync(struct hci_dev *hdev)
 {
-	if (!(hdev->commands[29] & 0x20))
-		return 0;
+	if (hdev->commands[45] & 0x04)
+		hci_read_supported_codecs_v2(hdev);
+	else if (hdev->commands[29] & 0x20)
+		hci_read_supported_codecs(hdev);
 
-	return __hci_cmd_sync_status(hdev, HCI_OP_READ_LOCAL_CODECS, 0, NULL,
-				     HCI_CMD_TIMEOUT);
+	return 0;
 }
 
 /* Read local pairing options if the HCI command is supported */

Signature · 1 line

2.17.1

[email protected]

2022-11-04 08:03 UTC #2 lore raw

In reply to Kiran K

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

---Test result---

Test Summary:

CheckPatch                    PASS      2.77 seconds
GitLint                       PASS      1.56 seconds
SubjectPrefix                 FAIL      1.47 seconds
BuildKernel                   PASS      34.13 seconds
BuildKernel32                 PASS      30.32 seconds
Incremental Build with patchesPASS      50.73 seconds
TestRunner: Setup             PASS      504.89 seconds
TestRunner: l2cap-tester      PASS      16.86 seconds
TestRunner: iso-tester        PASS      16.30 seconds
TestRunner: bnep-tester       PASS      6.27 seconds
TestRunner: mgmt-tester       PASS      102.15 seconds
TestRunner: rfcomm-tester     PASS      10.00 seconds
TestRunner: sco-tester        PASS      9.37 seconds
TestRunner: ioctl-tester      PASS      10.59 seconds
TestRunner: mesh-tester       PASS      7.63 seconds
TestRunner: smp-tester        PASS      9.48 seconds
TestRunner: userchan-tester   PASS      6.41 seconds

Details
##############################
Test: SubjectPrefix - FAIL - 1.47 seconds Check subject contains "Bluetooth" prefix "Bluetooth: " is not specified in the subject "Bluetooth: " is not specified in the subject

---
Regards,
Linux Bluetooth

Luiz Augusto von Dentz

maintainer

2022-11-16 21:00 UTC #3 lore raw

In reply to Kiran K

Hi Kiran, Chethan,

Quoted 5 lines · Kiran K

From: Chethan T N <[email protected]>
As per the specfication vendor codec id is defined. BLUETOOTH CORE SPECIFICATION Version 5.3 | Vol 4, Part E page 2127

We need the fixes tag, the monitor also seems to be wrong in this respect so I will push a fix for it once that is done please add its output.

Quoted 21 lines

Signed-off-by Chethan T N <[email protected]>

Signed-off-by Kiran K <[email protected]>

---
 include/net/bluetooth/hci.h | 1 -
 1 file changed, 1 deletion(-)

include/net/bluetooth/hci.h +0 -2

index e004ba04a9ae..581539cbb856 100644
@@ -1424,7 +1424,6 @@ struct hci_std_codecs_v2 {
 } __packed;
 
 struct hci_vnd_codec_v2 {
-       __u8    id;
        __le16  cid;
        __le16  vid;
        __u8    transport;
--

2.17.1

Signature · 1 line

Luiz Augusto von Dentz

[email protected]

2022-11-18 03:48 UTC #4 lore raw

In reply to Kiran K

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

---Test result---

Test Summary:

CheckPatch                    PASS      1.24 seconds
GitLint                       PASS      0.54 seconds
SubjectPrefix                 FAIL      0.41 seconds
BuildKernel                   PASS      34.19 seconds
BuildKernel32                 PASS      30.34 seconds
TestRunnerSetup               PASS      422.13 seconds
TestRunner_l2cap-tester       PASS      15.70 seconds
TestRunner_iso-tester         PASS      15.38 seconds
TestRunner_bnep-tester        PASS      5.33 seconds
TestRunner_mgmt-tester        PASS      103.42 seconds
TestRunner_rfcomm-tester      PASS      9.19 seconds
TestRunner_sco-tester         PASS      8.60 seconds
TestRunner_ioctl-tester       PASS      9.78 seconds
TestRunner_mesh-tester        PASS      6.64 seconds
TestRunner_smp-tester         PASS      8.37 seconds
TestRunner_userchan-tester    PASS      5.50 seconds
IncrementalBuild              PASS      37.75 seconds

Details
##############################
Test: SubjectPrefix - FAIL
Desc: Check subject contains "Bluetooth" prefix Output:
"Bluetooth: " prefix is not specified in the subject "Bluetooth: " prefix is not specified in the subject

---
Regards,
Linux Bluetooth

[email protected]

2022-11-18 04:35 UTC #5 lore raw

In reply to Kiran K

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

---Test result---

Test Summary:

CheckPatch                    PASS      1.31 seconds
GitLint                       PASS      0.59 seconds
SubjectPrefix                 FAIL      0.42 seconds
BuildKernel                   PASS      34.75 seconds
BuildKernel32                 PASS      31.17 seconds
TestRunnerSetup               PASS      429.31 seconds
TestRunner_l2cap-tester       PASS      16.13 seconds
TestRunner_iso-tester         PASS      16.14 seconds
TestRunner_bnep-tester        PASS      5.59 seconds
TestRunner_mgmt-tester        PASS      108.52 seconds
TestRunner_rfcomm-tester      PASS      9.57 seconds
TestRunner_sco-tester         PASS      8.94 seconds
TestRunner_ioctl-tester       PASS      10.20 seconds
TestRunner_mesh-tester        PASS      7.02 seconds
TestRunner_smp-tester         PASS      8.73 seconds
TestRunner_userchan-tester    PASS      5.82 seconds
IncrementalBuild              PASS      38.67 seconds

---
Regards,
Linux Bluetooth

[email protected]

2022-11-18 05:30 UTC #6 lore raw

In reply to Kiran K

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

---Test result---

Test Summary:

CheckPatch                    PASS      1.31 seconds
GitLint                       PASS      0.58 seconds
SubjectPrefix                 FAIL      0.40 seconds
BuildKernel                   PASS      33.94 seconds
BuildKernel32                 PASS      30.07 seconds
TestRunnerSetup               PASS      427.72 seconds
TestRunner_l2cap-tester       PASS      16.08 seconds
TestRunner_iso-tester         PASS      16.13 seconds
TestRunner_bnep-tester        PASS      5.55 seconds
TestRunner_mgmt-tester        PASS      107.54 seconds
TestRunner_rfcomm-tester      PASS      9.51 seconds
TestRunner_sco-tester         PASS      8.90 seconds
TestRunner_ioctl-tester       PASS      10.25 seconds
TestRunner_mesh-tester        PASS      7.07 seconds
TestRunner_smp-tester         PASS      8.66 seconds
TestRunner_userchan-tester    PASS      5.86 seconds
IncrementalBuild              PASS      38.08 seconds

---
Regards,
Linux Bluetooth

[email protected]

2022-11-18 06:34 UTC #7 lore raw

In reply to Kiran K

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

---Test result---

Test Summary:

CheckPatch                    PASS      1.49 seconds
GitLint                       PASS      0.70 seconds
SubjectPrefix                 FAIL      0.43 seconds
BuildKernel                   PASS      34.98 seconds
BuildKernel32                 PASS      30.76 seconds
TestRunnerSetup               PASS      432.61 seconds
TestRunner_l2cap-tester       PASS      15.77 seconds
TestRunner_iso-tester         PASS      15.47 seconds
TestRunner_bnep-tester        PASS      5.34 seconds
TestRunner_mgmt-tester        PASS      108.91 seconds
TestRunner_rfcomm-tester      PASS      9.38 seconds
TestRunner_sco-tester         PASS      8.67 seconds
TestRunner_ioctl-tester       PASS      9.87 seconds
TestRunner_mesh-tester        PASS      6.78 seconds
TestRunner_smp-tester         PASS      8.48 seconds
TestRunner_userchan-tester    PASS      5.66 seconds
IncrementalBuild              PASS      38.60 seconds

---
Regards,
Linux Bluetooth

[email protected]

2022-11-18 07:33 UTC #8 lore raw

In reply to Kiran K

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

---Test result---

Test Summary:

CheckPatch                    PASS      1.34 seconds
GitLint                       PASS      0.48 seconds
SubjectPrefix                 FAIL      0.53 seconds
BuildKernel                   PASS      43.60 seconds
BuildKernel32                 PASS      39.06 seconds
TestRunnerSetup               PASS      543.72 seconds
TestRunner_l2cap-tester       PASS      18.47 seconds
TestRunner_iso-tester         PASS      20.19 seconds
TestRunner_bnep-tester        PASS      6.84 seconds
TestRunner_mgmt-tester        PASS      130.27 seconds
TestRunner_rfcomm-tester      PASS      11.56 seconds
TestRunner_sco-tester         PASS      10.69 seconds
TestRunner_ioctl-tester       PASS      12.47 seconds
TestRunner_mesh-tester        PASS      8.95 seconds
TestRunner_smp-tester         PASS      10.31 seconds
TestRunner_userchan-tester    PASS      7.17 seconds
IncrementalBuild              PASS      48.29 seconds

---
Regards,
Linux Bluetooth

[email protected]

2022-11-18 08:37 UTC #9 lore raw

In reply to Kiran K

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

---Test result---

Test Summary:

CheckPatch                    PASS      1.75 seconds
GitLint                       PASS      0.79 seconds
SubjectPrefix                 FAIL      0.48 seconds
BuildKernel                   PASS      41.48 seconds
BuildKernel32                 PASS      36.64 seconds
TestRunnerSetup               PASS      505.67 seconds
TestRunner_l2cap-tester       PASS      18.12 seconds
TestRunner_iso-tester         PASS      18.83 seconds
TestRunner_bnep-tester        PASS      6.73 seconds
TestRunner_mgmt-tester        PASS      121.60 seconds
TestRunner_rfcomm-tester      PASS      10.91 seconds
TestRunner_sco-tester         PASS      10.01 seconds
TestRunner_ioctl-tester       PASS      12.12 seconds
TestRunner_mesh-tester        PASS      8.41 seconds
TestRunner_smp-tester         PASS      9.97 seconds
TestRunner_userchan-tester    PASS      6.95 seconds
IncrementalBuild              PASS      46.17 seconds

---
Regards,
Linux Bluetooth

[email protected]

2022-11-18 09:31 UTC #10 lore raw

In reply to Kiran K

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

---Test result---

Test Summary:

CheckPatch                    PASS      1.47 seconds
GitLint                       PASS      0.69 seconds
SubjectPrefix                 FAIL      0.55 seconds
BuildKernel                   PASS      34.13 seconds
BuildKernel32                 PASS      30.46 seconds
TestRunnerSetup               PASS      418.42 seconds
TestRunner_l2cap-tester       PASS      15.70 seconds
TestRunner_iso-tester         PASS      15.51 seconds
TestRunner_bnep-tester        PASS      5.30 seconds
TestRunner_mgmt-tester        PASS      105.31 seconds
TestRunner_rfcomm-tester      PASS      9.21 seconds
TestRunner_sco-tester         PASS      8.59 seconds
TestRunner_ioctl-tester       PASS      9.80 seconds
TestRunner_mesh-tester        PASS      6.64 seconds
TestRunner_smp-tester         PASS      8.50 seconds
TestRunner_userchan-tester    PASS      5.56 seconds
IncrementalBuild              PASS      38.08 seconds

---
Regards,
Linux Bluetooth

[email protected]

2022-11-19 03:59 UTC #11 lore raw

In reply to Kiran K

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

---Test result---

Test Summary:

CheckPatch                    PASS      1.47 seconds
GitLint                       PASS      0.68 seconds
SubjectPrefix                 FAIL      0.43 seconds
BuildKernel                   PASS      33.80 seconds
BuildKernel32                 PASS      30.08 seconds
TestRunnerSetup               PASS      417.72 seconds
TestRunner_l2cap-tester       PASS      16.06 seconds
TestRunner_iso-tester         PASS      15.93 seconds
TestRunner_bnep-tester        PASS      5.50 seconds
TestRunner_mgmt-tester        PASS      106.46 seconds
TestRunner_rfcomm-tester      PASS      9.48 seconds
TestRunner_sco-tester         PASS      8.78 seconds
TestRunner_ioctl-tester       PASS      10.19 seconds
TestRunner_mesh-tester        PASS      6.98 seconds
TestRunner_smp-tester         PASS      8.82 seconds
TestRunner_userchan-tester    PASS      5.81 seconds
IncrementalBuild              PASS      37.51 seconds

---
Regards,
Linux Bluetooth

[email protected]

2022-11-19 05:03 UTC #12 lore raw

In reply to Kiran K

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

---Test result---

Test Summary:

CheckPatch                    PASS      1.47 seconds
GitLint                       PASS      0.68 seconds
SubjectPrefix                 FAIL      0.49 seconds
BuildKernel                   PASS      35.22 seconds
BuildKernel32                 PASS      31.71 seconds
TestRunnerSetup               PASS      434.13 seconds
TestRunner_l2cap-tester       PASS      16.16 seconds
TestRunner_iso-tester         PASS      16.27 seconds
TestRunner_bnep-tester        PASS      5.59 seconds
TestRunner_mgmt-tester        PASS      112.46 seconds
TestRunner_rfcomm-tester      PASS      9.57 seconds
TestRunner_sco-tester         PASS      8.85 seconds
TestRunner_ioctl-tester       PASS      10.29 seconds
TestRunner_mesh-tester        PASS      6.95 seconds
TestRunner_smp-tester         PASS      8.71 seconds
TestRunner_userchan-tester    PASS      5.84 seconds
IncrementalBuild              PASS      39.47 seconds

---
Regards,
Linux Bluetooth

[email protected]

CI Applied

2022-12-01 20:00 UTC #13 lore raw

In reply to Kiran K

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

Hello:

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

Quoted 9 lines · On Fri, 4 Nov 2022 12:48:09 +0530 you wrote:

From: Chethan T N <[email protected]>
As per the specfication vendor codec id is defined. BLUETOOTH CORE SPECIFICATION Version 5.3 | Vol 4, Part E page 2127
Signed-off-by Chethan T N <[email protected]>
Signed-off-by Kiran K <[email protected]>
[...]

Here is the summary with links:
- [v1,1/2] bluetooth: Remove codec id field in vendor codec definition

    https://git.kernel.org/bluetooth/bluetooth-next/c/f0d0a36e32ab
  - [v1,2/2] bluetooth: Fix support for Read Local Supported Codecs V2
    https://git.kernel.org/bluetooth/bluetooth-next/c/fb77b0482a8a

You are awesome, thank you!

Signature · 2 lines

Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html