From patchwork Wed Jun 3 10:15:22 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "K, Kiran" X-Patchwork-Id: 11585479 X-Patchwork-Delegate: marcel@holtmann.org Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 28947913 for ; Wed, 3 Jun 2020 10:14:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 10B772067B for ; Wed, 3 Jun 2020 10:14:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725944AbgFCKOX (ORCPT ); Wed, 3 Jun 2020 06:14:23 -0400 Received: from mga02.intel.com ([134.134.136.20]:48549 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725854AbgFCKOX (ORCPT ); Wed, 3 Jun 2020 06:14:23 -0400 IronPort-SDR: PJA4YqrgQ8/uQ913w8JvAJAWTQpmzSUHXmpXxzImIBYYLY5zc9Sw+5Z7/E5oTSEeNjAcyrNG7/ g2O9a8AN6avg== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Jun 2020 03:14:21 -0700 IronPort-SDR: Fzn0DxAlo3eZsHhvbttv7hSpc+Hz5h/8BK5+JoDZWGkrVGe2/mBUaJgE/nANyzfgp92ZhSspzx sZiCGTYnnWHg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.73,467,1583222400"; d="scan'208";a="471084215" Received: from unknown (HELO intel-Lenovo-Legion-Y540-15IRH-PG0.iind.intel.com) ([10.224.186.95]) by fmsmga005.fm.intel.com with ESMTP; 03 Jun 2020 03:14:19 -0700 From: Kiran K To: linux-bluetooth@vger.kernel.org Cc: ravishankar.srivatsa@intel.com, Chethan T N , Ps@vger.kernel.org, AyappadasX , Kiran K Subject: [PATCH v2 1/2] Bluetooth: Add support to Intel read supported feature Date: Wed, 3 Jun 2020 15:45:22 +0530 Message-Id: <20200603101523.12547-1-kiran.k@intel.com> X-Mailer: git-send-email 2.17.1 Sender: linux-bluetooth-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-bluetooth@vger.kernel.org From: Chethan T N The command shall read the Intel controller supported feature. Based on the supported features addtional debug configuration shall be enabled. Signed-off-by: Chethan T N Signed-off-by: Ps, AyappadasX Signed-off-by: Kiran K --- drivers/bluetooth/btintel.c | 34 ++++++++++++++++++++++++++++++++++ drivers/bluetooth/btintel.h | 14 ++++++++++++++ drivers/bluetooth/btusb.c | 8 +++++++- 3 files changed, 55 insertions(+), 1 deletion(-) diff --git a/drivers/bluetooth/btintel.c b/drivers/bluetooth/btintel.c index 6a0e2c5a8beb..09e697b92426 100644 --- a/drivers/bluetooth/btintel.c +++ b/drivers/bluetooth/btintel.c @@ -754,6 +754,40 @@ void btintel_reset_to_bootloader(struct hci_dev *hdev) } EXPORT_SYMBOL_GPL(btintel_reset_to_bootloader); +int btintel_read_supported_features(struct hci_dev *hdev, + struct intel_supported_features *supported_features) +{ + struct sk_buff *skb; + u8 page_no = 1; + + /* Intel controller supports two pages, each page is of 128-bit + * feature bit mask. And each bit defines specific feature support + */ + skb = __hci_cmd_sync(hdev, 0xfca6, sizeof(page_no), &page_no, + HCI_INIT_TIMEOUT); + if (IS_ERR(skb)) { + BT_ERR("Reading supported features(page1) failed (%ld)", + PTR_ERR(skb)); + return PTR_ERR(skb); + } + + if (skb->len != (sizeof(supported_features->page1) + 3)) { + bt_dev_err(hdev, + "Supported feature(page1) event size mismatch"); + kfree_skb(skb); + return -EILSEQ; + } + + memcpy(supported_features->page1, skb->data + 3, + sizeof(supported_features->page1)); + + /* Read the supported features page2 if required in future. + */ + kfree_skb(skb); + return 0; +} +EXPORT_SYMBOL_GPL(btintel_read_supported_features); + MODULE_AUTHOR("Marcel Holtmann "); MODULE_DESCRIPTION("Bluetooth support for Intel devices ver " VERSION); MODULE_VERSION(VERSION); diff --git a/drivers/bluetooth/btintel.h b/drivers/bluetooth/btintel.h index a69ea8a87b9b..f3892c0233f4 100644 --- a/drivers/bluetooth/btintel.h +++ b/drivers/bluetooth/btintel.h @@ -62,6 +62,11 @@ struct intel_reset { __le32 boot_param; } __packed; + +struct intel_supported_features { + __u8 page1[16]; +} __packed; + #if IS_ENABLED(CONFIG_BT_INTEL) int btintel_check_bdaddr(struct hci_dev *hdev); @@ -88,6 +93,9 @@ int btintel_read_boot_params(struct hci_dev *hdev, int btintel_download_firmware(struct hci_dev *dev, const struct firmware *fw, u32 *boot_param); void btintel_reset_to_bootloader(struct hci_dev *hdev); +int btintel_read_supported_features(struct hci_dev *hdev, + struct intel_supported_features *supported_features); + #else static inline int btintel_check_bdaddr(struct hci_dev *hdev) @@ -186,4 +194,10 @@ static inline int btintel_download_firmware(struct hci_dev *dev, static inline void btintel_reset_to_bootloader(struct hci_dev *hdev) { } +static int btintel_read_supported_features(struct hci_dev *hdev, + struct intel_supported_features *supported_features) +{ + return -EOPNOTSUPP; +} + #endif diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c index 5f022e9cf667..a5a971e7025b 100644 --- a/drivers/bluetooth/btusb.c +++ b/drivers/bluetooth/btusb.c @@ -5,7 +5,6 @@ * * Copyright (C) 2005-2008 Marcel Holtmann */ - #include #include #include @@ -2273,6 +2272,7 @@ static int btusb_setup_intel_new(struct hci_dev *hdev) ktime_t calltime, delta, rettime; unsigned long long duration; int err; + struct intel_supported_features supported_features; BT_DBG("%s", hdev->name); @@ -2542,6 +2542,12 @@ static int btusb_setup_intel_new(struct hci_dev *hdev) */ btintel_load_ddc_config(hdev, fwname); + /* Read the Intel supported features and if new exception formats + * supported, need to load the additional DDC config to enable. + */ + btintel_read_supported_features(hdev, &supported_features); + + /* Read the Intel version information after loading the FW */ err = btintel_read_version(hdev, &ver); if (err) From patchwork Wed Jun 3 10:15:23 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "K, Kiran" X-Patchwork-Id: 11585481 X-Patchwork-Delegate: marcel@holtmann.org Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 3BB0B90 for ; Wed, 3 Jun 2020 10:14:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2C5872074B for ; Wed, 3 Jun 2020 10:14:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726334AbgFCKOZ (ORCPT ); Wed, 3 Jun 2020 06:14:25 -0400 Received: from mga02.intel.com ([134.134.136.20]:48549 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726123AbgFCKOY (ORCPT ); Wed, 3 Jun 2020 06:14:24 -0400 IronPort-SDR: HVzYX1j05+d4F+8arqYfYB1+zRyS5z1kHha24/XWMnpDgqKiSWGvQ1tPXkEVzJDq1FBHZMkqhF SEcxNXvavcwg== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Jun 2020 03:14:24 -0700 IronPort-SDR: rPt8A2vkJiM4vE4vjsNoG3aTvxPlpg7MkJM+mW3PWzPiGWA97MDhjlgm6XzBlzvyT1faHB13AL 6apNi731NR/Q== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.73,467,1583222400"; d="scan'208";a="471084226" Received: from unknown (HELO intel-Lenovo-Legion-Y540-15IRH-PG0.iind.intel.com) ([10.224.186.95]) by fmsmga005.fm.intel.com with ESMTP; 03 Jun 2020 03:14:21 -0700 From: Kiran K To: linux-bluetooth@vger.kernel.org Cc: ravishankar.srivatsa@intel.com, Chethan T N , Ps AyappadasX , Kiran K Subject: [PATCH v2 2/2] Bluetooth : Load debug config based on the debug support Date: Wed, 3 Jun 2020 15:45:23 +0530 Message-Id: <20200603101523.12547-2-kiran.k@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200603101523.12547-1-kiran.k@intel.com> References: <20200603101523.12547-1-kiran.k@intel.com> Sender: linux-bluetooth-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-bluetooth@vger.kernel.org From: Chethan T N This patch shall enables the Intel telemetry exception format based on the supported features Signed-off-by: Chethan T N Signed-off-by: Ps AyappadasX Signed-off-by: Kiran K --- drivers/bluetooth/btintel.c | 28 ++++++++++++++++++++++++++++ drivers/bluetooth/btintel.h | 9 ++++++++- drivers/bluetooth/btusb.c | 3 +++ 3 files changed, 39 insertions(+), 1 deletion(-) diff --git a/drivers/bluetooth/btintel.c b/drivers/bluetooth/btintel.c index 09e697b92426..5ef83e9ad19c 100644 --- a/drivers/bluetooth/btintel.c +++ b/drivers/bluetooth/btintel.c @@ -788,6 +788,34 @@ int btintel_read_supported_features(struct hci_dev *hdev, } EXPORT_SYMBOL_GPL(btintel_read_supported_features); +int btintel_load_debug_config_based_on_supported_features(struct hci_dev *hdev, + const struct intel_supported_features *supported_features) +{ + struct sk_buff *skb; + u8 mask_ddc[11] = { 0x0a, 0x92, 0x02, 0x07, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00 }; + + if (!supported_features) + return -EINVAL; + + if (!(supported_features->page1[0] & 0x3f)) { + bt_dev_info(hdev, "Telemety exception format not supported"); + return 0; + } + + skb = __hci_cmd_sync(hdev, 0xfc8b, 11, mask_ddc, HCI_INIT_TIMEOUT); + if (IS_ERR(skb)) { + bt_dev_err(hdev, "Setting Intel telemetry ddc write event mask failed (%ld)", + PTR_ERR(skb)); + return PTR_ERR(skb); + } + + kfree_skb(skb); + return 0; +} +EXPORT_SYMBOL_GPL(btintel_load_debug_config_based_on_supported_features); + + MODULE_AUTHOR("Marcel Holtmann "); MODULE_DESCRIPTION("Bluetooth support for Intel devices ver " VERSION); MODULE_VERSION(VERSION); diff --git a/drivers/bluetooth/btintel.h b/drivers/bluetooth/btintel.h index f3892c0233f4..c4e3c57c08ff 100644 --- a/drivers/bluetooth/btintel.h +++ b/drivers/bluetooth/btintel.h @@ -95,7 +95,8 @@ int btintel_download_firmware(struct hci_dev *dev, const struct firmware *fw, void btintel_reset_to_bootloader(struct hci_dev *hdev); int btintel_read_supported_features(struct hci_dev *hdev, struct intel_supported_features *supported_features); - +int btintel_load_debug_config_based_on_supported_features(struct hci_dev *hdev, + const struct intel_supported_features *supported_features); #else static inline int btintel_check_bdaddr(struct hci_dev *hdev) @@ -199,5 +200,11 @@ static int btintel_read_supported_features(struct hci_dev *hdev, { return -EOPNOTSUPP; } +static int btintel_load_debug_config_based_on_supported_features( + struct hci_dev *hdev, + const struct intel_supported_features *supported_features) +{ + return -EOPNOTSUPP; +} #endif diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c index a5a971e7025b..510e3c1c23dc 100644 --- a/drivers/bluetooth/btusb.c +++ b/drivers/bluetooth/btusb.c @@ -2547,6 +2547,9 @@ static int btusb_setup_intel_new(struct hci_dev *hdev) */ btintel_read_supported_features(hdev, &supported_features); + btintel_load_debug_config_based_on_supported_features(hdev, + &supported_features); + /* Read the Intel version information after loading the FW */ err = btintel_read_version(hdev, &ver);