From mboxrd@z Thu Jan 1 00:00:00 1970 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 9F73C3D76 for ; Fri, 5 Apr 2024 06:25:14 +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=1712298314; cv=none; b=OivUZG+goviLJh4lw0YlKEZxaJTFPbmrdCmqaKdgldET+wSpCYX5tkEZpe/f4m4ZiYz8SCo9JglOuVuvPswGvBvWzuG7vd4ErrDddPWJzN9QxaeDdIOZM78ZNagW2FlSLLFLQ3qqEWOGozYa9QLj5G9lZO2UCBwDI+vOSpr6N9Q= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712298314; c=relaxed/simple; bh=cCEwwVUU0UlDzrKA/TPSQfHvQNUtiuBoC01lsdi9cao=; h=Subject:To:Cc:From:Date:Message-ID:MIME-Version:Content-Type; b=AtXKIJRg8Wgf4xMpvwwDJrOKsWpHS6KdLwXFJJPguCnaTMyynWSsC4DpD6chpj4/YAqcQqBCHmkEVs6RTnVBT2WkS1yJUty7hqggcoaMj/4wdMs9/WHIF9KRDVyS30FhMPr6Jww836RSp57iAQedcbiAviux9CXgPxd52kCkuME= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=CuUz5o+i; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="CuUz5o+i" Received: by smtp.kernel.org (Postfix) with ESMTPSA id BBDD1C433C7; Fri, 5 Apr 2024 06:25:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1712298314; bh=cCEwwVUU0UlDzrKA/TPSQfHvQNUtiuBoC01lsdi9cao=; h=Subject:To:Cc:From:Date:From; b=CuUz5o+i36V+kdkXVlAcpc0b3E/sq+X8DAbp6JqoN8JlN7x6e1r1157TSy+HeViKH 534czldWtAmaEN90cEvlr7ATw74UcWcq3AMZ01MAhdQatI5+C/QDdK3MS55DSvWm5r 45n9RVwXjkMCBaYOsvv7pqLrA8I9hTRSwaXvr9P0= Subject: FAILED: patch "[PATCH] Bluetooth: add quirk for broken address properties" failed to apply to 5.4-stable tree To: johan+linaro@kernel.org,dianders@chromium.org,luiz.von.dentz@intel.com Cc: From: Date: Fri, 05 Apr 2024 08:25:00 +0200 Message-ID: <2024040500-resubmit-proofing-698b@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit The patch below does not apply to the 5.4-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to . To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.4.y git checkout FETCH_HEAD git cherry-pick -x 39646f29b100566451d37abc4cc8cdd583756dfe # git commit -s git send-email --to '' --in-reply-to '2024040500-resubmit-proofing-698b@gregkh' --subject-prefix 'PATCH 5.4.y' HEAD^.. Possible dependencies: thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 39646f29b100566451d37abc4cc8cdd583756dfe Mon Sep 17 00:00:00 2001 From: Johan Hovold Date: Wed, 20 Mar 2024 08:55:53 +0100 Subject: [PATCH] Bluetooth: add quirk for broken address properties 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 Signed-off-by: Luiz Augusto von Dentz diff --git a/include/net/bluetooth/hci.h b/include/net/bluetooth/hci.h index 8701ca5f31ee..5c12761cbc0e 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 f6b662369322..639090b9f4b8 100644 --- a/net/bluetooth/hci_sync.c +++ b/net/bluetooth/hci_sync.c @@ -3416,7 +3416,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 {