From: Abhishek Pandit-Subedi <abhishekpandit@chromium.org>
To: marcel@holtmann.org, luiz.dentz@gmail.com, alainm@chromium.org
Cc: linux-bluetooth@vger.kernel.org,
chromeos-bluetooth-upstreaming@chromium.org,
Abhishek Pandit-Subedi <abhishekpandit@chromium.org>,
"David S. Miller" <davem@davemloft.net>,
Johan Hedberg <johan.hedberg@gmail.com>,
netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
Jakub Kicinski <kuba@kernel.org>
Subject: [RFC PATCH v2 1/4] Bluetooth: Add mgmt op set_wake_capable
Date: Mon, 27 Jan 2020 17:58:45 -0800 [thread overview]
Message-ID: <20200127175842.RFC.v2.1.I797e2f4cb824299043e771f3ab9cef86ee09f4db@changeid> (raw)
In-Reply-To: <20200128015848.226966-1-abhishekpandit@chromium.org>
When the system is suspended, only some connected Bluetooth devices
cause user input that should wake the system (mostly HID devices). Add
a list to keep track of devices that can wake the system and add
a management API to let userspace tell the kernel whether a device is
wake capable or not.
Signed-off-by: Abhishek Pandit-Subedi <abhishekpandit@chromium.org>
---
Changes in v2: None
include/net/bluetooth/hci_core.h | 1 +
include/net/bluetooth/mgmt.h | 7 ++++++
net/bluetooth/hci_core.c | 1 +
net/bluetooth/mgmt.c | 40 ++++++++++++++++++++++++++++++++
4 files changed, 49 insertions(+)
diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h
index 89ecf0a80aa1..ce4bebcb0265 100644
--- a/include/net/bluetooth/hci_core.h
+++ b/include/net/bluetooth/hci_core.h
@@ -394,6 +394,7 @@ struct hci_dev {
struct list_head mgmt_pending;
struct list_head blacklist;
struct list_head whitelist;
+ struct list_head wakeable;
struct list_head uuids;
struct list_head link_keys;
struct list_head long_term_keys;
diff --git a/include/net/bluetooth/mgmt.h b/include/net/bluetooth/mgmt.h
index a90666af05bd..283ba5320bdb 100644
--- a/include/net/bluetooth/mgmt.h
+++ b/include/net/bluetooth/mgmt.h
@@ -671,6 +671,13 @@ struct mgmt_cp_set_blocked_keys {
} __packed;
#define MGMT_OP_SET_BLOCKED_KEYS_SIZE 2
+#define MGMT_OP_SET_WAKE_CAPABLE 0x0047
+#define MGMT_SET_WAKE_CAPABLE_SIZE 8
+struct mgmt_cp_set_wake_capable {
+ struct mgmt_addr_info addr;
+ u8 wake_capable;
+} __packed;
+
#define MGMT_EV_CMD_COMPLETE 0x0001
struct mgmt_ev_cmd_complete {
__le16 opcode;
diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c
index cbbc34a006d1..2fceaf76644a 100644
--- a/net/bluetooth/hci_core.c
+++ b/net/bluetooth/hci_core.c
@@ -3299,6 +3299,7 @@ struct hci_dev *hci_alloc_dev(void)
INIT_LIST_HEAD(&hdev->mgmt_pending);
INIT_LIST_HEAD(&hdev->blacklist);
INIT_LIST_HEAD(&hdev->whitelist);
+ INIT_LIST_HEAD(&hdev->wakeable);
INIT_LIST_HEAD(&hdev->uuids);
INIT_LIST_HEAD(&hdev->link_keys);
INIT_LIST_HEAD(&hdev->long_term_keys);
diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
index 3074363c68df..58468dfa112f 100644
--- a/net/bluetooth/mgmt.c
+++ b/net/bluetooth/mgmt.c
@@ -107,6 +107,7 @@ static const u16 mgmt_commands[] = {
MGMT_OP_READ_EXT_INFO,
MGMT_OP_SET_APPEARANCE,
MGMT_OP_SET_BLOCKED_KEYS,
+ MGMT_OP_SET_WAKE_CAPABLE,
};
static const u16 mgmt_events[] = {
@@ -4663,6 +4664,37 @@ static int set_fast_connectable(struct sock *sk, struct hci_dev *hdev,
return err;
}
+static int set_wake_capable(struct sock *sk, struct hci_dev *hdev, void *data,
+ u16 len)
+{
+ int err;
+ u8 status;
+ struct mgmt_cp_set_wake_capable *cp = data;
+ u8 addr_type = cp->addr.type == BDADDR_BREDR ?
+ cp->addr.type :
+ le_addr_type(cp->addr.type);
+
+ BT_DBG("Set wake capable %pMR (type 0x%x) = 0x%x\n", &cp->addr.bdaddr,
+ addr_type, cp->wake_capable);
+
+ if (cp->wake_capable)
+ err = hci_bdaddr_list_add(&hdev->wakeable, &cp->addr.bdaddr,
+ addr_type);
+ else
+ err = hci_bdaddr_list_del(&hdev->wakeable, &cp->addr.bdaddr,
+ addr_type);
+
+ if (!err || err == -EEXIST || err == -ENOENT)
+ status = MGMT_STATUS_SUCCESS;
+ else
+ status = MGMT_STATUS_FAILED;
+
+ err = mgmt_cmd_complete(sk, hdev->id, MGMT_OP_SET_WAKE_CAPABLE, status,
+ cp, sizeof(*cp));
+
+ return err;
+}
+
static void set_bredr_complete(struct hci_dev *hdev, u8 status, u16 opcode)
{
struct mgmt_pending_cmd *cmd;
@@ -5791,6 +5823,13 @@ static int remove_device(struct sock *sk, struct hci_dev *hdev,
err = hci_bdaddr_list_del(&hdev->whitelist,
&cp->addr.bdaddr,
cp->addr.type);
+
+ /* Don't check result since it either succeeds or device
+ * wasn't there (not wakeable or invalid params as
+ * covered by deleting from whitelist).
+ */
+ hci_bdaddr_list_del(&hdev->wakeable, &cp->addr.bdaddr,
+ cp->addr.type);
if (err) {
err = mgmt_cmd_complete(sk, hdev->id,
MGMT_OP_REMOVE_DEVICE,
@@ -6990,6 +7029,7 @@ static const struct hci_mgmt_handler mgmt_handlers[] = {
{ set_phy_configuration, MGMT_SET_PHY_CONFIGURATION_SIZE },
{ set_blocked_keys, MGMT_OP_SET_BLOCKED_KEYS_SIZE,
HCI_MGMT_VAR_LEN },
+ { set_wake_capable, MGMT_SET_WAKE_CAPABLE_SIZE },
};
void mgmt_index_added(struct hci_dev *hdev)
--
2.25.0.341.g760bfbb309-goog
next prev parent reply other threads:[~2020-01-28 1:59 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-28 1:58 [RFC PATCH v2 0/4] Bluetooth: Handle system suspend gracefully Abhishek Pandit-Subedi
2020-01-28 1:58 ` Abhishek Pandit-Subedi [this message]
2020-01-29 4:42 ` [RFC PATCH v2 1/4] Bluetooth: Add mgmt op set_wake_capable Marcel Holtmann
2020-01-28 1:58 ` [RFC PATCH v2 2/4] Bluetooth: Handle PM_SUSPEND_PREPARE and PM_POST_SUSPEND Abhishek Pandit-Subedi
2020-01-28 1:58 ` [RFC PATCH v2 3/4] Bluetooth: Update filters/whitelists for suspend Abhishek Pandit-Subedi
2020-01-29 8:40 ` Marcel Holtmann
2020-01-29 19:04 ` Abhishek Pandit-Subedi
2020-02-13 8:29 ` Marcel Holtmann
2020-02-18 18:29 ` Abhishek Pandit-Subedi
2020-01-28 1:58 ` [RFC PATCH v2 4/4] Bluetooth: Pause discovery and advertising during suspend Abhishek Pandit-Subedi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200127175842.RFC.v2.1.I797e2f4cb824299043e771f3ab9cef86ee09f4db@changeid \
--to=abhishekpandit@chromium.org \
--cc=alainm@chromium.org \
--cc=chromeos-bluetooth-upstreaming@chromium.org \
--cc=davem@davemloft.net \
--cc=johan.hedberg@gmail.com \
--cc=kuba@kernel.org \
--cc=linux-bluetooth@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=luiz.dentz@gmail.com \
--cc=marcel@holtmann.org \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).