Use V2 version of read local supported command is controller
supports
snoop:
> HCI Event: Command Complete (0x0e) plen 20
Read Local Supported Codecs V2 (0x04|0x000d) ncmd 1
Status: Success (0x00)
Number of supported codecs: 7
Codec: u-law log (0x00)
Logical Transport Type: 0x02
Codec supported over BR/EDR SCO and eSCO
Codec: A-law log (0x01)
Logical Transport Type: 0x02
Codec supported over BR/EDR SCO and eSCO
Codec: CVSD (0x02)
Logical Transport Type: 0x02
Codec supported over BR/EDR SCO and eSCO
Codec: Transparent (0x03)
Logical Transport Type: 0x02
Codec supported over BR/EDR SCO and eSCO
Codec: Linear PCM (0x04)
Logical Transport Type: 0x02
Codec supported over BR/EDR SCO and eSCO
Codec: Reserved (0x08)
Logical Transport Type: 0x03
Codec supported over BR/EDR ACL
Codec supported over BR/EDR SCO and eSCO
Codec: mSBC (0x05)
Logical Transport Type: 0x03
Codec supported over BR/EDR ACL
Codec supported over BR/EDR SCO and eSCO
Number of vendor codecs: 0
......
< HCI Command: Read Local Suppor.. (0x04|0x000e) plen 7
Codec: mSBC (0x05)
Logical Transport Type: 0x00
Direction: Input (Host to Controller) (0x00)
> HCI Event: Command Complete (0x0e) plen 12
Read Local Supported Codec Capabilities (0x04|0x000e) ncmd 1
Status: Success (0x00)
Number of codec capabilities: 1
Capabilities #0:
00 00 11 15 02 33
Signed-off-by: Kiran K <kiran.k@xxxxxxxxx>
Signed-off-by: Chethan T N <chethan.tumkur.narayan@xxxxxxxxx>
Signed-off-by: Srivatsa Ravishankar <ravishankar.srivatsa@xxxxxxxxx>
---
* changes in v4:
converts codec read capabilities calls from async to sync
* changes in v3:
No changes
* changes in v2:
add length check for event data before accessing
include/net/bluetooth/hci.h | 2 +
net/bluetooth/hci_core.c | 97 ++++++++++++++++++++++++++++++++++++-
2 files changed, 98 insertions(+), 1 deletion(-)
diff --git a/include/net/bluetooth/hci.h b/include/net/bluetooth/hci.h
index 2f7f8c6f7d63..38a6eeb5e03a 100644
--- a/include/net/bluetooth/hci.h
+++ b/include/net/bluetooth/hci.h
@@ -1314,6 +1314,8 @@ struct hci_rp_read_local_pairing_opts {
__u8 max_key_size;
} __packed;
+#define HCI_OP_READ_LOCAL_CODECS_V2 0x100d
+
#define HCI_OP_READ_LOCAL_CODEC_CAPS 0x100e
struct hci_op_read_local_codec_caps {
__u8 codec_id[5];
diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c
index 7201967b6e9c..039747b5617a 100644
--- a/net/bluetooth/hci_core.c
+++ b/net/bluetooth/hci_core.c
@@ -1003,10 +1003,105 @@ static void hci_read_supported_codecs(struct hci_dev *hdev)
kfree_skb(skb);
}
+static void hci_read_supported_codecs_v2(struct hci_dev *hdev)
+{
+ struct sk_buff *skb;
+ __u8 num_codecs;
+
+ skb = __hci_cmd_sync(hdev, HCI_OP_READ_LOCAL_CODECS_V2, 0, NULL,
+ HCI_CMD_TIMEOUT);
+
+ if (IS_ERR(skb)) {
+ bt_dev_err(hdev, "Failed to read local supported codecs v2 (%ld)",
+ PTR_ERR(skb));
+ return;
+ }
+
+ if (skb->len < 1 || skb->data[0])
+ goto error;
+
+ skb_pull(skb, 1);
+
+ if (skb->len < 1)
+ goto error;
+
+ /* enumerate standard codecs */
+ num_codecs = skb->data[0];
+
+ skb_pull(skb, 1);
+
+ if (num_codecs && skb->len < (num_codecs * 2))
+ goto error;
+
+ while (num_codecs--) {
+ __u8 transport;
+
+ transport = skb->data[1];
+
+ if (transport & LOCAL_CODEC_ACL_MASK)
+ hci_read_codec_capabilities(hdev, skb->data,
+ LOCAL_CODEC_ACL, false);
+
+ if (transport & LOCAL_CODEC_SCO_MASK)
+ hci_read_codec_capabilities(hdev, skb->data,
+ LOCAL_CODEC_SCO, false);
+
+ if (transport & LOCAL_CODEC_BIS_MASK)
+ hci_read_codec_capabilities(hdev, skb->data,
+ LOCAL_CODEC_BIS, false);
+
+ if (transport & LOCAL_CODEC_CIS_MASK)
+ hci_read_codec_capabilities(hdev, skb->data,
+ LOCAL_CODEC_CIS, false);
+
+ skb_pull(skb, 2);
+ }
+
+ /* enumerate vendor specific codecs */
+ if (skb->len < 1)
+ goto error;
+
+ num_codecs = skb->data[0];
+
+ skb_pull(skb, 1);
+
+ if (num_codecs && skb->len < (num_codecs * 5))
+ goto error;
+
+ while (num_codecs--) {
+ __u8 transport;
+
+ transport = skb->data[4];
+
+ if (transport & LOCAL_CODEC_ACL_MASK)
+ hci_read_codec_capabilities(hdev, skb->data,
+ LOCAL_CODEC_ACL, true);
+
+ if (transport & LOCAL_CODEC_SCO_MASK)
+ hci_read_codec_capabilities(hdev, skb->data,
+ LOCAL_CODEC_SCO, true);
+
+ if (transport & LOCAL_CODEC_BIS_MASK)
+ hci_read_codec_capabilities(hdev, skb->data,
+ LOCAL_CODEC_BIS, true);
+
+ if (transport & LOCAL_CODEC_CIS_MASK)
+ hci_read_codec_capabilities(hdev, skb->data,
+ LOCAL_CODEC_CIS, true);
+
+ skb_pull(skb, 5);
+ }
+
+error:
+ kfree_skb(skb);
+}
+
static void hci_init5_req(struct hci_dev *hdev)
{
/* Read local codec list if the HCI command is supported */
- if (hdev->commands[29] & 0x20)
+ if (hdev->commands[45] & 0x04)
+ hci_read_supported_codecs_v2(hdev);
+ else if (hdev->commands[29] & 0x20)
hci_read_supported_codecs(hdev);
}
--
2.17.1
