From patchwork Wed Oct 14 12:28:34 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kiran K X-Patchwork-Id: 11837603 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=-12.6 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,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 CB31DC433DF for ; Wed, 14 Oct 2020 12:29:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 4672A20878 for ; Wed, 14 Oct 2020 12:29:00 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="UO7TWEFg" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730311AbgJNM27 (ORCPT ); Wed, 14 Oct 2020 08:28:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40958 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730076AbgJNM27 (ORCPT ); Wed, 14 Oct 2020 08:28:59 -0400 Received: from mail-pg1-x542.google.com (mail-pg1-x542.google.com [IPv6:2607:f8b0:4864:20::542]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F1E7AC061755 for ; Wed, 14 Oct 2020 05:28:58 -0700 (PDT) Received: by mail-pg1-x542.google.com with SMTP id x13so1859504pgp.7 for ; Wed, 14 Oct 2020 05:28:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=9+a7cLLni7cDAnrU5j2NAKb9H6OSOhXIziEff9Pq+m0=; b=UO7TWEFgcSSTRs2M2HzRl25Pb12KELypvujWgYpi1YrWBToU2sbOR6gJvrfT1BtEfX 7Ck5GJdDkRHIGDb+mlMardBdjqvF+gEIHl1/sRgKY3eszswTCvYxbXwKXHnbX97Q4jcY CZHq+1mtd9fo1bDWRC5VTre2lieZDAOdVEkA0tcycy42eIusrrPgYHNsLAHbMuMJTgIF toAWcm9Gzcu0bTeFk6RN9rSx62NWrRNb2VD6hM4U/cam/1mk7hToECh0RnMb5uvKfdsS 6GRdPJay1Gp6wIE8tGp6tmHs9QaRm2VE8O3VXAeb8GLk0mx1Ek+qZk4CchxiqYcYsyzY K22w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=9+a7cLLni7cDAnrU5j2NAKb9H6OSOhXIziEff9Pq+m0=; b=LeZh9xIlVsL9DMAUT3l7jvGnULDT13bsXgY/3rgguLHyQSIFccHZ/hyRDSCDdXIH1R kF7sGvmD5HYCO995Xv4WGgKOyBh+0LA5kMFDJzBL/qnKSiuYWbyZwYUbyBMHQNjOWRYJ qwstF9fLtvJtPATZ7uehJZjbgEKeJhi/WTe320+bzh3vv3QcLdVNB/FAubKV/lNWTmSQ eyr3pxkZY++qkyguieqhj01w+xVw2MFQqtKgint66AHt7dIqzAgih9JrnCjAIAQxZQI+ /6nSFW2U6LkCYm+HX54CxtMWyZPRw/96KSOZaA/Xq4iOjqDWYN3ivoho7Pa20vIo7HP3 Dn/A== X-Gm-Message-State: AOAM530P9W7it7m//dzXr6zJyQtkjWDqmmXGl+7n3bvKI+C+1KKywMBO zeQ28dgm0jVfZGZZcRM8uJPR6PwPE0tctQ== X-Google-Smtp-Source: ABdhPJxS8JoGQvOUefra9ekdiJRYX9mh//JnrduqvdYSW0kRQh9ri8m/tny7KwjLkHQuMgJHnVKrVA== X-Received: by 2002:a63:d80e:: with SMTP id b14mr3664343pgh.114.1602678537189; Wed, 14 Oct 2020 05:28:57 -0700 (PDT) Received: from localhost.localdomain ([122.179.122.132]) by smtp.gmail.com with ESMTPSA id r16sm2930000pjo.19.2020.10.14.05.28.54 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 14 Oct 2020 05:28:56 -0700 (PDT) From: Kiran K X-Google-Original-From: Kiran K To: linux-bluetooth@vger.kernel.org Cc: sathish.narasimman@intel.com, chethan.tumkur.narayan@intel.com, ravishankar.srivatsa@intel.com, kiraank@gmail.com, Kiran K , Amit K Bag , Raghuram Hegde Subject: [PATCH v7 1/4] Bluetooth: btusb: Add *setup* function for new generation Intel controllers Date: Wed, 14 Oct 2020 17:58:34 +0530 Message-Id: <1602678517-9912-1-git-send-email-kiran.k@intel.com> X-Mailer: git-send-email 2.7.4 Precedence: bulk List-ID: X-Mailing-List: linux-bluetooth@vger.kernel.org Define a new *setup* function for new generation Intel controllers Signed-off-by: Kiran K Signed-off-by: Amit K Bag Signed-off-by: Raghuram Hegde Reviewed-by: Sathish Narasimman Reviewed-by: Chethan T N Reviewed-by: Srivatsa Ravishankar --- Changes in v7: * split code in to multiple patches Changes in v6: * Revert to v4 * Move TyphoonPeak controller mapping to BTUSB_INTEL_NEWGEN to a separte patch Changes in v5: * Remove BTUSB_INTEL_NEWGEN and use usb vid/pid combination to identify controller type Changes in v4: * Rebase patchset * Fix indentation issues * make btusb_setup_intel_new_get_fw_name to return void as return value is not getting used Changes in v3: * Combine the two patches in v2 series to one to avoid compiler warnings reported by kernel bot (lkp) Changed in v2: * Fix typo in commit message drivers/bluetooth/btusb.c | 144 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 143 insertions(+), 1 deletion(-) diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c index 1005b6e..2e40885 100644 --- a/drivers/bluetooth/btusb.c +++ b/drivers/bluetooth/btusb.c @@ -60,6 +60,7 @@ static struct usb_driver btusb_driver; #define BTUSB_WIDEBAND_SPEECH 0x400000 #define BTUSB_VALID_LE_STATES 0x800000 #define BTUSB_QCA_WCN6855 0x1000000 +#define BTUSB_INTEL_NEWGEN 0x2000000 static const struct usb_device_id btusb_table[] = { /* Generic Bluetooth USB device */ @@ -2693,6 +2694,132 @@ static int btusb_setup_intel_new(struct hci_dev *hdev) return 0; } +static int btusb_setup_intel_newgen(struct hci_dev *hdev) +{ + struct btusb_data *data = hci_get_drvdata(hdev); + u32 boot_param; + char ddcname[64]; + ktime_t calltime, delta, rettime; + unsigned long long duration; + int err; + struct intel_debug_features features; + struct intel_version_tlv version; + + BT_DBG("%s", hdev->name); + + /* Set the default boot parameter to 0x0 and it is updated to + * SKU specific boot parameter after reading Intel_Write_Boot_Params + * command while downloading the firmware. + */ + boot_param = 0x00000000; + + calltime = ktime_get(); + + /* Read the Intel version information to determine if the device + * is in bootloader mode or if it already has operational firmware + * loaded. + */ + err = btintel_read_version_tlv(hdev, &version); + if (err) { + bt_dev_err(hdev, "Intel Read version failed (%d)", err); + btintel_reset_to_bootloader(hdev); + return err; + } + + btintel_version_info_tlv(hdev, &version); + + /* TODO: Plugin in code here to download firmware */ + + /* check if controller is already having an operational firmware */ + if (version.img_type == 0x03) + goto finish; + + rettime = ktime_get(); + delta = ktime_sub(rettime, calltime); + duration = (unsigned long long)ktime_to_ns(delta) >> 10; + + bt_dev_info(hdev, "Firmware loaded in %llu usecs", duration); + + calltime = ktime_get(); + + set_bit(BTUSB_BOOTING, &data->flags); + + err = btintel_send_intel_reset(hdev, boot_param); + if (err) { + bt_dev_err(hdev, "Intel Soft Reset failed (%d)", err); + btintel_reset_to_bootloader(hdev); + return err; + } + + /* The bootloader will not indicate when the device is ready. This + * is done by the operational firmware sending bootup notification. + * + * Booting into operational firmware should not take longer than + * 1 second. However if that happens, then just fail the setup + * since something went wrong. + */ + bt_dev_info(hdev, "Waiting for device to boot"); + + err = wait_on_bit_timeout(&data->flags, BTUSB_BOOTING, + TASK_INTERRUPTIBLE, + msecs_to_jiffies(1000)); + + if (err == -EINTR) { + bt_dev_err(hdev, "Device boot interrupted"); + return -EINTR; + } + + if (err) { + bt_dev_err(hdev, "Device boot timeout"); + btintel_reset_to_bootloader(hdev); + return -ETIMEDOUT; + } + + rettime = ktime_get(); + delta = ktime_sub(rettime, calltime); + duration = (unsigned long long)ktime_to_ns(delta) >> 10; + + bt_dev_info(hdev, "Device booted in %llu usecs", duration); + + clear_bit(BTUSB_BOOTLOADER, &data->flags); + + /* TODO: Insert function call here to get the ddc file name */ + + /* Once the device is running in operational mode, it needs to + * apply the device configuration (DDC) parameters. + * + * The device can work without DDC parameters, so even if it + * fails to load the file, no need to fail the setup. + */ + btintel_load_ddc_config(hdev, ddcname); + + /* Read the Intel supported features and if new exception formats + * supported, need to load the additional DDC config to enable. + */ + btintel_read_debug_features(hdev, &features); + + /* Set DDC mask for available debug features */ + btintel_set_debug_features(hdev, &features); + + /* Read the Intel version information after loading the FW */ + err = btintel_read_version_tlv(hdev, &version); + if (err) + return err; + + btintel_version_info_tlv(hdev, &version); + +finish: + /* Set the event mask for Intel specific vendor events. This enables + * a few extra events that are useful during general operation. It + * does not enable any debugging related events. + * + * The device will function correctly without these events enabled + * and thus no need to fail the setup. + */ + btintel_set_event_mask(hdev, false); + + return 0; +} static int btusb_shutdown_intel(struct hci_dev *hdev) { struct sk_buff *skb; @@ -3969,7 +4096,8 @@ static int btusb_probe(struct usb_interface *intf, init_usb_anchor(&data->ctrl_anchor); spin_lock_init(&data->rxlock); - if (id->driver_info & BTUSB_INTEL_NEW) { + if ((id->driver_info & BTUSB_INTEL_NEW) || + (id->driver_info & BTUSB_INTEL_NEWGEN)) { data->recv_event = btusb_recv_event_intel; data->recv_bulk = btusb_recv_bulk_intel; set_bit(BTUSB_BOOTLOADER, &data->flags); @@ -4078,6 +4206,20 @@ static int btusb_probe(struct usb_interface *intf, set_bit(HCI_QUIRK_NON_PERSISTENT_DIAG, &hdev->quirks); } + if (id->driver_info & BTUSB_INTEL_NEWGEN) { + hdev->manufacturer = 2; + hdev->send = btusb_send_frame_intel; + hdev->setup = btusb_setup_intel_newgen; + hdev->shutdown = btusb_shutdown_intel_new; + hdev->hw_error = btintel_hw_error; + hdev->set_diag = btintel_set_diag; + hdev->set_bdaddr = btintel_set_bdaddr; + hdev->cmd_timeout = btusb_intel_cmd_timeout; + set_bit(HCI_QUIRK_STRICT_DUPLICATE_FILTER, &hdev->quirks); + set_bit(HCI_QUIRK_SIMULTANEOUS_DISCOVERY, &hdev->quirks); + set_bit(HCI_QUIRK_NON_PERSISTENT_DIAG, &hdev->quirks); + } + if (id->driver_info & BTUSB_MARVELL) hdev->set_bdaddr = btusb_set_bdaddr_marvell; From patchwork Wed Oct 14 12:28:35 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kiran K X-Patchwork-Id: 11837601 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=-12.6 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,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 DBEE0C433E7 for ; Wed, 14 Oct 2020 12:29:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2DF5220848 for ; Wed, 14 Oct 2020 12:29:01 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="DUlazri4" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730471AbgJNM3B (ORCPT ); Wed, 14 Oct 2020 08:29:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40964 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730076AbgJNM3A (ORCPT ); Wed, 14 Oct 2020 08:29:00 -0400 Received: from mail-pg1-x542.google.com (mail-pg1-x542.google.com [IPv6:2607:f8b0:4864:20::542]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7CC80C061755 for ; Wed, 14 Oct 2020 05:29:00 -0700 (PDT) Received: by mail-pg1-x542.google.com with SMTP id b193so1861304pga.6 for ; Wed, 14 Oct 2020 05:29:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=U0e2zJfxAy+N6g8dT+EzFbnTLYFfoLlNMU4TMWAIKds=; b=DUlazri44jf1wHHSa6Gkz9xtu31zeHJJDVqOJp83RtbeYx+V96qdkqtXQkFxDP5Bjn LthdFWS7hCBZ6rFSiDjp5lkYFWR5s7Fub0GV84+JAR06vqRT8jHZP7rTupIFtfNkmiqZ pcWFCLbG36S97TQ2+d7oZZZQ1BfAFH05BGrho86li/4cqfAD2DVNP+roJhjrq0IdNqWv AvPnG4TXy65CUoEiI2kw1DkSQxNYYzmqZRfHn8BQf1Oqetopo63sGwywTLCO4eQD6PnD JxM9UXAM/iI2gyUFlwF28s8wwfRR3u/dmXpBpuWt1SpZ30OR6rmlpXzRB08YOqlxo3zk P0bg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=U0e2zJfxAy+N6g8dT+EzFbnTLYFfoLlNMU4TMWAIKds=; b=rQNCGFQUMC9BIlEBJHg2udiMLUlbc90KPcfyaGZHATXtonyzutEGE/lly7SmVdbHIb wQS1x6ZoiUQhOoI2UIG2FieLrv9QoCDPwrvU+ooH8KJFKv/E7hR3auCLldsvYJQ7fdcm wFcl0gTzlM4lq2NUyLbUxlKxpHUzfFBA+gJ8PbjOjcnYqL5GVB6oGh6zELFuIGH8p2kk +LtFvPbHlG896XXXJ5cAWLPALUcdVLfsYU9mOkrsbQMSJdOamuoRAjLTy7IcSdDxOFmN FdJGxjO7pM5AZt1OpBa1EFEFcSHOM1GzZIwHAp89uaT9ydRKWAMQzrE1HGgu1Mgbr2Pq 9i6g== X-Gm-Message-State: AOAM530ZmhWQBJnEeKzT6/7/V3Hoa0fOO/Cdq/NmYtWOKiJZcVBYBAKG J7eW4KyJ2jEj9c1vUkWRscx7+nyjSvLocQ== X-Google-Smtp-Source: ABdhPJyylXy6POj6B9NJ3zwNSMiRLOmuPOf5Z8dnkEO9Sb9GTdwBfSmPrFWoS7Raef1Ar7yncxcU+Q== X-Received: by 2002:a63:65c7:: with SMTP id z190mr3661801pgb.444.1602678539829; Wed, 14 Oct 2020 05:28:59 -0700 (PDT) Received: from localhost.localdomain ([122.179.122.132]) by smtp.gmail.com with ESMTPSA id r16sm2930000pjo.19.2020.10.14.05.28.57 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 14 Oct 2020 05:28:59 -0700 (PDT) From: Kiran K X-Google-Original-From: Kiran K To: linux-bluetooth@vger.kernel.org Cc: sathish.narasimman@intel.com, chethan.tumkur.narayan@intel.com, ravishankar.srivatsa@intel.com, kiraank@gmail.com, Kiran K Subject: [PATCH v7 2/4] Bluetooth: btusb: Define a function to construct firmware filename Date: Wed, 14 Oct 2020 17:58:35 +0530 Message-Id: <1602678517-9912-2-git-send-email-kiran.k@intel.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1602678517-9912-1-git-send-email-kiran.k@intel.com> References: <1602678517-9912-1-git-send-email-kiran.k@intel.com> Precedence: bulk List-ID: X-Mailing-List: linux-bluetooth@vger.kernel.org Define a new function to construct firmware/ddc filename for new generation Intel controllers Signed-off-by: Kiran K Reviewed-by: Chethan T N --- drivers/bluetooth/btintel.h | 6 ++++++ drivers/bluetooth/btusb.c | 19 +++++++++++++++++-- 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/drivers/bluetooth/btintel.h b/drivers/bluetooth/btintel.h index 09346ae..c4e28a8 100644 --- a/drivers/bluetooth/btintel.h +++ b/drivers/bluetooth/btintel.h @@ -132,6 +132,12 @@ struct intel_debug_features { __u8 page1[16]; } __packed; +#define INTEL_HW_PLATFORM(cnvx_bt) ((u8)(((cnvx_bt) & 0x0000ff00) >> 8)) +#define INTEL_HW_VARIANT(cnvx_bt) ((u8)(((cnvx_bt) & 0x003f0000) >> 16)) +#define INTEL_CNVX_TOP_TYPE(cnvx_top) ((cnvx_top) & 0x00000fff) +#define INTEL_CNVX_TOP_STEP(cnvx_top) (((cnvx_top) & 0x0f000000) >> 24) +#define INTEL_CNVX_TOP_PACK_SWAB(t, s) __swab16(((__u16)(((t) << 4) | (s)))) + #if IS_ENABLED(CONFIG_BT_INTEL) int btintel_check_bdaddr(struct hci_dev *hdev); diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c index 2e40885..ac532dd 100644 --- a/drivers/bluetooth/btusb.c +++ b/drivers/bluetooth/btusb.c @@ -2360,6 +2360,21 @@ static bool btusb_setup_intel_new_get_fw_name(struct intel_version *ver, return true; } +static void btusb_setup_intel_newgen_get_fw_name(const struct intel_version_tlv *ver_tlv, + char *fw_name, size_t len, + const char *suffix) +{ + /* The firmware file name for new generation controllers will be + * ibt-- + */ + snprintf(fw_name, len, "intel/ibt-%04x-%04x.%s", + INTEL_CNVX_TOP_PACK_SWAB(INTEL_CNVX_TOP_TYPE(ver_tlv->cnvi_top), + INTEL_CNVX_TOP_STEP(ver_tlv->cnvi_top)), + INTEL_CNVX_TOP_PACK_SWAB(INTEL_CNVX_TOP_TYPE(ver_tlv->cnvr_top), + INTEL_CNVX_TOP_STEP(ver_tlv->cnvr_top)), + suffix); +} + static int btusb_intel_download_firmware(struct hci_dev *hdev, struct intel_version *ver, struct intel_boot_params *params, @@ -2783,8 +2798,8 @@ static int btusb_setup_intel_newgen(struct hci_dev *hdev) clear_bit(BTUSB_BOOTLOADER, &data->flags); - /* TODO: Insert function call here to get the ddc file name */ - + btusb_setup_intel_newgen_get_fw_name(&version, ddcname, sizeof(ddcname), + "ddc"); /* Once the device is running in operational mode, it needs to * apply the device configuration (DDC) parameters. * From patchwork Wed Oct 14 12:28:37 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kiran K X-Patchwork-Id: 11837607 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=-12.6 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,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 5525CC433DF for ; Wed, 14 Oct 2020 12:29:09 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E46F5208B3 for ; Wed, 14 Oct 2020 12:29:08 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="AM20Glar" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387910AbgJNM3I (ORCPT ); Wed, 14 Oct 2020 08:29:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40980 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387863AbgJNM3F (ORCPT ); Wed, 14 Oct 2020 08:29:05 -0400 Received: from mail-pf1-x441.google.com (mail-pf1-x441.google.com [IPv6:2607:f8b0:4864:20::441]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2FA04C061755 for ; Wed, 14 Oct 2020 05:29:05 -0700 (PDT) Received: by mail-pf1-x441.google.com with SMTP id c20so1883844pfr.8 for ; Wed, 14 Oct 2020 05:29:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=ouQ8cRYMceTUmNAA4f1Lby4MW/urEqOOQLwdbMnn3x4=; b=AM20GlarRQjV5iu975j1m0M15+BevoiFht+ZS7HhKqhOTnSCuT739bJb5kpoftJLX6 w9gT3LdUHprcCIh9HBR2XC5JNPdY0bYKITHujhtKCvuF3kmiJi1kworjxHy9n2JXCOMI 5FChroKaPnhBRty470IbWw9YjcpgRLNPLsPD62uhx3s3O0TU28ElqIC6oa3eDWuWKuEu Xd0lZK/oXHKU8xn7f4KLBNVsN1jUC13xzBR3YWBnyTs+iVruEgvqlmk4EcQI63Zphxol xN9c0JWLC3sVhey1+1aGhpYkI3LttmHkKuX7zf1JwSusA9QmqWhB4vIlQw5Msi7+i1VY oWog== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=ouQ8cRYMceTUmNAA4f1Lby4MW/urEqOOQLwdbMnn3x4=; b=Ac7irSjZZA6Ep/bXcc2Yq7KTHDt3GYMDyKA73jd5vljTxz9J1X32rEtwf0+ZbTu04t 8p6iUI6pusIVvIJZcgu+IvB7f2IORclN604/u8XJxLOMCEBCIswqvQmJvXVLkn1+mH3s EQqqqIcbwAeIKFy+Ynn+2Bu+5dgcVbUArRwMPR4USq+wi2OK/ORKDruG/U/q83Lr/SRG jewYqdA88pMGNVY7Z8haDKsvymykvljvXhfDvyZumDG2QPBkMPiEOKm5fUDEa2aJd/yp aTOjoXjz9ODnedQrkWd4VS1pn1tMFzEXHMS7ih/zlmQ5G8FABXFHgukLLoo2iQfBqpUF 0KZw== X-Gm-Message-State: AOAM530Qx5fB6eJVXqS7v/xM7zTXX00mcle8cqzG2P2JDktb3n0jhuCD 0HElP00360IBalQyPhZDYIscDJBwIHyN5Rcg X-Google-Smtp-Source: ABdhPJwdOPqfb4zjnAXWNI7ikeMlGrtGN9UD/KcX1RfQN2dQ3Z2QGwuG3cMVm2r/+2AaUlDrxYL6Jg== X-Received: by 2002:a63:481f:: with SMTP id v31mr3632949pga.187.1602678544566; Wed, 14 Oct 2020 05:29:04 -0700 (PDT) Received: from localhost.localdomain ([122.179.122.132]) by smtp.gmail.com with ESMTPSA id r16sm2930000pjo.19.2020.10.14.05.29.02 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 14 Oct 2020 05:29:04 -0700 (PDT) From: Kiran K X-Google-Original-From: Kiran K To: linux-bluetooth@vger.kernel.org Cc: sathish.narasimman@intel.com, chethan.tumkur.narayan@intel.com, ravishankar.srivatsa@intel.com, kiraank@gmail.com, Kiran K Subject: [PATCH v7 4/4] Bluetooth: btusb: Map Typhoon peak controller to BTUSB_INTEL_NEWGEN Date: Wed, 14 Oct 2020 17:58:37 +0530 Message-Id: <1602678517-9912-4-git-send-email-kiran.k@intel.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1602678517-9912-1-git-send-email-kiran.k@intel.com> References: <1602678517-9912-1-git-send-email-kiran.k@intel.com> Precedence: bulk List-ID: X-Mailing-List: linux-bluetooth@vger.kernel.org Map Typhoon peak Intel controller to BTUSB_INTEL_NEWGEN Signed-off-by: Kiran K Reviewed-by: Chethan T N --- drivers/bluetooth/btusb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c index 5d68cdb..3e21d5e 100644 --- a/drivers/bluetooth/btusb.c +++ b/drivers/bluetooth/btusb.c @@ -366,7 +366,7 @@ static const struct usb_device_id blacklist_table[] = { BTUSB_WIDEBAND_SPEECH }, { USB_DEVICE(0x8087, 0x0029), .driver_info = BTUSB_INTEL_NEW | BTUSB_WIDEBAND_SPEECH }, - { USB_DEVICE(0x8087, 0x0032), .driver_info = BTUSB_INTEL_NEW | + { USB_DEVICE(0x8087, 0x0032), .driver_info = BTUSB_INTEL_NEWGEN | BTUSB_WIDEBAND_SPEECH}, { USB_DEVICE(0x8087, 0x07da), .driver_info = BTUSB_CSR }, { USB_DEVICE(0x8087, 0x07dc), .driver_info = BTUSB_INTEL },