Bluetooth: Poll for RSSI updates from the remote device
This feature is required for implementing Low energy
proximity client immediate alert service. The proximtiy
client registers with the kernel for receiving RSSI updates
of the remote device. The kernel starts polling for RSSI
value using READ_RSSI HCI command and When it reaches
a particular threshold set by the proximity client,
updates are sent to the client.
Change-Id: I723dd140ad3bf02978c57b3ab127bb6768f28cca
CRs-fixed: 344936
Signed-off-by: Archana Ramachandran <archanar@codeaurora.org>
diff --git a/include/net/bluetooth/hci.h b/include/net/bluetooth/hci.h
index cd85855..eb89f4b 100644
--- a/include/net/bluetooth/hci.h
+++ b/include/net/bluetooth/hci.h
@@ -869,6 +869,17 @@
__le16 num_blocks;
} __packed;
+#define HCI_OP_READ_RSSI 0x1405
+struct hci_cp_read_rssi {
+ __le16 handle;
+} __packed;
+
+struct hci_rp_read_rssi {
+ __u8 status;
+ __le16 handle;
+ __s8 rssi;
+} __packed;
+
#define HCI_OP_READ_LOCAL_AMP_INFO 0x1409
struct hci_rp_read_local_amp_info {
__u8 status;
diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h
index 3ca14ff..4c86f24 100644
--- a/include/net/bluetooth/hci_core.h
+++ b/include/net/bluetooth/hci_core.h
@@ -310,12 +310,17 @@
__u8 remote_oob;
__u8 remote_auth;
+ __s8 rssi_threshold;
+ __u16 rssi_update_interval;
+ __u8 rssi_update_thresh_exceed;
+
unsigned int sent;
struct sk_buff_head data_q;
struct timer_list disc_timer;
struct timer_list idle_timer;
+ struct delayed_work rssi_update_work;
struct work_struct work_add;
struct work_struct work_del;
@@ -607,6 +612,10 @@
void hci_conn_hold_device(struct hci_conn *conn);
void hci_conn_put_device(struct hci_conn *conn);
+void hci_conn_set_rssi_reporter(struct hci_conn *conn,
+ s8 rssi_threshold, u16 interval, u8 updateOnThreshExceed);
+void hci_conn_unset_rssi_reporter(struct hci_conn *conn);
+
static inline void hci_conn_hold(struct hci_conn *conn)
{
atomic_inc(&conn->refcnt);
@@ -1039,6 +1048,8 @@
u8 status);
int mgmt_device_found(u16 index, bdaddr_t *bdaddr, u8 type, u8 le,
u8 *dev_class, s8 rssi, u8 eir_len, u8 *eir);
+void mgmt_read_rssi_complete(u16 index, s8 rssi, bdaddr_t *bdaddr,
+ u16 handle, u8 status);
int mgmt_remote_name(u16 index, bdaddr_t *bdaddr, u8 status, u8 *name);
void mgmt_inquiry_started(u16 index);
void mgmt_inquiry_complete_evt(u16 index, u8 status);
@@ -1090,4 +1101,6 @@
void hci_le_ltk_reply(struct hci_conn *conn, u8 ltk[16]);
void hci_le_ltk_neg_reply(struct hci_conn *conn);
+void hci_read_rssi(struct hci_conn *conn);
+
#endif /* __HCI_CORE_H */
diff --git a/include/net/bluetooth/mgmt.h b/include/net/bluetooth/mgmt.h
index 9c089e0..e34c425 100644
--- a/include/net/bluetooth/mgmt.h
+++ b/include/net/bluetooth/mgmt.h
@@ -233,6 +233,19 @@
__u8 enable;
} __packed;
+#define MGMT_OP_SET_RSSI_REPORTER 0x0022
+struct mgmt_cp_set_rssi_reporter {
+ bdaddr_t bdaddr;
+ __s8 rssi_threshold;
+ __le16 interval;
+ __u8 updateOnThreshExceed;
+} __packed;
+
+#define MGMT_OP_UNSET_RSSI_REPORTER 0x0023
+struct mgmt_cp_unset_rssi_reporter {
+ bdaddr_t bdaddr;
+} __packed;
+
#define MGMT_EV_CMD_COMPLETE 0x0001
struct mgmt_ev_cmd_complete {
__le16 opcode;
@@ -360,3 +373,9 @@
bdaddr_t bdaddr;
uint8_t features[8];
} __packed;
+
+#define MGMT_EV_RSSI_UPDATE 0x0020
+struct mgmt_ev_rssi_update {
+ bdaddr_t bdaddr;
+ __s8 rssi;
+} __packed;
diff --git a/net/bluetooth/hci_conn.c b/net/bluetooth/hci_conn.c
index a8e5af9..2854395 100644
--- a/net/bluetooth/hci_conn.c
+++ b/net/bluetooth/hci_conn.c
@@ -225,6 +225,18 @@
}
EXPORT_SYMBOL(hci_le_conn_update);
+void hci_read_rssi(struct hci_conn *conn)
+{
+ struct hci_cp_read_rssi cp;
+ struct hci_dev *hdev = conn->hdev;
+
+ memset(&cp, 0, sizeof(cp));
+ cp.handle = cpu_to_le16(conn->handle);
+
+ hci_send_cmd(hdev, HCI_OP_READ_RSSI, sizeof(cp), &cp);
+}
+EXPORT_SYMBOL(hci_read_rssi);
+
void hci_le_start_enc(struct hci_conn *conn, __le16 ediv, __u8 rand[8],
__u8 ltk[16])
{
@@ -340,6 +352,18 @@
hci_conn_enter_sniff_mode(conn);
}
+static void hci_conn_rssi_update(struct work_struct *work)
+{
+ struct delayed_work *delayed =
+ container_of(work, struct delayed_work, work);
+ struct hci_conn *conn =
+ container_of(delayed, struct hci_conn, rssi_update_work);
+
+ BT_DBG("conn %p mode %d", conn, conn->mode);
+
+ hci_read_rssi(conn);
+}
+
struct hci_conn *hci_conn_add(struct hci_dev *hdev, int type,
__u16 pkt_type, bdaddr_t *dst)
{
@@ -392,6 +416,7 @@
setup_timer(&conn->disc_timer, hci_conn_timeout, (unsigned long)conn);
setup_timer(&conn->idle_timer, hci_conn_idle, (unsigned long)conn);
+ INIT_DELAYED_WORK(&conn->rssi_update_work, hci_conn_rssi_update);
atomic_set(&conn->refcnt, 0);
@@ -434,6 +459,7 @@
del_timer(&conn->idle_timer);
del_timer(&conn->disc_timer);
del_timer(&conn->smp_timer);
+ __cancel_delayed_work(&conn->rssi_update_work);
if (conn->type == ACL_LINK) {
struct hci_conn *sco = conn->link;
@@ -900,6 +926,43 @@
jiffies + msecs_to_jiffies(hdev->idle_timeout));
}
+static inline void hci_conn_stop_rssi_timer(struct hci_conn *conn)
+{
+ BT_DBG("conn %p", conn);
+ cancel_delayed_work(&conn->rssi_update_work);
+}
+
+static inline void hci_conn_start_rssi_timer(struct hci_conn *conn,
+ u16 interval)
+{
+ struct hci_dev *hdev = conn->hdev;
+ BT_DBG("conn %p, pending %d", conn,
+ delayed_work_pending(&conn->rssi_update_work));
+ if (!delayed_work_pending(&conn->rssi_update_work)) {
+ queue_delayed_work(hdev->workqueue, &conn->rssi_update_work,
+ msecs_to_jiffies(interval));
+ }
+}
+
+void hci_conn_set_rssi_reporter(struct hci_conn *conn,
+ s8 rssi_threshold, u16 interval, u8 updateOnThreshExceed)
+{
+ if (conn) {
+ conn->rssi_threshold = rssi_threshold;
+ conn->rssi_update_interval = interval;
+ conn->rssi_update_thresh_exceed = updateOnThreshExceed;
+ hci_conn_start_rssi_timer(conn, interval);
+ }
+}
+
+void hci_conn_unset_rssi_reporter(struct hci_conn *conn)
+{
+ if (conn) {
+ BT_DBG("Deleting the rssi_update_timer");
+ hci_conn_stop_rssi_timer(conn);
+ }
+}
+
/* Enter sniff mode */
void hci_conn_enter_sniff_mode(struct hci_conn *conn)
{
diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
index aac934a..1d76674 100644
--- a/net/bluetooth/hci_event.c
+++ b/net/bluetooth/hci_event.c
@@ -940,6 +940,21 @@
hci_dev_unlock(hdev);
}
+static void hci_cc_read_rssi(struct hci_dev *hdev, struct sk_buff *skb)
+{
+ struct hci_conn *conn;
+ struct hci_rp_read_rssi *rp = (void *) skb->data;
+
+ BT_DBG("%s status 0x%x", hdev->name, rp->status);
+
+ BT_DBG("%s rssi : %d handle : %d", hdev->name, rp->rssi, rp->handle);
+
+ conn = hci_conn_hash_lookup_handle(hdev, __le16_to_cpu(rp->handle));
+ if (conn)
+ mgmt_read_rssi_complete(hdev->id, rp->rssi, &conn->dst,
+ __le16_to_cpu(rp->handle), rp->status);
+}
+
static void hci_cc_read_local_oob_data_reply(struct hci_dev *hdev,
struct sk_buff *skb)
{
@@ -2177,6 +2192,10 @@
hci_cc_le_read_buffer_size(hdev, skb);
break;
+ case HCI_OP_READ_RSSI:
+ hci_cc_read_rssi(hdev, skb);
+ break;
+
case HCI_OP_USER_CONFIRM_REPLY:
hci_cc_user_confirm_reply(hdev, skb);
break;
diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
index bc68c9f..ddb650b 100644
--- a/net/bluetooth/mgmt.c
+++ b/net/bluetooth/mgmt.c
@@ -1810,6 +1810,81 @@
return err;
}
+static int set_rssi_reporter(struct sock *sk, u16 index,
+ unsigned char *data, u16 len)
+{
+ struct mgmt_cp_set_rssi_reporter *cp = (void *) data;
+ struct hci_dev *hdev;
+ struct hci_conn *conn;
+ int err = 0;
+
+ if (len != sizeof(*cp))
+ return cmd_status(sk, index, MGMT_OP_SET_RSSI_REPORTER,
+ EINVAL);
+
+ hdev = hci_dev_get(index);
+ if (!hdev)
+ return cmd_status(sk, index, MGMT_OP_SET_RSSI_REPORTER,
+ ENODEV);
+
+ hci_dev_lock(hdev);
+
+ conn = hci_conn_hash_lookup_ba(hdev, LE_LINK, &cp->bdaddr);
+
+ if (!conn) {
+ err = cmd_status(sk, index, MGMT_OP_SET_RSSI_REPORTER,
+ ENOTCONN);
+ goto failed;
+ }
+
+ BT_DBG("updateOnThreshExceed %d ", cp->updateOnThreshExceed);
+ hci_conn_set_rssi_reporter(conn, cp->rssi_threshold,
+ __le16_to_cpu(cp->interval), cp->updateOnThreshExceed);
+
+failed:
+ hci_dev_unlock(hdev);
+ hci_dev_put(hdev);
+
+ return err;
+}
+
+static int unset_rssi_reporter(struct sock *sk, u16 index,
+ unsigned char *data, u16 len)
+{
+ struct mgmt_cp_unset_rssi_reporter *cp = (void *) data;
+ struct hci_dev *hdev;
+ struct hci_conn *conn;
+ int err = 0;
+
+ if (len != sizeof(*cp))
+ return cmd_status(sk, index, MGMT_OP_UNSET_RSSI_REPORTER,
+ EINVAL);
+
+ hdev = hci_dev_get(index);
+
+ if (!hdev)
+ return cmd_status(sk, index, MGMT_OP_UNSET_RSSI_REPORTER,
+ ENODEV);
+
+ hci_dev_lock(hdev);
+
+ conn = hci_conn_hash_lookup_ba(hdev, LE_LINK, &cp->bdaddr);
+
+ if (!conn) {
+ err = cmd_status(sk, index, MGMT_OP_UNSET_RSSI_REPORTER,
+ ENOTCONN);
+ goto failed;
+ }
+
+ hci_conn_unset_rssi_reporter(conn);
+
+failed:
+ hci_dev_unlock(hdev);
+ hci_dev_put(hdev);
+
+ return err;
+}
+
static int set_local_name(struct sock *sk, u16 index, unsigned char *data,
u16 len)
{
@@ -2365,6 +2440,12 @@
case MGMT_OP_SET_CONNECTION_PARAMS:
err = set_connection_params(sk, index, buf + sizeof(*hdr), len);
break;
+ case MGMT_OP_SET_RSSI_REPORTER:
+ err = set_rssi_reporter(sk, index, buf + sizeof(*hdr), len);
+ break;
+ case MGMT_OP_UNSET_RSSI_REPORTER:
+ err = unset_rssi_reporter(sk, index, buf + sizeof(*hdr), len);
+ break;
case MGMT_OP_READ_LOCAL_OOB_DATA:
err = read_local_oob_data(sk, index);
break;
@@ -2817,6 +2898,57 @@
return err;
}
+void mgmt_read_rssi_complete(u16 index, s8 rssi, bdaddr_t *bdaddr,
+ u16 handle, u8 status)
+{
+ struct mgmt_ev_rssi_update ev;
+ struct hci_conn *conn;
+ struct hci_dev *hdev;
+
+ if (status)
+ return;
+
+ hdev = hci_dev_get(index);
+ conn = hci_conn_hash_lookup_handle(hdev, handle);
+
+ if (!conn)
+ return;
+
+ BT_DBG("rssi_update_thresh_exceed : %d ",
+ conn->rssi_update_thresh_exceed);
+ BT_DBG("RSSI Threshold : %d , recvd RSSI : %d ",
+ conn->rssi_threshold, rssi);
+
+ if (conn->rssi_update_thresh_exceed == 1) {
+ BT_DBG("rssi_update_thresh_exceed == 1");
+ if (rssi >= conn->rssi_threshold) {
+ memset(&ev, 0, sizeof(ev));
+ bacpy(&ev.bdaddr, bdaddr);
+ ev.rssi = rssi;
+ mgmt_event(MGMT_EV_RSSI_UPDATE, index, &ev,
+ sizeof(ev), NULL);
+ } else {
+ hci_conn_set_rssi_reporter(conn, conn->rssi_threshold,
+ conn->rssi_update_interval,
+ conn->rssi_update_thresh_exceed);
+ }
+ } else {
+ BT_DBG("rssi_update_thresh_exceed == 0");
+ if (rssi <= conn->rssi_threshold) {
+ memset(&ev, 0, sizeof(ev));
+ bacpy(&ev.bdaddr, bdaddr);
+ ev.rssi = rssi;
+ mgmt_event(MGMT_EV_RSSI_UPDATE, index, &ev,
+ sizeof(ev), NULL);
+ } else {
+ hci_conn_set_rssi_reporter(conn, conn->rssi_threshold,
+ conn->rssi_update_interval,
+ conn->rssi_update_thresh_exceed);
+ }
+ }
+}
+
+
int mgmt_device_found(u16 index, bdaddr_t *bdaddr, u8 type, u8 le,
u8 *dev_class, s8 rssi, u8 eir_len, u8 *eir)
{