From patchwork Wed Mar 20 07:55:53 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Hovold X-Patchwork-Id: 781672 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9B2C32C6B5; Wed, 20 Mar 2024 07:58:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710921499; cv=none; b=ozYDm8X6CvlkA76Jp0n9O8VdO62d2mwuVIOsJjoX6o+rWGnKSutyFqpLiN6nDYOIQyn9SbJo3R1X1jZbMSXOqnc7qAluILD8nVLjX5OQwJPnNptuxVwbXEYSPkrLyVI34fTy8W/NMejKtGa/ohczTnv/cgVuMxrqZM0+BAMVhzA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710921499; c=relaxed/simple; bh=jMwtybi/vY23D4ux1YBawunur6a8HYoEY3QxQ+/Xaks=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=D/DOe4EbtquMsv1RTeaDivbi1NUOUbQDzD/xBQPRj7X+pMYO2BNrQZUg9NCwTFEWI1J6A/FiHq508T+AZuySkF5H3IBKAItgwo1kWHR0uisVEJ+rByqQwps+WCSXFHDrNvnvSOQg84SUCXWq+FId/y/hFCAFxvM7NjD9GzXNhLg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=LS9BStrb; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="LS9BStrb" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 14B87C433A6; Wed, 20 Mar 2024 07:58:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1710921499; bh=jMwtybi/vY23D4ux1YBawunur6a8HYoEY3QxQ+/Xaks=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=LS9BStrbKU6UmW+ub3pVIJtdgxGz4vgAD+ZGiEFJDZDHzB0ZafWf+Ct2gVVwsBSqW cwXiwLZyUzjHcdfRYPqtfqdmEPvNaQS/MbAataMyCtxgESpBf+uZva7WwSWLXffTOL 4sCSnRt+fnL6ZowqObgV/yG5eDolPOxJB6udC0peUwJS1jXtG3bDjV8Dy0r3uRnEsw bE3HJf0l2EEX0GqkND3obUUVmVsKtAV3Vh2k/gWem2QuS5IlWQrZNGJQ+MIkPlpD+E udCdBvcuOSEuaeH7q5mhcTfJqJa5G0gyjz276l/w5oNjcxMcVGzmUBXSxpHXs60wVZ fsHmS/U4Ux/6A== Received: from johan by xi.lan with local (Exim 4.97.1) (envelope-from ) id 1rmqq9-0000000029Q-24gf; Wed, 20 Mar 2024 08:58:25 +0100 From: Johan Hovold To: Marcel Holtmann , Luiz Augusto von Dentz , Bjorn Andersson Cc: Rob Herring , Krzysztof Kozlowski , Conor Dooley , cros-qcom-dts-watchers@chromium.org, Konrad Dybcio , Johan Hedberg , Balakrishna Godavarthi , Matthias Kaehlcke , Douglas Anderson , Rocky Liao , Dmitry Baryshkov , linux-bluetooth@vger.kernel.org, netdev@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, Johan Hovold , stable@vger.kernel.org Subject: [PATCH v4 3/4] Bluetooth: add quirk for broken address properties Date: Wed, 20 Mar 2024 08:55:53 +0100 Message-ID: <20240320075554.8178-4-johan+linaro@kernel.org> X-Mailer: git-send-email 2.43.2 In-Reply-To: <20240320075554.8178-1-johan+linaro@kernel.org> References: <20240320075554.8178-1-johan+linaro@kernel.org> Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Some Bluetooth controllers lack persistent storage for the device address and instead one can be provided by the boot firmware using the 'local-bd-address' devicetree property. The Bluetooth devicetree bindings clearly states that the address should be specified in little-endian order, but due to a long-standing bug in the Qualcomm driver which reversed the address some boot firmware has been providing the address in big-endian order instead. Add a new quirk that can be set on platforms with broken firmware and use it to reverse the address when parsing the property so that the underlying driver bug can be fixed. Fixes: 5c0a1001c8be ("Bluetooth: hci_qca: Add helper to set device address") Cc: stable@vger.kernel.org # 5.1 Reviewed-by: Douglas Anderson Signed-off-by: Johan Hovold --- include/net/bluetooth/hci.h | 9 +++++++++ net/bluetooth/hci_sync.c | 5 ++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/include/net/bluetooth/hci.h b/include/net/bluetooth/hci.h index bdee5d649cc6..191077d8d578 100644 --- a/include/net/bluetooth/hci.h +++ b/include/net/bluetooth/hci.h @@ -176,6 +176,15 @@ enum { */ HCI_QUIRK_USE_BDADDR_PROPERTY, + /* When this quirk is set, the Bluetooth Device Address provided by + * the 'local-bd-address' fwnode property is incorrectly specified in + * big-endian order. + * + * This quirk can be set before hci_register_dev is called or + * during the hdev->setup vendor callback. + */ + HCI_QUIRK_BDADDR_PROPERTY_BROKEN, + /* When this quirk is set, the duplicate filtering during * scanning is based on Bluetooth devices addresses. To allow * RSSI based updates, restart scanning if needed. diff --git a/net/bluetooth/hci_sync.c b/net/bluetooth/hci_sync.c index 5716345a26df..283ae8edc1e5 100644 --- a/net/bluetooth/hci_sync.c +++ b/net/bluetooth/hci_sync.c @@ -3215,7 +3215,10 @@ static void hci_dev_get_bd_addr_from_property(struct hci_dev *hdev) if (ret < 0 || !bacmp(&ba, BDADDR_ANY)) return; - bacpy(&hdev->public_addr, &ba); + if (test_bit(HCI_QUIRK_BDADDR_PROPERTY_BROKEN, &hdev->quirks)) + baswap(&hdev->public_addr, &ba); + else + bacpy(&hdev->public_addr, &ba); } struct hci_init_stage { From patchwork Wed Mar 20 07:55:54 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Hovold X-Patchwork-Id: 781674 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 451D329424; Wed, 20 Mar 2024 07:58:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710921499; cv=none; b=nIAoThuvOKpErKUUC5zcJlYAuNZk1Cti6joU5OgLhDFNYyt+Yn0VgXJPg3775aGkwdPv2FoQOvwuIdU6XiFBT2ijEEJ/Qpe1kI0fsFqwtfqeoi4q48SigQBIiSqgGxVIjj8we2BBUOuWNFzJxH0elqsOJXyJ5HM0KdX8qKd5daM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710921499; c=relaxed/simple; bh=C1RG275fn9xQtQpOn0JJPb4biy/sTALIc/k31KMVrzc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=AU+RHrTnDO7mJ/W68wEgCjZFEPUMbcO+wh+VhMbYbf2UNcdV/DVpOXtMv8hqHZZ/BgRl9KPSabR15nBIsnLSMEUyAhgoo5sYhxaZBexPQ0RN8HxymNwWOgI/jNdVEWUBTR+RKCGufERutEkeumIfO4hS86vUbMzNYi3V+jnrJSI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=BxRfRrdS; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="BxRfRrdS" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 123CAC43399; Wed, 20 Mar 2024 07:58:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1710921499; bh=C1RG275fn9xQtQpOn0JJPb4biy/sTALIc/k31KMVrzc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BxRfRrdSNN8lK3/F2XPyGySwbkYlfkf+PlhwU9xAdxtkJFdsgzBOWEimFvecJfH6l 2KKJBGlWd8ceHC6xjgsSBXtYwNrz3jBVsCI2SBuCdQjtibqsBSv6LriLGJpnX8SMAt ha+wLtvTJvqCgtqRP4zCrsV8nUO/IBrSvv5OkvbU1yZquSZoOCokd52l5K+Qg+J8dw JyMk72W5k2SGyb3gdj1mELPPJy+/QrqnWPopTszQhqJzZ/yvukY5WGjwJpUsrVNjbp CcM2orjiNDk6Xx5chtHCIXKDc9KLEzANvpXC1I4ZknrSCx59yz6f4TscZLbcXxCCcs jwMs2nmdROgeA== Received: from johan by xi.lan with local (Exim 4.97.1) (envelope-from ) id 1rmqq9-0000000029S-2OzU; Wed, 20 Mar 2024 08:58:25 +0100 From: Johan Hovold To: Marcel Holtmann , Luiz Augusto von Dentz , Bjorn Andersson Cc: Rob Herring , Krzysztof Kozlowski , Conor Dooley , cros-qcom-dts-watchers@chromium.org, Konrad Dybcio , Johan Hedberg , Balakrishna Godavarthi , Matthias Kaehlcke , Douglas Anderson , Rocky Liao , Dmitry Baryshkov , linux-bluetooth@vger.kernel.org, netdev@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, Johan Hovold , stable@vger.kernel.org, Nikita Travkin Subject: [PATCH v4 4/4] Bluetooth: qca: fix device-address endianness Date: Wed, 20 Mar 2024 08:55:54 +0100 Message-ID: <20240320075554.8178-5-johan+linaro@kernel.org> X-Mailer: git-send-email 2.43.2 In-Reply-To: <20240320075554.8178-1-johan+linaro@kernel.org> References: <20240320075554.8178-1-johan+linaro@kernel.org> Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 The WCN6855 firmware on the Lenovo ThinkPad X13s expects the Bluetooth device address in big-endian order when setting it using the EDL_WRITE_BD_ADDR_OPCODE command. Presumably, this is the case for all non-ROME devices which all use the EDL_WRITE_BD_ADDR_OPCODE command for this (unlike the ROME devices which use a different command and expect the address in little-endian order). Reverse the little-endian address before setting it to make sure that the address can be configured using tools like btmgmt or using the 'local-bd-address' devicetree property. Note that this can potentially break systems with boot firmware which has started relying on the broken behaviour and is incorrectly passing the address via devicetree in big-endian order. The only device affected by this should be the WCN3991 used in some Chromebooks. As ChromeOS updates the kernel and devicetree in lockstep, the new 'qcom,local-bd-address-broken' property can be used to determine if the firmware is buggy so that the underlying driver bug can be fixed without breaking backwards compatibility. Set the HCI_QUIRK_BDADDR_PROPERTY_BROKEN quirk for such platforms so that the address is reversed when parsing the address property. Fixes: 5c0a1001c8be ("Bluetooth: hci_qca: Add helper to set device address") Cc: stable@vger.kernel.org # 5.1 Cc: Balakrishna Godavarthi Cc: Matthias Kaehlcke Tested-by: Nikita Travkin # sc7180 Reviewed-by: Douglas Anderson Signed-off-by: Johan Hovold --- drivers/bluetooth/btqca.c | 8 ++++++-- drivers/bluetooth/hci_qca.c | 10 ++++++++++ 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/drivers/bluetooth/btqca.c b/drivers/bluetooth/btqca.c index b40b32fa7f1c..19cfc342fc7b 100644 --- a/drivers/bluetooth/btqca.c +++ b/drivers/bluetooth/btqca.c @@ -826,11 +826,15 @@ EXPORT_SYMBOL_GPL(qca_uart_setup); int qca_set_bdaddr(struct hci_dev *hdev, const bdaddr_t *bdaddr) { + bdaddr_t bdaddr_swapped; struct sk_buff *skb; int err; - skb = __hci_cmd_sync_ev(hdev, EDL_WRITE_BD_ADDR_OPCODE, 6, bdaddr, - HCI_EV_VENDOR, HCI_INIT_TIMEOUT); + baswap(&bdaddr_swapped, bdaddr); + + skb = __hci_cmd_sync_ev(hdev, EDL_WRITE_BD_ADDR_OPCODE, 6, + &bdaddr_swapped, HCI_EV_VENDOR, + HCI_INIT_TIMEOUT); if (IS_ERR(skb)) { err = PTR_ERR(skb); bt_dev_err(hdev, "QCA Change address cmd failed (%d)", err); diff --git a/drivers/bluetooth/hci_qca.c b/drivers/bluetooth/hci_qca.c index f989c05f8177..c73481c57741 100644 --- a/drivers/bluetooth/hci_qca.c +++ b/drivers/bluetooth/hci_qca.c @@ -225,6 +225,7 @@ struct qca_serdev { struct qca_power *bt_power; u32 init_speed; u32 oper_speed; + bool bdaddr_property_broken; const char *firmware_name; }; @@ -1842,6 +1843,7 @@ static int qca_setup(struct hci_uart *hu) const char *firmware_name = qca_get_firmware_name(hu); int ret; struct qca_btsoc_version ver; + struct qca_serdev *qcadev; const char *soc_name; ret = qca_check_speeds(hu); @@ -1904,6 +1906,11 @@ static int qca_setup(struct hci_uart *hu) case QCA_WCN6855: case QCA_WCN7850: set_bit(HCI_QUIRK_USE_BDADDR_PROPERTY, &hdev->quirks); + + qcadev = serdev_device_get_drvdata(hu->serdev); + if (qcadev->bdaddr_property_broken) + set_bit(HCI_QUIRK_BDADDR_PROPERTY_BROKEN, &hdev->quirks); + hci_set_aosp_capable(hdev); ret = qca_read_soc_version(hdev, &ver, soc_type); @@ -2284,6 +2291,9 @@ static int qca_serdev_probe(struct serdev_device *serdev) if (!qcadev->oper_speed) BT_DBG("UART will pick default operating speed"); + qcadev->bdaddr_property_broken = device_property_read_bool(&serdev->dev, + "qcom,local-bd-address-broken"); + if (data) qcadev->btsoc_type = data->soc_type; else