Some devices ship with the controller default address, like the
Orange Pi 3 (BCM4345C5).
Allow the bootloader to set a valid address through the device tree.
Signed-off-by: Andre Heider <a.heider@xxxxxxxxx>
---
drivers/bluetooth/btbcm.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/bluetooth/btbcm.c b/drivers/bluetooth/btbcm.c
index 2d2e6d862068..9d16162d01ea 100644
--- a/drivers/bluetooth/btbcm.c
+++ b/drivers/bluetooth/btbcm.c
@@ -439,6 +439,7 @@ int btbcm_finalize(struct hci_dev *hdev)
btbcm_check_bdaddr(hdev);
set_bit(HCI_QUIRK_STRICT_DUPLICATE_FILTER, &hdev->quirks);
+ set_bit(HCI_QUIRK_USE_BDADDR_PROPERTY, &hdev->quirks);
return 0;
}
have you actually tested this? I might be mistaken, but the code that I read in hci_dev_do_open() would drop this into unconfigured state since HCI_QURIK_INVALID_BDADDR is still set.
I thought so, but double-checking something obviously failed...
What would be an acceptable solution to this HCI_QUIRK_USE_BDADDR_PROPERTY|HCI_QUIRK_INVALID_BDADDR situation?
Getting rid of the quirk in the driver in e.g. set_bdaddr() doesn't sound right.
How about:
diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c
index 04bc79359a17..7bc384be89f8 100644
--- a/net/bluetooth/hci_core.c
+++ b/net/bluetooth/hci_core.c
@@ -1470,7 +1470,8 @@ static int hci_dev_do_open(struct hci_dev *hdev)
* start up as unconfigured.
*/
if (test_bit(HCI_QUIRK_EXTERNAL_CONFIG, &hdev->quirks) ||
- test_bit(HCI_QUIRK_INVALID_BDADDR, &hdev->quirks))
+ (test_bit(HCI_QUIRK_INVALID_BDADDR, &hdev->quirks) &&
+ !test_bit(HCI_QUIRK_USE_BDADDR_PROPERTY, &hdev->quirks)))
hci_dev_set_flag(hdev, HCI_UNCONFIGURED);
/* For an unconfigured controller it is required to
That works for me (double-checked this time ;)
I am not sure yet. I mean we define what HCI_QUIRK_USE_BDADDR_PROPERTY actually means. Right now it means this:
1) Run though ->setup
2) If no public BD_ADDR is set, then try to read from DT
3) If found, try to set, if set fails, abort dev_up
Now there is also another problem that no public BD_ADDR means BDADDR_ANY right now. Which means, for Broadcom chips that is never the case. So HCI_QUIRK_USE_BDADDR_PROPERTY doesn’t even work since their invalid addresses are not BDDADDR_ANY.
The first change needs to be something along these lines:
if (test_bit(HCI_QUIRK_USE_BDADDR_PROPERTY, &hdev->quirks)) {
- if (!bacmp(&hdev->public_addr, BDADDR_ANY))
+ if (!bacmp(&hdev->public_addr, BDADDR_ANY) ||
+ test_bit(HCI_QUIRK_INVALID_BDADDR, &hdev->quirks))
hci_dev_get_bd_addr_from_property(hdev);
Maybe I misunderstood, but just for the record: It works for me even without this hunk (with just my hunk above and the v2 bcm patch). The bdaddr via dt is used and the controller works without any userland interaction.
then please have a btmon trace and check what BD_ADDR is returned from the Read_BD_Addr command. It could be well that hdev->public_addr is not yet populated with the Broadcom specific hdev->setup and thus it does work. However what happens for the hardware that requires to re-run hdev->setup every time. As I said, we need to get the semantics figure out on what we expect things to be when these quirks are provided.
Ok, so here's what I did:
- rmmod bt modules
- start btmon
- modprobe 'em again
The relevant part looks like:
< HCI Command: Read BD ADDR (0x04|0x0009) plen 0 #279 [hci0] 95.691010
HCI Event: Command Complete (0x0e) plen 10 #280 [hci0] 95.691727
Read BD ADDR (0x04|0x0009) ncmd 1
Status: Success (0x00)
Address: 43:45:C5:00:1F:AC (OUI 43-45-C5)
...
< HCI Command: Broadcom Write BD ADDR (0x3f|0x0001) plen 6 #283 [hci0] 95.692816
Address: 02:07:96:3D:D4:52 (OUI 02-07-96)
HCI Event: Command Complete (0x0e) plen 4 #284 [hci0] 95.693859
Broadcom Write BD ADDR (0x3f|0x0001) ncmd 1
Status: Success (0x00)
< HCI Command: Reset (0x03|0x0003) plen 0 #285 [hci0] 95.693946
HCI Event: Command Complete (0x0e) plen 4 #286 [hci0] 95.697468
Reset (0x03|0x0003) ncmd 1
Status: Success (0x00)
...
< HCI Command: Read BD ADDR (0x04|0x0009) plen 0 #291 [hci0] 95.698995
HCI Event: Command Complete (0x0e) plen 10 #292 [hci0] 95.699851
Read BD ADDR (0x04|0x0009) ncmd 1
Status: Success (0x00)
Address: 02:07:96:3D:D4:52 (OUI 02-07-96)
So it seems it gets BDADDR_BCM4345C5 first but a reset after set_bdaddr(what-I-passed-via-devicetree) makes this work?
What happens on a system that has the patch and doesn’t provide an address via DT?
How about something like (not even compile tested):
diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c
index 04bc79359a17..40c6cc6bd35f 100644
--- a/net/bluetooth/hci_core.c
+++ b/net/bluetooth/hci_core.c
@@ -1385,6 +1385,7 @@ static void hci_dev_get_bd_addr_from_property(struct hci_dev *hdev)
static int hci_dev_do_open(struct hci_dev *hdev)
{
int ret = 0;
+ bool valid_bdaddr = false;
BT_DBG("%s %p", hdev->name, hdev);
@@ -1457,9 +1458,11 @@ static int hci_dev_do_open(struct hci_dev *hdev)
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);
+ valid_bdaddr = ret == 0;
+ }
}
setup_failed:
@@ -1469,8 +1472,11 @@ static int hci_dev_do_open(struct hci_dev *hdev)
* In case any of them is set, the controller has to
* start up as unconfigured.
*/
+ if (!valid_bdaddr)
+ valid_bdaddr = !test_bit(HCI_QUIRK_INVALID_BDADDR, &hdev->quirks);
+
if (test_bit(HCI_QUIRK_EXTERNAL_CONFIG, &hdev->quirks) ||
- test_bit(HCI_QUIRK_INVALID_BDADDR, &hdev->quirks))
+ !valid_bdaddr)
hci_dev_set_flag(hdev, HCI_UNCONFIGURED);
/* For an unconfigured controller it is required to
