| Message ID | 20200117132623.RFC.1.I797e2f4cb824299043e771f3ab9cef86ee09f4db@changeid |
|---|---|
| State | Awaiting Upstream |
| Delegated to: | David Miller |
| Headers | show |
| Series | Bluetooth: Handle system suspend gracefully | expand |
Hi Abhishek, > 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> > --- > > include/net/bluetooth/hci_core.h | 1 + > include/net/bluetooth/mgmt.h | 7 ++++++ > net/bluetooth/hci_core.c | 1 + > net/bluetooth/mgmt.c | 42 ++++++++++++++++++++++++++++++++ > 4 files changed, 51 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; > + please also send a patch for doc/mgmt-api.txt describing these opcodes. I would also like to have the discussion if it might be better to add an extra Action parameter to Add Device. We want to differentiate between allow incoming connection that allows to wakeup and the one that doesn’t. Another option is to create an Add Extended Device command. Main reason here is that I don’t want to end up in the situation where you have to add a device and then send another 10 commands to set its features. > #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 1ca7508b6ca7..7057b9b65173 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 0dc610faab70..95092130f16c 100644 > --- a/net/bluetooth/mgmt.c > +++ b/net/bluetooth/mgmt.c > @@ -106,7 +106,10 @@ static const u16 mgmt_commands[] = { > MGMT_OP_START_LIMITED_DISCOVERY, > MGMT_OP_READ_EXT_INFO, > MGMT_OP_SET_APPEARANCE, > + MGMT_OP_GET_PHY_CONFIGURATION, > + MGMT_OP_SET_PHY_CONFIGURATION, These are unrelated to this patch. > MGMT_OP_SET_BLOCKED_KEYS, > + MGMT_OP_SET_WAKE_CAPABLE, > }; > > static const u16 mgmt_events[] = { > @@ -4663,6 +4666,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 +5825,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 +7031,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 }, > }; > Regards Marcel
On Tue, Jan 21, 2020 at 8:35 AM Marcel Holtmann <marcel@holtmann.org> wrote: > > Hi Abhishek, > > > 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> > > --- > > > > include/net/bluetooth/hci_core.h | 1 + > > include/net/bluetooth/mgmt.h | 7 ++++++ > > net/bluetooth/hci_core.c | 1 + > > net/bluetooth/mgmt.c | 42 ++++++++++++++++++++++++++++++++ > > 4 files changed, 51 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; > > + > > please also send a patch for doc/mgmt-api.txt describing these opcodes. I would also like to have the discussion if it might be better to add an extra Action parameter to Add Device. We want to differentiate between allow incoming connection that allows to wakeup and the one that doesn’t. > > Another option is to create an Add Extended Device command. Main reason here is that I don’t want to end up in the situation where you have to add a device and then send another 10 commands to set its features. Sent an email for doc/mgmt-api.txt. I think adding this to "Add Device" would be acceptable. However, it is possible for "wake capable" to be modified at runtime so it might be more appropriate on some sort of Set Connection Parameters type command. > > > #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 1ca7508b6ca7..7057b9b65173 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 0dc610faab70..95092130f16c 100644 > > --- a/net/bluetooth/mgmt.c > > +++ b/net/bluetooth/mgmt.c > > @@ -106,7 +106,10 @@ static const u16 mgmt_commands[] = { > > MGMT_OP_START_LIMITED_DISCOVERY, > > MGMT_OP_READ_EXT_INFO, > > MGMT_OP_SET_APPEARANCE, > > + MGMT_OP_GET_PHY_CONFIGURATION, > > + MGMT_OP_SET_PHY_CONFIGURATION, > > These are unrelated to this patch. They weren't there on tip last time I rebased. Should I create a new patch for this? > > > MGMT_OP_SET_BLOCKED_KEYS, > > + MGMT_OP_SET_WAKE_CAPABLE, > > }; > > > > static const u16 mgmt_events[] = { > > @@ -4663,6 +4666,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 +5825,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 +7031,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 }, > > }; > > > > Regards > > Marcel >
On Tue, Jan 21, 2020 at 6:31 PM Abhishek Pandit-Subedi <abhishekpandit@chromium.org> wrote: > > On Tue, Jan 21, 2020 at 8:35 AM Marcel Holtmann <marcel@holtmann.org> wrote: > > > > Hi Abhishek, > > > > > 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> > > > --- > > > > > > include/net/bluetooth/hci_core.h | 1 + > > > include/net/bluetooth/mgmt.h | 7 ++++++ > > > net/bluetooth/hci_core.c | 1 + > > > net/bluetooth/mgmt.c | 42 ++++++++++++++++++++++++++++++++ > > > 4 files changed, 51 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; > > > + > > > > please also send a patch for doc/mgmt-api.txt describing these opcodes. I would also like to have the discussion if it might be better to add an extra Action parameter to Add Device. We want to differentiate between allow incoming connection that allows to wakeup and the one that doesn’t. > > > > Another option is to create an Add Extended Device command. Main reason here is that I don’t want to end up in the situation where you have to add a device and then send another 10 commands to set its features. > > Sent an email for doc/mgmt-api.txt. I think adding this to "Add > Device" would be acceptable. However, it is possible for "wake > capable" to be modified at runtime so it might be more appropriate on > some sort of Set Connection Parameters type command. Agreed, a generic property mechanism seems appropriate. However, I would advise against overloading Add_Device as Abhishek indicated. Wake capability (or many other types of device featuers) may only be discovered (or enabled by a user) after the device has already been added. > > > > > > #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 1ca7508b6ca7..7057b9b65173 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 0dc610faab70..95092130f16c 100644 > > > --- a/net/bluetooth/mgmt.c > > > +++ b/net/bluetooth/mgmt.c > > > @@ -106,7 +106,10 @@ static const u16 mgmt_commands[] = { > > > MGMT_OP_START_LIMITED_DISCOVERY, > > > MGMT_OP_READ_EXT_INFO, > > > MGMT_OP_SET_APPEARANCE, > > > + MGMT_OP_GET_PHY_CONFIGURATION, > > > + MGMT_OP_SET_PHY_CONFIGURATION, > > > > These are unrelated to this patch. > > They weren't there on tip last time I rebased. Should I create a new > patch for this? > > > > > > MGMT_OP_SET_BLOCKED_KEYS, > > > + MGMT_OP_SET_WAKE_CAPABLE, > > > }; > > > > > > static const u16 mgmt_events[] = { > > > @@ -4663,6 +4666,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 +5825,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 +7031,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 }, > > > }; > > > > > > > Regards > > > > Marcel > >
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 1ca7508b6ca7..7057b9b65173 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 0dc610faab70..95092130f16c 100644 --- a/net/bluetooth/mgmt.c +++ b/net/bluetooth/mgmt.c @@ -106,7 +106,10 @@ static const u16 mgmt_commands[] = { MGMT_OP_START_LIMITED_DISCOVERY, MGMT_OP_READ_EXT_INFO, MGMT_OP_SET_APPEARANCE, + MGMT_OP_GET_PHY_CONFIGURATION, + MGMT_OP_SET_PHY_CONFIGURATION, MGMT_OP_SET_BLOCKED_KEYS, + MGMT_OP_SET_WAKE_CAPABLE, }; static const u16 mgmt_events[] = { @@ -4663,6 +4666,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 +5825,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 +7031,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)
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> --- include/net/bluetooth/hci_core.h | 1 + include/net/bluetooth/mgmt.h | 7 ++++++ net/bluetooth/hci_core.c | 1 + net/bluetooth/mgmt.c | 42 ++++++++++++++++++++++++++++++++ 4 files changed, 51 insertions(+)