Commit 0cb73658 authored by Johan Hovold's avatar Johan Hovold Committed by Jakub Kicinski
Browse files

Bluetooth: fix invalid-bdaddr quirk for non-persistent setup 



Devices that lack persistent storage for the device address can indicate
this by setting the HCI_QUIRK_INVALID_BDADDR which causes the controller
to be marked as unconfigured until user space has set a valid address.

Once configured, the device address must be set on every setup for
controllers with HCI_QUIRK_NON_PERSISTENT_SETUP to avoid marking the
controller as unconfigured and requiring the address to be set again.

Fixes: 740011cf ("Bluetooth: Add new quirk for non-persistent setup settings")
Signed-off-by: default avatarJohan Hovold <johan+linaro@kernel.org>
Signed-off-by: default avatarLuiz Augusto von Dentz <luiz.von.dentz@intel.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent f752a0b3

net/bluetooth/hci_sync.c

+11 −17
Original line number Diff line number Diff line
@@ -4626,25 +4626,19 @@ static int hci_dev_setup_sync(struct hci_dev *hdev) 
	invalid_bdaddr = test_bit(HCI_QUIRK_INVALID_BDADDR, &hdev->quirks);



	if (!ret) {

		if (test_bit(HCI_QUIRK_USE_BDADDR_PROPERTY, &hdev->quirks)) {

			if (!bacmp(&hdev->public_addr, BDADDR_ANY))

		if (test_bit(HCI_QUIRK_USE_BDADDR_PROPERTY, &hdev->quirks) &&

		    !bacmp(&hdev->public_addr, BDADDR_ANY))

			hci_dev_get_bd_addr_from_property(hdev);



			if (bacmp(&hdev->public_addr, BDADDR_ANY) &&

		if ((invalid_bdaddr ||

		     test_bit(HCI_QUIRK_USE_BDADDR_PROPERTY, &hdev->quirks)) &&

		    bacmp(&hdev->public_addr, BDADDR_ANY) &&

		    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.

				 */

			ret = hdev->set_bdaddr(hdev, &hdev->public_addr);

			if (!ret)

				invalid_bdaddr = false;

		}

	}

	}



	/* The transport driver can set these quirks before

	 * creating the HCI device or in its setup callback.