Commit 1bbf4023 authored by Luiz Augusto von Dentz's avatar Luiz Augusto von Dentz
Browse files

Bluetooth: hci_sync: Split hci_dev_open_sync 



This splits hci_dev_open_sync so each stage is handle by its own
function so it is easier to identify each stage.

Signed-off-by: default avatarLuiz Augusto von Dentz <luiz.von.dentz@intel.com>
parent 7cf5c297

net/bluetooth/hci_sync.c

+126 −99
Original line number Diff line number Diff line
@@ -3875,68 +3875,22 @@ static const struct { 
			 "advertised, but not supported.")

};



int hci_dev_open_sync(struct hci_dev *hdev)

/* This function handles hdev setup stage:

 *

 * Calls hdev->setup

 * Setup address if HCI_QUIRK_USE_BDADDR_PROPERTY is set.

 */

static int hci_dev_setup_sync(struct hci_dev *hdev)

{

	int ret = 0;



	bt_dev_dbg(hdev, "");



	if (hci_dev_test_flag(hdev, HCI_UNREGISTER)) {

		ret = -ENODEV;

		goto done;

	}

	bool invalid_bdaddr;

	size_t i;



	if (!hci_dev_test_flag(hdev, HCI_SETUP) &&

	    !hci_dev_test_flag(hdev, HCI_CONFIG)) {

		/* Check for rfkill but allow the HCI setup stage to

		 * proceed (which in itself doesn't cause any RF activity).

		 */

		if (hci_dev_test_flag(hdev, HCI_RFKILLED)) {

			ret = -ERFKILL;

			goto done;

		}



		/* Check for valid public address or a configured static

		 * random address, but let the HCI setup proceed to

		 * be able to determine if there is a public address

		 * or not.

		 *

		 * In case of user channel usage, it is not important

		 * if a public address or static random address is

		 * available.

		 *

		 * This check is only valid for BR/EDR controllers

		 * since AMP controllers do not have an address.

		 */

		if (!hci_dev_test_flag(hdev, HCI_USER_CHANNEL) &&

		    hdev->dev_type == HCI_PRIMARY &&

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

		    !bacmp(&hdev->static_addr, BDADDR_ANY)) {

			ret = -EADDRNOTAVAIL;

			goto done;

		}

	}



	if (test_bit(HCI_UP, &hdev->flags)) {

		ret = -EALREADY;

		goto done;

	}



	if (hdev->open(hdev)) {

		ret = -EIO;

		goto done;

	}



	set_bit(HCI_RUNNING, &hdev->flags);

	hci_sock_dev_event(hdev, HCI_DEV_OPEN);



	atomic_set(&hdev->cmd_cnt, 1);

	set_bit(HCI_INIT, &hdev->flags);

	    !test_bit(HCI_QUIRK_NON_PERSISTENT_SETUP, &hdev->quirks))

		return 0;



	if (hci_dev_test_flag(hdev, HCI_SETUP) ||

	    test_bit(HCI_QUIRK_NON_PERSISTENT_SETUP, &hdev->quirks)) {

		bool invalid_bdaddr;

		size_t i;

	bt_dev_dbg(hdev, "");



	hci_sock_dev_event(hdev, HCI_DEV_SETUP);
@@ -3945,20 +3899,16 @@ int hci_dev_open_sync(struct hci_dev *hdev) 


	for (i = 0; i < ARRAY_SIZE(hci_broken_table); i++) {

		if (test_bit(hci_broken_table[i].quirk, &hdev->quirks))

				bt_dev_warn(hdev, "%s",

					    hci_broken_table[i].desc);

			bt_dev_warn(hdev, "%s", hci_broken_table[i].desc);

	}



	/* 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 (ret)

			goto setup_failed;

	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))

				hci_dev_get_bd_addr_from_property(hdev);
@@ -3977,8 +3927,8 @@ int hci_dev_open_sync(struct hci_dev *hdev) 
					invalid_bdaddr = false;

			}

		}

	}



setup_failed:

	/* The transport driver can set these quirks before

	 * creating the HCI device or in its setup callback.

	 *
@@ -4002,9 +3952,27 @@ int hci_dev_open_sync(struct hci_dev *hdev) 
	 * will be read using the Read BD Address command.

	 */

	if (hci_dev_test_flag(hdev, HCI_UNCONFIGURED))

			ret = hci_unconf_init_sync(hdev);

		return hci_unconf_init_sync(hdev);



	return ret;

}



/* This function handles hdev init stage:

 *

 * Calls hci_dev_setup_sync to perform setup stage

 * Calls hci_init_sync to perform HCI command init sequence

 */

static int hci_dev_init_sync(struct hci_dev *hdev)

{

	int ret;



	bt_dev_dbg(hdev, "");



	atomic_set(&hdev->cmd_cnt, 1);

	set_bit(HCI_INIT, &hdev->flags);



	ret = hci_dev_setup_sync(hdev);



	if (hci_dev_test_flag(hdev, HCI_CONFIG)) {

		/* If public address change is configured, ensure that

		 * the address gets programmed. If the driver does not
@@ -4043,6 +4011,65 @@ int hci_dev_open_sync(struct hci_dev *hdev) 


	clear_bit(HCI_INIT, &hdev->flags);



	return ret;

}



int hci_dev_open_sync(struct hci_dev *hdev)

{

	int ret;



	bt_dev_dbg(hdev, "");



	if (hci_dev_test_flag(hdev, HCI_UNREGISTER)) {

		ret = -ENODEV;

		goto done;

	}



	if (!hci_dev_test_flag(hdev, HCI_SETUP) &&

	    !hci_dev_test_flag(hdev, HCI_CONFIG)) {

		/* Check for rfkill but allow the HCI setup stage to

		 * proceed (which in itself doesn't cause any RF activity).

		 */

		if (hci_dev_test_flag(hdev, HCI_RFKILLED)) {

			ret = -ERFKILL;

			goto done;

		}



		/* Check for valid public address or a configured static

		 * random address, but let the HCI setup proceed to

		 * be able to determine if there is a public address

		 * or not.

		 *

		 * In case of user channel usage, it is not important

		 * if a public address or static random address is

		 * available.

		 *

		 * This check is only valid for BR/EDR controllers

		 * since AMP controllers do not have an address.

		 */

		if (!hci_dev_test_flag(hdev, HCI_USER_CHANNEL) &&

		    hdev->dev_type == HCI_PRIMARY &&

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

		    !bacmp(&hdev->static_addr, BDADDR_ANY)) {

			ret = -EADDRNOTAVAIL;

			goto done;

		}

	}



	if (test_bit(HCI_UP, &hdev->flags)) {

		ret = -EALREADY;

		goto done;

	}



	if (hdev->open(hdev)) {

		ret = -EIO;

		goto done;

	}



	set_bit(HCI_RUNNING, &hdev->flags);

	hci_sock_dev_event(hdev, HCI_DEV_OPEN);



	ret = hci_dev_init_sync(hdev);

	if (!ret) {

		hci_dev_hold(hdev);

		hci_dev_set_flag(hdev, HCI_RPA_EXPIRED);