From patchwork Tue Jun 2 05:07:51 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "K, Kiran" X-Patchwork-Id: 11583235 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 9AF4D912 for ; Tue, 2 Jun 2020 05:06:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8A4AE20772 for ; Tue, 2 Jun 2020 05:06:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726255AbgFBFGu (ORCPT ); Tue, 2 Jun 2020 01:06:50 -0400 Received: from mga05.intel.com ([192.55.52.43]:61114 "EHLO mga05.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725781AbgFBFGu (ORCPT ); Tue, 2 Jun 2020 01:06:50 -0400 IronPort-SDR: Nxj0k7mGyF4bzD0KgW8AhCY7s722ioapwwyso3K+CgrEO80P84q1IuPMI0rP4xqwfXQVdxPRsK HGZfdAHDd4Ug== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Jun 2020 22:06:49 -0700 IronPort-SDR: i8tII4w7vdtkx0bth2vA9NYRyCN7DCA3pQ3zEVu5OUS/r9Kx3wo15WTAQGIxx8yRer2RFaTo9w YKX5iEpt7q1A== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.73,463,1583222400"; d="scan'208";a="258162629" Received: from unknown (HELO intel-Lenovo-Legion-Y540-15IRH-PG0.iind.intel.com) ([10.224.186.95]) by fmsmga008.fm.intel.com with ESMTP; 01 Jun 2020 22:06:47 -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 1/2] Bluetooth: Add support to Intel read supported feature Date: Tue, 2 Jun 2020 10:37:51 +0530 Message-Id: <20200602050752.7470-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 Tue Jun 2 05:07:52 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "K, Kiran" X-Patchwork-Id: 11583237 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 AEB05912 for ; Tue, 2 Jun 2020 05:06:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A27CD20738 for ; Tue, 2 Jun 2020 05:06:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726261AbgFBFGw (ORCPT ); Tue, 2 Jun 2020 01:06:52 -0400 Received: from mga05.intel.com ([192.55.52.43]:61114 "EHLO mga05.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725781AbgFBFGw (ORCPT ); Tue, 2 Jun 2020 01:06:52 -0400 IronPort-SDR: VBBPV1FZGnnBEdncN2nkdyohwrG2wUBzpANJ12OzOBCSaZdTfYOwAm2GPpKsLADV03Dv/QjJr6 lxsl0i/xtMBA== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Jun 2020 22:06:51 -0700 IronPort-SDR: fzwNGEOvJSvS7i1/54jYWyuIX2Z29yci0qHBgaEx09KLQfiWH7+Z5B/6s3XftYNZBwZnthgwbf mdsX3D5Kdcnw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.73,463,1583222400"; d="scan'208";a="258162636" Received: from unknown (HELO intel-Lenovo-Legion-Y540-15IRH-PG0.iind.intel.com) ([10.224.186.95]) by fmsmga008.fm.intel.com with ESMTP; 01 Jun 2020 22:06:49 -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 2/2] Bluetooth : Load debug config based on the debug support Date: Tue, 2 Jun 2020 10:37:52 +0530 Message-Id: <20200602050752.7470-2-kiran.k@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200602050752.7470-1-kiran.k@intel.com> References: <20200602050752.7470-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 Reported-by: kbuild test robot --- 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..043d76c0e7cd 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);