Bluetooth: add quirk for broken address properties

commit 39646f29b100566451d37abc4cc8cdd583756dfe upstream.

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 <dianders@chromium.org>
Signed-off-by: Johan Hovold <johan+linaro@kernel.org>
Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/include/net/bluetooth/hci.h b/include/net/bluetooth/hci.h
index 0d231024570a3bae11a3e77d368fb778a8d7ee6b..03e68a8e229f5f7262e8e7e8cc3019757f8ad43b 100644 (file)
--- 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 9b241eabca3e8eaac4c2b431993f9714dea4b78c..d6c0633bfe5bfb8bcf1777e0619bcccce256978c 100644 (file)
--- a/net/bluetooth/hci_sync.c
+++ b/net/bluetooth/hci_sync.c
@@ -3292,7 +3292,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 {