Bluetooth: Perform HCI update for power on synchronously
[deliverable/linux.git] / net / bluetooth / hci_request.c
index da1e30b85e770ef483ead7a690ccaeeb73c5f2d0..7cc24f1448bd3d902aef81fa1f8d9352710ac325 100644 (file)
    SOFTWARE IS DISCLAIMED.
 */
 
+#include <asm/unaligned.h>
+
 #include <net/bluetooth/bluetooth.h>
 #include <net/bluetooth/hci_core.h>
+#include <net/bluetooth/mgmt.h>
 
 #include "smp.h"
 #include "hci_request.h"
@@ -220,8 +223,14 @@ int __hci_req_sync(struct hci_dev *hdev, int (*func)(struct hci_request *req,
                 * trigger any commands to be sent. This is normal behavior
                 * and should not trigger an error return.
                 */
-               if (err == -ENODATA)
+               if (err == -ENODATA) {
+                       if (hci_status)
+                               *hci_status = 0;
                        return 0;
+               }
+
+               if (hci_status)
+                       *hci_status = HCI_ERROR_UNSPECIFIED;
 
                return err;
        }
@@ -340,6 +349,311 @@ void hci_req_add(struct hci_request *req, u16 opcode, u32 plen,
        hci_req_add_ev(req, opcode, plen, param, 0);
 }
 
+void __hci_req_write_fast_connectable(struct hci_request *req, bool enable)
+{
+       struct hci_dev *hdev = req->hdev;
+       struct hci_cp_write_page_scan_activity acp;
+       u8 type;
+
+       if (!hci_dev_test_flag(hdev, HCI_BREDR_ENABLED))
+               return;
+
+       if (hdev->hci_ver < BLUETOOTH_VER_1_2)
+               return;
+
+       if (enable) {
+               type = PAGE_SCAN_TYPE_INTERLACED;
+
+               /* 160 msec page scan interval */
+               acp.interval = cpu_to_le16(0x0100);
+       } else {
+               type = PAGE_SCAN_TYPE_STANDARD; /* default */
+
+               /* default 1.28 sec page scan */
+               acp.interval = cpu_to_le16(0x0800);
+       }
+
+       acp.window = cpu_to_le16(0x0012);
+
+       if (__cpu_to_le16(hdev->page_scan_interval) != acp.interval ||
+           __cpu_to_le16(hdev->page_scan_window) != acp.window)
+               hci_req_add(req, HCI_OP_WRITE_PAGE_SCAN_ACTIVITY,
+                           sizeof(acp), &acp);
+
+       if (hdev->page_scan_type != type)
+               hci_req_add(req, HCI_OP_WRITE_PAGE_SCAN_TYPE, 1, &type);
+}
+
+/* This function controls the background scanning based on hdev->pend_le_conns
+ * list. If there are pending LE connection we start the background scanning,
+ * otherwise we stop it.
+ *
+ * This function requires the caller holds hdev->lock.
+ */
+static void __hci_update_background_scan(struct hci_request *req)
+{
+       struct hci_dev *hdev = req->hdev;
+
+       if (!test_bit(HCI_UP, &hdev->flags) ||
+           test_bit(HCI_INIT, &hdev->flags) ||
+           hci_dev_test_flag(hdev, HCI_SETUP) ||
+           hci_dev_test_flag(hdev, HCI_CONFIG) ||
+           hci_dev_test_flag(hdev, HCI_AUTO_OFF) ||
+           hci_dev_test_flag(hdev, HCI_UNREGISTER))
+               return;
+
+       /* No point in doing scanning if LE support hasn't been enabled */
+       if (!hci_dev_test_flag(hdev, HCI_LE_ENABLED))
+               return;
+
+       /* If discovery is active don't interfere with it */
+       if (hdev->discovery.state != DISCOVERY_STOPPED)
+               return;
+
+       /* Reset RSSI and UUID filters when starting background scanning
+        * since these filters are meant for service discovery only.
+        *
+        * The Start Discovery and Start Service Discovery operations
+        * ensure to set proper values for RSSI threshold and UUID
+        * filter list. So it is safe to just reset them here.
+        */
+       hci_discovery_filter_clear(hdev);
+
+       if (list_empty(&hdev->pend_le_conns) &&
+           list_empty(&hdev->pend_le_reports)) {
+               /* If there is no pending LE connections or devices
+                * to be scanned for, we should stop the background
+                * scanning.
+                */
+
+               /* If controller is not scanning we are done. */
+               if (!hci_dev_test_flag(hdev, HCI_LE_SCAN))
+                       return;
+
+               hci_req_add_le_scan_disable(req);
+
+               BT_DBG("%s stopping background scanning", hdev->name);
+       } else {
+               /* If there is at least one pending LE connection, we should
+                * keep the background scan running.
+                */
+
+               /* If controller is connecting, we should not start scanning
+                * since some controllers are not able to scan and connect at
+                * the same time.
+                */
+               if (hci_lookup_le_connect(hdev))
+                       return;
+
+               /* If controller is currently scanning, we stop it to ensure we
+                * don't miss any advertising (due to duplicates filter).
+                */
+               if (hci_dev_test_flag(hdev, HCI_LE_SCAN))
+                       hci_req_add_le_scan_disable(req);
+
+               hci_req_add_le_passive_scan(req);
+
+               BT_DBG("%s starting background scanning", hdev->name);
+       }
+}
+
+void __hci_req_update_name(struct hci_request *req)
+{
+       struct hci_dev *hdev = req->hdev;
+       struct hci_cp_write_local_name cp;
+
+       memcpy(cp.name, hdev->dev_name, sizeof(cp.name));
+
+       hci_req_add(req, HCI_OP_WRITE_LOCAL_NAME, sizeof(cp), &cp);
+}
+
+#define PNP_INFO_SVCLASS_ID            0x1200
+
+static u8 *create_uuid16_list(struct hci_dev *hdev, u8 *data, ptrdiff_t len)
+{
+       u8 *ptr = data, *uuids_start = NULL;
+       struct bt_uuid *uuid;
+
+       if (len < 4)
+               return ptr;
+
+       list_for_each_entry(uuid, &hdev->uuids, list) {
+               u16 uuid16;
+
+               if (uuid->size != 16)
+                       continue;
+
+               uuid16 = get_unaligned_le16(&uuid->uuid[12]);
+               if (uuid16 < 0x1100)
+                       continue;
+
+               if (uuid16 == PNP_INFO_SVCLASS_ID)
+                       continue;
+
+               if (!uuids_start) {
+                       uuids_start = ptr;
+                       uuids_start[0] = 1;
+                       uuids_start[1] = EIR_UUID16_ALL;
+                       ptr += 2;
+               }
+
+               /* Stop if not enough space to put next UUID */
+               if ((ptr - data) + sizeof(u16) > len) {
+                       uuids_start[1] = EIR_UUID16_SOME;
+                       break;
+               }
+
+               *ptr++ = (uuid16 & 0x00ff);
+               *ptr++ = (uuid16 & 0xff00) >> 8;
+               uuids_start[0] += sizeof(uuid16);
+       }
+
+       return ptr;
+}
+
+static u8 *create_uuid32_list(struct hci_dev *hdev, u8 *data, ptrdiff_t len)
+{
+       u8 *ptr = data, *uuids_start = NULL;
+       struct bt_uuid *uuid;
+
+       if (len < 6)
+               return ptr;
+
+       list_for_each_entry(uuid, &hdev->uuids, list) {
+               if (uuid->size != 32)
+                       continue;
+
+               if (!uuids_start) {
+                       uuids_start = ptr;
+                       uuids_start[0] = 1;
+                       uuids_start[1] = EIR_UUID32_ALL;
+                       ptr += 2;
+               }
+
+               /* Stop if not enough space to put next UUID */
+               if ((ptr - data) + sizeof(u32) > len) {
+                       uuids_start[1] = EIR_UUID32_SOME;
+                       break;
+               }
+
+               memcpy(ptr, &uuid->uuid[12], sizeof(u32));
+               ptr += sizeof(u32);
+               uuids_start[0] += sizeof(u32);
+       }
+
+       return ptr;
+}
+
+static u8 *create_uuid128_list(struct hci_dev *hdev, u8 *data, ptrdiff_t len)
+{
+       u8 *ptr = data, *uuids_start = NULL;
+       struct bt_uuid *uuid;
+
+       if (len < 18)
+               return ptr;
+
+       list_for_each_entry(uuid, &hdev->uuids, list) {
+               if (uuid->size != 128)
+                       continue;
+
+               if (!uuids_start) {
+                       uuids_start = ptr;
+                       uuids_start[0] = 1;
+                       uuids_start[1] = EIR_UUID128_ALL;
+                       ptr += 2;
+               }
+
+               /* Stop if not enough space to put next UUID */
+               if ((ptr - data) + 16 > len) {
+                       uuids_start[1] = EIR_UUID128_SOME;
+                       break;
+               }
+
+               memcpy(ptr, uuid->uuid, 16);
+               ptr += 16;
+               uuids_start[0] += 16;
+       }
+
+       return ptr;
+}
+
+static void create_eir(struct hci_dev *hdev, u8 *data)
+{
+       u8 *ptr = data;
+       size_t name_len;
+
+       name_len = strlen(hdev->dev_name);
+
+       if (name_len > 0) {
+               /* EIR Data type */
+               if (name_len > 48) {
+                       name_len = 48;
+                       ptr[1] = EIR_NAME_SHORT;
+               } else
+                       ptr[1] = EIR_NAME_COMPLETE;
+
+               /* EIR Data length */
+               ptr[0] = name_len + 1;
+
+               memcpy(ptr + 2, hdev->dev_name, name_len);
+
+               ptr += (name_len + 2);
+       }
+
+       if (hdev->inq_tx_power != HCI_TX_POWER_INVALID) {
+               ptr[0] = 2;
+               ptr[1] = EIR_TX_POWER;
+               ptr[2] = (u8) hdev->inq_tx_power;
+
+               ptr += 3;
+       }
+
+       if (hdev->devid_source > 0) {
+               ptr[0] = 9;
+               ptr[1] = EIR_DEVICE_ID;
+
+               put_unaligned_le16(hdev->devid_source, ptr + 2);
+               put_unaligned_le16(hdev->devid_vendor, ptr + 4);
+               put_unaligned_le16(hdev->devid_product, ptr + 6);
+               put_unaligned_le16(hdev->devid_version, ptr + 8);
+
+               ptr += 10;
+       }
+
+       ptr = create_uuid16_list(hdev, ptr, HCI_MAX_EIR_LENGTH - (ptr - data));
+       ptr = create_uuid32_list(hdev, ptr, HCI_MAX_EIR_LENGTH - (ptr - data));
+       ptr = create_uuid128_list(hdev, ptr, HCI_MAX_EIR_LENGTH - (ptr - data));
+}
+
+void __hci_req_update_eir(struct hci_request *req)
+{
+       struct hci_dev *hdev = req->hdev;
+       struct hci_cp_write_eir cp;
+
+       if (!hdev_is_powered(hdev))
+               return;
+
+       if (!lmp_ext_inq_capable(hdev))
+               return;
+
+       if (!hci_dev_test_flag(hdev, HCI_SSP_ENABLED))
+               return;
+
+       if (hci_dev_test_flag(hdev, HCI_SERVICE_CACHE))
+               return;
+
+       memset(&cp, 0, sizeof(cp));
+
+       create_eir(hdev, cp.data);
+
+       if (memcmp(cp.data, hdev->eir, sizeof(cp.data)) == 0)
+               return;
+
+       memcpy(hdev->eir, cp.data, sizeof(cp.data));
+
+       hci_req_add(req, HCI_OP_WRITE_EIR, sizeof(cp), &cp);
+}
+
 void hci_req_add_le_scan_disable(struct hci_request *req)
 {
        struct hci_cp_le_set_scan_enable cp;
@@ -501,81 +815,599 @@ void hci_req_add_le_passive_scan(struct hci_request *req)
                    &enable_cp);
 }
 
-static void set_random_addr(struct hci_request *req, bdaddr_t *rpa)
+static u8 get_current_adv_instance(struct hci_dev *hdev)
 {
-       struct hci_dev *hdev = req->hdev;
-
-       /* If we're advertising or initiating an LE connection we can't
-        * go ahead and change the random address at this time. This is
-        * because the eventual initiator address used for the
-        * subsequently created connection will be undefined (some
-        * controllers use the new address and others the one we had
-        * when the operation started).
-        *
-        * In this kind of scenario skip the update and let the random
-        * address be updated at the next cycle.
+       /* The "Set Advertising" setting supersedes the "Add Advertising"
+        * setting. Here we set the advertising data based on which
+        * setting was set. When neither apply, default to the global settings,
+        * represented by instance "0".
         */
-       if (hci_dev_test_flag(hdev, HCI_LE_ADV) ||
-           hci_lookup_le_connect(hdev)) {
-               BT_DBG("Deferring random address update");
-               hci_dev_set_flag(hdev, HCI_RPA_EXPIRED);
-               return;
-       }
+       if (hci_dev_test_flag(hdev, HCI_ADVERTISING_INSTANCE) &&
+           !hci_dev_test_flag(hdev, HCI_ADVERTISING))
+               return hdev->cur_adv_instance;
 
-       hci_req_add(req, HCI_OP_LE_SET_RANDOM_ADDR, 6, rpa);
+       return 0x00;
 }
 
-int hci_update_random_address(struct hci_request *req, bool require_privacy,
-                             u8 *own_addr_type)
+static u8 get_cur_adv_instance_scan_rsp_len(struct hci_dev *hdev)
 {
-       struct hci_dev *hdev = req->hdev;
-       int err;
+       u8 instance = get_current_adv_instance(hdev);
+       struct adv_info *adv_instance;
 
-       /* If privacy is enabled use a resolvable private address. If
-        * current RPA has expired or there is something else than
-        * the current RPA in use, then generate a new one.
+       /* Ignore instance 0 */
+       if (instance == 0x00)
+               return 0;
+
+       adv_instance = hci_find_adv_instance(hdev, instance);
+       if (!adv_instance)
+               return 0;
+
+       /* TODO: Take into account the "appearance" and "local-name" flags here.
+        * These are currently being ignored as they are not supported.
         */
-       if (hci_dev_test_flag(hdev, HCI_PRIVACY)) {
-               int to;
+       return adv_instance->scan_rsp_len;
+}
 
-               *own_addr_type = ADDR_LE_DEV_RANDOM;
+void __hci_req_disable_advertising(struct hci_request *req)
+{
+       u8 enable = 0x00;
 
-               if (!hci_dev_test_and_clear_flag(hdev, HCI_RPA_EXPIRED) &&
-                   !bacmp(&hdev->random_addr, &hdev->rpa))
-                       return 0;
+       hci_req_add(req, HCI_OP_LE_SET_ADV_ENABLE, sizeof(enable), &enable);
+}
 
-               err = smp_generate_rpa(hdev, hdev->irk, &hdev->rpa);
-               if (err < 0) {
-                       BT_ERR("%s failed to generate new RPA", hdev->name);
-                       return err;
-               }
+static u32 get_adv_instance_flags(struct hci_dev *hdev, u8 instance)
+{
+       u32 flags;
+       struct adv_info *adv_instance;
 
-               set_random_addr(req, &hdev->rpa);
+       if (instance == 0x00) {
+               /* Instance 0 always manages the "Tx Power" and "Flags"
+                * fields
+                */
+               flags = MGMT_ADV_FLAG_TX_POWER | MGMT_ADV_FLAG_MANAGED_FLAGS;
 
-               to = msecs_to_jiffies(hdev->rpa_timeout * 1000);
-               queue_delayed_work(hdev->workqueue, &hdev->rpa_expired, to);
+               /* For instance 0, the HCI_ADVERTISING_CONNECTABLE setting
+                * corresponds to the "connectable" instance flag.
+                */
+               if (hci_dev_test_flag(hdev, HCI_ADVERTISING_CONNECTABLE))
+                       flags |= MGMT_ADV_FLAG_CONNECTABLE;
 
-               return 0;
+               return flags;
        }
 
-       /* In case of required privacy without resolvable private address,
-        * use an non-resolvable private address. This is useful for active
-        * scanning and non-connectable advertising.
-        */
-       if (require_privacy) {
-               bdaddr_t nrpa;
+       adv_instance = hci_find_adv_instance(hdev, instance);
 
-               while (true) {
-                       /* The non-resolvable private address is generated
-                        * from random six bytes with the two most significant
-                        * bits cleared.
-                        */
-                       get_random_bytes(&nrpa, 6);
-                       nrpa.b[5] &= 0x3f;
+       /* Return 0 when we got an invalid instance identifier. */
+       if (!adv_instance)
+               return 0;
 
-                       /* The non-resolvable private address shall not be
-                        * equal to the public address.
-                        */
+       return adv_instance->flags;
+}
+
+void __hci_req_enable_advertising(struct hci_request *req)
+{
+       struct hci_dev *hdev = req->hdev;
+       struct hci_cp_le_set_adv_param cp;
+       u8 own_addr_type, enable = 0x01;
+       bool connectable;
+       u8 instance;
+       u32 flags;
+
+       if (hci_conn_num(hdev, LE_LINK) > 0)
+               return;
+
+       if (hci_dev_test_flag(hdev, HCI_LE_ADV))
+               __hci_req_disable_advertising(req);
+
+       /* Clear the HCI_LE_ADV bit temporarily so that the
+        * hci_update_random_address knows that it's safe to go ahead
+        * and write a new random address. The flag will be set back on
+        * as soon as the SET_ADV_ENABLE HCI command completes.
+        */
+       hci_dev_clear_flag(hdev, HCI_LE_ADV);
+
+       instance = get_current_adv_instance(hdev);
+       flags = get_adv_instance_flags(hdev, instance);
+
+       /* If the "connectable" instance flag was not set, then choose between
+        * ADV_IND and ADV_NONCONN_IND based on the global connectable setting.
+        */
+       connectable = (flags & MGMT_ADV_FLAG_CONNECTABLE) ||
+                     mgmt_get_connectable(hdev);
+
+       /* Set require_privacy to true only when non-connectable
+        * advertising is used. In that case it is fine to use a
+        * non-resolvable private address.
+        */
+       if (hci_update_random_address(req, !connectable, &own_addr_type) < 0)
+               return;
+
+       memset(&cp, 0, sizeof(cp));
+       cp.min_interval = cpu_to_le16(hdev->le_adv_min_interval);
+       cp.max_interval = cpu_to_le16(hdev->le_adv_max_interval);
+
+       if (connectable)
+               cp.type = LE_ADV_IND;
+       else if (get_cur_adv_instance_scan_rsp_len(hdev))
+               cp.type = LE_ADV_SCAN_IND;
+       else
+               cp.type = LE_ADV_NONCONN_IND;
+
+       cp.own_address_type = own_addr_type;
+       cp.channel_map = hdev->le_adv_channel_map;
+
+       hci_req_add(req, HCI_OP_LE_SET_ADV_PARAM, sizeof(cp), &cp);
+
+       hci_req_add(req, HCI_OP_LE_SET_ADV_ENABLE, sizeof(enable), &enable);
+}
+
+static u8 create_default_scan_rsp_data(struct hci_dev *hdev, u8 *ptr)
+{
+       u8 ad_len = 0;
+       size_t name_len;
+
+       name_len = strlen(hdev->dev_name);
+       if (name_len > 0) {
+               size_t max_len = HCI_MAX_AD_LENGTH - ad_len - 2;
+
+               if (name_len > max_len) {
+                       name_len = max_len;
+                       ptr[1] = EIR_NAME_SHORT;
+               } else
+                       ptr[1] = EIR_NAME_COMPLETE;
+
+               ptr[0] = name_len + 1;
+
+               memcpy(ptr + 2, hdev->dev_name, name_len);
+
+               ad_len += (name_len + 2);
+               ptr += (name_len + 2);
+       }
+
+       return ad_len;
+}
+
+static u8 create_instance_scan_rsp_data(struct hci_dev *hdev, u8 instance,
+                                       u8 *ptr)
+{
+       struct adv_info *adv_instance;
+
+       adv_instance = hci_find_adv_instance(hdev, instance);
+       if (!adv_instance)
+               return 0;
+
+       /* TODO: Set the appropriate entries based on advertising instance flags
+        * here once flags other than 0 are supported.
+        */
+       memcpy(ptr, adv_instance->scan_rsp_data,
+              adv_instance->scan_rsp_len);
+
+       return adv_instance->scan_rsp_len;
+}
+
+static void update_inst_scan_rsp_data(struct hci_request *req, u8 instance)
+{
+       struct hci_dev *hdev = req->hdev;
+       struct hci_cp_le_set_scan_rsp_data cp;
+       u8 len;
+
+       if (!hci_dev_test_flag(hdev, HCI_LE_ENABLED))
+               return;
+
+       memset(&cp, 0, sizeof(cp));
+
+       if (instance)
+               len = create_instance_scan_rsp_data(hdev, instance, cp.data);
+       else
+               len = create_default_scan_rsp_data(hdev, cp.data);
+
+       if (hdev->scan_rsp_data_len == len &&
+           !memcmp(cp.data, hdev->scan_rsp_data, len))
+               return;
+
+       memcpy(hdev->scan_rsp_data, cp.data, sizeof(cp.data));
+       hdev->scan_rsp_data_len = len;
+
+       cp.length = len;
+
+       hci_req_add(req, HCI_OP_LE_SET_SCAN_RSP_DATA, sizeof(cp), &cp);
+}
+
+void __hci_req_update_scan_rsp_data(struct hci_request *req, int instance)
+{
+       if (instance == HCI_ADV_CURRENT)
+               instance = get_current_adv_instance(req->hdev);
+
+       update_inst_scan_rsp_data(req, get_current_adv_instance(req->hdev));
+}
+
+static u8 create_instance_adv_data(struct hci_dev *hdev, u8 instance, u8 *ptr)
+{
+       struct adv_info *adv_instance = NULL;
+       u8 ad_len = 0, flags = 0;
+       u32 instance_flags;
+
+       /* Return 0 when the current instance identifier is invalid. */
+       if (instance) {
+               adv_instance = hci_find_adv_instance(hdev, instance);
+               if (!adv_instance)
+                       return 0;
+       }
+
+       instance_flags = get_adv_instance_flags(hdev, instance);
+
+       /* The Add Advertising command allows userspace to set both the general
+        * and limited discoverable flags.
+        */
+       if (instance_flags & MGMT_ADV_FLAG_DISCOV)
+               flags |= LE_AD_GENERAL;
+
+       if (instance_flags & MGMT_ADV_FLAG_LIMITED_DISCOV)
+               flags |= LE_AD_LIMITED;
+
+       if (flags || (instance_flags & MGMT_ADV_FLAG_MANAGED_FLAGS)) {
+               /* If a discovery flag wasn't provided, simply use the global
+                * settings.
+                */
+               if (!flags)
+                       flags |= mgmt_get_adv_discov_flags(hdev);
+
+               if (!hci_dev_test_flag(hdev, HCI_BREDR_ENABLED))
+                       flags |= LE_AD_NO_BREDR;
+
+               /* If flags would still be empty, then there is no need to
+                * include the "Flags" AD field".
+                */
+               if (flags) {
+                       ptr[0] = 0x02;
+                       ptr[1] = EIR_FLAGS;
+                       ptr[2] = flags;
+
+                       ad_len += 3;
+                       ptr += 3;
+               }
+       }
+
+       if (adv_instance) {
+               memcpy(ptr, adv_instance->adv_data,
+                      adv_instance->adv_data_len);
+               ad_len += adv_instance->adv_data_len;
+               ptr += adv_instance->adv_data_len;
+       }
+
+       /* Provide Tx Power only if we can provide a valid value for it */
+       if (hdev->adv_tx_power != HCI_TX_POWER_INVALID &&
+           (instance_flags & MGMT_ADV_FLAG_TX_POWER)) {
+               ptr[0] = 0x02;
+               ptr[1] = EIR_TX_POWER;
+               ptr[2] = (u8)hdev->adv_tx_power;
+
+               ad_len += 3;
+               ptr += 3;
+       }
+
+       return ad_len;
+}
+
+static void update_inst_adv_data(struct hci_request *req, u8 instance)
+{
+       struct hci_dev *hdev = req->hdev;
+       struct hci_cp_le_set_adv_data cp;
+       u8 len;
+
+       if (!hci_dev_test_flag(hdev, HCI_LE_ENABLED))
+               return;
+
+       memset(&cp, 0, sizeof(cp));
+
+       len = create_instance_adv_data(hdev, instance, cp.data);
+
+       /* There's nothing to do if the data hasn't changed */
+       if (hdev->adv_data_len == len &&
+           memcmp(cp.data, hdev->adv_data, len) == 0)
+               return;
+
+       memcpy(hdev->adv_data, cp.data, sizeof(cp.data));
+       hdev->adv_data_len = len;
+
+       cp.length = len;
+
+       hci_req_add(req, HCI_OP_LE_SET_ADV_DATA, sizeof(cp), &cp);
+}
+
+void __hci_req_update_adv_data(struct hci_request *req, int instance)
+{
+       if (instance == HCI_ADV_CURRENT)
+               instance = get_current_adv_instance(req->hdev);
+
+       update_inst_adv_data(req, instance);
+}
+
+int hci_req_update_adv_data(struct hci_dev *hdev, int instance)
+{
+       struct hci_request req;
+
+       hci_req_init(&req, hdev);
+       __hci_req_update_adv_data(&req, instance);
+
+       return hci_req_run(&req, NULL);
+}
+
+static void adv_enable_complete(struct hci_dev *hdev, u8 status, u16 opcode)
+{
+       BT_DBG("%s status %u", hdev->name, status);
+}
+
+void hci_req_reenable_advertising(struct hci_dev *hdev)
+{
+       struct hci_request req;
+       u8 instance;
+
+       if (!hci_dev_test_flag(hdev, HCI_ADVERTISING) &&
+           !hci_dev_test_flag(hdev, HCI_ADVERTISING_INSTANCE))
+               return;
+
+       instance = get_current_adv_instance(hdev);
+
+       hci_req_init(&req, hdev);
+
+       if (instance) {
+               __hci_req_schedule_adv_instance(&req, instance, true);
+       } else {
+               __hci_req_update_adv_data(&req, HCI_ADV_CURRENT);
+               __hci_req_update_scan_rsp_data(&req, HCI_ADV_CURRENT);
+               __hci_req_enable_advertising(&req);
+       }
+
+       hci_req_run(&req, adv_enable_complete);
+}
+
+static void adv_timeout_expire(struct work_struct *work)
+{
+       struct hci_dev *hdev = container_of(work, struct hci_dev,
+                                           adv_instance_expire.work);
+
+       struct hci_request req;
+       u8 instance;
+
+       BT_DBG("%s", hdev->name);
+
+       hci_dev_lock(hdev);
+
+       hdev->adv_instance_timeout = 0;
+
+       instance = get_current_adv_instance(hdev);
+       if (instance == 0x00)
+               goto unlock;
+
+       hci_req_init(&req, hdev);
+
+       hci_req_clear_adv_instance(hdev, &req, instance, false);
+
+       if (list_empty(&hdev->adv_instances))
+               __hci_req_disable_advertising(&req);
+
+       if (!skb_queue_empty(&req.cmd_q))
+               hci_req_run(&req, NULL);
+
+unlock:
+       hci_dev_unlock(hdev);
+}
+
+int __hci_req_schedule_adv_instance(struct hci_request *req, u8 instance,
+                                   bool force)
+{
+       struct hci_dev *hdev = req->hdev;
+       struct adv_info *adv_instance = NULL;
+       u16 timeout;
+
+       if (hci_dev_test_flag(hdev, HCI_ADVERTISING) ||
+           !hci_dev_test_flag(hdev, HCI_ADVERTISING_INSTANCE))
+               return -EPERM;
+
+       if (hdev->adv_instance_timeout)
+               return -EBUSY;
+
+       adv_instance = hci_find_adv_instance(hdev, instance);
+       if (!adv_instance)
+               return -ENOENT;
+
+       /* A zero timeout means unlimited advertising. As long as there is
+        * only one instance, duration should be ignored. We still set a timeout
+        * in case further instances are being added later on.
+        *
+        * If the remaining lifetime of the instance is more than the duration
+        * then the timeout corresponds to the duration, otherwise it will be
+        * reduced to the remaining instance lifetime.
+        */
+       if (adv_instance->timeout == 0 ||
+           adv_instance->duration <= adv_instance->remaining_time)
+               timeout = adv_instance->duration;
+       else
+               timeout = adv_instance->remaining_time;
+
+       /* The remaining time is being reduced unless the instance is being
+        * advertised without time limit.
+        */
+       if (adv_instance->timeout)
+               adv_instance->remaining_time =
+                               adv_instance->remaining_time - timeout;
+
+       hdev->adv_instance_timeout = timeout;
+       queue_delayed_work(hdev->req_workqueue,
+                          &hdev->adv_instance_expire,
+                          msecs_to_jiffies(timeout * 1000));
+
+       /* If we're just re-scheduling the same instance again then do not
+        * execute any HCI commands. This happens when a single instance is
+        * being advertised.
+        */
+       if (!force && hdev->cur_adv_instance == instance &&
+           hci_dev_test_flag(hdev, HCI_LE_ADV))
+               return 0;
+
+       hdev->cur_adv_instance = instance;
+       __hci_req_update_adv_data(req, HCI_ADV_CURRENT);
+       __hci_req_update_scan_rsp_data(req, HCI_ADV_CURRENT);
+       __hci_req_enable_advertising(req);
+
+       return 0;
+}
+
+static void cancel_adv_timeout(struct hci_dev *hdev)
+{
+       if (hdev->adv_instance_timeout) {
+               hdev->adv_instance_timeout = 0;
+               cancel_delayed_work(&hdev->adv_instance_expire);
+       }
+}
+
+/* For a single instance:
+ * - force == true: The instance will be removed even when its remaining
+ *   lifetime is not zero.
+ * - force == false: the instance will be deactivated but kept stored unless
+ *   the remaining lifetime is zero.
+ *
+ * For instance == 0x00:
+ * - force == true: All instances will be removed regardless of their timeout
+ *   setting.
+ * - force == false: Only instances that have a timeout will be removed.
+ */
+void hci_req_clear_adv_instance(struct hci_dev *hdev, struct hci_request *req,
+                               u8 instance, bool force)
+{
+       struct adv_info *adv_instance, *n, *next_instance = NULL;
+       int err;
+       u8 rem_inst;
+
+       /* Cancel any timeout concerning the removed instance(s). */
+       if (!instance || hdev->cur_adv_instance == instance)
+               cancel_adv_timeout(hdev);
+
+       /* Get the next instance to advertise BEFORE we remove
+        * the current one. This can be the same instance again
+        * if there is only one instance.
+        */
+       if (instance && hdev->cur_adv_instance == instance)
+               next_instance = hci_get_next_instance(hdev, instance);
+
+       if (instance == 0x00) {
+               list_for_each_entry_safe(adv_instance, n, &hdev->adv_instances,
+                                        list) {
+                       if (!(force || adv_instance->timeout))
+                               continue;
+
+                       rem_inst = adv_instance->instance;
+                       err = hci_remove_adv_instance(hdev, rem_inst);
+                       if (!err)
+                               mgmt_advertising_removed(NULL, hdev, rem_inst);
+               }
+               hdev->cur_adv_instance = 0x00;
+       } else {
+               adv_instance = hci_find_adv_instance(hdev, instance);
+
+               if (force || (adv_instance && adv_instance->timeout &&
+                             !adv_instance->remaining_time)) {
+                       /* Don't advertise a removed instance. */
+                       if (next_instance &&
+                           next_instance->instance == instance)
+                               next_instance = NULL;
+
+                       err = hci_remove_adv_instance(hdev, instance);
+                       if (!err)
+                               mgmt_advertising_removed(NULL, hdev, instance);
+               }
+       }
+
+       if (list_empty(&hdev->adv_instances)) {
+               hdev->cur_adv_instance = 0x00;
+               hci_dev_clear_flag(hdev, HCI_ADVERTISING_INSTANCE);
+       }
+
+       if (!req || !hdev_is_powered(hdev) ||
+           hci_dev_test_flag(hdev, HCI_ADVERTISING))
+               return;
+
+       if (next_instance)
+               __hci_req_schedule_adv_instance(req, next_instance->instance,
+                                               false);
+}
+
+static void set_random_addr(struct hci_request *req, bdaddr_t *rpa)
+{
+       struct hci_dev *hdev = req->hdev;
+
+       /* If we're advertising or initiating an LE connection we can't
+        * go ahead and change the random address at this time. This is
+        * because the eventual initiator address used for the
+        * subsequently created connection will be undefined (some
+        * controllers use the new address and others the one we had
+        * when the operation started).
+        *
+        * In this kind of scenario skip the update and let the random
+        * address be updated at the next cycle.
+        */
+       if (hci_dev_test_flag(hdev, HCI_LE_ADV) ||
+           hci_lookup_le_connect(hdev)) {
+               BT_DBG("Deferring random address update");
+               hci_dev_set_flag(hdev, HCI_RPA_EXPIRED);
+               return;
+       }
+
+       hci_req_add(req, HCI_OP_LE_SET_RANDOM_ADDR, 6, rpa);
+}
+
+int hci_update_random_address(struct hci_request *req, bool require_privacy,
+                             u8 *own_addr_type)
+{
+       struct hci_dev *hdev = req->hdev;
+       int err;
+
+       /* If privacy is enabled use a resolvable private address. If
+        * current RPA has expired or there is something else than
+        * the current RPA in use, then generate a new one.
+        */
+       if (hci_dev_test_flag(hdev, HCI_PRIVACY)) {
+               int to;
+
+               *own_addr_type = ADDR_LE_DEV_RANDOM;
+
+               if (!hci_dev_test_and_clear_flag(hdev, HCI_RPA_EXPIRED) &&
+                   !bacmp(&hdev->random_addr, &hdev->rpa))
+                       return 0;
+
+               err = smp_generate_rpa(hdev, hdev->irk, &hdev->rpa);
+               if (err < 0) {
+                       BT_ERR("%s failed to generate new RPA", hdev->name);
+                       return err;
+               }
+
+               set_random_addr(req, &hdev->rpa);
+
+               to = msecs_to_jiffies(hdev->rpa_timeout * 1000);
+               queue_delayed_work(hdev->workqueue, &hdev->rpa_expired, to);
+
+               return 0;
+       }
+
+       /* In case of required privacy without resolvable private address,
+        * use an non-resolvable private address. This is useful for active
+        * scanning and non-connectable advertising.
+        */
+       if (require_privacy) {
+               bdaddr_t nrpa;
+
+               while (true) {
+                       /* The non-resolvable private address is generated
+                        * from random six bytes with the two most significant
+                        * bits cleared.
+                        */
+                       get_random_bytes(&nrpa, 6);
+                       nrpa.b[5] &= 0x3f;
+
+                       /* The non-resolvable private address shall not be
+                        * equal to the public address.
+                        */
                        if (bacmp(&hdev->bdaddr, &nrpa))
                                break;
                }
@@ -631,7 +1463,7 @@ static bool disconnected_whitelist_entries(struct hci_dev *hdev)
        return false;
 }
 
-void __hci_update_page_scan(struct hci_request *req)
+void __hci_req_update_scan(struct hci_request *req)
 {
        struct hci_dev *hdev = req->hdev;
        u8 scan;
@@ -651,95 +1483,168 @@ void __hci_update_page_scan(struct hci_request *req)
        else
                scan = SCAN_DISABLED;
 
-       if (test_bit(HCI_PSCAN, &hdev->flags) == !!(scan & SCAN_PAGE))
-               return;
-
        if (hci_dev_test_flag(hdev, HCI_DISCOVERABLE))
                scan |= SCAN_INQUIRY;
 
+       if (test_bit(HCI_PSCAN, &hdev->flags) == !!(scan & SCAN_PAGE) &&
+           test_bit(HCI_ISCAN, &hdev->flags) == !!(scan & SCAN_INQUIRY))
+               return;
+
        hci_req_add(req, HCI_OP_WRITE_SCAN_ENABLE, 1, &scan);
 }
 
-void hci_update_page_scan(struct hci_dev *hdev)
+static int update_scan(struct hci_request *req, unsigned long opt)
 {
-       struct hci_request req;
+       hci_dev_lock(req->hdev);
+       __hci_req_update_scan(req);
+       hci_dev_unlock(req->hdev);
+       return 0;
+}
 
-       hci_req_init(&req, hdev);
-       __hci_update_page_scan(&req);
-       hci_req_run(&req, NULL);
+static void scan_update_work(struct work_struct *work)
+{
+       struct hci_dev *hdev = container_of(work, struct hci_dev, scan_update);
+
+       hci_req_sync(hdev, update_scan, 0, HCI_CMD_TIMEOUT, NULL);
 }
 
-/* This function controls the background scanning based on hdev->pend_le_conns
- * list. If there are pending LE connection we start the background scanning,
- * otherwise we stop it.
- *
- * This function requires the caller holds hdev->lock.
- */
-static void __hci_update_background_scan(struct hci_request *req)
+static int connectable_update(struct hci_request *req, unsigned long opt)
 {
        struct hci_dev *hdev = req->hdev;
 
-       if (!test_bit(HCI_UP, &hdev->flags) ||
-           test_bit(HCI_INIT, &hdev->flags) ||
-           hci_dev_test_flag(hdev, HCI_SETUP) ||
-           hci_dev_test_flag(hdev, HCI_CONFIG) ||
-           hci_dev_test_flag(hdev, HCI_AUTO_OFF) ||
-           hci_dev_test_flag(hdev, HCI_UNREGISTER))
+       hci_dev_lock(hdev);
+
+       __hci_req_update_scan(req);
+
+       /* If BR/EDR is not enabled and we disable advertising as a
+        * by-product of disabling connectable, we need to update the
+        * advertising flags.
+        */
+       if (!hci_dev_test_flag(hdev, HCI_BREDR_ENABLED))
+               __hci_req_update_adv_data(req, HCI_ADV_CURRENT);
+
+       /* Update the advertising parameters if necessary */
+       if (hci_dev_test_flag(hdev, HCI_ADVERTISING) ||
+           hci_dev_test_flag(hdev, HCI_ADVERTISING_INSTANCE))
+               __hci_req_enable_advertising(req);
+
+       __hci_update_background_scan(req);
+
+       hci_dev_unlock(hdev);
+
+       return 0;
+}
+
+static void connectable_update_work(struct work_struct *work)
+{
+       struct hci_dev *hdev = container_of(work, struct hci_dev,
+                                           connectable_update);
+       u8 status;
+
+       hci_req_sync(hdev, connectable_update, 0, HCI_CMD_TIMEOUT, &status);
+       mgmt_set_connectable_complete(hdev, status);
+}
+
+static u8 get_service_classes(struct hci_dev *hdev)
+{
+       struct bt_uuid *uuid;
+       u8 val = 0;
+
+       list_for_each_entry(uuid, &hdev->uuids, list)
+               val |= uuid->svc_hint;
+
+       return val;
+}
+
+void __hci_req_update_class(struct hci_request *req)
+{
+       struct hci_dev *hdev = req->hdev;
+       u8 cod[3];
+
+       BT_DBG("%s", hdev->name);
+
+       if (!hdev_is_powered(hdev))
                return;
 
-       /* No point in doing scanning if LE support hasn't been enabled */
-       if (!hci_dev_test_flag(hdev, HCI_LE_ENABLED))
+       if (!hci_dev_test_flag(hdev, HCI_BREDR_ENABLED))
                return;
 
-       /* If discovery is active don't interfere with it */
-       if (hdev->discovery.state != DISCOVERY_STOPPED)
+       if (hci_dev_test_flag(hdev, HCI_SERVICE_CACHE))
                return;
 
-       /* Reset RSSI and UUID filters when starting background scanning
-        * since these filters are meant for service discovery only.
-        *
-        * The Start Discovery and Start Service Discovery operations
-        * ensure to set proper values for RSSI threshold and UUID
-        * filter list. So it is safe to just reset them here.
-        */
-       hci_discovery_filter_clear(hdev);
+       cod[0] = hdev->minor_class;
+       cod[1] = hdev->major_class;
+       cod[2] = get_service_classes(hdev);
 
-       if (list_empty(&hdev->pend_le_conns) &&
-           list_empty(&hdev->pend_le_reports)) {
-               /* If there is no pending LE connections or devices
-                * to be scanned for, we should stop the background
-                * scanning.
-                */
+       if (hci_dev_test_flag(hdev, HCI_LIMITED_DISCOVERABLE))
+               cod[1] |= 0x20;
 
-               /* If controller is not scanning we are done. */
-               if (!hci_dev_test_flag(hdev, HCI_LE_SCAN))
-                       return;
+       if (memcmp(cod, hdev->dev_class, 3) == 0)
+               return;
 
-               hci_req_add_le_scan_disable(req);
+       hci_req_add(req, HCI_OP_WRITE_CLASS_OF_DEV, sizeof(cod), cod);
+}
+
+static void write_iac(struct hci_request *req)
+{
+       struct hci_dev *hdev = req->hdev;
+       struct hci_cp_write_current_iac_lap cp;
+
+       if (!hci_dev_test_flag(hdev, HCI_DISCOVERABLE))
+               return;
+
+       if (hci_dev_test_flag(hdev, HCI_LIMITED_DISCOVERABLE)) {
+               /* Limited discoverable mode */
+               cp.num_iac = min_t(u8, hdev->num_iac, 2);
+               cp.iac_lap[0] = 0x00;   /* LIAC */
+               cp.iac_lap[1] = 0x8b;
+               cp.iac_lap[2] = 0x9e;
+               cp.iac_lap[3] = 0x33;   /* GIAC */
+               cp.iac_lap[4] = 0x8b;
+               cp.iac_lap[5] = 0x9e;
+       } else {
+               /* General discoverable mode */
+               cp.num_iac = 1;
+               cp.iac_lap[0] = 0x33;   /* GIAC */
+               cp.iac_lap[1] = 0x8b;
+               cp.iac_lap[2] = 0x9e;
+       }
+
+       hci_req_add(req, HCI_OP_WRITE_CURRENT_IAC_LAP,
+                   (cp.num_iac * 3) + 1, &cp);
+}
+
+static int discoverable_update(struct hci_request *req, unsigned long opt)
+{
+       struct hci_dev *hdev = req->hdev;
+
+       hci_dev_lock(hdev);
+
+       if (hci_dev_test_flag(hdev, HCI_BREDR_ENABLED)) {
+               write_iac(req);
+               __hci_req_update_scan(req);
+               __hci_req_update_class(req);
+       }
 
-               BT_DBG("%s stopping background scanning", hdev->name);
-       } else {
-               /* If there is at least one pending LE connection, we should
-                * keep the background scan running.
-                */
+       /* Advertising instances don't use the global discoverable setting, so
+        * only update AD if advertising was enabled using Set Advertising.
+        */
+       if (hci_dev_test_flag(hdev, HCI_ADVERTISING))
+               __hci_req_update_adv_data(req, HCI_ADV_CURRENT);
 
-               /* If controller is connecting, we should not start scanning
-                * since some controllers are not able to scan and connect at
-                * the same time.
-                */
-               if (hci_lookup_le_connect(hdev))
-                       return;
+       hci_dev_unlock(hdev);
 
-               /* If controller is currently scanning, we stop it to ensure we
-                * don't miss any advertising (due to duplicates filter).
-                */
-               if (hci_dev_test_flag(hdev, HCI_LE_SCAN))
-                       hci_req_add_le_scan_disable(req);
+       return 0;
+}
 
-               hci_req_add_le_passive_scan(req);
+static void discoverable_update_work(struct work_struct *work)
+{
+       struct hci_dev *hdev = container_of(work, struct hci_dev,
+                                           discoverable_update);
+       u8 status;
 
-               BT_DBG("%s starting background scanning", hdev->name);
-       }
+       hci_req_sync(hdev, discoverable_update, 0, HCI_CMD_TIMEOUT, &status);
+       mgmt_set_discoverable_complete(hdev, status);
 }
 
 void __hci_abort_conn(struct hci_request *req, struct hci_conn *conn,
@@ -864,83 +1769,31 @@ static void bg_scan_update(struct work_struct *work)
        hci_dev_unlock(hdev);
 }
 
-static void inquiry_complete(struct hci_dev *hdev, u8 status, u16 opcode)
+static int le_scan_disable(struct hci_request *req, unsigned long opt)
 {
-       if (status) {
-               BT_ERR("Failed to start inquiry: status %d", status);
-
-               hci_dev_lock(hdev);
-               hci_discovery_set_state(hdev, DISCOVERY_STOPPED);
-               hci_dev_unlock(hdev);
-               return;
-       }
+       hci_req_add_le_scan_disable(req);
+       return 0;
 }
 
-static void le_scan_disable_work_complete(struct hci_dev *hdev, u8 status)
+static int bredr_inquiry(struct hci_request *req, unsigned long opt)
 {
+       u8 length = opt;
        /* General inquiry access code (GIAC) */
        u8 lap[3] = { 0x33, 0x8b, 0x9e };
        struct hci_cp_inquiry cp;
-       int err;
-
-       if (status) {
-               BT_ERR("Failed to disable LE scanning: status %d", status);
-               return;
-       }
-
-       hdev->discovery.scan_start = 0;
-
-       switch (hdev->discovery.type) {
-       case DISCOV_TYPE_LE:
-               hci_dev_lock(hdev);
-               hci_discovery_set_state(hdev, DISCOVERY_STOPPED);
-               hci_dev_unlock(hdev);
-               break;
-
-       case DISCOV_TYPE_INTERLEAVED:
-               hci_dev_lock(hdev);
-
-               if (test_bit(HCI_QUIRK_SIMULTANEOUS_DISCOVERY,
-                            &hdev->quirks)) {
-                       /* 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 (!test_bit(HCI_INQUIRY, &hdev->flags) &&
-                           hdev->discovery.state != DISCOVERY_RESOLVING)
-                               hci_discovery_set_state(hdev,
-                                                       DISCOVERY_STOPPED);
-               } else {
-                       struct hci_request req;
-
-                       hci_inquiry_cache_flush(hdev);
 
-                       hci_req_init(&req, hdev);
+       BT_DBG("%s", req->hdev->name);
 
-                       memset(&cp, 0, sizeof(cp));
-                       memcpy(&cp.lap, lap, sizeof(cp.lap));
-                       cp.length = DISCOV_INTERLEAVED_INQUIRY_LEN;
-                       hci_req_add(&req, HCI_OP_INQUIRY, sizeof(cp), &cp);
+       hci_dev_lock(req->hdev);
+       hci_inquiry_cache_flush(req->hdev);
+       hci_dev_unlock(req->hdev);
 
-                       err = hci_req_run(&req, inquiry_complete);
-                       if (err) {
-                               BT_ERR("Inquiry request failed: err %d", err);
-                               hci_discovery_set_state(hdev,
-                                                       DISCOVERY_STOPPED);
-                       }
-               }
+       memset(&cp, 0, sizeof(cp));
+       memcpy(&cp.lap, lap, sizeof(cp.lap));
+       cp.length = length;
 
-               hci_dev_unlock(hdev);
-               break;
-       }
-}
+       hci_req_add(req, HCI_OP_INQUIRY, sizeof(cp), &cp);
 
-static int le_scan_disable(struct hci_request *req, unsigned long opt)
-{
-       hci_req_add_le_scan_disable(req);
        return 0;
 }
 
@@ -949,61 +1802,56 @@ 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;
-       int err;
 
        BT_DBG("%s", hdev->name);
 
-       cancel_delayed_work(&hdev->le_scan_restart);
-
-       err = hci_req_sync(hdev, le_scan_disable, 0, HCI_CMD_TIMEOUT, &status);
-       if (err)
+       if (!hci_dev_test_flag(hdev, HCI_LE_SCAN))
                return;
 
-       le_scan_disable_work_complete(hdev, status);
-}
-
-static void le_scan_restart_work_complete(struct hci_dev *hdev, u8 status)
-{
-       unsigned long timeout, duration, scan_start, now;
-
-       BT_DBG("%s", hdev->name);
+       cancel_delayed_work(&hdev->le_scan_restart);
 
+       hci_req_sync(hdev, le_scan_disable, 0, HCI_CMD_TIMEOUT, &status);
        if (status) {
-               BT_ERR("Failed to restart LE scan: status %d", status);
+               BT_ERR("Failed to disable LE scan: status 0x%02x", status);
                return;
        }
 
-       hci_dev_lock(hdev);
-
-       if (!test_bit(HCI_QUIRK_STRICT_DUPLICATE_FILTER, &hdev->quirks) ||
-           !hdev->discovery.scan_start)
-               goto unlock;
+       hdev->discovery.scan_start = 0;
 
-       /* When the scan was started, hdev->le_scan_disable has been queued
-        * after duration from scan_start. During scan restart this job
-        * has been canceled, and we need to queue it again after proper
-        * timeout, to make sure that scan does not run indefinitely.
+       /* 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.
         */
-       duration = hdev->discovery.scan_duration;
-       scan_start = hdev->discovery.scan_start;
-       now = jiffies;
-       if (now - scan_start <= duration) {
-               int elapsed;
 
-               if (now >= scan_start)
-                       elapsed = now - scan_start;
-               else
-                       elapsed = ULONG_MAX - scan_start + now;
+       if (hdev->discovery.type == DISCOV_TYPE_LE)
+               goto discov_stopped;
 
-               timeout = duration - elapsed;
-       } else {
-               timeout = 0;
+       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;
        }
 
-       queue_delayed_work(hdev->req_workqueue,
-                          &hdev->le_scan_disable, timeout);
+       hci_req_sync(hdev, bredr_inquiry, DISCOV_INTERLEAVED_INQUIRY_LEN,
+                    HCI_CMD_TIMEOUT, &status);
+       if (status) {
+               BT_ERR("Inquiry failed: status 0x%02x", status);
+               goto discov_stopped;
+       }
 
-unlock:
+       return;
+
+discov_stopped:
+       hci_dev_lock(hdev);
+       hci_discovery_set_state(hdev, DISCOVERY_STOPPED);
        hci_dev_unlock(hdev);
 }
 
@@ -1030,45 +1878,49 @@ static void le_scan_restart_work(struct work_struct *work)
 {
        struct hci_dev *hdev = container_of(work, struct hci_dev,
                                            le_scan_restart.work);
+       unsigned long timeout, duration, scan_start, now;
        u8 status;
-       int err;
 
        BT_DBG("%s", hdev->name);
 
-       err = hci_req_sync(hdev, le_scan_restart, 0, HCI_CMD_TIMEOUT, &status);
-       if (err)
+       hci_req_sync(hdev, le_scan_restart, 0, HCI_CMD_TIMEOUT, &status);
+       if (status) {
+               BT_ERR("Failed to restart LE scan: status %d", status);
                return;
+       }
 
-       le_scan_restart_work_complete(hdev, status);
-}
-
-static int bredr_inquiry(struct hci_request *req, unsigned long opt)
-{
-       struct hci_cp_inquiry cp;
-       /* General inquiry access code (GIAC) */
-       u8 lap[3] = { 0x33, 0x8b, 0x9e };
+       hci_dev_lock(hdev);
 
-       BT_DBG("%s", req->hdev->name);
+       if (!test_bit(HCI_QUIRK_STRICT_DUPLICATE_FILTER, &hdev->quirks) ||
+           !hdev->discovery.scan_start)
+               goto unlock;
 
-       hci_dev_lock(req->hdev);
-       hci_inquiry_cache_flush(req->hdev);
-       hci_dev_unlock(req->hdev);
+       /* When the scan was started, hdev->le_scan_disable has been queued
+        * after duration from scan_start. During scan restart this job
+        * has been canceled, and we need to queue it again after proper
+        * timeout, to make sure that scan does not run indefinitely.
+        */
+       duration = hdev->discovery.scan_duration;
+       scan_start = hdev->discovery.scan_start;
+       now = jiffies;
+       if (now - scan_start <= duration) {
+               int elapsed;
 
-       memset(&cp, 0, sizeof(cp));
-       memcpy(&cp.lap, lap, sizeof(cp.lap));
-       cp.length = DISCOV_BREDR_INQUIRY_LEN;
+               if (now >= scan_start)
+                       elapsed = now - scan_start;
+               else
+                       elapsed = ULONG_MAX - scan_start + now;
 
-       hci_req_add(req, HCI_OP_INQUIRY, sizeof(cp), &cp);
+               timeout = duration - elapsed;
+       } else {
+               timeout = 0;
+       }
 
-       return 0;
-}
+       queue_delayed_work(hdev->req_workqueue,
+                          &hdev->le_scan_disable, timeout);
 
-static void cancel_adv_timeout(struct hci_dev *hdev)
-{
-       if (hdev->adv_instance_timeout) {
-               hdev->adv_instance_timeout = 0;
-               cancel_delayed_work(&hdev->adv_instance_expire);
-       }
+unlock:
+       hci_dev_unlock(hdev);
 }
 
 static void disable_advertising(struct hci_request *req)
@@ -1150,7 +2002,7 @@ static int interleaved_discov(struct hci_request *req, unsigned long opt)
        if (err)
                return err;
 
-       return bredr_inquiry(req, opt);
+       return bredr_inquiry(req, DISCOV_BREDR_INQUIRY_LEN);
 }
 
 static void start_discovery(struct hci_dev *hdev, u8 *status)
@@ -1162,7 +2014,8 @@ static void start_discovery(struct hci_dev *hdev, u8 *status)
        switch (hdev->discovery.type) {
        case DISCOV_TYPE_BREDR:
                if (!hci_dev_test_flag(hdev, HCI_INQUIRY))
-                       hci_req_sync(hdev, bredr_inquiry, 0, HCI_CMD_TIMEOUT,
+                       hci_req_sync(hdev, bredr_inquiry,
+                                    DISCOV_BREDR_INQUIRY_LEN, HCI_CMD_TIMEOUT,
                                     status);
                return;
        case DISCOV_TYPE_INTERLEAVED:
@@ -1221,6 +2074,62 @@ static void start_discovery(struct hci_dev *hdev, u8 *status)
                           timeout);
 }
 
+bool hci_req_stop_discovery(struct hci_request *req)
+{
+       struct hci_dev *hdev = req->hdev;
+       struct discovery_state *d = &hdev->discovery;
+       struct hci_cp_remote_name_req_cancel cp;
+       struct inquiry_entry *e;
+       bool ret = false;
+
+       BT_DBG("%s state %u", hdev->name, hdev->discovery.state);
+
+       if (d->state == DISCOVERY_FINDING || d->state == DISCOVERY_STOPPING) {
+               if (test_bit(HCI_INQUIRY, &hdev->flags))
+                       hci_req_add(req, HCI_OP_INQUIRY_CANCEL, 0, NULL);
+
+               if (hci_dev_test_flag(hdev, HCI_LE_SCAN)) {
+                       cancel_delayed_work(&hdev->le_scan_disable);
+                       hci_req_add_le_scan_disable(req);
+               }
+
+               ret = true;
+       } else {
+               /* Passive scanning */
+               if (hci_dev_test_flag(hdev, HCI_LE_SCAN)) {
+                       hci_req_add_le_scan_disable(req);
+                       ret = true;
+               }
+       }
+
+       /* No further actions needed for LE-only discovery */
+       if (d->type == DISCOV_TYPE_LE)
+               return ret;
+
+       if (d->state == DISCOVERY_RESOLVING || d->state == DISCOVERY_STOPPING) {
+               e = hci_inquiry_cache_lookup_resolve(hdev, BDADDR_ANY,
+                                                    NAME_PENDING);
+               if (!e)
+                       return ret;
+
+               bacpy(&cp.bdaddr, &e->data.bdaddr);
+               hci_req_add(req, HCI_OP_REMOTE_NAME_REQ_CANCEL, sizeof(cp),
+                           &cp);
+               ret = true;
+       }
+
+       return ret;
+}
+
+static int stop_discovery(struct hci_request *req, unsigned long opt)
+{
+       hci_dev_lock(req->hdev);
+       hci_req_stop_discovery(req);
+       hci_dev_unlock(req->hdev);
+
+       return 0;
+}
+
 static void discov_update(struct work_struct *work)
 {
        struct hci_dev *hdev = container_of(work, struct hci_dev,
@@ -1236,24 +2145,170 @@ static void discov_update(struct work_struct *work)
                else
                        hci_discovery_set_state(hdev, DISCOVERY_FINDING);
                break;
+       case DISCOVERY_STOPPING:
+               hci_req_sync(hdev, stop_discovery, 0, HCI_CMD_TIMEOUT, &status);
+               mgmt_stop_discovery_complete(hdev, status);
+               if (!status)
+                       hci_discovery_set_state(hdev, DISCOVERY_STOPPED);
+               break;
        case DISCOVERY_STOPPED:
        default:
                return;
        }
 }
 
+static void discov_off(struct work_struct *work)
+{
+       struct hci_dev *hdev = container_of(work, struct hci_dev,
+                                           discov_off.work);
+
+       BT_DBG("%s", hdev->name);
+
+       hci_dev_lock(hdev);
+
+       /* When discoverable timeout triggers, then just make sure
+        * the limited discoverable flag is cleared. Even in the case
+        * of a timeout triggered from general discoverable, it is
+        * safe to unconditionally clear the flag.
+        */
+       hci_dev_clear_flag(hdev, HCI_LIMITED_DISCOVERABLE);
+       hci_dev_clear_flag(hdev, HCI_DISCOVERABLE);
+       hdev->discov_timeout = 0;
+
+       hci_dev_unlock(hdev);
+
+       hci_req_sync(hdev, discoverable_update, 0, HCI_CMD_TIMEOUT, NULL);
+       mgmt_new_settings(hdev);
+}
+
+static int powered_update_hci(struct hci_request *req, unsigned long opt)
+{
+       struct hci_dev *hdev = req->hdev;
+       struct adv_info *adv_instance;
+       u8 link_sec;
+
+       hci_dev_lock(hdev);
+
+       if (hci_dev_test_flag(hdev, HCI_SSP_ENABLED) &&
+           !lmp_host_ssp_capable(hdev)) {
+               u8 mode = 0x01;
+
+               hci_req_add(req, HCI_OP_WRITE_SSP_MODE, sizeof(mode), &mode);
+
+               if (bredr_sc_enabled(hdev) && !lmp_host_sc_capable(hdev)) {
+                       u8 support = 0x01;
+
+                       hci_req_add(req, HCI_OP_WRITE_SC_SUPPORT,
+                                   sizeof(support), &support);
+               }
+       }
+
+       if (hci_dev_test_flag(hdev, HCI_LE_ENABLED) &&
+           lmp_bredr_capable(hdev)) {
+               struct hci_cp_write_le_host_supported cp;
+
+               cp.le = 0x01;
+               cp.simul = 0x00;
+
+               /* Check first if we already have the right
+                * host state (host features set)
+                */
+               if (cp.le != lmp_host_le_capable(hdev) ||
+                   cp.simul != lmp_host_le_br_capable(hdev))
+                       hci_req_add(req, HCI_OP_WRITE_LE_HOST_SUPPORTED,
+                                   sizeof(cp), &cp);
+       }
+
+       if (lmp_le_capable(hdev)) {
+               /* Make sure the controller has a good default for
+                * advertising data. This also applies to the case
+                * where BR/EDR was toggled during the AUTO_OFF phase.
+                */
+               if (hci_dev_test_flag(hdev, HCI_LE_ENABLED) &&
+                   (hci_dev_test_flag(hdev, HCI_ADVERTISING) ||
+                    !hci_dev_test_flag(hdev, HCI_ADVERTISING_INSTANCE))) {
+                       __hci_req_update_adv_data(req, HCI_ADV_CURRENT);
+                       __hci_req_update_scan_rsp_data(req, HCI_ADV_CURRENT);
+               }
+
+               if (hci_dev_test_flag(hdev, HCI_ADVERTISING_INSTANCE) &&
+                   hdev->cur_adv_instance == 0x00 &&
+                   !list_empty(&hdev->adv_instances)) {
+                       adv_instance = list_first_entry(&hdev->adv_instances,
+                                                       struct adv_info, list);
+                       hdev->cur_adv_instance = adv_instance->instance;
+               }
+
+               if (hci_dev_test_flag(hdev, HCI_ADVERTISING))
+                       __hci_req_enable_advertising(req);
+               else if (hci_dev_test_flag(hdev, HCI_ADVERTISING_INSTANCE) &&
+                        hdev->cur_adv_instance)
+                       __hci_req_schedule_adv_instance(req,
+                                                       hdev->cur_adv_instance,
+                                                       true);
+       }
+
+       link_sec = hci_dev_test_flag(hdev, HCI_LINK_SECURITY);
+       if (link_sec != test_bit(HCI_AUTH, &hdev->flags))
+               hci_req_add(req, HCI_OP_WRITE_AUTH_ENABLE,
+                           sizeof(link_sec), &link_sec);
+
+       if (lmp_bredr_capable(hdev)) {
+               if (hci_dev_test_flag(hdev, HCI_FAST_CONNECTABLE))
+                       __hci_req_write_fast_connectable(req, true);
+               else
+                       __hci_req_write_fast_connectable(req, false);
+               __hci_req_update_scan(req);
+               __hci_req_update_class(req);
+               __hci_req_update_name(req);
+               __hci_req_update_eir(req);
+       }
+
+       hci_dev_unlock(hdev);
+       return 0;
+}
+
+int __hci_req_hci_power_on(struct hci_dev *hdev)
+{
+       /* Register the available SMP channels (BR/EDR and LE) only when
+        * successfully powering on the controller. This late
+        * registration is required so that LE SMP can clearly decide if
+        * the public address or static address is used.
+        */
+       smp_register(hdev);
+
+       return __hci_req_sync(hdev, powered_update_hci, 0, HCI_CMD_TIMEOUT,
+                             NULL);
+}
+
 void hci_request_setup(struct hci_dev *hdev)
 {
        INIT_WORK(&hdev->discov_update, discov_update);
        INIT_WORK(&hdev->bg_scan_update, bg_scan_update);
+       INIT_WORK(&hdev->scan_update, scan_update_work);
+       INIT_WORK(&hdev->connectable_update, connectable_update_work);
+       INIT_WORK(&hdev->discoverable_update, discoverable_update_work);
+       INIT_DELAYED_WORK(&hdev->discov_off, discov_off);
        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);
 }
 
 void hci_request_cancel_all(struct hci_dev *hdev)
 {
+       hci_req_sync_cancel(hdev, ENODEV);
+
        cancel_work_sync(&hdev->discov_update);
        cancel_work_sync(&hdev->bg_scan_update);
+       cancel_work_sync(&hdev->scan_update);
+       cancel_work_sync(&hdev->connectable_update);
+       cancel_work_sync(&hdev->discoverable_update);
+       cancel_delayed_work_sync(&hdev->discov_off);
        cancel_delayed_work_sync(&hdev->le_scan_disable);
        cancel_delayed_work_sync(&hdev->le_scan_restart);
+
+       if (hdev->adv_instance_timeout) {
+               cancel_delayed_work_sync(&hdev->adv_instance_expire);
+               hdev->adv_instance_timeout = 0;
+       }
 }
This page took 0.066738 seconds and 5 git commands to generate.