1 files changed, 224 insertions, 0 deletions

diff --git a/include/net/bluetooth/hci.h b/include/net/bluetooth/hci.h
index 1668211297a9..cdd9f1fe7cfa 100644
--- a/include/net/bluetooth/hci.h
+++ b/include/net/bluetooth/hci.h
@@ -183,6 +183,15 @@ enum {
          * during the hdev->setup vendor callback.
          */
         HCI_QUIRK_NON_PERSISTENT_DIAG,
+
+        /* When this quirk is set, setup() would be run after every
+         * open() and not just after the first open().
+         *
+         * This quirk can be set before hci_register_dev is called or
+         * during the hdev->setup vendor callback.
+         *
+         */
+        HCI_QUIRK_NON_PERSISTENT_SETUP,
 };
 
 /* HCI device flags */
@@ -260,6 +269,7 @@ enum {
         HCI_VENDOR_DIAG,
         HCI_FORCE_BREDR_SMP,
         HCI_FORCE_STATIC_ADDR,
+        HCI_LL_RPA_RESOLUTION,
 
         __HCI_NUM_FLAGS,
 };
@@ -291,6 +301,14 @@ enum {
 #define HCI_DH3         0x0800
 #define HCI_DH5         0x8000
 
+/* HCI packet types inverted masks */
+#define HCI_2DH1        0x0002
+#define HCI_3DH1        0x0004
+#define HCI_2DH3        0x0100
+#define HCI_3DH3        0x0200
+#define HCI_2DH5        0x1000
+#define HCI_3DH5        0x2000
+
 #define HCI_HV1         0x0020
 #define HCI_HV2         0x0040
 #define HCI_HV3         0x0080
@@ -354,6 +372,8 @@ enum {
 #define LMP_PCONTROL    0x04
 #define LMP_TRANSPARENT 0x08
 
+#define LMP_EDR_2M              0x02
+#define LMP_EDR_3M              0x04
 #define LMP_RSSI_INQ    0x40
 #define LMP_ESCO        0x80
 
@@ -361,7 +381,9 @@ enum {
 #define LMP_EV5         0x02
 #define LMP_NO_BREDR    0x20
 #define LMP_LE          0x40
+#define LMP_EDR_3SLOT   0x80
 
+#define LMP_EDR_5SLOT   0x01
 #define LMP_SNIFF_SUBR  0x02
 #define LMP_PAUSE_ENC   0x04
 #define LMP_EDR_ESCO_2M 0x20
@@ -398,7 +420,12 @@ enum {
 #define HCI_LE_SLAVE_FEATURES           0x08
 #define HCI_LE_PING                     0x10
 #define HCI_LE_DATA_LEN_EXT             0x20
+#define HCI_LE_PHY_2M                   0x01
+#define HCI_LE_PHY_CODED                0x08
+#define HCI_LE_EXT_ADV                  0x10
 #define HCI_LE_EXT_SCAN_POLICY          0x80
+#define HCI_LE_PHY_2M                   0x01
+#define HCI_LE_PHY_CODED                0x08
 #define HCI_LE_CHAN_SEL_ALG2            0x40
 
 /* Connection modes */
@@ -1490,6 +1517,16 @@ struct hci_cp_le_write_def_data_len {
         __le16  tx_time;
 } __packed;
 
+#define HCI_OP_LE_CLEAR_RESOLV_LIST     0x2029
+
+#define HCI_OP_LE_READ_RESOLV_LIST_SIZE 0x202a
+struct hci_rp_le_read_resolv_list_size {
+        __u8    status;
+        __u8    size;
+} __packed;
+
+#define HCI_OP_LE_SET_ADDR_RESOLV_ENABLE 0x202d
+
 #define HCI_OP_LE_READ_MAX_DATA_LEN     0x202f
 struct hci_rp_le_read_max_data_len {
         __u8    status;
@@ -1506,6 +1543,134 @@ struct hci_cp_le_set_default_phy {
         __u8    rx_phys;
 } __packed;
 
+#define HCI_LE_SET_PHY_1M               0x01
+#define HCI_LE_SET_PHY_2M               0x02
+#define HCI_LE_SET_PHY_CODED            0x04
+
+#define HCI_OP_LE_SET_EXT_SCAN_PARAMS   0x2041
+struct hci_cp_le_set_ext_scan_params {
+        __u8    own_addr_type;
+        __u8    filter_policy;
+        __u8    scanning_phys;
+        __u8    data[0];
+} __packed;
+
+#define LE_SCAN_PHY_1M          0x01
+#define LE_SCAN_PHY_2M          0x02
+#define LE_SCAN_PHY_CODED       0x04
+
+struct hci_cp_le_scan_phy_params {
+        __u8    type;
+        __le16  interval;
+        __le16  window;
+} __packed;
+
+#define HCI_OP_LE_SET_EXT_SCAN_ENABLE   0x2042
+struct hci_cp_le_set_ext_scan_enable {
+        __u8    enable;
+        __u8    filter_dup;
+        __le16  duration;
+        __le16  period;
+} __packed;
+
+#define HCI_OP_LE_EXT_CREATE_CONN    0x2043
+struct hci_cp_le_ext_create_conn {
+        __u8      filter_policy;
+        __u8      own_addr_type;
+        __u8      peer_addr_type;
+        bdaddr_t  peer_addr;
+        __u8      phys;
+        __u8      data[0];
+} __packed;
+
+struct hci_cp_le_ext_conn_param {
+        __le16 scan_interval;
+        __le16 scan_window;
+        __le16 conn_interval_min;
+        __le16 conn_interval_max;
+        __le16 conn_latency;
+        __le16 supervision_timeout;
+        __le16 min_ce_len;
+        __le16 max_ce_len;
+} __packed;
+
+#define HCI_OP_LE_READ_NUM_SUPPORTED_ADV_SETS   0x203b
+struct hci_rp_le_read_num_supported_adv_sets {
+        __u8  status;
+        __u8  num_of_sets;
+} __packed;
+
+#define HCI_OP_LE_SET_EXT_ADV_PARAMS            0x2036
+struct hci_cp_le_set_ext_adv_params {
+        __u8      handle;
+        __le16    evt_properties;
+        __u8      min_interval[3];
+        __u8      max_interval[3];
+        __u8      channel_map;
+        __u8      own_addr_type;
+        __u8      peer_addr_type;
+        bdaddr_t  peer_addr;
+        __u8      filter_policy;
+        __u8      tx_power;
+        __u8      primary_phy;
+        __u8      secondary_max_skip;
+        __u8      secondary_phy;
+        __u8      sid;
+        __u8      notif_enable;
+} __packed;
+
+#define HCI_ADV_PHY_1M          0X01
+#define HCI_ADV_PHY_2M          0x02
+#define HCI_ADV_PHY_CODED       0x03
+
+struct hci_rp_le_set_ext_adv_params {
+        __u8  status;
+        __u8  tx_power;
+} __packed;
+
+#define HCI_OP_LE_SET_EXT_ADV_ENABLE            0x2039
+struct hci_cp_le_set_ext_adv_enable {
+        __u8  enable;
+        __u8  num_of_sets;
+        __u8  data[0];
+} __packed;
+
+struct hci_cp_ext_adv_set {
+        __u8  handle;
+        __le16 duration;
+        __u8  max_events;
+} __packed;
+
+#define HCI_OP_LE_SET_EXT_ADV_DATA              0x2037
+struct hci_cp_le_set_ext_adv_data {
+        __u8  handle;
+        __u8  operation;
+        __u8  frag_pref;
+        __u8  length;
+        __u8  data[HCI_MAX_AD_LENGTH];
+} __packed;
+
+#define HCI_OP_LE_SET_EXT_SCAN_RSP_DATA         0x2038
+struct hci_cp_le_set_ext_scan_rsp_data {
+        __u8  handle;
+        __u8  operation;
+        __u8  frag_pref;
+        __u8  length;
+        __u8  data[HCI_MAX_AD_LENGTH];
+} __packed;
+
+#define LE_SET_ADV_DATA_OP_COMPLETE     0x03
+
+#define LE_SET_ADV_DATA_NO_FRAG         0x01
+
+#define HCI_OP_LE_CLEAR_ADV_SETS        0x203d
+
+#define HCI_OP_LE_SET_ADV_SET_RAND_ADDR 0x2035
+struct hci_cp_le_set_adv_set_rand_addr {
+        __u8  handle;
+        bdaddr_t  bdaddr;
+} __packed;
+
 /* ---- HCI Events ---- */
 #define HCI_EV_INQUIRY_COMPLETE         0x01
 
@@ -1893,6 +2058,23 @@ struct hci_ev_le_conn_complete {
 #define LE_ADV_SCAN_IND         0x02
 #define LE_ADV_NONCONN_IND      0x03
 #define LE_ADV_SCAN_RSP         0x04
+#define LE_ADV_INVALID          0x05
+
+/* Legacy event types in extended adv report */
+#define LE_LEGACY_ADV_IND               0x0013
+#define LE_LEGACY_ADV_DIRECT_IND        0x0015
+#define LE_LEGACY_ADV_SCAN_IND          0x0012
+#define LE_LEGACY_NONCONN_IND           0x0010
+#define LE_LEGACY_SCAN_RSP_ADV          0x001b
+#define LE_LEGACY_SCAN_RSP_ADV_SCAN     0x001a
+
+/* Extended Advertising event types */
+#define LE_EXT_ADV_NON_CONN_IND         0x0000
+#define LE_EXT_ADV_CONN_IND             0x0001
+#define LE_EXT_ADV_SCAN_IND             0x0002
+#define LE_EXT_ADV_DIRECT_IND           0x0004
+#define LE_EXT_ADV_SCAN_RSP             0x0008
+#define LE_EXT_ADV_LEGACY_PDU           0x0010
 
 #define ADDR_LE_DEV_PUBLIC      0x00
 #define ADDR_LE_DEV_RANDOM      0x01
@@ -1957,6 +2139,48 @@ struct hci_ev_le_direct_adv_info {
         __s8     rssi;
 } __packed;
 
+#define HCI_EV_LE_EXT_ADV_REPORT    0x0d
+struct hci_ev_le_ext_adv_report {
+        __le16   evt_type;
+        __u8     bdaddr_type;
+        bdaddr_t bdaddr;
+        __u8     primary_phy;
+        __u8     secondary_phy;
+        __u8     sid;
+        __u8     tx_power;
+        __s8     rssi;
+        __le16   interval;
+        __u8     direct_addr_type;
+        bdaddr_t direct_addr;
+        __u8     length;
+        __u8     data[0];
+} __packed;
+
+#define HCI_EV_LE_ENHANCED_CONN_COMPLETE    0x0a
+struct hci_ev_le_enh_conn_complete {
+        __u8      status;
+        __le16    handle;
+        __u8      role;
+        __u8      bdaddr_type;
+        bdaddr_t  bdaddr;
+        bdaddr_t  local_rpa;
+        bdaddr_t  peer_rpa;
+        __le16    interval;
+        __le16    latency;
+        __le16    supervision_timeout;
+        __u8      clk_accurancy;
+} __packed;
+
+#define HCI_EV_LE_EXT_ADV_SET_TERM      0x12
+struct hci_evt_le_ext_adv_set_term {
+        __u8    status;
+        __u8    handle;
+        __le16  conn_handle;
+        __u8    num_evts;
+} __packed;
+
+#define HCI_EV_VENDOR                   0xff
+
 /* Internal events generated by Bluetooth stack */
 #define HCI_EV_STACK_INTERNAL   0xfd
 struct hci_ev_stack_internal {