From patchwork Mon Apr 12 08:35:36 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kiran K X-Patchwork-Id: 419592 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.9 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,UNWANTED_LANGUAGE_BODY, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 13581C433B4 for ; Mon, 12 Apr 2021 08:31:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id DAE80611AD for ; Mon, 12 Apr 2021 08:31:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237219AbhDLIcA (ORCPT ); Mon, 12 Apr 2021 04:32:00 -0400 Received: from mga12.intel.com ([192.55.52.136]:24858 "EHLO mga12.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237019AbhDLIcA (ORCPT ); Mon, 12 Apr 2021 04:32:00 -0400 IronPort-SDR: Z0CmV6AQx/g1WQOIvtBVS0svvULXFQ7GXxuANvVvjb5mwp5zg+zNQ0Bz0Rgeocxfq60AlbSC3A O/yT2SSosXWw== X-IronPort-AV: E=McAfee;i="6000,8403,9951"; a="173632833" X-IronPort-AV: E=Sophos;i="5.82,216,1613462400"; d="scan'208";a="173632833" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Apr 2021 01:31:42 -0700 IronPort-SDR: wcQNouTHA7dV9MMmEIfJey6sCGVdRYRLMlOgUtGsJRLVxz2WlK3ORqBuE9FB5s5w1Q6OK09Utg Qkt5qHH97BZA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.82,216,1613462400"; d="scan'208";a="451353683" Received: from intel-lenovo-legion-y540-15irh-pg0.iind.intel.com ([10.224.186.95]) by fmsmga002.fm.intel.com with ESMTP; 12 Apr 2021 01:31:40 -0700 From: Kiran K To: linux-bluetooth@vger.kernel.org Cc: ravishankar.srivatsa@intel.com, chethan.tumkur.narayan@intel.com, luiz.von.dentz@intel.com, Kiran K Subject: [PATCH v2 1/3] Bluetooth: add support to enumerate codec capabilities Date: Mon, 12 Apr 2021 14:05:36 +0530 Message-Id: <20210412083538.18600-1-kiran.k@intel.com> X-Mailer: git-send-email 2.17.1 Precedence: bulk List-ID: X-Mailing-List: linux-bluetooth@vger.kernel.org add support to enumerate local supported codec capabilities < 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 Signed-off-by: Chethan T N Signed-off-by: Srivatsa Ravishankar --- * changes in v2 add skb->len check before accessing event data include/net/bluetooth/hci.h | 7 ++++ net/bluetooth/hci_event.c | 68 +++++++++++++++++++++++++++++++++++++ 2 files changed, 75 insertions(+) diff --git a/include/net/bluetooth/hci.h b/include/net/bluetooth/hci.h index ea4ae551c426..e3f7771fe84f 100644 --- a/include/net/bluetooth/hci.h +++ b/include/net/bluetooth/hci.h @@ -1314,6 +1314,13 @@ struct hci_rp_read_local_pairing_opts { __u8 max_key_size; } __packed; +#define HCI_OP_READ_LOCAL_CODEC_CAPS 0x100e +struct hci_op_read_local_codec_caps { + __u8 codec_id[5]; + __u8 transport; + __u8 direction; +} __packed; + #define HCI_OP_READ_PAGE_SCAN_ACTIVITY 0x0c1b struct hci_rp_read_page_scan_activity { __u8 status; diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c index 5e99968939ce..a4b905a76c1b 100644 --- a/net/bluetooth/hci_event.c +++ b/net/bluetooth/hci_event.c @@ -887,6 +887,70 @@ static void hci_cc_read_data_block_size(struct hci_dev *hdev, hdev->block_cnt, hdev->block_len); } +static void hci_cc_read_local_codecs(struct hci_dev *hdev, + struct sk_buff *skb) +{ + __u8 num_codecs; + struct hci_op_read_local_codec_caps caps; + + if (skb->len < sizeof(caps)) + return; + + bt_dev_dbg(hdev, "status 0x%2.2x", skb->data[0]); + + if (skb->data[0]) + return; + + /* enumerate standard codecs */ + skb_pull(skb, 1); + + if (skb->len < 1) + return; + + num_codecs = skb->data[0]; + + bt_dev_dbg(hdev, "Number of standard codecs: %u", num_codecs); + + skb_pull(skb, 1); + + if (skb->len < num_codecs) + return; + + while (num_codecs--) { + caps.codec_id[0] = skb->data[0]; + caps.transport = 0x00; + caps.direction = 0x00; + + hci_send_cmd(hdev, HCI_OP_READ_LOCAL_CODEC_CAPS, sizeof(caps), + &caps); + + skb_pull(skb, 1); + } + + /* enumerate vendor specific codecs */ + if (skb->len < 1) + return; + + num_codecs = skb->data[0]; + skb_pull(skb, 1); + + bt_dev_dbg(hdev, "Number of vendor specific codecs: %u", num_codecs); + + if (skb->len < (num_codecs * 4)) + return; + + while (num_codecs--) { + caps.codec_id[0] = 0xFF; + memcpy(&caps.codec_id[1], skb->data, 4); + caps.transport = 0x00; + caps.direction = 0x00; + + hci_send_cmd(hdev, HCI_OP_READ_LOCAL_CODEC_CAPS, sizeof(caps), + &caps); + skb_pull(skb, 4); + } +} + static void hci_cc_read_clock(struct hci_dev *hdev, struct sk_buff *skb) { struct hci_rp_read_clock *rp = (void *) skb->data; @@ -3437,6 +3501,10 @@ static void hci_cmd_complete_evt(struct hci_dev *hdev, struct sk_buff *skb, hci_cc_read_data_block_size(hdev, skb); break; + case HCI_OP_READ_LOCAL_CODECS: + hci_cc_read_local_codecs(hdev, skb); + break; + case HCI_OP_READ_FLOW_CONTROL_MODE: hci_cc_read_flow_control_mode(hdev, skb); break; From patchwork Mon Apr 12 08:35:37 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kiran K X-Patchwork-Id: 420296 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C2C30C43460 for ; Mon, 12 Apr 2021 08:31:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 865366120F for ; Mon, 12 Apr 2021 08:31:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237329AbhDLIcC (ORCPT ); Mon, 12 Apr 2021 04:32:02 -0400 Received: from mga12.intel.com ([192.55.52.136]:24858 "EHLO mga12.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237019AbhDLIcB (ORCPT ); Mon, 12 Apr 2021 04:32:01 -0400 IronPort-SDR: bayOX5mzvn2u+6ma3FZidroKeNYyKex8w6zMu3ZeZF3VitWFjfgFMR05pyj95yVr++9y5WgIyM ULb3mUOlPjFw== X-IronPort-AV: E=McAfee;i="6000,8403,9951"; a="173632838" X-IronPort-AV: E=Sophos;i="5.82,216,1613462400"; d="scan'208";a="173632838" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Apr 2021 01:31:43 -0700 IronPort-SDR: J7P7qIoA0Bmfv91LNTMVaLF4GiwCAIksbinLkxYpFHQQbTt4S/71cnm3A2uTkADz6Symhm9bbR ChTt7X4iw6fw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.82,216,1613462400"; d="scan'208";a="451353701" Received: from intel-lenovo-legion-y540-15irh-pg0.iind.intel.com ([10.224.186.95]) by fmsmga002.fm.intel.com with ESMTP; 12 Apr 2021 01:31:42 -0700 From: Kiran K To: linux-bluetooth@vger.kernel.org Cc: ravishankar.srivatsa@intel.com, chethan.tumkur.narayan@intel.com, luiz.von.dentz@intel.com, Kiran K Subject: [PATCH v2 2/3] Bluetooth: add support to enumerate local supports codecs v2 Date: Mon, 12 Apr 2021 14:05:37 +0530 Message-Id: <20210412083538.18600-2-kiran.k@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210412083538.18600-1-kiran.k@intel.com> References: <20210412083538.18600-1-kiran.k@intel.com> Precedence: bulk List-ID: X-Mailing-List: linux-bluetooth@vger.kernel.org Add support for HCI_Read_Local_Supported_Codecs_V2 and query codec capabilities 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 Signed-off-by: Chethan T N Signed-off-by: Srivatsa Ravishankar --- * changes in v2: add length check for event data before accessing include/net/bluetooth/hci.h | 2 + include/net/bluetooth/hci_core.h | 10 +++ net/bluetooth/hci_core.c | 4 +- net/bluetooth/hci_event.c | 110 +++++++++++++++++++++++++++++++ 4 files changed, 125 insertions(+), 1 deletion(-) diff --git a/include/net/bluetooth/hci.h b/include/net/bluetooth/hci.h index e3f7771fe84f..34eb9f4b027f 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/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h index 8f5f390363f5..2c19b02a805d 100644 --- a/include/net/bluetooth/hci_core.h +++ b/include/net/bluetooth/hci_core.h @@ -1848,4 +1848,14 @@ void hci_copy_identity_address(struct hci_dev *hdev, bdaddr_t *bdaddr, #define SCO_AIRMODE_CVSD 0x0000 #define SCO_AIRMODE_TRANSP 0x0003 +#define LOCAL_CODEC_ACL_MASK BIT(0) +#define LOCAL_CODEC_SCO_MASK BIT(1) +#define LOCAL_CODEC_CIS_MASK BIT(2) +#define LOCAL_CODEC_BIS_MASK BIT(3) + +#define LOCAL_CODEC_ACL 0x00 +#define LOCAL_CODEC_SCO 0x01 +#define LOCAL_CODEC_CIS 0x02 +#define LOCAL_CODEC_BIS 0x03 + #endif /* __HCI_CORE_H */ diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c index fd12f1652bdf..230aeedd6d00 100644 --- a/net/bluetooth/hci_core.c +++ b/net/bluetooth/hci_core.c @@ -839,7 +839,9 @@ static int hci_init4_req(struct hci_request *req, unsigned long opt) hci_set_event_mask_page_2(req); /* Read local codec list if the HCI command is supported */ - if (hdev->commands[29] & 0x20) + if (hdev->commands[45] & 0x04) + hci_req_add(req, HCI_OP_READ_LOCAL_CODECS_V2, 0, NULL); + else if (hdev->commands[29] & 0x20) hci_req_add(req, HCI_OP_READ_LOCAL_CODECS, 0, NULL); /* Read local pairing options if the HCI command is supported */ diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c index a4b905a76c1b..7ca3535f30de 100644 --- a/net/bluetooth/hci_event.c +++ b/net/bluetooth/hci_event.c @@ -951,6 +951,112 @@ static void hci_cc_read_local_codecs(struct hci_dev *hdev, } } +static void hci_cc_read_local_codecs_v2(struct hci_dev *hdev, + struct sk_buff *skb) +{ + __u8 num_codecs, transport; + struct hci_op_read_local_codec_caps caps; + + if (skb->len < sizeof(caps)) + return; + + bt_dev_dbg(hdev, "status 0x%2.2x", skb->data[0]); + + if (skb->data[0]) + return; + + /* enumerate standard codecs */ + skb_pull(skb, 1); + + if (skb->len < 1) + return; + + num_codecs = skb->data[0]; + + bt_dev_info(hdev, "Number of standard codecs: %u", num_codecs); + + skb_pull(skb, 1); + + if (skb->len < (num_codecs * 2)) + return; + + while (num_codecs--) { + caps.codec_id[0] = skb->data[0]; + transport = skb->data[1]; + caps.direction = 0x00; + + if (transport & LOCAL_CODEC_ACL_MASK) { + caps.transport = LOCAL_CODEC_ACL; + hci_send_cmd(hdev, HCI_OP_READ_LOCAL_CODEC_CAPS, sizeof(caps), + &caps); + } + + if (transport & LOCAL_CODEC_SCO_MASK) { + caps.transport = LOCAL_CODEC_SCO; + hci_send_cmd(hdev, HCI_OP_READ_LOCAL_CODEC_CAPS, sizeof(caps), + &caps); + } + + if (transport & LOCAL_CODEC_BIS_MASK) { + caps.transport = LOCAL_CODEC_BIS; + hci_send_cmd(hdev, HCI_OP_READ_LOCAL_CODEC_CAPS, sizeof(caps), + &caps); + } + + if (transport & LOCAL_CODEC_CIS_MASK) { + caps.transport = LOCAL_CODEC_CIS; + hci_send_cmd(hdev, HCI_OP_READ_LOCAL_CODEC_CAPS, sizeof(caps), + &caps); + } + + skb_pull(skb, 2); + } + + /* enumerate vendor specific codecs */ + if (skb->len < 1) + return; + + num_codecs = skb->data[0]; + + skb_pull(skb, 1); + + if (skb->len < (num_codecs * 5)) + return; + + bt_dev_info(hdev, "Number of vendor specific codecs: %u", num_codecs); + + while (num_codecs--) { + caps.codec_id[0] = 0xFF; + memcpy(&caps.codec_id[1], skb->data, 4); + transport = skb->data[4]; + caps.direction = 0x00; + + if (transport & LOCAL_CODEC_ACL_MASK) { + caps.transport = LOCAL_CODEC_ACL; + hci_send_cmd(hdev, HCI_OP_READ_LOCAL_CODEC_CAPS, sizeof(caps), + &caps); + } + + if (transport & LOCAL_CODEC_SCO_MASK) { + caps.transport = LOCAL_CODEC_SCO; + hci_send_cmd(hdev, HCI_OP_READ_LOCAL_CODEC_CAPS, sizeof(caps), + &caps); + } + + if (transport & LOCAL_CODEC_BIS) { + caps.transport = LOCAL_CODEC_BIS; + hci_send_cmd(hdev, HCI_OP_READ_LOCAL_CODEC_CAPS, sizeof(caps), + &caps); + } + + if (transport & LOCAL_CODEC_CIS_MASK) { + caps.transport = LOCAL_CODEC_CIS; + hci_send_cmd(hdev, HCI_OP_READ_LOCAL_CODEC_CAPS, sizeof(caps), + &caps); + } + } +} + static void hci_cc_read_clock(struct hci_dev *hdev, struct sk_buff *skb) { struct hci_rp_read_clock *rp = (void *) skb->data; @@ -3505,6 +3611,10 @@ static void hci_cmd_complete_evt(struct hci_dev *hdev, struct sk_buff *skb, hci_cc_read_local_codecs(hdev, skb); break; + case HCI_OP_READ_LOCAL_CODECS_V2: + hci_cc_read_local_codecs_v2(hdev, skb); + break; + case HCI_OP_READ_FLOW_CONTROL_MODE: hci_cc_read_flow_control_mode(hdev, skb); break; From patchwork Mon Apr 12 08:35:38 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kiran K X-Patchwork-Id: 419591 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.9 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,UNWANTED_LANGUAGE_BODY, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0D06AC433ED for ; Mon, 12 Apr 2021 08:31:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id DDE88611F0 for ; Mon, 12 Apr 2021 08:31:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237300AbhDLIcE (ORCPT ); Mon, 12 Apr 2021 04:32:04 -0400 Received: from mga12.intel.com ([192.55.52.136]:24858 "EHLO mga12.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237019AbhDLIcD (ORCPT ); Mon, 12 Apr 2021 04:32:03 -0400 IronPort-SDR: k7D8XA2I+fj+7zKRhIgpMW+p0puqPeOsfwg1GRw+BVn0fZCrq5vdVwuDuaQCcKL7R+TxG0i8um XB2o6aE7k4CQ== X-IronPort-AV: E=McAfee;i="6000,8403,9951"; a="173632842" X-IronPort-AV: E=Sophos;i="5.82,216,1613462400"; d="scan'208";a="173632842" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Apr 2021 01:31:46 -0700 IronPort-SDR: X+YbSDZnChAnX5jQHjHTLDeO4CYvKQUSaGy3LzZT900+PTSYjK+5P82qPjnWMqq3H/biyR1vek 1ozBfoM3okfA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.82,216,1613462400"; d="scan'208";a="451353722" Received: from intel-lenovo-legion-y540-15irh-pg0.iind.intel.com ([10.224.186.95]) by fmsmga002.fm.intel.com with ESMTP; 12 Apr 2021 01:31:44 -0700 From: Kiran K To: linux-bluetooth@vger.kernel.org Cc: ravishankar.srivatsa@intel.com, chethan.tumkur.narayan@intel.com, luiz.von.dentz@intel.com, Kiran K Subject: [PATCH v2 3/3] Bluetooth: cache local supported codec capabilities Date: Mon, 12 Apr 2021 14:05:38 +0530 Message-Id: <20210412083538.18600-3-kiran.k@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210412083538.18600-1-kiran.k@intel.com> References: <20210412083538.18600-1-kiran.k@intel.com> Precedence: bulk List-ID: X-Mailing-List: linux-bluetooth@vger.kernel.org Cache the codec information in the driver and this data can be exposed to user space audio modules via getsockopt Signed-off-by: Kiran K Signed-off-by: Chethan T N Signed-off-by: Srivatsa Ravishankar --- * changes in v2 add skb length check before accessing data include/net/bluetooth/hci.h | 11 +++++++++++ include/net/bluetooth/hci_core.h | 13 ++++++++++++ net/bluetooth/hci_core.c | 31 +++++++++++++++++++++++++++++ net/bluetooth/hci_event.c | 34 ++++++++++++++++++++++++++++++++ 4 files changed, 89 insertions(+) diff --git a/include/net/bluetooth/hci.h b/include/net/bluetooth/hci.h index 34eb9f4b027f..6b4344639ff7 100644 --- a/include/net/bluetooth/hci.h +++ b/include/net/bluetooth/hci.h @@ -1323,6 +1323,17 @@ struct hci_op_read_local_codec_caps { __u8 direction; } __packed; +struct hci_codec_caps { + __u8 len; + __u8 caps[]; +} __packed; + +struct hci_rp_read_local_codec_caps { + __u8 status; + __u8 num_caps; + struct hci_codec_caps caps[]; +} __packed; + #define HCI_OP_READ_PAGE_SCAN_ACTIVITY 0x0c1b struct hci_rp_read_page_scan_activity { __u8 status; diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h index 2c19b02a805d..b40c7ed38d18 100644 --- a/include/net/bluetooth/hci_core.h +++ b/include/net/bluetooth/hci_core.h @@ -131,6 +131,14 @@ struct bdaddr_list { u8 bdaddr_type; }; +struct codec_list { + struct list_head list; + u8 transport; + u8 codec_id[5]; + u8 num_caps; + struct hci_codec_caps caps[]; +}; + struct bdaddr_list_with_irk { struct list_head list; bdaddr_t bdaddr; @@ -534,6 +542,7 @@ struct hci_dev { struct list_head pend_le_conns; struct list_head pend_le_reports; struct list_head blocked_keys; + struct list_head local_codecs; struct hci_dev_stats stat; @@ -1843,6 +1852,10 @@ void hci_le_start_enc(struct hci_conn *conn, __le16 ediv, __le64 rand, void hci_copy_identity_address(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 *bdaddr_type); +int hci_codec_list_add(struct list_head *list, struct hci_rp_read_local_codec_caps *rp, + __u32 len, + struct hci_op_read_local_codec_caps *sent); +void hci_codec_list_clear(struct list_head *codec_list); #define SCO_AIRMODE_MASK 0x0003 #define SCO_AIRMODE_CVSD 0x0000 diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c index 230aeedd6d00..578f417d1904 100644 --- a/net/bluetooth/hci_core.c +++ b/net/bluetooth/hci_core.c @@ -3561,6 +3561,35 @@ void hci_conn_params_clear_disabled(struct hci_dev *hdev) BT_DBG("All LE disabled connection parameters were removed"); } +int hci_codec_list_add(struct list_head *list, struct hci_rp_read_local_codec_caps *rp, + __u32 len, + struct hci_op_read_local_codec_caps *sent) +{ + struct codec_list *entry; + + entry = kzalloc(sizeof(*entry) + len, GFP_KERNEL); + if (!entry) + return -ENOMEM; + + memcpy(entry->codec_id, sent->codec_id, 5); + entry->transport = sent->transport; + entry->num_caps = rp->num_caps; + if (rp->num_caps) + memcpy(entry->caps, rp->caps, len); + list_add(&entry->list, list); + + return 0; +} + +void hci_codec_list_clear(struct list_head *codec_list) +{ + struct codec_list *c, *n; + + list_for_each_entry_safe(c, n, codec_list, list) { + list_del(&c->list); + kfree(c); + } +} /* This function requires the caller holds hdev->lock */ static void hci_conn_params_clear_all(struct hci_dev *hdev) { @@ -3820,6 +3849,7 @@ struct hci_dev *hci_alloc_dev(void) INIT_LIST_HEAD(&hdev->conn_hash.list); INIT_LIST_HEAD(&hdev->adv_instances); INIT_LIST_HEAD(&hdev->blocked_keys); + INIT_LIST_HEAD(&hdev->local_codecs); INIT_WORK(&hdev->rx_work, hci_rx_work); INIT_WORK(&hdev->cmd_work, hci_cmd_work); @@ -4038,6 +4068,7 @@ void hci_unregister_dev(struct hci_dev *hdev) hci_conn_params_clear_all(hdev); hci_discovery_filter_clear(hdev); hci_blocked_keys_clear(hdev); + hci_codec_list_clear(&hdev->local_codecs); hci_dev_unlock(hdev); hci_dev_put(hdev); diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c index 7ca3535f30de..f9ea3109d620 100644 --- a/net/bluetooth/hci_event.c +++ b/net/bluetooth/hci_event.c @@ -1057,6 +1057,36 @@ static void hci_cc_read_local_codecs_v2(struct hci_dev *hdev, } } +static void hci_cc_read_local_codec_caps(struct hci_dev *hdev, + struct sk_buff *skb) +{ + struct hci_op_read_local_codec_caps *sent; + struct hci_rp_read_local_codec_caps *rp; + + if (skb->len < sizeof(*rp)) + return; + + rp = (void *)skb->data; + + bt_dev_dbg(hdev, "status 0x%2.2x", rp->status); + + if (rp->status) + return; + + sent = hci_sent_cmd_data(hdev, HCI_OP_READ_LOCAL_CODEC_CAPS); + + if (!sent) + return; + + hci_dev_lock(hdev); + + bt_dev_info(hdev, "Adding Codec. No of caps: %u", rp->num_caps); + + hci_codec_list_add(&hdev->local_codecs, rp, skb->len - 2, sent); + + hci_dev_unlock(hdev); +} + static void hci_cc_read_clock(struct hci_dev *hdev, struct sk_buff *skb) { struct hci_rp_read_clock *rp = (void *) skb->data; @@ -3615,6 +3645,10 @@ static void hci_cmd_complete_evt(struct hci_dev *hdev, struct sk_buff *skb, hci_cc_read_local_codecs_v2(hdev, skb); break; + case HCI_OP_READ_LOCAL_CODEC_CAPS: + hci_cc_read_local_codec_caps(hdev, skb); + break; + case HCI_OP_READ_FLOW_CONTROL_MODE: hci_cc_read_flow_control_mode(hdev, skb); break;