Bluetooth: Refactor code to read supported codecs in getsockopt
Subsystems (2)
PATCH v3 1/13 Bluetooth: Refactor code to read supported codecs in getsockopt
This patch moves reading of supported codecs from cache to a new function to reuse over L2CAP sockets to be used in a2dp offload use case.
--- net/bluetooth/hci_codec.c | 88 +++++++++++++++++++++++++++++++++++ net/bluetooth/hci_codec.h | 2 + net/bluetooth/sco.c | 98 +++------------------------------------ 3 files changed, 96 insertions(+), 92 deletions(-)
net/bluetooth/hci_codec.c +88 -0
@@ -250,3 +250,91 @@ void hci_read_supported_codecs_v2(struct hci_dev *hdev) error:kfree_skb (skb); } + +int hci_get_supported_codecs (struct hci_dev *hdev,u8 type,char __user *optval, +int __user *optlen,int len) +{ +int n =0 , buf_len =0 , err =0 ; +struct hci_codec_caps *caps; +struct bt_codec codec; +u8 num_codecs =0 , i,__user *ptr; +struct codec_list *c; + +if (!hci_dev_test_flag (hdev,HCI_OFFLOAD_CODECS_ENABLED )) { + err = -EOPNOTSUPP ; + goto error; + } + +if (!hdev->get_data_path_id) { + err = -EOPNOTSUPP ; + goto error; + } + +/* find total buffer size required to copy codec + capabilities */ +hci_dev_lock (hdev); +list_for_each_entry (c, &hdev->local_codecs, list) { +if (c->transport != type) +continue ; + num_codecs++; +for (i =0 , caps = c->caps; i < c->num_caps; i++) { + buf_len +=1 + caps->len; + caps = (void *)&caps->data[caps->len]; + } + buf_len +=sizeof (struct bt_codec ); + } +hci_dev_unlock (hdev); + + buf_len +=sizeof (struct bt_codecs ); +if (buf_len > len) { + err = -ENOBUFS ; + goto error; + } + ptr = optval; + +if (put_user (num_codecs, ptr)) { + err = -EFAULT ; + goto error; + } + ptr +=sizeof (num_codecs); + +/* Iterate over all the codecs on required transport */ +hci_dev_lock (hdev); +list_for_each_entry (c, &hdev->local_codecs, list) { +if (c->transport != type) +continue ; + + codec.id = c->id; + codec.cid = c->cid; + codec.vid = c->vid; + err = hdev->get_data_path_id (hdev, &codec.data_path); +if (err <0 ) +break ; + codec.num_caps = c->num_caps; +if (copy_to_user (ptr, &codec,sizeof (codec))) { + err = -EFAULT ; +break ; + } + ptr +=sizeof (codec); + +/* find codec capabilities data length */ + n =0 ; +for (i =0 , caps = c->caps; i < c->num_caps; i++) { + n +=1 + caps->len; + caps = (void *)&caps->data[caps->len]; + } + +/* copy codec capabilities data */ +if (n &©_to_user (ptr, c->caps, n)) { + err = -EFAULT ; +break ; + } + ptr += n; + } +hci_dev_unlock (hdev); + +if (!err &&put_user (buf_len, optlen)) + err = -EFAULT ; + +error: +return err; +}
net/bluetooth/hci_codec.h +2 -0
@@ -5,3 +5,5 @@void hci_read_supported_codecs (struct hci_dev *hdev);void hci_read_supported_codecs_v2 (struct hci_dev *hdev);void hci_codec_list_clear (struct list_head *codec_list); +int hci_get_supported_codecs (struct hci_dev *hdev,u8 type,char __user *optval, +int __user *optlen,int len);
net/bluetooth/sco.c +6 -92
122 lines not on this page · raw message
Signature · 1 line
2.17.1
PATCH v3 2/13 Bluetooth: Support reading of codecs supported over l2cap socket
Codecs supported for A2DP offload use case are returned over l2cap socket. Add BT_CODEC option to getsockopt to return the codecs.
--- include/net/bluetooth/hci.h | 1 + net/bluetooth/l2cap_sock.c | 14 ++++++++++++++ 2 files changed, 15 insertions(+)
include/net/bluetooth/hci.h +1 -0
@@ -2666,6 +2666,7 @@ static inline struct hci_sco_hdr *hci_sco_hdr(const struct sk_buff *skb)#define hci_iso_data_flags (h) ((h) >> 14)/* codec transport types */ +#define HCI_TRANSPORT_ACL 0x00#define HCI_TRANSPORT_SCO_ESCO 0x01/* le24 support */
net/bluetooth/l2cap_sock.c +14 -0
@@ -36,6 +36,7 @@#include <net/bluetooth/l2cap.h> #include "smp.h" +#include "hci_codec.h" static struct bt_sock_list l2cap_sk_list = { .lock =__RW_LOCK_UNLOCKED (l2cap_sk_list.lock)
@@ -568,6 +569,7 @@ static int l2cap_sock_getsockopt(struct socket *sock, int level, int optname,struct bt_power pwr;u32 phys;int len, mode, err =0 ; +struct hci_dev *hdev;BT_DBG ("sk %p" , sk);
@@ -704,6 +706,18 @@ static int l2cap_sock_getsockopt(struct socket *sock, int level, int optname, err = -EFAULT ;break ; +case BT_CODEC : + hdev =hci_get_route (BDADDR_ANY , &chan->src,BDADDR_BREDR ); +if (!hdev) { + err = -EBADFD ; +break ; + } + + err =hci_get_supported_codecs (hdev,HCI_TRANSPORT_ACL , optval, + optlen, len); +hci_dev_put (hdev); +break ; +default : err = -ENOPROTOOPT ;break ;
Signature · 1 line
2.17.1
PATCH v3 3/13 Bluetooth: btintel: cache offload use case data
In reply to Kiran KKeep a copy of use cases preset information in driver data. Use cases preset data can be re-used later instead of reading from controller every time.
--- drivers/bluetooth/btintel.c | 6 ++++++ drivers/bluetooth/btintel.h | 1 + 2 files changed, 7 insertions(+)
drivers/bluetooth/btintel.c +6 -0
@@ -2221,6 +2221,7 @@ static int btintel_configure_offload(struct hci_dev *hdev)struct sk_buff *skb;int err =0 ;struct intel_offload_use_cases *use_cases; +struct btintel_data *intel_data; skb =__hci_cmd_sync (hdev,0xfc86 ,0 ,NULL ,HCI_INIT_TIMEOUT );if (IS_ERR (skb)) {
@@ -2241,10 +2242,15 @@ static int btintel_configure_offload(struct hci_dev *hdev) goto error; } + intel_data =hci_get_priv ((hdev)); + + intel_data->use_cases = *use_cases; +if (use_cases->preset[0 ] &0x03 ) { hdev->get_data_path_id = btintel_get_data_path_id; hdev->get_codec_config_data = btintel_get_codec_config_data; } + error:kfree_skb (skb);return err;
drivers/bluetooth/btintel.h +1 -0
@@ -158,6 +158,7 @@ enum {struct btintel_data { DECLARE_BITMAP(flags, __INTEL_NUM_FLAGS); +struct intel_offload_use_cases use_cases; };#define btintel_set_flag (hdev, nr) \
Signature · 1 line
2.17.1
PATCH v3 4/13 Bluetooth: Pass transport type in get_data_path_id
In reply to Kiran KTo support fetching of data path id for other transport types like a2dp, le audio, pass an additional parameter to get_data_path_id callback function.
--- drivers/bluetooth/btintel.c | 19 +++++++++++++++---- drivers/bluetooth/hci_vhci.c | 6 +++++- include/net/bluetooth/hci_core.h | 3 ++- net/bluetooth/hci_codec.c | 9 ++++++--- net/bluetooth/hci_conn.c | 3 ++- net/bluetooth/hci_request.c | 5 +++-- net/bluetooth/hci_request.h | 3 ++- 7 files changed, 35 insertions(+), 13 deletions(-)
drivers/bluetooth/btintel.c +15 -4
@@ -2209,11 +2209,22 @@ static int btintel_get_codec_config_data(struct hci_dev *hdev,return err; } -static int btintel_get_data_path_id (struct hci_dev *hdev,__u8 *data_path_id) +static int btintel_get_data_path_id (struct hci_dev *hdev,__u8 transport, +__u8 *data_path_id) { -/* Intel uses 1 as data path id for all the usecases */ - *data_path_id =1 ; -return 0 ; +struct btintel_data *intel_data; + +if (transport !=HCI_TRANSPORT_SCO_ESCO ) +return -EINVAL ; + + intel_data =hci_get_priv ((hdev)); + +if (intel_data->use_cases.preset[0 ] &0x03 ) { +/* Intel uses 1 as data path id for all the usecases */ + *data_path_id =1 ; +return 0 ; + } +return -EOPNOTSUPP ; }static int btintel_configure_offload (struct hci_dev *hdev)
drivers/bluetooth/hci_vhci.c +5 -1
@@ -80,8 +80,12 @@ static int vhci_send_frame(struct hci_dev *hdev, struct sk_buff *skb)return 0 ; } -static int vhci_get_data_path_id (struct hci_dev *hdev,u8 *data_path_id) +static int vhci_get_data_path_id (struct hci_dev *hdev,u8 transport, +u8 *data_path_id) { +if (transport !=HCI_TRANSPORT_SCO_ESCO ) +return -EINVAL ; + *data_path_id =0 ;return 0 ; }
include/net/bluetooth/hci_core.h +2 -1
@@ -620,7 +620,8 @@ struct hci_dev {void (*cmd_timeout)(struct hci_dev *hdev);bool (*wakeup)(struct hci_dev *hdev);int (*set_quality_report)(struct hci_dev *hdev,bool enable); -int (*get_data_path_id)(struct hci_dev *hdev,__u8 *data_path); +int (*get_data_path_id)(struct hci_dev *hdev,__u8 transport, +__u8 *data_path);int (*get_codec_config_data)(struct hci_dev *hdev,__u8 type,struct bt_codec *codec,__u8 *vnd_len,__u8 **vnd_data);
net/bluetooth/hci_codec.c +6 -3
@@ -259,6 +259,7 @@ int hci_get_supported_codecs(struct hci_dev *hdev, u8 type, char __user *optval,struct bt_codec codec;u8 num_codecs =0 , i,__user *ptr;struct codec_list *c; +u8 data_path;if (!hci_dev_test_flag (hdev,HCI_OFFLOAD_CODECS_ENABLED )) { err = -EOPNOTSUPP ;
@@ -270,6 +271,10 @@ int hci_get_supported_codecs(struct hci_dev *hdev, u8 type, char __user *optval, goto error; } + err = hdev->get_data_path_id (hdev, type, &data_path); +if (err <0 ) + goto error; +/* find total buffer size required to copy codec + capabilities */ hci_dev_lock (hdev);list_for_each_entry (c, &hdev->local_codecs, list) {
@@ -306,9 +311,7 @@ int hci_get_supported_codecs(struct hci_dev *hdev, u8 type, char __user *optval, codec.id = c->id; codec.cid = c->cid; codec.vid = c->vid; - err = hdev->get_data_path_id (hdev, &codec.data_path); -if (err <0 ) -break ; + codec.data_path = data_path; codec.num_caps = c->num_caps;if (copy_to_user (ptr, &codec,sizeof (codec))) { err = -EFAULT ;
net/bluetooth/hci_conn.c +2 -1
@@ -317,7 +317,8 @@ static bool hci_enhanced_setup_sync_conn(struct hci_conn *conn, __u16 handle)/* for offload use case, codec needs to configured before opening SCO */ if (conn->codec.data_path) -hci_req_configure_datapath (hdev, &conn->codec); +hci_req_configure_datapath (hdev,HCI_TRANSPORT_SCO_ESCO , + &conn->codec); conn->state =BT_CONNECT ; conn->out = true;
net/bluetooth/hci_request.c +3 -2
@@ -2636,7 +2636,8 @@ static void config_data_path_complete(struct hci_dev *hdev, u8 status,bt_dev_dbg (hdev,"status %u" , status); } -int hci_req_configure_datapath (struct hci_dev *hdev,struct bt_codec *codec) +int hci_req_configure_datapath (struct hci_dev *hdev,u8 transport, +struct bt_codec *codec) {struct hci_request req;int err;
@@ -2656,7 +2657,7 @@ int hci_req_configure_datapath(struct hci_dev *hdev, struct bt_codec *codec) goto error; } - err = hdev->get_data_path_id (hdev, &cmd->data_path_id); + err = hdev->get_data_path_id (hdev, transport, &cmd->data_path_id);if (err <0 ) goto error;
net/bluetooth/hci_request.h +2 -1
@@ -111,7 +111,8 @@ void __hci_req_update_class(struct hci_request *req);/* Returns true if HCI commands were queued */ bool hci_req_stop_discovery (struct hci_request *req); -int hci_req_configure_datapath (struct hci_dev *hdev,struct bt_codec *codec); +int hci_req_configure_datapath (struct hci_dev *hdev,u8 transport, +struct bt_codec *codec);static inline void hci_req_update_scan (struct hci_dev *hdev) {
Signature · 1 line
2.17.1
PATCH v3 5/13 Bluetooth: btintel: Add support to fetch data path id for a2dp offload
In reply to Kiran KDuring *setup*, when configuring offload, set get_data_path_id callback function and support fetching of data path id for a2dp offload use case.
--- drivers/bluetooth/btintel.c | 28 +++++++++++++++++++++++----- 1 file changed, 23 insertions(+), 5 deletions(-)
drivers/bluetooth/btintel.c +23 -5
@@ -2214,16 +2214,30 @@ static int btintel_get_data_path_id(struct hci_dev *hdev, __u8 transport, {struct btintel_data *intel_data; -if (transport !=HCI_TRANSPORT_SCO_ESCO ) +if (transport !=HCI_TRANSPORT_SCO_ESCO && + transport !=HCI_TRANSPORT_ACL ) { +bt_dev_err (hdev,"Invalid transport type %u" , transport);return -EINVAL ; + } intel_data =hci_get_priv ((hdev)); -if (intel_data->use_cases.preset[0 ] &0x03 ) { -/* Intel uses 1 as data path id for all the usecases */ - *data_path_id =1 ; -return 0 ; +switch (transport) { +case HCI_TRANSPORT_SCO_ESCO : +if (intel_data->use_cases.preset[0 ] &0x03 ) { + *data_path_id =1 ; +return 0 ; + } +break ; +case HCI_TRANSPORT_ACL : +if (intel_data->use_cases.preset[0 ] &0x08 ) { + *data_path_id =1 ; +return 0 ; + } +break ; } +bt_dev_err (hdev,"Required preset is not supported 0x%02x" , + intel_data->use_cases.preset[0 ]);return -EOPNOTSUPP ; }
@@ -2262,6 +2276,10 @@ static int btintel_configure_offload(struct hci_dev *hdev) hdev->get_codec_config_data = btintel_get_codec_config_data; } +/* supports SBC codec for a2dp offload */ +if (use_cases->preset[0 ] &0x08 ) + hdev->get_data_path_id = btintel_get_data_path_id; + error:kfree_skb (skb);return err;
Signature · 1 line
2.17.1
PATCH v3 6/13 Bluetooth: Remove unused member in struct hci_vnd_codec_v2
In reply to Kiran KRemove unused "u8 id" member in struct hci_vnd_codec_v2. Vendor codec is identifiable by Company Id and Vendor Id fields.
--- include/net/bluetooth/hci.h | 1 - 1 file changed, 1 deletion(-)
include/net/bluetooth/hci.h +0 -1
@@ -1393,7 +1393,6 @@ struct hci_std_codecs_v2 { } __packed;struct hci_vnd_codec_v2 { -__u8 id;__le16 cid;__le16 vid;__u8 transport;
Signature · 1 line
2.17.1
PATCH v3 7/13 Bluetooth: Read Output codec capabilities
In reply to Kiran KWhen reading codec capabilities, read output (controller to host) capabilities also along with input (host to controller) capabilities.
--- net/bluetooth/hci_codec.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+)
net/bluetooth/hci_codec.c +14 -0
@@ -159,6 +159,9 @@ void hci_read_supported_codecs(struct hci_dev *hdev) caps.id = std_codecs->codec[i]; caps.direction =0x00 ;hci_read_codec_capabilities (hdev,LOCAL_CODEC_ACL_MASK , &caps); + + caps.direction =0x01 ; +hci_read_codec_capabilities (hdev,LOCAL_CODEC_ACL_MASK , &caps); } skb_pull(skb, flex_array_size(std_codecs, codec, std_codecs->num)
@@ -179,6 +182,9 @@ void hci_read_supported_codecs(struct hci_dev *hdev) caps.vid = vnd_codecs->codec[i].vid; caps.direction =0x00 ;hci_read_codec_capabilities (hdev,LOCAL_CODEC_ACL_MASK , &caps); + + caps.direction =0x01 ; +hci_read_codec_capabilities (hdev,LOCAL_CODEC_ACL_MASK , &caps); } error:
@@ -224,6 +230,10 @@ void hci_read_supported_codecs_v2(struct hci_dev *hdev)for (i =0 ; i < std_codecs->num; i++) { caps.id = std_codecs->codec[i].id; + caps.direction =0x00 ; +hci_read_codec_capabilities (hdev, std_codecs->codec[i].transport, + &caps); + caps.direction =0x01 ;hci_read_codec_capabilities (hdev, std_codecs->codec[i].transport, &caps); }
@@ -243,6 +253,10 @@ void hci_read_supported_codecs_v2(struct hci_dev *hdev) caps.id =0xFF ; caps.cid = vnd_codecs->codec[i].cid; caps.vid = vnd_codecs->codec[i].vid; + caps.direction =0x00 ; +hci_read_codec_capabilities (hdev, vnd_codecs->codec[i].transport, + &caps); + caps.direction =0x01 ;hci_read_codec_capabilities (hdev, vnd_codecs->codec[i].transport, &caps); }
Signature · 1 line
2.17.1
PATCH v3 8/13 Bluetooth: Implement MSFT avdtp open command
In reply to Kiran KIn A2DP offload use case, controller needs to configured with selected codec capabilities, dcid of media transport channel and ACL connection handle.
Controller responds with avdtp handle which needs to be sent in other avdtp commands like start, suspend and close.
--- include/net/bluetooth/bluetooth.h | 2 ++ include/net/bluetooth/hci.h | 16 ++++++++++++ net/bluetooth/hci_codec.c | 43 +++++++++++++++++++++++++++++++ net/bluetooth/hci_codec.h | 4 +++ net/bluetooth/l2cap_sock.c | 24 +++++++++++++++++ 5 files changed, 89 insertions(+)
include/net/bluetooth/bluetooth.h +2 -0
@@ -177,6 +177,8 @@ struct bt_codecs {#define BT_CODEC_TRANSPARENT 0x03#define BT_CODEC_MSBC 0x05 +#define BT_MSFT_OPEN 20 + __printf(1, 2)void bt_info (const char *fmt, ...);__printf (1 ,2 )
include/net/bluetooth/hci.h +16 -0
@@ -2009,6 +2009,22 @@ struct hci_cp_le_reject_cis {__u8 reason; } __packed; +#define HCI_MSFT_AVDTP_CMD 0xfc1e + +#define HCI_MSFT_AVDTP_OPEN 0x08 +struct hci_media_service_caps { +__u8 category; +__u8 len; +__u8 data[0 ]; +} __packed; + +struct msft_cp_avdtp_open { +__u8 sub_opcode; +__le16 handle; +__le16 dcid; +__le16 omtu; +} __packed; +/* ---- HCI Events ---- */ #define HCI_EV_INQUIRY_COMPLETE 0x01
net/bluetooth/hci_codec.c +43 -0
46 lines not on this page · raw message
net/bluetooth/hci_codec.h +4 -0
@@ -2,8 +2,12 @@/* Copyright (C) 2014 Intel Corporation */ +#include <net/bluetooth/l2cap.h> +void hci_read_supported_codecs (struct hci_dev *hdev);void hci_read_supported_codecs_v2 (struct hci_dev *hdev);void hci_codec_list_clear (struct list_head *codec_list);int hci_get_supported_codecs (struct hci_dev *hdev,u8 type,char __user *optval,int __user *optlen,int len); +int hci_configure_msft_avdtp_open (struct hci_dev *hdev,struct l2cap_chan *chan, +sockptr_t optval,int optlen);
net/bluetooth/l2cap_sock.c +24 -0
@@ -909,6 +909,7 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname,struct l2cap_conn *conn;int len, err =0 ;u32 opt; +struct hci_dev *hdev;BT_DBG ("sk %p" , sk);
@@ -1137,6 +1138,29 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname,break ; +case BT_MSFT_OPEN : +if (sk->sk_state !=BT_CONNECTED ) { + err = -ENOTCONN ; +break ; + } + + hdev =hci_get_route (BDADDR_ANY , &chan->src,BDADDR_BREDR ); +if (!hdev) { + err = -EBADFD ; +break ; + } + +if (!hci_dev_test_flag (hdev,HCI_OFFLOAD_CODECS_ENABLED ) || + !hdev->get_data_path_id) { + err = -EOPNOTSUPP ; +hci_dev_put (hdev); +break ; + } + + err =hci_configure_msft_avdtp_open (hdev, chan, optval, optlen); +hci_dev_put (hdev); +break ; +default : err = -ENOPROTOOPT ;break ;
Signature · 1 line
2.17.1
Luiz Augusto von Dentz
maintainerRe: [PATCH v3 08/13] Bluetooth: Implement MSFT avdtp open command
Hi Kiran,
Quoted 24 lines · Kiran K
In A2DP offload use case, controller needs to configured with selected codec capabilities, dcid of media transport channel and ACL connection handle.
Controller responds with avdtp handle which needs to be sent in other avdtp commands like start, suspend and close.
Signed-off-by Kiran K <[email protected]>Reviewed-by Chethan T N <[email protected]>Reviewed-by Srivatsa Ravishankar <[email protected]>--- include/net/bluetooth/bluetooth.h | 2 ++ include/net/bluetooth/hci.h | 16 ++++++++++++ net/bluetooth/hci_codec.c | 43 +++++++++++++++++++++++++++++++ net/bluetooth/hci_codec.h | 4 +++ net/bluetooth/l2cap_sock.c | 24 +++++++++++++++++ 5 files changed, 89 insertions(+)include/net/bluetooth/bluetooth.h +0
-0
include/net/bluetooth/bluetooth.h struct bt_codecs { · line 180
Quoted 4 lines
include/net/bluetooth/bluetooth.h +1
-0@@ -177,6 +177,8 @@ struct bt_codecs {#define BT_CODEC_TRANSPARENT 0x03#define BT_CODEC_MSBC 0x05 +#define BT_MSFT_OPEN 20
I rather not have each command as a different sockopt, instead I would suggest just one opcode and a internal header for each command so we don't pollute too much our sockopt space since this only really apply to MSFT I guess calling it BT_MSFT should be fine, also Id make it extensible so we have a header and a flexible payload in case more commands needs to be added.
Quoted 88 lines
include/net/bluetooth/bluetooth.h +0
-0__printf(1, 2)void bt_info (const char *fmt, ...);__printf (1 ,2 )include/net/bluetooth/hci.h +16
-0@@ -2009,6 +2009,22 @@ struct hci_cp_le_reject_cis {__u8 reason; } __packed; +#define HCI_MSFT_AVDTP_CMD 0xfc1e + +#define HCI_MSFT_AVDTP_OPEN 0x08 +struct hci_media_service_caps { +__u8 category; +__u8 len; +__u8 data[0 ]; +} __packed; + +struct msft_cp_avdtp_open { +__u8 sub_opcode; +__le16 handle; +__le16 dcid; +__le16 omtu; +} __packed; +/* ---- HCI Events ---- */ #define HCI_EV_INQUIRY_COMPLETE 0x01net/bluetooth/hci_codec.c +43
-0@@ -355,3 +355,46 @@ int hci_get_supported_codecs(struct hci_dev *hdev, u8 type, char __user *optval, error:return err; } + +int hci_configure_msft_avdtp_open (struct hci_dev *hdev,struct l2cap_chan *chan, +sockptr_t optval,int optlen) +{ +struct msft_cp_avdtp_open *cmd =NULL ; +struct hci_media_service_caps *caps; +int err; + +if (!optlen || optlen <sizeof (*caps)) { + err = -EINVAL ; + goto fail; + } + + cmd =kzalloc (sizeof (*cmd) + optlen,GFP_KERNEL ); +if (!cmd) { + err = -ENOMEM ; + goto fail; + } + + cmd->sub_opcode =HCI_MSFT_AVDTP_OPEN ; + cmd->handle =__cpu_to_le16 (chan->conn->hcon->handle); + cmd->dcid =cpu_to_le16 (chan->dcid); + cmd->omtu =cpu_to_le16 (chan->omtu); + caps = (void *)(cmd +1 ); + +if (copy_from_sockptr (caps, optval, optlen)) { + err = -EFAULT ; + goto fail; + } + +if (caps->category !=0x07 ) { + err = -EINVAL ; + goto fail; + } + +hci_send_cmd (hdev,HCI_MSFT_AVDTP_CMD ,sizeof (*cmd) + optlen, cmd); + +/* wait until we get avdtp handle or timeout */ + +fail: +kfree (cmd); +return err; +}net/bluetooth/hci_codec.h +0
-0@@ -2,8 +2,12 @@/* Copyright (C) 2014 Intel Corporation */
net/bluetooth/hci_codec.h line 13
Quoted 10 lines
net/bluetooth/hci_codec.h +4
-0+#include <net/bluetooth/l2cap.h> +void hci_read_supported_codecs (struct hci_dev *hdev);void hci_read_supported_codecs_v2 (struct hci_dev *hdev);void hci_codec_list_clear (struct list_head *codec_list);int hci_get_supported_codecs (struct hci_dev *hdev,u8 type,char __user *optval,int __user *optlen,int len); +int hci_configure_msft_avdtp_open (struct hci_dev *hdev,struct l2cap_chan *chan, +sockptr_t optval,int optlen);
Id place this function inside msft.h/msft.c since this is a MSFT extension.
Quoted 45 lines
net/bluetooth/l2cap_sock.c +24
-1@@ -909,6 +909,7 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname,struct l2cap_conn *conn;int len, err =0 ;u32 opt; +struct hci_dev *hdev;BT_DBG ("sk %p" , sk);@@ -1137,6 +1138,29 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname,break ; +case BT_MSFT_OPEN : +if (sk->sk_state !=BT_CONNECTED ) { + err = -ENOTCONN ; +break ; + } + + hdev =hci_get_route (BDADDR_ANY , &chan->src,BDADDR_BREDR ); +if (!hdev) { + err = -EBADFD ; +break ; + } + +if (!hci_dev_test_flag (hdev,HCI_OFFLOAD_CODECS_ENABLED ) || + !hdev->get_data_path_id) { + err = -EOPNOTSUPP ; +hci_dev_put (hdev); +break ; + } + + err =hci_configure_msft_avdtp_open (hdev, chan, optval, optlen); +hci_dev_put (hdev); +break ; +default : err = -ENOPROTOOPT ;break ; --2.17.1
Signature · 1 line
Luiz Augusto von Dentz
RE: [PATCH v3 08/13] Bluetooth: Implement MSFT avdtp open command
Hi Luiz,
Quoted 32 lines
Hi Kiran,
Quoted 28 lines · Kiran K
In A2DP offload use case, controller needs to configured with selected codec capabilities, dcid of media transport channel and ACL connection handle.
Controller responds with avdtp handle which needs to be sent in other avdtp commands like start, suspend and close.
Signed-off-by Kiran K <[email protected]>Reviewed-by Chethan T N <[email protected]>Reviewed-by Srivatsa Ravishankar <[email protected]>--- include/net/bluetooth/bluetooth.h | 2 ++ include/net/bluetooth/hci.h | 16 ++++++++++++ net/bluetooth/hci_codec.c | 43 +++++++++++++++++++++++++++++++ net/bluetooth/hci_codec.h | 4 +++ net/bluetooth/l2cap_sock.c | 24 +++++++++++++++++ 5 files changed, 89 insertions(+)include/net/bluetooth/bluetooth.h +0
-0@@ -177,6 +177,8 @@ struct bt_codecs {#define BT_CODEC_TRANSPARENT 0x03#define BT_CODEC_MSBC 0x05
Quoted 8 lines
include/net/bluetooth/bluetooth.h struct bt_codecs { · line 180
Quoted 1 line
include/net/bluetooth/bluetooth.h +1
-0+#define BT_MSFT_OPEN 20I rather not have each command as a different sockopt, instead I would suggest just one opcode and a internal header for each command so we don't pollute too much our sockopt space since this only really apply to MSFT I guess calling it
BT_MSFTshould be fine, also Id make it extensible so we have a header and a flexible payload in case more commands needs to be added.
Agree. I will send an updated patch.
Quoted 150 lines
Quoted 36 lines
include/net/bluetooth/bluetooth.h +0
-0__printf(1, 2)void bt_info (const char *fmt, ...);__printf (1 ,2 )include/net/bluetooth/hci.h +16
-0@@ -2009,6 +2009,22 @@ struct hci_cp_le_reject_cis {__u8 reason; } __packed; +#define HCI_MSFT_AVDTP_CMD 0xfc1e + +#define HCI_MSFT_AVDTP_OPEN 0x08 +struct hci_media_service_caps { +__u8 category; +__u8 len; +__u8 data[0 ]; +} __packed; + +struct msft_cp_avdtp_open { +__u8 sub_opcode; +__le16 handle; +__le16 dcid; +__le16 omtu; +} __packed; +/* ---- HCI Events ---- */ #define HCI_EV_INQUIRY_COMPLETE 0x01net/bluetooth/hci_codec.c +0
-0net/bluetooth/hci_codec.c int hci_get_supported_codecs(struct hci_dev
Quoted 6 lines
net/bluetooth/hci_codec.c +2
-0@@ -355,3 +355,46 @@ int hci_get_supported_codecs(struct hci_dev *hdev, u8 type, char __user *optval, error:return err; } + +int hci_configure_msft_avdtp_open(struct hci_dev *hdev, struct
l2cap_chan*chan,Quoted 52 lines
net/bluetooth/hci_codec.c +41
-0+ sockptr_t optval, int optlen) { +struct msft_cp_avdtp_open *cmd =NULL ; +struct hci_media_service_caps *caps; +int err; + +if (!optlen || optlen <sizeof (*caps)) { + err = -EINVAL ; + goto fail; + } + + cmd =kzalloc (sizeof (*cmd) + optlen,GFP_KERNEL ); +if (!cmd) { + err = -ENOMEM ; + goto fail; + } + + cmd->sub_opcode =HCI_MSFT_AVDTP_OPEN ; + cmd->handle =__cpu_to_le16 (chan->conn->hcon->handle); + cmd->dcid =cpu_to_le16 (chan->dcid); + cmd->omtu =cpu_to_le16 (chan->omtu); + caps = (void *)(cmd +1 ); + +if (copy_from_sockptr (caps, optval, optlen)) { + err = -EFAULT ; + goto fail; + } + +if (caps->category !=0x07 ) { + err = -EINVAL ; + goto fail; + } + +hci_send_cmd (hdev,HCI_MSFT_AVDTP_CMD ,sizeof (*cmd) + optlen, + cmd); + +/* wait until we get avdtp handle or timeout */ + +fail: +kfree (cmd); +return err; +}net/bluetooth/hci_codec.h +2
-0@@ -2,8 +2,12 @@/* Copyright (C) 2014 Intel Corporation */ +#include <net/bluetooth/l2cap.h> +void hci_read_supported_codecs (struct hci_dev *hdev);void Quoted 3 lines
hci_read_supported_codecs_v2(struct hci_dev *hdev); voidhci_codec_list_clear(struct list_head *codec_list); int hci_get_supported_codecs(structhci_dev*hdev, u8 type, char__user*optval,
Quoted 2 lines
int __user *optlen, int len);+int hci_configure_msft_avdtp_open(struct
hci_dev*hdev, struct
l2cap_chan*chan,Quoted 1 line
+
sockptr_toptval, int optlen);Id place this function inside
msft.h/msft.csince this is a MSFT extension.net/bluetooth/l2cap_sock.c static int l2cap_sock_setsockopt(struct socket
Quoted 5 lines
net/bluetooth/l2cap_sock.c +0
-0@@ -909,6 +909,7 @@ static int l2cap_sock_setsockopt(struct socket*sock, int level, int optname,
Quoted 9 lines
net/bluetooth/l2cap_sock.c +1
-0struct l2cap_conn *conn;int len, err =0 ;u32 opt; +struct hci_dev *hdev;BT_DBG ("sk %p" , sk);@@ -1137,6 +1138,29 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname,net/bluetooth/l2cap_sock.c static int l2cap_sock_setsockopt(struct socket · line 1148
Quoted 10 lines
net/bluetooth/l2cap_sock.c +7
-0break ; +case BT_MSFT_OPEN : +if (sk->sk_state !=BT_CONNECTED ) { + err = -ENOTCONN ; +break ; + } + + hdev = hci_get_route(BDADDR_ANY, &chan->src,
BDADDR_BREDR);Quoted 18 lines
net/bluetooth/l2cap_sock.c +16
-0+if (!hdev) { + err = -EBADFD ; +break ; + } + +if (!hci_dev_test_flag (hdev,HCI_OFFLOAD_CODECS_ENABLED ) || + !hdev->get_data_path_id) { + err = -EOPNOTSUPP ; +hci_dev_put (hdev); +break ; + } + + err =hci_configure_msft_avdtp_open (hdev, chan, optval, optlen); +hci_dev_put (hdev); +break ; +default : err = -ENOPROTOOPT ;
Quoted 8 lines
Quoted 4 lines
break;--
2.17.1--
Luiz Augusto von Dentz
Thanks,
Kiran
Dan Carpenter
build botRe: [PATCH v3 08/13] Bluetooth: Implement MSFT avdtp open command
In reply to Kiran KCC: kbuild-all(a)lists.01.org In-Reply-To: <[email protected]> References: <[email protected]> TO: Kiran K <[email protected]> TO…
CC: kbuild-all(a)lists.01.org
In-Reply-To: <[email protected]>
References: <[email protected]>
TO: Kiran K <[email protected]>
TO: linux-bluetooth(a)vger.kernel.org
CC: ravishankar.srivatsa(a)intel.com
CC: chethan.tumkur.narayan(a)intel.com
CC: luiz.von.dentz(a)intel.com
CC: Kiran K <[email protected]>
Hi Kiran,
Thank you for the patch! Perhaps something to improve:
[auto build test WARNING on bluetooth-next/master]
[also build test WARNING on v5.16-rc1 next-20211118]
[cannot apply to bluetooth/master]
[If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/0day-ci/linux/commits/Kiran-K/Bluetooth-Refactor-code-to-read-supported-codecs-in-getsockopt/20211115-144640 base: https://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git master
:::::: branch date: 4 days ago
:::::: commit date: 4 days ago
config: i386-randconfig-m021-20211115 (attached as .config)
compiler: gcc-9 (Debian 9.3.0-22) 9.3.0
If you fix the issue, kindly add following tag as appropriate
New smatch warnings:net/bluetooth/hci_codec.c:388 hci_configure_msft_avdtp_open() warn: is 'cmd + 1' large enough for 'struct hci_media_service_caps'? s32min
Old smatch warnings:net/bluetooth/hci_codec.c:399 hci_configure_msft_avdtp_open() error: uninitialized symbol 'err'.
vim +388 net/bluetooth/hci_codec.c
d9396dc909768b Kiran K 2021-11-15 358
d9396dc909768b Kiran K 2021-11-15 359 int hci_configure_msft_avdtp_open(struct hci_dev *hdev, struct l2cap_chan *chan,
d9396dc909768b Kiran K 2021-11-15 360 sockptr_t optval, int optlen)
d9396dc909768b Kiran K 2021-11-15 361 {
d9396dc909768b Kiran K 2021-11-15 362 struct msft_cp_avdtp_open *cmd = NULL;
d9396dc909768b Kiran K 2021-11-15 363 struct hci_media_service_caps *caps;
d9396dc909768b Kiran K 2021-11-15 364 int err;
d9396dc909768b Kiran K 2021-11-15 365
d9396dc909768b Kiran K 2021-11-15 366 if (!optlen || optlen < sizeof(*caps)) {
d9396dc909768b Kiran K 2021-11-15 367 err = -EINVAL;
d9396dc909768b Kiran K 2021-11-15 368 goto fail;
d9396dc909768b Kiran K 2021-11-15 369 }
d9396dc909768b Kiran K 2021-11-15 370
d9396dc909768b Kiran K 2021-11-15 371 cmd = kzalloc(sizeof(*cmd) + optlen, GFP_KERNEL);
d9396dc909768b Kiran K 2021-11-15 372 if (!cmd) {
d9396dc909768b Kiran K 2021-11-15 373 err = -ENOMEM;
d9396dc909768b Kiran K 2021-11-15 374 goto fail;
d9396dc909768b Kiran K 2021-11-15 375 }
d9396dc909768b Kiran K 2021-11-15 376
d9396dc909768b Kiran K 2021-11-15 377 cmd->sub_opcode = HCI_MSFT_AVDTP_OPEN;
d9396dc909768b Kiran K 2021-11-15 378 cmd->handle = __cpu_to_le16(chan->conn->hcon->handle);
d9396dc909768b Kiran K 2021-11-15 379 cmd->dcid = cpu_to_le16(chan->dcid);
d9396dc909768b Kiran K 2021-11-15 380 cmd->omtu = cpu_to_le16(chan->omtu);
d9396dc909768b Kiran K 2021-11-15 381 caps = (void *)(cmd + 1);
d9396dc909768b Kiran K 2021-11-15 382
d9396dc909768b Kiran K 2021-11-15 383 if (copy_from_sockptr(caps, optval, optlen)) {
d9396dc909768b Kiran K 2021-11-15 384 err = -EFAULT;
d9396dc909768b Kiran K 2021-11-15 385 goto fail;
d9396dc909768b Kiran K 2021-11-15 386 }
d9396dc909768b Kiran K 2021-11-15 387 d9396dc909768b Kiran K 2021-11-15 @388 if (caps->category != 0x07) {
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org
PATCH v3 9/13 Bluetooth: Handle MSFT avdtp open event
In reply to Kiran KController responds with CCE event for MSFT avdtp open command. On success MSFT avdtp open event contains avdtp handle which needs to sent in start/suspend/close avdtp commands.
--- include/net/bluetooth/hci.h | 7 +++++ net/bluetooth/hci_event.c | 53 +++++++++++++++++++++++++++++++++++++ 2 files changed, 60 insertions(+)
include/net/bluetooth/hci.h +7 -0
@@ -2025,6 +2025,13 @@ struct msft_cp_avdtp_open {__le16 omtu; } __packed; +struct msft_rp_avdtp_open { +__u8 status; +__u8 sub_opcode; +__le16 avdtp_handle; +__u8 audio_intf_param_cnt; +} __packed; +/* ---- HCI Events ---- */ #define HCI_EV_INQUIRY_COMPLETE 0x01
net/bluetooth/hci_event.c +53 -0
65 lines not on this page · raw message
Signature · 1 line
2.17.1
PATCH v3 10/13 Bluetooth: Handle MSFT avdtp open event
In reply to Kiran KOn receiving MSFT avdtp open event, cache avdtp handle and signal the task waiting on avdtp handle.
--- include/net/bluetooth/bluetooth.h | 3 +++ include/net/bluetooth/hci.h | 1 + include/net/bluetooth/l2cap.h | 4 ++++ net/bluetooth/af_bluetooth.c | 36 +++++++++++++++++++++++++++++++ net/bluetooth/hci_codec.c | 6 ++++-- net/bluetooth/hci_codec.h | 2 +- net/bluetooth/hci_event.c | 5 +++++ net/bluetooth/l2cap_core.c | 15 +++++++++++++ net/bluetooth/l2cap_sock.c | 17 ++++++++++++++- 9 files changed, 85 insertions(+), 4 deletions(-)
include/net/bluetooth/bluetooth.h +3 -0
@@ -317,6 +317,7 @@ struct bt_sock {struct list_head accept_q;struct sock *parent;unsigned long flags; +u16 avdtp_handle;void (*skb_msg_name)(struct sk_buff *,void *,int *);void (*skb_put_cmsg)(struct sk_buff *,struct msghdr *,struct sock *); };
@@ -324,6 +325,7 @@ struct bt_sock {enum {BT_SK_DEFER_SETUP ,BT_SK_SUSPEND , +BT_SK_AVDTP_PEND , };struct bt_sock_list {
@@ -346,6 +348,7 @@ __poll_t bt_sock_poll(struct file *file, struct socket *sock, poll_table *wait);int bt_sock_ioctl (struct socket *sock,unsigned int cmd,unsigned long arg);int bt_sock_wait_state (struct sock *sk,int state,unsigned long timeo);int bt_sock_wait_ready (struct sock *sk,unsigned long flags); +int bt_sock_wait_for_avdtp_hndl (struct sock *sk,unsigned long timeo);void bt_accept_enqueue (struct sock *parent,struct sock *sk,bool bh);void bt_accept_unlink (struct sock *sk);
include/net/bluetooth/hci.h +1 -0
@@ -347,6 +347,7 @@ enum {#define HCI_POWER_OFF_TIMEOUT msecs_to_jiffies(5000)/* 5 seconds */ #define HCI_LE_CONN_TIMEOUT msecs_to_jiffies(20000)/* 20 seconds */ #define HCI_LE_AUTOCONN_TIMEOUT msecs_to_jiffies(4000)/* 4 seconds */ +#define MSFT_AVDTP_TIMEOUT msecs_to_jiffies(500)/* 0.5 seconds */ /* HCI data types */ #define HCI_COMMAND_PKT 0x01
include/net/bluetooth/l2cap.h +4 -0
@@ -669,6 +669,8 @@ struct l2cap_ops { unsigned long len, int nb);int (*filter) (struct l2cap_chan * chan,struct sk_buff *skb); +void (*avdtp_wakeup) (struct l2cap_chan *chan, +u8 status,u16 handle); };struct l2cap_conn {
@@ -1001,6 +1003,8 @@ void __l2cap_physical_cfm(struct l2cap_chan *chan, int result);struct l2cap_conn *l2cap_conn_get (struct l2cap_conn *conn);void l2cap_conn_put (struct l2cap_conn *conn); +void l2cap_avdtp_wakeup (struct l2cap_conn *conn,u16 dcid,u8 status, +u16 handle);int l2cap_register_user (struct l2cap_conn *conn,struct l2cap_user *user);void l2cap_unregister_user (struct l2cap_conn *conn,struct l2cap_user *user);
net/bluetooth/af_bluetooth.c +36 -0
@@ -607,6 +607,42 @@ int bt_sock_wait_ready(struct sock *sk, unsigned long flags) }EXPORT_SYMBOL (bt_sock_wait_ready); +/* This function expects the sk lock to be held when called */ +int bt_sock_wait_for_avdtp_hndl (struct sock *sk,unsigned long timeo) +{ +DECLARE_WAITQUEUE (wait, current); +int err =0 ; + +BT_DBG ("sk %p" , sk); + +add_wait_queue (sk_sleep (sk), &wait); +set_current_state (TASK_INTERRUPTIBLE ); +while (test_bit (BT_SK_AVDTP_PEND , &bt_sk (sk)->flags)) { +if (!timeo) { + err = -EINPROGRESS ; +break ; + } + +if (signal_pending (current)) { + err =sock_intr_errno (timeo); +break ; + } + +release_sock (sk); + timeo =schedule_timeout (timeo); +lock_sock (sk); +set_current_state (TASK_INTERRUPTIBLE ); + + err =sock_error (sk); +if (err) +break ; + } +__set_current_state (TASK_RUNNING ); +remove_wait_queue (sk_sleep (sk), &wait); +return err; +} +EXPORT_SYMBOL (bt_sock_wait_for_avdtp_hndl); +#ifdef CONFIG_PROC_FS static void *bt_seq_start (struct seq_file *seq,loff_t *pos) __acquires(seq->private->l->lock)
net/bluetooth/hci_codec.c +4 -2
@@ -357,7 +357,7 @@ int hci_get_supported_codecs(struct hci_dev *hdev, u8 type, char __user *optval, }int hci_configure_msft_avdtp_open (struct hci_dev *hdev,struct l2cap_chan *chan, -sockptr_t optval,int optlen) +sockptr_t optval,int optlen,struct sock *sk) {struct msft_cp_avdtp_open *cmd =NULL ;struct hci_media_service_caps *caps;
@@ -392,7 +392,9 @@ int hci_configure_msft_avdtp_open(struct hci_dev *hdev, struct l2cap_chan *chan,hci_send_cmd (hdev,HCI_MSFT_AVDTP_CMD ,sizeof (*cmd) + optlen, cmd); -/* wait until we get avdtp handle or timeout */ +set_bit (BT_SK_AVDTP_PEND , &bt_sk (sk)->flags); + + err =bt_sock_wait_for_avdtp_hndl (sk,MSFT_AVDTP_TIMEOUT ); fail:kfree (cmd);
net/bluetooth/hci_codec.h +1 -1
@@ -10,4 +10,4 @@ void hci_codec_list_clear(struct list_head *codec_list);int hci_get_supported_codecs (struct hci_dev *hdev,u8 type,char __user *optval,int __user *optlen,int len);int hci_configure_msft_avdtp_open (struct hci_dev *hdev,struct l2cap_chan *chan, -sockptr_t optval,int optlen); +sockptr_t optval,int optlen,struct sock *sk);
net/bluetooth/hci_event.c +5 -0
@@ -1450,6 +1450,7 @@ static void hci_cc_msft_avdtp_open(struct hci_dev *hdev, struct sk_buff *skb)struct msft_rp_avdtp_open *rp;struct msft_cp_avdtp_open *sent;struct hci_conn *hconn; +struct l2cap_conn *conn;if (skb->len <sizeof (*rp))return ;
@@ -1463,7 +1464,11 @@ static void hci_cc_msft_avdtp_open(struct hci_dev *hdev, struct sk_buff *skb)if (!hconn)return ; + conn = hconn->l2cap_data; +/* wake up the task waiting on avdtp handle */ +l2cap_avdtp_wakeup (conn, sent->dcid, rp->status, + rp->status ?0 :__le16_to_cpu (rp->avdtp_handle)); }static void hci_cc_msft_avdtp_cmd (struct hci_dev *hdev,struct sk_buff *skb)
net/bluetooth/l2cap_core.c +15 -0
@@ -8507,6 +8507,21 @@ int __init l2cap_init(void)return 0 ; } +void l2cap_avdtp_wakeup (struct l2cap_conn *conn,u16 cid,u8 status, +u16 handle) +{ +struct l2cap_chan *chan; + + chan =l2cap_get_chan_by_dcid (conn, cid); + +if (!chan) +return ; + + chan->ops->avdtp_wakeup (chan, status, handle); + +l2cap_chan_unlock (chan); +} +void l2cap_exit (void ) {debugfs_remove (l2cap_debugfs);
net/bluetooth/l2cap_sock.c +16 -1
@@ -1157,7 +1157,8 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname,break ; } - err =hci_configure_msft_avdtp_open (hdev, chan, optval, optlen); + err =hci_configure_msft_avdtp_open (hdev, chan, optval, + optlen, sk);hci_dev_put (hdev);break ;
@@ -1748,6 +1749,19 @@ static int l2cap_sock_filter(struct l2cap_chan *chan, struct sk_buff *skb)return 0 ; } +static void l2cap_sock_avdtp_wakeup (struct l2cap_chan *chan,u8 status, +u16 handle) +{ +struct sock *sk = chan->data; + +if (test_bit (BT_SK_AVDTP_PEND , &bt_sk (sk)->flags)) { +bt_sk (sk)->avdtp_handle = handle; + sk->sk_err = -bt_to_errno (status); +clear_bit (BT_SK_AVDTP_PEND , &bt_sk (sk)->flags); + sk->sk_state_change (sk); + } +} +static const struct l2cap_ops l2cap_chan_ops = { .name ="L2CAP Socket Interface" , .new_connection = l2cap_sock_new_connection_cb,
@@ -1764,6 +1778,7 @@ static const struct l2cap_ops l2cap_chan_ops = { .get_peer_pid = l2cap_sock_get_peer_pid_cb, .alloc_skb = l2cap_sock_alloc_skb_cb, .filter = l2cap_sock_filter, + .avdtp_wakeup = l2cap_sock_avdtp_wakeup, };static void l2cap_sock_destruct (struct sock *sk)
Signature · 1 line
2.17.1
kernel test robot
build botRe: [PATCH v3 10/13] Bluetooth: Handle MSFT avdtp open event
Thank you for the patch! Perhaps something to improve:
Hi Kiran,
Thank you for the patch! Perhaps something to improve:
[auto build test WARNING on bluetooth-next/master]
[also build test WARNING on v5.16-rc1 next-20211115]
[cannot apply to bluetooth/master]
[If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/0day-ci/linux/commits/Kiran-K/Bluetooth-Refactor-code-to-read-supported-codecs-in-getsockopt/20211115-144640 base: https://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git master config: h8300-randconfig-s031-20211115 (attached as .config) compiler: h8300-linux-gcc (GCC) 11.2.0
reproduce:
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross
# apt-get install sparse
# sparse version: v0.6.4-dirty
# https://github.com/0day-ci/linux/commit/0a4eb6e6849d95c7565face4fc18ef652bacad11
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review Kiran-K/Bluetooth-Refactor-code-to-read-supported-codecs-in-getsockopt/20211115-144640 git checkout 0a4eb6e6849d95c7565face4fc18ef652bacad11
# save the attached .config to linux build tree
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-11.2.0 make.cross C=1 CF='-fdiagnostic-prefix -D__CHECK_ENDIAN__' ARCH=h8300
If you fix the issue, kindly add following tag as appropriate
sparse warnings: (new ones prefixed by >>)
>> net/bluetooth/hci_event.c:1470:38: sparse: sparse: incorrect type in argument 2 (different base types) @@ expected unsigned short [usertype] dcid @@ got restricted __le16 [usertype] dcid @@
net/bluetooth/hci_event.c:1470:38: sparse: expected unsigned short [usertype] dcid
net/bluetooth/hci_event.c:1470:38: sparse: got restricted __le16 [usertype] dcid
vim +1470 net/bluetooth/hci_event.c
1447
1448 static void hci_cc_msft_avdtp_open(struct hci_dev *hdev, struct sk_buff *skb)
1449 {
1450 struct msft_rp_avdtp_open *rp;
1451 struct msft_cp_avdtp_open *sent;
1452 struct hci_conn *hconn;
1453 struct l2cap_conn *conn;
1454
1455 if (skb->len < sizeof(*rp))
1456 return;
1457
1458 rp = (void *)skb->data;
1459
1460 sent = hci_sent_cmd_data(hdev, HCI_MSFT_AVDTP_CMD);
1461
1462 hconn = hci_conn_hash_lookup_handle(hdev, __le16_to_cpu(sent->handle));
1463
1464 if (!hconn)
1465 return;
1466
1467 conn = hconn->l2cap_data;
1468
1469 /* wake up the task waiting on avdtp handle */
> 1470 l2cap_avdtp_wakeup(conn, sent->dcid, rp->status,
1471 rp->status ? 0 : __le16_to_cpu(rp->avdtp_handle));
1472 }
1473
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org
PATCH v3 11/13 Bluetooth: Implment MSFT avdtp start command
In reply to Kiran KIn a2dp offload use case, after sending L2CAP AVDTP start command, controller needs to sent MSFT avdtp start command to trigger to let know the controller to start streaming audio data. Allow BlueZ daemon to send MSFT avdtp start command via setsockopt.
--- include/net/bluetooth/bluetooth.h | 1 + include/net/bluetooth/hci.h | 6 ++++++ net/bluetooth/hci_codec.c | 13 +++++++++++++ net/bluetooth/hci_codec.h | 1 + net/bluetooth/hci_event.c | 3 +++ net/bluetooth/l2cap_sock.c | 18 ++++++++++++++++++ 6 files changed, 42 insertions(+)
include/net/bluetooth/bluetooth.h +1 -0
@@ -178,6 +178,7 @@ struct bt_codecs {#define BT_CODEC_MSBC 0x05#define BT_MSFT_OPEN 20 +#define BT_MSFT_START 21 __printf(1, 2)void bt_info (const char *fmt, ...);
include/net/bluetooth/hci.h +6 -0
@@ -2033,6 +2033,12 @@ struct msft_rp_avdtp_open {__u8 audio_intf_param_cnt; } __packed; +#define HCI_MSFT_AVDTP_START 0x09 +struct msft_cp_avdtp_start { +u8 sub_opcode; +__le16 avdtp_handle; +} __packed; +/* ---- HCI Events ---- */ #define HCI_EV_INQUIRY_COMPLETE 0x01
net/bluetooth/hci_codec.c +13 -0
@@ -400,3 +400,16 @@ int hci_configure_msft_avdtp_open(struct hci_dev *hdev, struct l2cap_chan *chan,kfree (cmd);return err; } + +int hci_configure_msft_avdtp_start (struct hci_dev *hdev,struct sock *sk) +{ +struct msft_cp_avdtp_start cmd; + +if (!bt_sk (sk)->avdtp_handle) +return -EBADFD ; + + cmd.sub_opcode =HCI_MSFT_AVDTP_START ; + cmd.avdtp_handle =cpu_to_le16 (bt_sk (sk)->avdtp_handle); + +return hci_send_cmd (hdev,HCI_MSFT_AVDTP_CMD ,sizeof (cmd), &cmd); +}
net/bluetooth/hci_codec.h +1 -0
@@ -11,3 +11,4 @@ int hci_get_supported_codecs(struct hci_dev *hdev, u8 type, char __user *optval, int __user *optlen, int len);int hci_configure_msft_avdtp_open (struct hci_dev *hdev,struct l2cap_chan *chan,sockptr_t optval,int optlen,struct sock *sk); +int hci_configure_msft_avdtp_start (struct hci_dev *hdev,struct sock *sk);
net/bluetooth/hci_event.c +3 -0
@@ -1492,6 +1492,9 @@ static void hci_cc_msft_avdtp_cmd(struct hci_dev *hdev, struct sk_buff *skb)hci_cc_msft_avdtp_open (hdev, skb);break ; +case HCI_MSFT_AVDTP_START : +break ; +default :bt_dev_err (hdev,"Invalid MSFT sub opcode 0x%2.2x" , skb->data[1 ]);
net/bluetooth/l2cap_sock.c +18 -0
@@ -1162,6 +1162,24 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname,hci_dev_put (hdev);break ; +case BT_MSFT_START : + hdev =hci_get_route (BDADDR_ANY , &chan->src,BDADDR_BREDR ); +if (!hdev) { + err = -EBADFD ; +break ; + } + +if (!hci_dev_test_flag (hdev,HCI_OFFLOAD_CODECS_ENABLED ) || + !hdev->get_data_path_id) { + err = -EOPNOTSUPP ; +hci_dev_put (hdev); +break ; + } + + err =hci_configure_msft_avdtp_start (hdev, sk); +hci_dev_put (hdev); +break ; +default : err = -ENOPROTOOPT ;break ;
Signature · 1 line
2.17.1
PATCH v3 12/13 Bluetooth: Implment MSFT avdtp suspend command
In reply to Kiran KIn a2dp offload use case, to suspend streaming, controller needs to sent MSFT avdtp suspend command. Allow BlueZ daemon to send MSFT avdtp suspend command via setsockopt.
--- include/net/bluetooth/bluetooth.h | 1 + include/net/bluetooth/hci.h | 6 ++++++ net/bluetooth/hci_codec.c | 13 +++++++++++++ net/bluetooth/hci_codec.h | 1 + net/bluetooth/hci_event.c | 1 + net/bluetooth/l2cap_sock.c | 18 ++++++++++++++++++ 6 files changed, 40 insertions(+)
include/net/bluetooth/bluetooth.h +1 -0
@@ -179,6 +179,7 @@ struct bt_codecs {#define BT_MSFT_OPEN 20#define BT_MSFT_START 21 +#define BT_MSFT_SUSPEND 22 __printf(1, 2)void bt_info (const char *fmt, ...);
include/net/bluetooth/hci.h +6 -0
@@ -2039,6 +2039,12 @@ struct msft_cp_avdtp_start {__le16 avdtp_handle; } __packed; +#define HCI_MSFT_AVDTP_SUSPEND 0x0A +struct msft_cp_avdtp_suspend { +u8 sub_opcode; +__le16 avdtp_handle; +} __packed; +/* ---- HCI Events ---- */ #define HCI_EV_INQUIRY_COMPLETE 0x01
net/bluetooth/hci_codec.c +13 -0
@@ -413,3 +413,16 @@ int hci_configure_msft_avdtp_start(struct hci_dev *hdev, struct sock *sk)return hci_send_cmd (hdev,HCI_MSFT_AVDTP_CMD ,sizeof (cmd), &cmd); } + +int hci_configure_msft_avdtp_suspend (struct hci_dev *hdev,struct sock *sk) +{ +struct msft_cp_avdtp_suspend cmd; + +if (!bt_sk (sk)->avdtp_handle) +return -EBADFD ; + + cmd.sub_opcode =HCI_MSFT_AVDTP_SUSPEND ; + cmd.avdtp_handle =cpu_to_le16 (bt_sk (sk)->avdtp_handle); + +return hci_send_cmd (hdev,HCI_MSFT_AVDTP_CMD ,sizeof (cmd), &cmd); +}
net/bluetooth/hci_codec.h +1 -0
@@ -12,3 +12,4 @@ int hci_get_supported_codecs(struct hci_dev *hdev, u8 type, char __user *optval,int hci_configure_msft_avdtp_open (struct hci_dev *hdev,struct l2cap_chan *chan,sockptr_t optval,int optlen,struct sock *sk);int hci_configure_msft_avdtp_start (struct hci_dev *hdev,struct sock *sk); +int hci_configure_msft_avdtp_suspend (struct hci_dev *hdev,struct sock *sk);
net/bluetooth/hci_event.c +1 -0
@@ -1493,6 +1493,7 @@ static void hci_cc_msft_avdtp_cmd(struct hci_dev *hdev, struct sk_buff *skb)break ;case HCI_MSFT_AVDTP_START : +case HCI_MSFT_AVDTP_SUSPEND :break ;default :
net/bluetooth/l2cap_sock.c +18 -0
@@ -1180,6 +1180,24 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname,hci_dev_put (hdev);break ; +case BT_MSFT_SUSPEND : + hdev =hci_get_route (BDADDR_ANY , &chan->src,BDADDR_BREDR ); +if (!hdev) { + err = -EBADFD ; +break ; + } + +if (!hci_dev_test_flag (hdev,HCI_OFFLOAD_CODECS_ENABLED ) || + !hdev->get_data_path_id) { + err = -EOPNOTSUPP ; +hci_dev_put (hdev); +break ; + } + + err =hci_configure_msft_avdtp_suspend (hdev, sk); +hci_dev_put (hdev); +break ; +default : err = -ENOPROTOOPT ;break ;
Signature · 1 line
2.17.1
PATCH v3 13/13 Bluetooth: Implment MSFT avdtp close command
In reply to Kiran KIn a2dp offload use case, to tear down streaming, controller needs to sent MSFT avdtp close command. Allow BlueZ daemon to send MSFT avdtp close command via setsockopt.
--- include/net/bluetooth/bluetooth.h | 1 + include/net/bluetooth/hci.h | 6 ++++++ net/bluetooth/hci_codec.c | 15 +++++++++++++++ net/bluetooth/hci_codec.h | 1 + net/bluetooth/hci_event.c | 1 + net/bluetooth/l2cap_sock.c | 18 ++++++++++++++++++ 6 files changed, 42 insertions(+)
include/net/bluetooth/bluetooth.h +1 -0
@@ -180,6 +180,7 @@ struct bt_codecs {#define BT_MSFT_OPEN 20#define BT_MSFT_START 21#define BT_MSFT_SUSPEND 22 +#define BT_MSFT_CLOSE 23 __printf(1, 2)void bt_info (const char *fmt, ...);
include/net/bluetooth/hci.h +6 -0
@@ -2045,6 +2045,12 @@ struct msft_cp_avdtp_suspend {__le16 avdtp_handle; } __packed; +#define HCI_MSFT_AVDTP_CLOSE 0x0B +struct msft_cp_avdtp_close { +u8 sub_opcode; +__le16 avdtp_handle; +} __packed; +/* ---- HCI Events ---- */ #define HCI_EV_INQUIRY_COMPLETE 0x01
net/bluetooth/hci_codec.c +15 -0
@@ -426,3 +426,18 @@ int hci_configure_msft_avdtp_suspend(struct hci_dev *hdev, struct sock *sk)return hci_send_cmd (hdev,HCI_MSFT_AVDTP_CMD ,sizeof (cmd), &cmd); } + +int hci_configure_msft_avdtp_close (struct hci_dev *hdev,struct sock *sk) +{ +struct msft_cp_avdtp_close cmd; + +if (!bt_sk (sk)->avdtp_handle) +return -EBADFD ; + + cmd.sub_opcode =HCI_MSFT_AVDTP_CLOSE ; + cmd.avdtp_handle =cpu_to_le16 (bt_sk (sk)->avdtp_handle); + +bt_sk (sk)->avdtp_handle =0 ; + +return hci_send_cmd (hdev,HCI_MSFT_AVDTP_CMD ,sizeof (cmd), &cmd); +}
net/bluetooth/hci_codec.h +1 -0
@@ -13,3 +13,4 @@ int hci_configure_msft_avdtp_open(struct hci_dev *hdev, struct l2cap_chan *chan, sockptr_t optval, int optlen, struct sock *sk);int hci_configure_msft_avdtp_start (struct hci_dev *hdev,struct sock *sk);int hci_configure_msft_avdtp_suspend (struct hci_dev *hdev,struct sock *sk); +int hci_configure_msft_avdtp_close (struct hci_dev *hdev,struct sock *sk);
net/bluetooth/hci_event.c +1 -0
@@ -1494,6 +1494,7 @@ static void hci_cc_msft_avdtp_cmd(struct hci_dev *hdev, struct sk_buff *skb)case HCI_MSFT_AVDTP_START :case HCI_MSFT_AVDTP_SUSPEND : +case HCI_MSFT_AVDTP_CLOSE :break ;default :
net/bluetooth/l2cap_sock.c +18 -0
@@ -1198,6 +1198,24 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname,hci_dev_put (hdev);break ; +case BT_MSFT_CLOSE : + hdev =hci_get_route (BDADDR_ANY , &chan->src,BDADDR_BREDR ); +if (!hdev) { + err = -EBADFD ; +break ; + } + +if (!hci_dev_test_flag (hdev,HCI_OFFLOAD_CODECS_ENABLED ) || + !hdev->get_data_path_id) { + err = -EOPNOTSUPP ; +hci_dev_put (hdev); +break ; + } + + err =hci_configure_msft_avdtp_close (hdev, sk); +hci_dev_put (hdev); +break ; +default : err = -ENOPROTOOPT ;break ;
Signature · 1 line
2.17.1