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

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

Bluetooth: Add timer to force power off 



If some of the cleanup commands caused by mgmt_set_powered(off) never
complete we should still force the adapter to be powered down. This is
rather easy to do since hdev->power_off is already a delayed work
struct. This patch schedules this delayed work if at least one HCI
command was sent by the cleanup procedure.

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

include/net/bluetooth/hci.h

+1 −0
Original line number Diff line number Diff line
@@ -182,6 +182,7 @@ enum { 
#define HCI_CMD_TIMEOUT		msecs_to_jiffies(2000)	/* 2 seconds */

#define HCI_ACL_TX_TIMEOUT	msecs_to_jiffies(45000)	/* 45 seconds */

#define HCI_AUTO_OFF_TIMEOUT	msecs_to_jiffies(2000)	/* 2 seconds */

#define HCI_POWER_OFF_TIMEOUT	msecs_to_jiffies(5000)	/* 5 seconds */



/* HCI data types */

#define HCI_COMMAND_PKT		0x01

net/bluetooth/mgmt.c

+13 −3
Original line number Diff line number Diff line
@@ -1031,9 +1031,11 @@ static void clean_up_hci_complete(struct hci_dev *hdev, u8 status) 
{

	BT_DBG("%s status 0x%02x", hdev->name, status);



	if (hci_conn_count(hdev) == 0)

	if (hci_conn_count(hdev) == 0) {

		cancel_delayed_work(&hdev->power_off);

		queue_work(hdev->req_workqueue, &hdev->power_off.work);

	}

}



static int clean_up_hci_state(struct hci_dev *hdev)

{
@@ -1139,9 +1141,13 @@ static int set_powered(struct sock *sk, struct hci_dev *hdev, void *data, 
	} else {

		/* Disconnect connections, stop scans, etc */

		err = clean_up_hci_state(hdev);

		if (!err)

			queue_delayed_work(hdev->req_workqueue, &hdev->power_off,

					   HCI_POWER_OFF_TIMEOUT);



		/* ENODATA means there were no HCI commands queued */

		if (err == -ENODATA) {

			cancel_delayed_work(&hdev->power_off);

			queue_work(hdev->req_workqueue, &hdev->power_off.work);

			err = 0;

		}
@@ -5147,9 +5153,11 @@ void mgmt_device_disconnected(struct hci_dev *hdev, bdaddr_t *bdaddr, 
		/* The connection is still in hci_conn_hash so test for 1

		 * instead of 0 to know if this is the last one.

		 */

		if (!cp->val && hci_conn_count(hdev) == 1)

		if (!cp->val && hci_conn_count(hdev) == 1) {

			cancel_delayed_work(&hdev->power_off);

			queue_work(hdev->req_workqueue, &hdev->power_off.work);

		}

	}



	if (!mgmt_connected)

		return;
@@ -5217,9 +5225,11 @@ void mgmt_connect_failed(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 link_type, 
		/* The connection is still in hci_conn_hash so test for 1

		 * instead of 0 to know if this is the last one.

		 */

		if (!cp->val && hci_conn_count(hdev) == 1)

		if (!cp->val && hci_conn_count(hdev) == 1) {

			cancel_delayed_work(&hdev->power_off);

			queue_work(hdev->req_workqueue, &hdev->power_off.work);

		}

	}



	bacpy(&ev.addr.bdaddr, bdaddr);

	ev.addr.type = link_to_bdaddr(link_type, addr_type);