From nobody Thu Apr 25 05:12:45 2024 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 268E8C433EF for ; Fri, 20 May 2022 15:07:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1350651AbiETPHy (ORCPT ); Fri, 20 May 2022 11:07:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55036 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344764AbiETPHg (ORCPT ); Fri, 20 May 2022 11:07:36 -0400 Received: from smtp14.infineon.com (smtp14.infineon.com [IPv6:2a00:18f0:1e00:4::6]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C5CE28B0A4; Fri, 20 May 2022 08:07:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=infineon.com; i=@infineon.com; q=dns/txt; s=IFXMAIL; t=1653059255; x=1684595255; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=EqWptlm65K/aZUFe8FaK8aN2US122LKzpWh5yxjk5M8=; b=VsKv4gArlz3/owkdMfkDnoRenQUDaZ7H/y413+OFpCh/xoGEKCSuPJDK s5H3HR0SLWTqKMS90/AAWXyNoc/Sf7HiFWU88fTQGrC8r4EL8XPmxFgGK QaOHn+oH+AGwq3c+4E8NxFqPoTjweAFQ2tMPR/cAJVO9av80OeRZYjngV 4=; X-SBRS: None X-IronPort-AV: E=McAfee;i="6400,9594,10353"; a="122053875" X-IronPort-AV: E=Sophos;i="5.91,239,1647298800"; d="scan'208";a="122053875" Received: from unknown (HELO mucxv002.muc.infineon.com) ([172.23.11.17]) by smtp14.infineon.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 May 2022 17:07:32 +0200 Received: from MUCSE803.infineon.com (MUCSE803.infineon.com [172.23.29.29]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mucxv002.muc.infineon.com (Postfix) with ESMTPS; Fri, 20 May 2022 17:07:31 +0200 (CEST) Received: from MUCSE807.infineon.com (172.23.29.33) by MUCSE803.infineon.com (172.23.29.29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.22; Fri, 20 May 2022 17:07:31 +0200 Received: from ISCNPF0RJXQS.infineon.com (172.23.8.247) by MUCSE807.infineon.com (172.23.29.33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.22; Fri, 20 May 2022 17:07:30 +0200 From: Hakan Jansson CC: Hakan Jansson , "David S. Miller" , Jakub Kicinski , Paolo Abeni , Rob Herring , Krzysztof Kozlowski , Linus Walleij , , , , Marcel Holtmann , Johan Hedberg , "Luiz Augusto von Dentz" , Subject: [PATCH v2 1/2] dt-bindings: net: broadcom-bluetooth: Add property for autobaud mode Date: Fri, 20 May 2022 17:07:13 +0200 Message-ID: X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [172.23.8.247] X-ClientProxiedBy: MUCSE815.infineon.com (172.23.29.41) To MUCSE807.infineon.com (172.23.29.33) To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Some devices (e.g. CYW5557x) require autobaud mode to enable FW loading. Autobaud mode can also be required on some boards where the controller device is using a non-standard baud rate when first powered on. This patch adds a property, "brcm,uses-autobaud-mode", to enable autobaud mode selection. Signed-off-by: Hakan Jansson --- V1 -> V2: Modify property description .../devicetree/bindings/net/broadcom-bluetooth.yaml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/Documentation/devicetree/bindings/net/broadcom-bluetooth.yaml = b/Documentation/devicetree/bindings/net/broadcom-bluetooth.yaml index 5aac094fd217..a29f059c21cc 100644 --- a/Documentation/devicetree/bindings/net/broadcom-bluetooth.yaml +++ b/Documentation/devicetree/bindings/net/broadcom-bluetooth.yaml @@ -92,6 +92,15 @@ properties: pcm-sync-mode: slave, master pcm-clock-mode: slave, master =20 + brcm,uses-autobaud-mode: + type: boolean + description: > + Setting this property will make the host (driver) assert the control= ler + chip's BT_UART_CTS_N prior to asserting BT_REG_ON. This will make the + controller start up in autobaud mode. The controller will then detec= t the + baud rate of the first incoming (HCI Reset) command from the host and + subsequently use that baud rate. + interrupts: items: - description: Handle to the line HOST_WAKE used to wake --=20 2.25.1 From nobody Thu Apr 25 05:12:45 2024 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0DDBEC433EF for ; Fri, 20 May 2022 15:08:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1350633AbiETPIB (ORCPT ); Fri, 20 May 2022 11:08:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55102 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1350529AbiETPHh (ORCPT ); Fri, 20 May 2022 11:07:37 -0400 Received: from smtp2.infineon.com (smtp2.infineon.com [IPv6:2a00:18f0:1e00:4::4]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 37C411666BF; Fri, 20 May 2022 08:07:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=infineon.com; i=@infineon.com; q=dns/txt; s=IFXMAIL; t=1653059255; x=1684595255; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=TVGD+RI7ONjcaP+2ro4ykcSv7oyzWhgaxYsaQqzuMlk=; b=FANOTozyfjjfoBG6pXyMaN0imEwc5pmxvJj9qyWhEmSW9FS8ZMKHKhi9 OlCsBhBIwo7XXQZPmM9HCfx9gWrY+66+TMEBxzgW3b9iBgLP80Q+d38o4 590TmfgBGrJfku/tsvf287ocNwA/37KNduej41BYu4SZNVpCfPWwDYFAa 0=; X-SBRS: None X-IronPort-AV: E=McAfee;i="6400,9594,10353"; a="179026253" X-IronPort-AV: E=Sophos;i="5.91,239,1647298800"; d="scan'208";a="179026253" Received: from unknown (HELO mucxv003.muc.infineon.com) ([172.23.11.20]) by smtp2.infineon.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 May 2022 17:07:33 +0200 Received: from MUCSE822.infineon.com (MUCSE822.infineon.com [172.23.29.53]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mucxv003.muc.infineon.com (Postfix) with ESMTPS; Fri, 20 May 2022 17:07:33 +0200 (CEST) Received: from MUCSE807.infineon.com (172.23.29.33) by MUCSE822.infineon.com (172.23.29.53) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.22; Fri, 20 May 2022 17:07:33 +0200 Received: from ISCNPF0RJXQS.infineon.com (172.23.8.247) by MUCSE807.infineon.com (172.23.29.33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.22; Fri, 20 May 2022 17:07:31 +0200 From: Hakan Jansson CC: Hakan Jansson , "David S. Miller" , Jakub Kicinski , Paolo Abeni , Rob Herring , Krzysztof Kozlowski , Linus Walleij , , , , Marcel Holtmann , Johan Hedberg , "Luiz Augusto von Dentz" , Subject: [PATCH v2 2/2] Bluetooth: hci_bcm: Add support for FW loading in autobaud mode Date: Fri, 20 May 2022 17:07:14 +0200 Message-ID: <996c7e5f1eaffbb1a1af40c004f897029f586d58.1653057480.git.hakan.jansson@infineon.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [172.23.8.247] X-ClientProxiedBy: MUCSE815.infineon.com (172.23.29.41) To MUCSE807.infineon.com (172.23.29.33) To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Some devices (e.g. CYW5557x) require autobaud mode to enable FW loading. Autobaud mode can also be required on some boards where the controller device is using a non-standard baud rate when first powered on. Only a limited subset of HCI commands are supported in autobaud mode. This patch looks for a DT property, "brcm,uses-autobaud-mode", to enable autobaud mode selection. If the property is present, the device is started in autobaud mode by keeping RTS asserted while powering on the device. The patch also prevents the use of unsupported commands for devices started in autobaud mode. Signed-off-by: Hakan Jansson --- V1 -> V2: No changes, submitted as part of updated patch series drivers/bluetooth/btbcm.c | 31 +++++++++++++++++++++++-------- drivers/bluetooth/btbcm.h | 8 ++++---- drivers/bluetooth/hci_bcm.c | 15 ++++++++++++--- 3 files changed, 39 insertions(+), 15 deletions(-) diff --git a/drivers/bluetooth/btbcm.c b/drivers/bluetooth/btbcm.c index 92a2b7e81757..0c0958030c0a 100644 --- a/drivers/bluetooth/btbcm.c +++ b/drivers/bluetooth/btbcm.c @@ -403,6 +403,13 @@ static int btbcm_read_info(struct hci_dev *hdev) bt_dev_info(hdev, "BCM: chip id %u", skb->data[1]); kfree_skb(skb); =20 + return 0; +} + +static int btbcm_print_controller_features(struct hci_dev *hdev) +{ + struct sk_buff *skb; + /* Read Controller Features */ skb =3D btbcm_read_controller_features(hdev); if (IS_ERR(skb)) @@ -513,7 +520,7 @@ static const char *btbcm_get_board_name(struct device *= dev) #endif } =20 -int btbcm_initialize(struct hci_dev *hdev, bool *fw_load_done) +int btbcm_initialize(struct hci_dev *hdev, bool *fw_load_done, bool use_au= tobaud_mode) { u16 subver, rev, pid, vid; struct sk_buff *skb; @@ -550,9 +557,16 @@ int btbcm_initialize(struct hci_dev *hdev, bool *fw_lo= ad_done) if (err) return err; } - err =3D btbcm_print_local_name(hdev); - if (err) - return err; + + if (!use_autobaud_mode) { + err =3D btbcm_print_controller_features(hdev); + if (err) + return err; + + err =3D btbcm_print_local_name(hdev); + if (err) + return err; + } =20 bcm_subver_table =3D (hdev->bus =3D=3D HCI_USB) ? bcm_usb_subver_table : bcm_uart_subver_table; @@ -635,13 +649,13 @@ int btbcm_initialize(struct hci_dev *hdev, bool *fw_l= oad_done) } EXPORT_SYMBOL_GPL(btbcm_initialize); =20 -int btbcm_finalize(struct hci_dev *hdev, bool *fw_load_done) +int btbcm_finalize(struct hci_dev *hdev, bool *fw_load_done, bool use_auto= baud_mode) { int err; =20 /* Re-initialize if necessary */ if (*fw_load_done) { - err =3D btbcm_initialize(hdev, fw_load_done); + err =3D btbcm_initialize(hdev, fw_load_done, use_autobaud_mode); if (err) return err; } @@ -657,15 +671,16 @@ EXPORT_SYMBOL_GPL(btbcm_finalize); int btbcm_setup_patchram(struct hci_dev *hdev) { bool fw_load_done =3D false; + bool use_autobaud_mode =3D false; int err; =20 /* Initialize */ - err =3D btbcm_initialize(hdev, &fw_load_done); + err =3D btbcm_initialize(hdev, &fw_load_done, use_autobaud_mode); if (err) return err; =20 /* Re-initialize after loading Patch */ - return btbcm_finalize(hdev, &fw_load_done); + return btbcm_finalize(hdev, &fw_load_done, use_autobaud_mode); } EXPORT_SYMBOL_GPL(btbcm_setup_patchram); =20 diff --git a/drivers/bluetooth/btbcm.h b/drivers/bluetooth/btbcm.h index 8bf01565fdfc..b4cb24231a20 100644 --- a/drivers/bluetooth/btbcm.h +++ b/drivers/bluetooth/btbcm.h @@ -62,8 +62,8 @@ int btbcm_write_pcm_int_params(struct hci_dev *hdev, int btbcm_setup_patchram(struct hci_dev *hdev); int btbcm_setup_apple(struct hci_dev *hdev); =20 -int btbcm_initialize(struct hci_dev *hdev, bool *fw_load_done); -int btbcm_finalize(struct hci_dev *hdev, bool *fw_load_done); +int btbcm_initialize(struct hci_dev *hdev, bool *fw_load_done, bool use_au= tobaud_mode); +int btbcm_finalize(struct hci_dev *hdev, bool *fw_load_done, bool use_auto= baud_mode); =20 #else =20 @@ -104,12 +104,12 @@ static inline int btbcm_setup_apple(struct hci_dev *h= dev) return 0; } =20 -static inline int btbcm_initialize(struct hci_dev *hdev, bool *fw_load_don= e) +static inline int btbcm_initialize(struct hci_dev *hdev, bool *fw_load_don= e, bool use_autobaud_mode) { return 0; } =20 -static inline int btbcm_finalize(struct hci_dev *hdev, bool *fw_load_done) +static inline int btbcm_finalize(struct hci_dev *hdev, bool *fw_load_done,= bool use_autobaud_mode) { return 0; } diff --git a/drivers/bluetooth/hci_bcm.c b/drivers/bluetooth/hci_bcm.c index 785f445dd60d..0230cfcc8e3e 100644 --- a/drivers/bluetooth/hci_bcm.c +++ b/drivers/bluetooth/hci_bcm.c @@ -99,6 +99,7 @@ struct bcm_device_data { * @no_early_set_baudrate: don't set_baudrate before setup() * @drive_rts_on_open: drive RTS signal on ->open() when platform requires= it * @pcm_int_params: keep the initial PCM configuration + * @use_autobaud_mode: start Bluetooth device in autobaud mode */ struct bcm_device { /* Must be the first member, hci_serdev.c expects this. */ @@ -136,6 +137,7 @@ struct bcm_device { #endif bool no_early_set_baudrate; bool drive_rts_on_open; + bool use_autobaud_mode; u8 pcm_int_params[5]; }; =20 @@ -472,7 +474,9 @@ static int bcm_open(struct hci_uart *hu) =20 out: if (bcm->dev) { - if (bcm->dev->drive_rts_on_open) + if (bcm->dev->use_autobaud_mode) + hci_uart_set_flow_control(hu, false); /* Assert BT_UART_CTS_N */ + else if (bcm->dev->drive_rts_on_open) hci_uart_set_flow_control(hu, true); =20 hu->init_speed =3D bcm->dev->init_speed; @@ -564,6 +568,7 @@ static int bcm_setup(struct hci_uart *hu) { struct bcm_data *bcm =3D hu->priv; bool fw_load_done =3D false; + bool use_autobaud_mode =3D (bcm->dev ? bcm->dev->use_autobaud_mode : 0); unsigned int speed; int err; =20 @@ -572,7 +577,7 @@ static int bcm_setup(struct hci_uart *hu) hu->hdev->set_diag =3D bcm_set_diag; hu->hdev->set_bdaddr =3D btbcm_set_bdaddr; =20 - err =3D btbcm_initialize(hu->hdev, &fw_load_done); + err =3D btbcm_initialize(hu->hdev, &fw_load_done, use_autobaud_mode); if (err) return err; =20 @@ -616,7 +621,7 @@ static int bcm_setup(struct hci_uart *hu) btbcm_write_pcm_int_params(hu->hdev, ¶ms); } =20 - err =3D btbcm_finalize(hu->hdev, &fw_load_done); + err =3D btbcm_finalize(hu->hdev, &fw_load_done, use_autobaud_mode); if (err) return err; =20 @@ -1197,6 +1202,10 @@ static int bcm_acpi_probe(struct bcm_device *dev) =20 static int bcm_of_probe(struct bcm_device *bdev) { + bdev->use_autobaud_mode =3D device_property_read_bool(bdev->dev, "brcm,us= es-autobaud-mode"); + if (bdev->use_autobaud_mode) + bdev->no_early_set_baudrate =3D true; + device_property_read_u32(bdev->dev, "max-speed", &bdev->oper_speed); device_property_read_u8_array(bdev->dev, "brcm,bt-pcm-int-params", bdev->pcm_int_params, 5); --=20 2.25.1