Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f41c70c4 authored by Marcel Holtmann's avatar Marcel Holtmann Committed by Johan Hedberg
Browse files

Bluetooth: Add driver setup stage for early init 



Some drivers require a special stage for their early init. This is
always specific to the driver or transport. So call back into driver to
allow bringing up the device.

The advantage with this stage is that the Bluetooth core is actually
handling the HCI layer now. This means that command and event processing
is available.

Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
Signed-off-by: default avatarJohan Hedberg <johan.hedberg@intel.com>
parent 7b1abbbe

include/net/bluetooth/hci_core.h

+1 −0
Original line number Diff line number Diff line
@@ -293,6 +293,7 @@ struct hci_dev { 
	int (*open)(struct hci_dev *hdev);

	int (*close)(struct hci_dev *hdev);

	int (*flush)(struct hci_dev *hdev);

	int (*setup)(struct hci_dev *hdev);

	int (*send)(struct sk_buff *skb);

	void (*notify)(struct hci_dev *hdev, unsigned int evt);

	int (*ioctl)(struct hci_dev *hdev, unsigned int cmd, unsigned long arg);

net/bluetooth/hci_core.c

+20 −13
Original line number Diff line number Diff line
@@ -1127,26 +1127,33 @@ int hci_dev_open(__u16 dev) 
		goto done;

	}



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

		set_bit(HCI_RAW, &hdev->flags);



	/* Treat all non BR/EDR controllers as raw devices if

	   enable_hs is not set */

	if (hdev->dev_type != HCI_BREDR && !enable_hs)

		set_bit(HCI_RAW, &hdev->flags);



	if (hdev->open(hdev)) {

		ret = -EIO;

		goto done;

	}



	if (!test_bit(HCI_RAW, &hdev->flags)) {

	atomic_set(&hdev->cmd_cnt, 1);

	set_bit(HCI_INIT, &hdev->flags);



	if (hdev->setup && test_bit(HCI_SETUP, &hdev->dev_flags))

		ret = hdev->setup(hdev);



	if (!ret) {

		/* Treat all non BR/EDR controllers as raw devices if

		 * enable_hs is not set.

		 */

		if (hdev->dev_type != HCI_BREDR && !enable_hs)

			set_bit(HCI_RAW, &hdev->flags);



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

			set_bit(HCI_RAW, &hdev->flags);



		if (!test_bit(HCI_RAW, &hdev->flags))

			ret = __hci_init(hdev);

		clear_bit(HCI_INIT, &hdev->flags);

	}



	clear_bit(HCI_INIT, &hdev->flags);



	if (!ret) {

		hci_dev_hold(hdev);

		set_bit(HCI_UP, &hdev->flags);