From mboxrd@z Thu Jan 1 00:00:00 1970 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=-9.6 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, 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 BB42EC2D0DA for ; Thu, 26 Dec 2019 06:46:21 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 76D1220838 for ; Thu, 26 Dec 2019 06:46:21 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="key not found in DNS" (0-bit key) header.d=mg.codeaurora.org header.i=@mg.codeaurora.org header.b="w85seMOQ" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726626AbfLZGqU (ORCPT ); Thu, 26 Dec 2019 01:46:20 -0500 Received: from mail25.static.mailgun.info ([104.130.122.25]:44453 "EHLO mail25.static.mailgun.info" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726596AbfLZGqT (ORCPT ); Thu, 26 Dec 2019 01:46:19 -0500 DKIM-Signature: a=rsa-sha256; v=1; c=relaxed/relaxed; d=mg.codeaurora.org; q=dns/txt; s=smtp; t=1577342779; h=References: In-Reply-To: Message-Id: Date: Subject: Cc: To: From: Sender; bh=v1AH2NA0xoxdtUtCAEWxg+AQOR2pcDRqvKP1MT7e/e8=; b=w85seMOQ8MhFoBZEPbQAykWeVubwv7XqZ29uInGaIogdxFjAuYp+ADjRk79mZ0Y7QnNnrpDb rR3pUzXV/b4lqCvtIFEnknwynIPHymzIIVRqyjq269d/WJ/y4E306LmB7+x6LUAg9yKjU59H 2kBt0fbX0heeEyN88fkWyyBTPW0= X-Mailgun-Sending-Ip: 104.130.122.25 X-Mailgun-Sid: WyI2MTA3ZSIsICJsaW51eC1ibHVldG9vdGhAdmdlci5rZXJuZWwub3JnIiwgImJlOWU0YSJd Received: from smtp.codeaurora.org (ec2-35-166-182-171.us-west-2.compute.amazonaws.com [35.166.182.171]) by mxa.mailgun.org with ESMTP id 5e045732.7f6fcdf78ab0-smtp-out-n02; Thu, 26 Dec 2019 06:46:10 -0000 (UTC) Received: by smtp.codeaurora.org (Postfix, from userid 1001) id 97422C4479C; Thu, 26 Dec 2019 06:46:09 +0000 (UTC) Received: from rocky-Inspiron-7590.qca.qualcomm.com (unknown [180.166.53.21]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: rjliao) by smtp.codeaurora.org (Postfix) with ESMTPSA id B648AC433A2; Thu, 26 Dec 2019 06:46:07 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org B648AC433A2 Authentication-Results: aws-us-west-2-caf-mail-1.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: aws-us-west-2-caf-mail-1.web.codeaurora.org; spf=none smtp.mailfrom=rjliao@codeaurora.org From: Rocky Liao To: marcel@holtmann.org, johan.hedberg@gmail.com Cc: linux-kernel@vger.kernel.org, linux-bluetooth@vger.kernel.org, linux-arm-msm@vger.kernel.org, Rocky Liao Subject: [PATCH v2 4/4] Bluetooth: hci_qca: Add HCI command timeout handling Date: Thu, 26 Dec 2019 14:45:54 +0800 Message-Id: <20191226064554.16803-4-rjliao@codeaurora.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191226064554.16803-1-rjliao@codeaurora.org> References: <20191225060317.5258-1-rjliao@codeaurora.org> <20191226064554.16803-1-rjliao@codeaurora.org> Sender: linux-bluetooth-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-bluetooth@vger.kernel.org This patch adds the HCI command timeout handling, it will trigger btsoc to report its memory dump via vendor specific events when hit the defined max HCI command timeout count. After all the memory dump VSE are sent, the btsoc will also send a HCI_HW_ERROR event to host and this will cause a new hci down/up process and the btsoc will be re-initialized. Signed-off-by: Rocky Liao --- Changes in v2: - Fix build error drivers/bluetooth/hci_qca.c | 43 +++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/drivers/bluetooth/hci_qca.c b/drivers/bluetooth/hci_qca.c index 7e202041ed77..34ef73daebb2 100644 --- a/drivers/bluetooth/hci_qca.c +++ b/drivers/bluetooth/hci_qca.c @@ -47,6 +47,8 @@ #define IBS_HOST_TX_IDLE_TIMEOUT_MS 2000 #define CMD_TRANS_TIMEOUT_MS 100 +#define QCA_BTSOC_DUMP_CMD 0xFB + /* susclk rate */ #define SUSCLK_RATE_32KHZ 32768 @@ -56,6 +58,9 @@ /* max retry count when init fails */ #define QCA_MAX_INIT_RETRY_COUNT 3 +/* when hit the max cmd time out count, trigger btsoc dump */ +#define QCA_MAX_CMD_TIMEOUT_COUNT 3 + enum qca_flags { QCA_IBS_ENABLED, QCA_DROP_VENDOR_EVENT, @@ -123,6 +128,8 @@ struct qca_data { u64 rx_votes_off; u64 votes_on; u64 votes_off; + + u32 cmd_timeout_cnt; }; enum qca_speed_type { @@ -170,6 +177,7 @@ static int qca_regulator_enable(struct qca_serdev *qcadev); static void qca_regulator_disable(struct qca_serdev *qcadev); static void qca_power_shutdown(struct hci_uart *hu); static int qca_power_off(struct hci_dev *hdev); +static void qca_cmd_timeout(struct hci_dev *hdev); static enum qca_btsoc_type qca_soc_type(struct hci_uart *hu) { @@ -1337,6 +1345,8 @@ static int qca_setup(struct hci_uart *hu) if (!ret) { set_bit(QCA_IBS_ENABLED, &qca->flags); qca_debugfs_init(hdev); + hdev->cmd_timeout = qca_cmd_timeout; + qca->cmd_timeout_cnt = 0; } else if (ret == -ENOENT) { /* No patch/nvm-config found, run with original fw/config */ ret = 0; @@ -1467,6 +1477,39 @@ static int qca_power_off(struct hci_dev *hdev) return 0; } +static int qca_send_btsoc_dump_cmd(struct hci_uart *hu) +{ + int err = 0; + struct sk_buff *skb = NULL; + struct qca_data *qca = hu->priv; + + BT_DBG("hu %p sending btsoc dump command", hu); + + skb = bt_skb_alloc(1, GFP_ATOMIC); + if (!skb) { + BT_ERR("Failed to allocate memory for qca dump command"); + return -ENOMEM; + } + + skb_put_u8(skb, QCA_BTSOC_DUMP_CMD); + + skb_queue_tail(&qca->txq, skb); + + return err; +} + + +static void qca_cmd_timeout(struct hci_dev *hdev) +{ + struct hci_uart *hu = hci_get_drvdata(hdev); + struct qca_data *qca = hu->priv; + + BT_ERR("hu %p hci cmd timeout count=0x%x", hu, ++qca->cmd_timeout_cnt); + + if (qca->cmd_timeout_cnt >= QCA_MAX_CMD_TIMEOUT_COUNT) + qca_send_btsoc_dump_cmd(hu); +} + static int qca_regulator_enable(struct qca_serdev *qcadev) { struct qca_power *power = qcadev->bt_power; -- The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project