Bluetooth: hci_sync: Add fallback-bd-address prop

The kernel Bluetooth framework understands that devices may not
be programmed with valid Bluetooth addresses. It also has the ability
to override a Bluetooth address with the value of the local-bd-address
DT property, but it ignores the validity of the existing address when
doing so.

Add a new boolean property, fallback-bd-address, which indicates that
the given local-bd-address property should only be used if the device
does not already have a valid BDADDR.

Signed-off-by: Phil Elwell <phil@raspberrypi.com>

diff --git a/net/bluetooth/hci_sync.c b/net/bluetooth/hci_sync.c
index 5c4efa6..5a94740 100644 (file)
--- a/net/bluetooth/hci_sync.c
+++ b/net/bluetooth/hci_sync.c
@@ -4678,6 +4678,7 @@ static const struct {
  */
 static int hci_dev_setup_sync(struct hci_dev *hdev)
 {
+       struct fwnode_handle *fwnode = dev_fwnode(hdev->dev.parent);
        int ret = 0;
        bool invalid_bdaddr;
        size_t i;
@@ -4706,7 +4707,8 @@ static int hci_dev_setup_sync(struct hci_dev *hdev)
                         test_bit(HCI_QUIRK_USE_BDADDR_PROPERTY, &hdev->quirks);
        if (!ret) {
                if (test_bit(HCI_QUIRK_USE_BDADDR_PROPERTY, &hdev->quirks) &&
-                   !bacmp(&hdev->public_addr, BDADDR_ANY))
+                   !bacmp(&hdev->public_addr, BDADDR_ANY) &&
+                   (invalid_bdaddr || !fwnode_property_present(fwnode, "fallback-bd-address")))
                        hci_dev_get_bd_addr_from_property(hdev);
 
                if (invalid_bdaddr && bacmp(&hdev->public_addr, BDADDR_ANY) &&