From: Abhishek Pandit-Subedi <abhishekpandit@chromium.org>
To: marcel@holtmann.org, luiz.dentz@gmail.com
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 1/1] Bluetooth: Update add_device to accept flags
Date: Thu, 19 Mar 2020 18:49:49 -0700 [thread overview]
Message-ID: <20200319184913.RFC.1.I4657d5566e8562d9813915e16a1a38a27195671d@changeid> (raw)
In-Reply-To: <20200320014950.85018-1-abhishekpandit@chromium.org>
Add the capability to set flags on devices being added via add_device.
The first flag being used is the wakeable flag which allows the device
to wake the system from suspend.
Signed-off-by: Abhishek Pandit-Subedi <abhishekpandit@chromium.org>
---
include/net/bluetooth/mgmt.h | 5 ++++-
net/bluetooth/mgmt.c | 42 +++++++++++++++++++++++++++++++++++-
2 files changed, 45 insertions(+), 2 deletions(-)
diff --git a/include/net/bluetooth/mgmt.h b/include/net/bluetooth/mgmt.h
index f41cd87550dc..e9db9b1a4436 100644
--- a/include/net/bluetooth/mgmt.h
+++ b/include/net/bluetooth/mgmt.h
@@ -445,8 +445,11 @@ struct mgmt_rp_get_clock_info {
struct mgmt_cp_add_device {
struct mgmt_addr_info addr;
__u8 action;
+ __u8 flags_mask;
+ __u8 flags_value;
} __packed;
-#define MGMT_ADD_DEVICE_SIZE (MGMT_ADDR_INFO_SIZE + 1)
+#define MGMT_ADD_DEVICE_SIZE (MGMT_ADDR_INFO_SIZE + 3)
+#define DEVICE_FLAG_WAKEABLE (1 << 0)
#define MGMT_OP_REMOVE_DEVICE 0x0034
struct mgmt_cp_remove_device {
diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
index 6552003a170e..ae241f541713 100644
--- a/net/bluetooth/mgmt.c
+++ b/net/bluetooth/mgmt.c
@@ -5759,6 +5759,25 @@ static int hci_conn_params_set(struct hci_dev *hdev, bdaddr_t *addr,
return 0;
}
+static int hci_conn_params_set_flags(struct hci_dev *hdev, bdaddr_t *addr,
+ u8 addr_type, u8 flags_mask,
+ u8 flags_value)
+{
+ struct hci_conn_params *params =
+ hci_conn_params_add(hdev, addr, addr_type);
+
+ if (!params)
+ return -EIO;
+
+ if (flags_mask & DEVICE_FLAG_WAKEABLE)
+ params->wakeable = flags_mask & DEVICE_FLAG_WAKEABLE;
+
+ bt_dev_dbg(hdev, "addr %pMR (type %u) flag mask %u, values %u", addr,
+ addr_type, flags_mask, flags_value);
+
+ return 0;
+}
+
static void device_added(struct sock *sk, struct hci_dev *hdev,
bdaddr_t *bdaddr, u8 type, u8 action)
{
@@ -5805,11 +5824,23 @@ static int add_device(struct sock *sk, struct hci_dev *hdev,
err = hci_bdaddr_list_add(&hdev->whitelist, &cp->addr.bdaddr,
cp->addr.type);
- if (err)
+ if (err && err != -EEXIST)
goto unlock;
hci_req_update_scan(hdev);
+ /* Modify wake capable property if set. */
+ if (cp->flags_mask & DEVICE_FLAG_WAKEABLE) {
+ if (cp->flags_value & DEVICE_FLAG_WAKEABLE)
+ hci_bdaddr_list_add(&hdev->wakeable,
+ &cp->addr.bdaddr,
+ cp->addr.type);
+ else
+ hci_bdaddr_list_del(&hdev->wakeable,
+ &cp->addr.bdaddr,
+ cp->addr.type);
+ }
+
goto added;
}
@@ -5845,6 +5876,15 @@ static int add_device(struct sock *sk, struct hci_dev *hdev,
goto unlock;
}
+ /* Set or clear flags that were configured for this device */
+ if (hci_conn_params_set_flags(hdev, &cp->addr.bdaddr, addr_type,
+ cp->flags_mask, cp->flags_value)) {
+ err = mgmt_cmd_complete(sk, hdev->id, MGMT_OP_ADD_DEVICE,
+ MGMT_STATUS_FAILED, &cp->addr,
+ sizeof(cp->addr));
+ goto unlock;
+ }
+
hci_update_background_scan(hdev);
added:
--
2.25.1.696.g5e7596f4ac-goog
next prev parent reply other threads:[~2020-03-20 1:50 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-20 1:49 [RFC PATCH 0/1] Bluetooth: Set wakeable flag via add_device Abhishek Pandit-Subedi
2020-03-20 1:49 ` Abhishek Pandit-Subedi [this message]
2020-03-25 21:27 ` [RFC PATCH 1/1] Bluetooth: Update add_device to accept flags Marcel Holtmann
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=20200319184913.RFC.1.I4657d5566e8562d9813915e16a1a38a27195671d@changeid \
--to=abhishekpandit@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).