2019-11-21 08:28:30

by Marcel Holtmann

Subject: [PATCH 2/2] Bluetooth: Allow combination of BDADDR_PROPERTY and INVALID_BDADDR quirks

When utilizing BDADDR_PROPERTY and INVALID_BDADDR quirks together it
results in an unconfigured controller even if the bootloader provides
a valid address. Fix this by allowing a bootloader provided address
to mark the controller as configured.

Signed-off-by: Marcel Holtmann <[email protected]>
---
net/bluetooth/hci_core.c | 26 ++++++++++++++++++++++++--
1 file changed, 24 insertions(+), 2 deletions(-)

diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c
index c957f0611f74..6039105c96c0 100644
--- a/net/bluetooth/hci_core.c
+++ b/net/bluetooth/hci_core.c
@@ -1444,6 +1444,8 @@ static int hci_dev_do_open(struct hci_dev *hdev)

if (hci_dev_test_flag(hdev, HCI_SETUP) ||
test_bit(HCI_QUIRK_NON_PERSISTENT_SETUP, &hdev->quirks)) {
+ bool invalid_bdaddr;
+
hci_sock_dev_event(hdev, HCI_DEV_SETUP);

if (hdev->setup) {
@@ -1452,25 +1454,45 @@ static int hci_dev_do_open(struct hci_dev *hdev)
goto setup_failed;
}

+ /* The transport driver can set the quirk to mark the
+ * BD_ADDR invalid before creating the HCI device or in
+ * its setup callback.
+ */
+ invalid_bdaddr = test_bit(HCI_QUIRK_INVALID_BDADDR,
+ &hdev->quirks);
+
if (test_bit(HCI_QUIRK_USE_BDADDR_PROPERTY, &hdev->quirks)) {
if (!bacmp(&hdev->public_addr, BDADDR_ANY))
hci_dev_get_bd_addr_from_property(hdev);

if (bacmp(&hdev->public_addr, BDADDR_ANY) &&
- hdev->set_bdaddr)
+ hdev->set_bdaddr) {
ret = hdev->set_bdaddr(hdev,
&hdev->public_addr);
+
+ /* If setting of the BD_ADDR from the device
+ * property succeeds, then treat the address
+ * as valid even if the invalid BD_ADDR
+ * quirk indicates otherwise.
+ */
+ if (!ret)
+ invalid_bdaddr = false;
+ }
}

setup_failed:
/* The transport driver can set these quirks before
* creating the HCI device or in its setup callback.
*
+ * For the invalid BD_ADDR quirk it is possible that
+ * it becomes a valid address if the bootloader does
+ * provide it (see above).
+ *
* In case any of them is set, the controller has to
* start up as unconfigured.
*/
if (test_bit(HCI_QUIRK_EXTERNAL_CONFIG, &hdev->quirks) ||
- test_bit(HCI_QUIRK_INVALID_BDADDR, &hdev->quirks))
+ invalid_bdaddr)
hci_dev_set_flag(hdev, HCI_UNCONFIGURED);

/* For an unconfigured controller it is required to
--
2.23.0

2019-11-21 11:01:25

by Andre Heider

Subject: Re: [PATCH 2/2] Bluetooth: Allow combination of BDADDR_PROPERTY and INVALID_BDADDR quirks

> When utilizing BDADDR_PROPERTY and INVALID_BDADDR quirks together it
> results in an unconfigured controller even if the bootloader provides
> a valid address. Fix this by allowing a bootloader provided address
> to mark the controller as configured.
>
> Signed-off-by: Marcel Holtmann <[email protected]>

Thanks, confirmed working!

Both patches are:
Tested-by: Andre Heider <[email protected]>