From patchwork Wed Nov 21 23:50:18 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rajat Jain X-Patchwork-Id: 10693295 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 01C9413B5 for ; Wed, 21 Nov 2018 23:50:38 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E8B7B2C1D3 for ; Wed, 21 Nov 2018 23:50:37 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DCAA92C869; Wed, 21 Nov 2018 23:50:37 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.5 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI, USER_IN_DEF_DKIM_WL autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 797AD2C1D3 for ; Wed, 21 Nov 2018 23:50:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390748AbeKVK1K (ORCPT ); Thu, 22 Nov 2018 05:27:10 -0500 Received: from mail-io1-f74.google.com ([209.85.166.74]:40838 "EHLO mail-io1-f74.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388031AbeKVK1J (ORCPT ); Thu, 22 Nov 2018 05:27:09 -0500 Received: by mail-io1-f74.google.com with SMTP id g6-v6so6757779iom.7 for ; Wed, 21 Nov 2018 15:50:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=ocDM1LbkKNji8o5absN8u+LSfXhmwVAzLCbs3C5cHds=; b=mpd7iLCah+Z9Gu6vxhKiFF10xJnX1KHQVw3lpU8SyL1suAVcHf8AF/KNn1OkJDg+yT gjkNvCIzW9xj2ove5q4YmnFiDcC/EIBbFNX0S1Irzl8ARWZfoDp+5W5XRA/YuCxXO/Dp NSKAZdc4hVs4AztyLeaWUoLHWHCgPcDSFKHtP5zSk1ZU+t2nIWRLlWqKWTxdBRy3HGzO lNtYrskbMkKcWPB0VAsmv0DW6SuHd3HxheJwujsRI3xBBS9UCYTXpWPL/QgU7p5qIyba huh59ItTGrMk6uIaXUEonH7Jn0caALosC5F0liOzTfX42VEMh1oJII87MRhQA68TZwbt jzRQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=ocDM1LbkKNji8o5absN8u+LSfXhmwVAzLCbs3C5cHds=; b=BQ0OF0T7vYpBurYMMO7R9z1TwJNFgGCLtqmt72Axi8Iy5ZJY/rY/JdE/NKNDGCiUhh LMpk0f7/eYtO1+ppc4crYYoE0U5P7ANMsh2hASQy8krMurrYQ4QSbpLgIy5BwaVPwLcO mXrJyamgIdINUk8/15pkdC0ww8tfdOBWWcC7PKaFTzH93dGDshQXtidDsppUlY3/Fjip jS1qpCIcH/Lzv2kj46cjcPey0p3vw3FpR2wja2jvAvfhMMj23YVwskbgKX0vg5DVwBN3 zGPLjCZealM9zMiPYHLMusky3lrclaw3oT6EkrFvsGex7pJYFFezy1JAwlGzf3H7rH1F f3mQ== X-Gm-Message-State: AA+aEWZG55vBGPH2wLQJZOL4+IdKld49Af3qRG6qRpc1NjPWbUneM7A8 yikfjkm0005+NMWpcslv8wesfogsZekJ X-Google-Smtp-Source: AFSGD/VWHTw4LLRgcchZIk+vaapC6bhpBHLgFkmsbKMxr4zP6VfNpmzz3LYh/UzX6On2fcu40OBbMpoLwGpg X-Received: by 2002:a24:41d4:: with SMTP id b81mr5300566itd.0.1542844232253; Wed, 21 Nov 2018 15:50:32 -0800 (PST) Date: Wed, 21 Nov 2018 15:50:18 -0800 In-Reply-To: <20181121235020.29461-1-rajatja@google.com> Message-Id: <20181121235020.29461-3-rajatja@google.com> Mime-Version: 1.0 References: <20181117010748.24347-1-rajatja@google.com> <20181121235020.29461-1-rajatja@google.com> X-Mailer: git-send-email 2.19.1.1215.g8438c0b245-goog Subject: [PATCH v3 3/5] Bluetooth: Reset Bluetooth chip after multiple command timeouts From: Rajat Jain To: Marcel Holtmann , Johan Hedberg , Greg Kroah-Hartman , "David S. Miller" , Dmitry Torokhov , Rajat Jain , Alex Hung , linux-bluetooth@vger.kernel.org, linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org, netdev@vger.kernel.org Cc: rajatxjain@gmail.com, dtor@google.com, raghuram.hegde@intel.com, chethan.tumkur.narayan@intel.com, sukumar.ghorai@intel.com Sender: linux-usb-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-usb@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Add a quirk and a hook to allow the HCI core to reset the BT chip if needed (after a number of timed out commands). Use that new hook to initiate BT chip reset if the controller fails to respond to certain number of commands (currently 5) including the HCI reset commands. This is done based on a newly introduced quirk. This is done based on some initial work by Intel. Signed-off-by: Rajat Jain --- v3: same as v1 v2: same as v1 include/net/bluetooth/hci.h | 8 ++++++++ include/net/bluetooth/hci_core.h | 2 ++ net/bluetooth/hci_core.c | 15 +++++++++++++-- 3 files changed, 23 insertions(+), 2 deletions(-) diff --git a/include/net/bluetooth/hci.h b/include/net/bluetooth/hci.h index c36dc1e20556..af02fa5ffe54 100644 --- a/include/net/bluetooth/hci.h +++ b/include/net/bluetooth/hci.h @@ -192,6 +192,14 @@ enum { * */ HCI_QUIRK_NON_PERSISTENT_SETUP, + + /* When this quirk is set, hw_reset() would be run to reset the + * hardware, after a certain number of commands (currently 5) + * time out because the device fails to respond. + * + * This quirk should be set before hci_register_dev is called. + */ + HCI_QUIRK_HW_RESET_ON_TIMEOUT, }; /* HCI device flags */ diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h index e5ea633ea368..b86218304b80 100644 --- a/include/net/bluetooth/hci_core.h +++ b/include/net/bluetooth/hci_core.h @@ -313,6 +313,7 @@ struct hci_dev { unsigned int acl_cnt; unsigned int sco_cnt; unsigned int le_cnt; + unsigned int timeout_cnt; unsigned int acl_mtu; unsigned int sco_mtu; @@ -437,6 +438,7 @@ struct hci_dev { int (*post_init)(struct hci_dev *hdev); int (*set_diag)(struct hci_dev *hdev, bool enable); int (*set_bdaddr)(struct hci_dev *hdev, const bdaddr_t *bdaddr); + void (*hw_reset)(struct hci_dev *hdev); }; #define HCI_PHY_HANDLE(handle) (handle & 0xff) diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c index 7352fe85674b..ab3a6a8b7ba6 100644 --- a/net/bluetooth/hci_core.c +++ b/net/bluetooth/hci_core.c @@ -2569,13 +2569,24 @@ static void hci_cmd_timeout(struct work_struct *work) struct hci_dev *hdev = container_of(work, struct hci_dev, cmd_timer.work); + hdev->timeout_cnt++; if (hdev->sent_cmd) { struct hci_command_hdr *sent = (void *) hdev->sent_cmd->data; u16 opcode = __le16_to_cpu(sent->opcode); - bt_dev_err(hdev, "command 0x%4.4x tx timeout", opcode); + bt_dev_err(hdev, "command 0x%4.4x tx timeout (cnt = %u)", + opcode, hdev->timeout_cnt); } else { - bt_dev_err(hdev, "command tx timeout"); + bt_dev_err(hdev, "command tx timeout (cnt = %u)", + hdev->timeout_cnt); + } + + if (test_bit(HCI_QUIRK_HW_RESET_ON_TIMEOUT, &hdev->quirks) && + hdev->timeout_cnt >= 5) { + hdev->timeout_cnt = 0; + if (hdev->hw_reset) + hdev->hw_reset(hdev); + return; } atomic_set(&hdev->cmd_cnt, 1);