Skip to content

Commit

Permalink
Bluetooth: Convert le_scan_disable timeout to hci_sync
Browse files Browse the repository at this point in the history 
The le_scan_disable timeout was being performed on the deprecated
hci_request.c mechanism.  This timeout is performed in hci_sync.c

Signed-off-by: Brian Gix <brian.gix@intel.com>
Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
  • Loading branch information
Brian Gix authored and Luiz Augusto von Dentz committed Aug 25, 2022
1 parent 7ac7267 commit 8ffde2a
Show file tree
Hide file tree
Showing 2 changed files with 74 additions and 97 deletions.
98 changes: 1 addition & 97 deletions net/bluetooth/hci_request.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -269,6 +269,7 @@ void hci_req_add_ev(struct hci_request *req, u16 opcode, u32 plen,
void hci_req_add(struct hci_request *req, u16 opcode, u32 plen,
const void *param)
{
bt_dev_dbg(req->hdev, "HCI_REQ-0x%4.4x", opcode);
hci_req_add_ev(req, opcode, plen, param, 0);
}

Expand Down Expand Up @@ -1974,101 +1975,6 @@ int hci_abort_conn(struct hci_conn *conn, u8 reason)
return 0;
}

static int le_scan_disable(struct hci_request *req, unsigned long opt)
{
hci_req_add_le_scan_disable(req, false);
return 0;
}

static int bredr_inquiry(struct hci_request *req, unsigned long opt)
{
u8 length = opt;
const u8 giac[3] = { 0x33, 0x8b, 0x9e };
const u8 liac[3] = { 0x00, 0x8b, 0x9e };
struct hci_cp_inquiry cp;

if (test_bit(HCI_INQUIRY, &req->hdev->flags))
return 0;

bt_dev_dbg(req->hdev, "");

hci_dev_lock(req->hdev);
hci_inquiry_cache_flush(req->hdev);
hci_dev_unlock(req->hdev);

memset(&cp, 0, sizeof(cp));

if (req->hdev->discovery.limited)
memcpy(&cp.lap, liac, sizeof(cp.lap));
else
memcpy(&cp.lap, giac, sizeof(cp.lap));

cp.length = length;

hci_req_add(req, HCI_OP_INQUIRY, sizeof(cp), &cp);

return 0;
}

static void le_scan_disable_work(struct work_struct *work)
{
struct hci_dev *hdev = container_of(work, struct hci_dev,
le_scan_disable.work);
u8 status;

bt_dev_dbg(hdev, "");

if (!hci_dev_test_flag(hdev, HCI_LE_SCAN))
return;

cancel_delayed_work(&hdev->le_scan_restart);

hci_req_sync(hdev, le_scan_disable, 0, HCI_CMD_TIMEOUT, &status);
if (status) {
bt_dev_err(hdev, "failed to disable LE scan: status 0x%02x",
status);
return;
}

hdev->discovery.scan_start = 0;

/* If we were running LE only scan, change discovery state. If
* we were running both LE and BR/EDR inquiry simultaneously,
* and BR/EDR inquiry is already finished, stop discovery,
* otherwise BR/EDR inquiry will stop discovery when finished.
* If we will resolve remote device name, do not change
* discovery state.
*/

if (hdev->discovery.type == DISCOV_TYPE_LE)
goto discov_stopped;

if (hdev->discovery.type != DISCOV_TYPE_INTERLEAVED)
return;

if (test_bit(HCI_QUIRK_SIMULTANEOUS_DISCOVERY, &hdev->quirks)) {
if (!test_bit(HCI_INQUIRY, &hdev->flags) &&
hdev->discovery.state != DISCOVERY_RESOLVING)
goto discov_stopped;

return;
}

hci_req_sync(hdev, bredr_inquiry, DISCOV_INTERLEAVED_INQUIRY_LEN,
HCI_CMD_TIMEOUT, &status);
if (status) {
bt_dev_err(hdev, "inquiry failed: status 0x%02x", status);
goto discov_stopped;
}

return;

discov_stopped:
hci_dev_lock(hdev);
hci_discovery_set_state(hdev, DISCOVERY_STOPPED);
hci_dev_unlock(hdev);
}

static int le_scan_restart(struct hci_request *req, unsigned long opt)
{
struct hci_dev *hdev = req->hdev;
Expand Down Expand Up @@ -2252,7 +2158,6 @@ int hci_req_configure_datapath(struct hci_dev *hdev, struct bt_codec *codec)

void hci_request_setup(struct hci_dev *hdev)
{
INIT_DELAYED_WORK(&hdev->le_scan_disable, le_scan_disable_work);
INIT_DELAYED_WORK(&hdev->le_scan_restart, le_scan_restart_work);
INIT_DELAYED_WORK(&hdev->adv_instance_expire, adv_timeout_expire);
INIT_DELAYED_WORK(&hdev->interleave_scan, interleave_scan_work);
Expand All @@ -2262,7 +2167,6 @@ void hci_request_cancel_all(struct hci_dev *hdev)
{
__hci_cmd_sync_cancel(hdev, ENODEV);

cancel_delayed_work_sync(&hdev->le_scan_disable);
cancel_delayed_work_sync(&hdev->le_scan_restart);

if (hdev->adv_instance_timeout) {
Expand Down
73 changes: 73 additions & 0 deletions net/bluetooth/hci_sync.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -321,13 +321,85 @@ static void hci_cmd_sync_cancel_work(struct work_struct *work)
wake_up_interruptible(&hdev->req_wait_q);
}

static int hci_scan_disable_sync(struct hci_dev *hdev);
static int scan_disable_sync(struct hci_dev *hdev, void *data)
{
return hci_scan_disable_sync(hdev);
}

static int hci_inquiry_sync(struct hci_dev *hdev, u8 length);
static int interleaved_inquiry_sync(struct hci_dev *hdev, void *data)
{
return hci_inquiry_sync(hdev, DISCOV_INTERLEAVED_INQUIRY_LEN);
}

static void le_scan_disable(struct work_struct *work)
{
struct hci_dev *hdev = container_of(work, struct hci_dev,
le_scan_disable.work);
int status;

bt_dev_dbg(hdev, "");
hci_dev_lock(hdev);

if (!hci_dev_test_flag(hdev, HCI_LE_SCAN))
goto _return;

cancel_delayed_work(&hdev->le_scan_restart);

status = hci_cmd_sync_queue(hdev, scan_disable_sync, NULL, NULL);
if (status) {
bt_dev_err(hdev, "failed to disable LE scan: %d", status);
goto _return;
}

hdev->discovery.scan_start = 0;

/* If we were running LE only scan, change discovery state. If
* we were running both LE and BR/EDR inquiry simultaneously,
* and BR/EDR inquiry is already finished, stop discovery,
* otherwise BR/EDR inquiry will stop discovery when finished.
* If we will resolve remote device name, do not change
* discovery state.
*/

if (hdev->discovery.type == DISCOV_TYPE_LE)
goto discov_stopped;

if (hdev->discovery.type != DISCOV_TYPE_INTERLEAVED)
goto _return;

if (test_bit(HCI_QUIRK_SIMULTANEOUS_DISCOVERY, &hdev->quirks)) {
if (!test_bit(HCI_INQUIRY, &hdev->flags) &&
hdev->discovery.state != DISCOVERY_RESOLVING)
goto discov_stopped;

goto _return;
}

status = hci_cmd_sync_queue(hdev, interleaved_inquiry_sync, NULL, NULL);
if (status) {
bt_dev_err(hdev, "inquiry failed: status %d", status);
goto discov_stopped;
}

goto _return;

discov_stopped:
hci_discovery_set_state(hdev, DISCOVERY_STOPPED);

_return:
hci_dev_unlock(hdev);
}

void hci_cmd_sync_init(struct hci_dev *hdev)
{
INIT_WORK(&hdev->cmd_sync_work, hci_cmd_sync_work);
INIT_LIST_HEAD(&hdev->cmd_sync_work_list);
mutex_init(&hdev->cmd_sync_work_lock);

INIT_WORK(&hdev->cmd_sync_cancel_work, hci_cmd_sync_cancel_work);
INIT_DELAYED_WORK(&hdev->le_scan_disable, le_scan_disable);
}

void hci_cmd_sync_clear(struct hci_dev *hdev)
Expand Down Expand Up @@ -4415,6 +4487,7 @@ int hci_dev_close_sync(struct hci_dev *hdev)

cancel_delayed_work(&hdev->power_off);
cancel_delayed_work(&hdev->ncmd_timer);
cancel_delayed_work(&hdev->le_scan_disable);

hci_request_cancel_all(hdev);

Expand Down

0 comments on commit 8ffde2a

Please sign in to comment.