From patchwork Tue Mar 19 15:29:22 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Hovold X-Patchwork-Id: 13596777 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 9B0B3651B1; Tue, 19 Mar 2024 15:29:53 +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=1710862193; cv=none; b=SOdmJkCGOc6D8BkaBOTlz1V8yIstTemC08XrkKmGkFOEMryEWeSSYzhUwHfBl398yHN2NS3RPngXl0FKcklVe1lkd1EQ1bKHEg/maqrWvjKH6EMjfcP6RyszJr24rLFcjEFR6+9X+pHQP+rcmc+7IUgd3K/1OYwEz61A9ghmKys= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710862193; c=relaxed/simple; bh=hMyiu5JK/7MAu6W+diFQKH4vE96KDUmzS3ovObG9hKw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=FrWnKlTgQQoSbbjFk20p2mGo0SrTor7CXKakDYnKVd22iQW+tWZiL4dwkUXKEShusH1lXfeyI65iXxZLRJckL69CrsQjs5nxnsA+JZAlzFOlae/pGuIcJcHm8yX7MaANh+T8JSC84ziLTRob3TEGEV43kRz65AbgKuCcGQq3b7M= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=suoOUA+R; 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="suoOUA+R" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4BA9EC433A6; Tue, 19 Mar 2024 15:29:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1710862193; bh=hMyiu5JK/7MAu6W+diFQKH4vE96KDUmzS3ovObG9hKw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=suoOUA+ROqkzwuq7B7Wh2oMLPEVi8Dqauv+pedDROEQHjz9v6OxvRCdEyuOq9txaY IO1gre9BzJJanX37PxUbB2mDkqxSAUtd7JfzMOSI/KQX4ZxXyo+s+MMcBjsGYCqHuU 3rbD5agXgzM5OEmQ8LpKZb/Z/Sf48CSiCEhzYzfk7n2r1vONn9Rimtbq/70Qmx03Jk n6ATxDRFPFKIt6Qz6NHUVxaTxu/hxRcnV9W6qNp0FyHR28sFpL4S5S4Q4eZvn6O/b6 qwIrCsaBbwBvxRp2jvkjgeUncGJpMJwRLei2y11YboJAgdWFt8l9LUMfIMcEdJzvxn jrqi1/emkelEQ== Received: from johan by xi.lan with local (Exim 4.97.1) (envelope-from ) id 1rmbPb-000000000LF-3Dca; Tue, 19 Mar 2024 16:29:59 +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 Subject: [PATCH v3 1/5] dt-bindings: bluetooth: add 'qcom,local-bd-address-broken' Date: Tue, 19 Mar 2024 16:29:22 +0100 Message-ID: <20240319152926.1288-2-johan+linaro@kernel.org> X-Mailer: git-send-email 2.43.2 In-Reply-To: <20240319152926.1288-1-johan+linaro@kernel.org> References: <20240319152926.1288-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 Several Qualcomm 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 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. The only device out there that should be affected by this is the WCN3991 used in some Chromebooks. Add a 'qcom,local-bd-address-broken' property which can be set on these platforms to indicate that the boot firmware is using the wrong byte order. Note that ChromeOS always updates the kernel and devicetree in lockstep so that there is no need to handle backwards compatibility with older devicetrees. Signed-off-by: Johan Hovold Reviewed-by: Douglas Anderson --- .../devicetree/bindings/net/bluetooth/qualcomm-bluetooth.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Documentation/devicetree/bindings/net/bluetooth/qualcomm-bluetooth.yaml b/Documentation/devicetree/bindings/net/bluetooth/qualcomm-bluetooth.yaml index eba2f3026ab0..e099ef83e7b1 100644 --- a/Documentation/devicetree/bindings/net/bluetooth/qualcomm-bluetooth.yaml +++ b/Documentation/devicetree/bindings/net/bluetooth/qualcomm-bluetooth.yaml @@ -94,6 +94,9 @@ properties: local-bd-address: true + qcom,local-bd-address-broken: true + description: > + boot firmware is incorrectly passing the address in big-endian order required: - compatible From patchwork Tue Mar 19 15:29:23 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Hovold X-Patchwork-Id: 13596776 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 74AAC24B33; Tue, 19 Mar 2024 15:29:53 +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=1710862193; cv=none; b=GfpLlOSb8GTc4W3BPQywerqzvvEGbSJQqQltCxXCdrOVZe1RB3YhYamNf7hZEJCKRV/p02tbFTYk+3BBWFqHwahonlo5xoQnd2IbQNwQsLpfYREqPtASFtS3mnNJSYrs3d3vvncXehEWb0bedOutS+Rk+t3xG1ggJuA8DW+AcPc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710862193; c=relaxed/simple; bh=GlKb7exKEjnOBWdPf3Xo0Tq4lX2VT0Np+I2c1gOvVDo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=iHOYdbeDfK4O76x3PcaF6jUQZzC9vkRoTnyfIVg8jGbXeTMSsaqIoDROdVQBZJd4eVcbLjyTTH8jDdk8ngACFKKiaqWrpx358N1/p8RpztKL0sjUicQwzoUKVRLFTTPfpzS7nmHKvoxKb3Fd08kf6qJ6Po65F5+xe0IDpLiRweA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=rtd3eZol; 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="rtd3eZol" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 445CAC43390; Tue, 19 Mar 2024 15:29:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1710862193; bh=GlKb7exKEjnOBWdPf3Xo0Tq4lX2VT0Np+I2c1gOvVDo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rtd3eZolOpnk+hy4zpiZ1Mz3ZZpaLFJeIV1tvkRAq2x6GEdU6V6OAAaYgoqmWgcJ0 GkEjU2OYG88xD2TXL7Re5tZhjrDwkBxHWUXrsE+inxaGWXsgHCh7g8+ZngnqZBx6hj jGXoiIljP7qlQmRRnuM04O0+JPTv1hvEYchak6Y5keMzuDjn4HhPSmMY95HEtm7hjC lQCrV/6K/V0xF2b01kGaNHjaOb0ttyHJprgGjycsOapYSEXC9tig+wkrSvLxjxF+bK Sn7KcattZWiUTIXug2bvSgiEnahFUY5Hf6vt1CtQ0COi4n500+jC+Y7JB7u+r9Tpj3 FowITlqeA7n7g== Received: from johan by xi.lan with local (Exim 4.97.1) (envelope-from ) id 1rmbPb-000000000LI-3dbm; Tue, 19 Mar 2024 16:29:59 +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 v3 2/5] Bluetooth: add quirk for broken address properties Date: Tue, 19 Mar 2024 16:29:23 +0100 Message-ID: <20240319152926.1288-3-johan+linaro@kernel.org> X-Mailer: git-send-email 2.43.2 In-Reply-To: <20240319152926.1288-1-johan+linaro@kernel.org> References: <20240319152926.1288-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 Signed-off-by: Johan Hovold Reviewed-by: Douglas Anderson --- 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 Tue Mar 19 15:29:24 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Hovold X-Patchwork-Id: 13596778 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 9B0EE657AE; Tue, 19 Mar 2024 15:29:53 +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=1710862193; cv=none; b=NQEFQq45W8OHk0U7sUCQ5hVSOURFKoAbakd6K9VNX+LIs0e098LD9W6zAaCyqCYaTpVhWnbfM00daGADOnBUjwv6/lifvAF9WbChHG7vpfjkBa0rfDMzXMYZQnVW7nKkJefvCoh/n95uOYTea0RMYL/thcboi+7er5d3ScBPkag= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710862193; c=relaxed/simple; bh=VQl76OihFJ6MD7Q7CC4hfGfrDaQ2DcOqSN3Z7HUNPy4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=WiFyHwyoRAUSh8dm4rKGO7Ucv+DJnpiZGklS+VLjYw75gl3pAtG+lVgBe7UYsSq54mwLIX4+bDgkV8d0JzWub+CVoNzJn2wHENP/MDmbzcz+K2TQDCg4U2zCrZ+bkdWhUtITaiggO0wYIYs87wb20JMQAhTT1hD/mzkoH5Eh/DQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=B1VSA08T; 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="B1VSA08T" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 495B9C43399; Tue, 19 Mar 2024 15:29:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1710862193; bh=VQl76OihFJ6MD7Q7CC4hfGfrDaQ2DcOqSN3Z7HUNPy4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=B1VSA08Tfu9WZyqkrKPZ8x4B32TX6mqYbtpRrXFfwX4/3281/9JY7iMvLJ7hZK3c4 ewIYzgkBng6RzuW1xf81tQkwDn3LOOd/8eTbnOLLC0QGbYCBkAzM/CK2pxCoIvGOep oLYDOsX6lrl1o50ULRR/trR+uvpiLPYTOolPgfP+/6YvXQdJXj+RGi+2q8zbHij4n4 PAJ1sdLs9VIu04xX7mwRdqcmOdT2dFxaNuL+F/xOjmFoE5xrWeYcfH6EuXfqx8ediM EFArKKIZTpv7VFKR8EBdODoGyiXvrr5e1nA2H8bFKctlyFFBEAr+ZXVQQnmkly37Gz oALi4M7urPUKg== Received: from johan by xi.lan with local (Exim 4.97.1) (envelope-from ) id 1rmbPb-000000000LK-3yLp; Tue, 19 Mar 2024 16:29:59 +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 v3 3/5] Bluetooth: qca: fix device-address endianness Date: Tue, 19 Mar 2024 16:29:24 +0100 Message-ID: <20240319152926.1288-4-johan+linaro@kernel.org> X-Mailer: git-send-email 2.43.2 In-Reply-To: <20240319152926.1288-1-johan+linaro@kernel.org> References: <20240319152926.1288-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. 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 Signed-off-by: Johan Hovold --- drivers/bluetooth/btqca.c | 8 ++++++-- 1 file changed, 6 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); From patchwork Tue Mar 19 15:29:25 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Hovold X-Patchwork-Id: 13596780 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 9B165657B2; Tue, 19 Mar 2024 15:29:53 +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=1710862193; cv=none; b=Ntxj/IvCJ/4B/MxQLk+1RC5hmsTBxFrsk6/edKy3l6p7X7xftY6lHj3ASLb81MO6az2k3g8aIjkFSrGsihucDfH0qpplBnM9f79YrF77Jt6bt9cRrOIyp7tIGAn43ZbDRjSON0649N8DcPaY2Ty7jbrePO+UbvbA9HACVKtv//0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710862193; c=relaxed/simple; bh=J6fbFW/hwqiA6LHzfsT/AMLYc+NWeHRMPXg1NtzMCYA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=PjrRhTb7fdRNqg3pvlp6Kfk5brs3iqCTz/yez07tFir3cW4Xc0pUU7wlLwv+McOBrHzHZodC/SZnqJ9Zb86dFGcTYSjthP2DI8/CVvx55vvkAlwLThQvl535WkwEzF1/gMAyg2ZBfpu4wO0RQeKVWVzj51las6OGKWdn59epLE8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=WbOEhBTF; 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="WbOEhBTF" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 46972C43394; Tue, 19 Mar 2024 15:29:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1710862193; bh=J6fbFW/hwqiA6LHzfsT/AMLYc+NWeHRMPXg1NtzMCYA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WbOEhBTFeXAdxstMkBJ6ztS1KBg2hbVkr5PS1mveNvUknB4WliWXG6r54oZ8u2Y4t YXB8a6MQARRjjY50sYMvO0SZMWwxZ2sorrRV5coXKnQeeVQkyorbsGhFvAjLYjJUys /QOtJWsU0TJHsMqb6aM11UJvBKkGEOHy5dd6D/MpBoZcoYwlqvalNXMvTbFj7jfG6t nwuyHo//zrbWj9GZIhtoK3N7XBqSWOMrPpUgDSyotA8QmhVX2Xx34ISeISnzqaNuMq RVrYI4bHdDhdQo1OUmCTK/sdjzBsXBJrN4V8Tvm2ODS/nQnVf2uloKt9jhSk12/BAS J+GNgKQ1JEWCQ== Received: from johan by xi.lan with local (Exim 4.97.1) (envelope-from ) id 1rmbPc-000000000LM-0CB1; Tue, 19 Mar 2024 16:30:00 +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 v3 4/5] Bluetooth: qca: add workaround for broken address properties Date: Tue, 19 Mar 2024 16:29:25 +0100 Message-ID: <20240319152926.1288-5-johan+linaro@kernel.org> X-Mailer: git-send-email 2.43.2 In-Reply-To: <20240319152926.1288-1-johan+linaro@kernel.org> References: <20240319152926.1288-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 Due to a long-standing bug in the Qualcomm Bluetooth driver, the device address has so far been reversed when configuring non-ROME controllers. This, in turn, has led to one vendor reversing the address that the boot firmware provides using the 'local-bd-address' devicetree property. 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 Signed-off-by: Johan Hovold --- drivers/bluetooth/hci_qca.c | 10 ++++++++++ 1 file changed, 10 insertions(+) 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 From patchwork Tue Mar 19 15:29:26 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Hovold X-Patchwork-Id: 13596781 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 AD132657BE; Tue, 19 Mar 2024 15:29:53 +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=1710862193; cv=none; b=Hga3DdTiuMqDLCrhGeuHd0rbiXGj0hUCd+CTXIWhQAuMOLNH5QZ2yjzX7HiiVugBjl4bevuQEHz7+TY5eO5rAZfeDns05Z8LYlwLzY1T20sCUzr/sW0C0/koEIYrKzLQ8n5EN3ql/iVXnNkmvTut9YIV9eexOD7O/E2HtIxrQ9o= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710862193; c=relaxed/simple; bh=8/BAOgM7/E4Oo/lzhVSkfOrC0gVN60IoirdUeSlLQpk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=sUgYcZcQ0NWP/o45wR8H1ja/QCTBDJVG/axzfQKrK81SiSLl1NY6S4jUyhV2erv8E4zEvCBOWePEtcsLeWDr5+Fb24yifiPu+ZpNZ+PpTuaaK8PypRpW1uukECIe1vIr/ATKgcqD5/hXV0EY0YYzg/BgMAwbYuelZONgoOTWzMQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=FZEu/ANV; 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="FZEu/ANV" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4E101C433C7; Tue, 19 Mar 2024 15:29:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1710862193; bh=8/BAOgM7/E4Oo/lzhVSkfOrC0gVN60IoirdUeSlLQpk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=FZEu/ANVOCScrmFrRpYhb6lv9kfcI1MRolgnPAxDfUrvI856KNELYC3gAS8nuBngd M9XRLrl7h90EkRCEN7dMkycWmKdksVc5h+jviA+dvCsF6khX3idFQrM08mbr/zFiH0 uB30woKsESP10flPIy9Es48hqFbbAc8uRLc4JmkUiN+zkmTmEOeepDeBh68U0qROlK epUIiwqvdOWJeQTxGFdJIQ7w37pcOzYQEFJDNIsFdzyVgbc//n2AEKPzQYeZgANrb1 q545wrbYA5yREvFDOuo80nyciU2H/jCDmRWOvqvj0GJBaYCxZRVgtqlYOR+KQusKHI 8ACqk3BgRQhGw== Received: from johan by xi.lan with local (Exim 4.97.1) (envelope-from ) id 1rmbPc-000000000LO-0cIK; Tue, 19 Mar 2024 16:30:00 +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, Rob Clark Subject: [PATCH v3 5/5] arm64: dts: qcom: sc7180-trogdor: mark bluetooth address as broken Date: Tue, 19 Mar 2024 16:29:26 +0100 Message-ID: <20240319152926.1288-6-johan+linaro@kernel.org> X-Mailer: git-send-email 2.43.2 In-Reply-To: <20240319152926.1288-1-johan+linaro@kernel.org> References: <20240319152926.1288-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 Several Qualcomm 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 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. The boot firmware in SC7180 Trogdor Chromebooks is known to be affected so mark the 'local-bd-address' property as broken to maintain backwards compatibility with older firmware when fixing the underlying driver bug. Note that ChromeOS always updates the kernel and devicetree in lockstep so that there is no need to handle backwards compatibility with older devicetrees. Fixes: 7ec3e67307f8 ("arm64: dts: qcom: sc7180-trogdor: add initial trogdor and lazor dt") Cc: stable@vger.kernel.org # 5.10 Cc: Rob Clark Signed-off-by: Johan Hovold Reviewed-by: Douglas Anderson --- arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi index 46aaeba28604..ebe37678102f 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi @@ -943,6 +943,8 @@ bluetooth: bluetooth { vddrf-supply = <&pp1300_l2c>; vddch0-supply = <&pp3300_l10c>; max-speed = <3200000>; + + qcom,local-bd-address-broken; }; };