diff mbox series

[v11,06/10] Bluetooth: Allow setting of codec for HFP offload usecase

Message ID 20210727084713.23038-6-kiran.k@intel.com
State Superseded
Headers show
Series None | expand

Commit Message

K, Kiran July 27, 2021, 8:47 a.m. UTC
For HFP offload usecase, controller needs to be configured
with codec data and capabilities. This patch uses Bluetooth
SIG defined command HCI_CONFIGURE_DATA_PATH to specify vendor
specific data and allows userspace modules to set the codec
via setsockopt systemcall.

Signed-off-by: Kiran K <kiran.k@intel.com>
Reviewed-by: Chethan T N <chethan.tumkur.narayan@intel.com>
Reviewed-by: Srivatsa Ravishankar <ravishankar.srivatsa@intel.com>
---
* changes in v11:
  - Remove changes related to Kconfig
* changes in v10:
  - patch refactor - having callback definition and usage in the same patch

 include/net/bluetooth/bluetooth.h |   2 +
 include/net/bluetooth/hci.h       |   8 ++
 include/net/bluetooth/hci_core.h  |   3 +
 net/bluetooth/sco.c               | 118 ++++++++++++++++++++++++++++++
 4 files changed, 131 insertions(+)

Comments

Marcel Holtmann July 30, 2021, 2:17 p.m. UTC | #1
Hi Kiran,

> For HFP offload usecase, controller needs to be configured

> with codec data and capabilities. This patch uses Bluetooth

> SIG defined command HCI_CONFIGURE_DATA_PATH to specify vendor

> specific data and allows userspace modules to set the codec

> via setsockopt systemcall.

> 

> Signed-off-by: Kiran K <kiran.k@intel.com>

> Reviewed-by: Chethan T N <chethan.tumkur.narayan@intel.com>

> Reviewed-by: Srivatsa Ravishankar <ravishankar.srivatsa@intel.com>

> ---

> * changes in v11:

>  - Remove changes related to Kconfig

> * changes in v10:

>  - patch refactor - having callback definition and usage in the same patch

> 

> include/net/bluetooth/bluetooth.h |   2 +

> include/net/bluetooth/hci.h       |   8 ++

> include/net/bluetooth/hci_core.h  |   3 +

> net/bluetooth/sco.c               | 118 ++++++++++++++++++++++++++++++

> 4 files changed, 131 insertions(+)

> 

> diff --git a/include/net/bluetooth/bluetooth.h b/include/net/bluetooth/bluetooth.h

> index 64cddff0c9c4..1a48b6732eef 100644

> --- a/include/net/bluetooth/bluetooth.h

> +++ b/include/net/bluetooth/bluetooth.h

> @@ -173,6 +173,8 @@ struct bt_codecs {

> 	struct bt_codec	codecs[];

> } __packed;

> 

> +#define CODING_FORMAT_CVSD	0x02

> +

> __printf(1, 2)

> void bt_info(const char *fmt, ...);

> __printf(1, 2)

> diff --git a/include/net/bluetooth/hci.h b/include/net/bluetooth/hci.h

> index 22e872e60ff8..c998607fc517 100644

> --- a/include/net/bluetooth/hci.h

> +++ b/include/net/bluetooth/hci.h

> @@ -1250,6 +1250,14 @@ struct hci_rp_read_local_oob_ext_data {

> 	__u8     rand256[16];

> } __packed;

> 

> +#define HCI_CONFIGURE_DATA_PATH	0x0c83

> +struct hci_op_configure_data_path {

> +	__u8	direction;

> +	__u8	data_path_id;

> +	__u8	vnd_len;

> +	__u8	vnd_data[];

> +} __packed;

> +

> #define HCI_OP_READ_LOCAL_VERSION	0x1001

> struct hci_rp_read_local_version {

> 	__u8     status;

> diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h

> index 71c409c8ab34..eafa6f8114cb 100644

> --- a/include/net/bluetooth/hci_core.h

> +++ b/include/net/bluetooth/hci_core.h

> @@ -618,6 +618,9 @@ struct hci_dev {

> 	void (*cmd_timeout)(struct hci_dev *hdev);

> 	bool (*prevent_wake)(struct hci_dev *hdev);

> 	int (*get_data_path_id)(struct hci_dev *hdev, __u8 *data_path);

> +	int (*get_codec_config_data)(struct hci_dev *hdev, __u8 type,

> +				     struct bt_codec *codec, __u8 *vnd_len,

> +				     __u8 **vnd_data);


why are these two independent callbacks? I seem to remember saying that it looks like we only need one.

Regards

Marcel
K, Kiran Aug. 1, 2021, 11:45 p.m. UTC | #2
Hi Marcel,

> 

> Hi Kiran,

> 

> > For HFP offload usecase, controller needs to be configured with codec

> > data and capabilities. This patch uses Bluetooth SIG defined command

> > HCI_CONFIGURE_DATA_PATH to specify vendor specific data and allows

> > userspace modules to set the codec via setsockopt systemcall.

> >

> > Signed-off-by: Kiran K <kiran.k@intel.com>

> > Reviewed-by: Chethan T N <chethan.tumkur.narayan@intel.com>

> > Reviewed-by: Srivatsa Ravishankar <ravishankar.srivatsa@intel.com>

> > ---

> > * changes in v11:

> >  - Remove changes related to Kconfig

> > * changes in v10:

> >  - patch refactor - having callback definition and usage in the same

> > patch

> >

> > include/net/bluetooth/bluetooth.h |   2 +

> > include/net/bluetooth/hci.h       |   8 ++

> > include/net/bluetooth/hci_core.h  |   3 +

> > net/bluetooth/sco.c               | 118 ++++++++++++++++++++++++++++++

> > 4 files changed, 131 insertions(+)

> >

> > diff --git a/include/net/bluetooth/bluetooth.h

> > b/include/net/bluetooth/bluetooth.h

> > index 64cddff0c9c4..1a48b6732eef 100644

> > --- a/include/net/bluetooth/bluetooth.h

> > +++ b/include/net/bluetooth/bluetooth.h

> > @@ -173,6 +173,8 @@ struct bt_codecs {

> > 	struct bt_codec	codecs[];

> > } __packed;

> >

> > +#define CODING_FORMAT_CVSD	0x02

> > +

> > __printf(1, 2)

> > void bt_info(const char *fmt, ...);

> > __printf(1, 2)

> > diff --git a/include/net/bluetooth/hci.h b/include/net/bluetooth/hci.h

> > index 22e872e60ff8..c998607fc517 100644

> > --- a/include/net/bluetooth/hci.h

> > +++ b/include/net/bluetooth/hci.h

> > @@ -1250,6 +1250,14 @@ struct hci_rp_read_local_oob_ext_data {

> > 	__u8     rand256[16];

> > } __packed;

> >

> > +#define HCI_CONFIGURE_DATA_PATH	0x0c83

> > +struct hci_op_configure_data_path {

> > +	__u8	direction;

> > +	__u8	data_path_id;

> > +	__u8	vnd_len;

> > +	__u8	vnd_data[];

> > +} __packed;

> > +

> > #define HCI_OP_READ_LOCAL_VERSION	0x1001

> > struct hci_rp_read_local_version {

> > 	__u8     status;

> > diff --git a/include/net/bluetooth/hci_core.h

> > b/include/net/bluetooth/hci_core.h

> > index 71c409c8ab34..eafa6f8114cb 100644

> > --- a/include/net/bluetooth/hci_core.h

> > +++ b/include/net/bluetooth/hci_core.h

> > @@ -618,6 +618,9 @@ struct hci_dev {

> > 	void (*cmd_timeout)(struct hci_dev *hdev);

> > 	bool (*prevent_wake)(struct hci_dev *hdev);

> > 	int (*get_data_path_id)(struct hci_dev *hdev, __u8 *data_path);

> > +	int (*get_codec_config_data)(struct hci_dev *hdev, __u8 type,

> > +				     struct bt_codec *codec, __u8 *vnd_len,

> > +				     __u8 **vnd_data);

> 

> why are these two independent callbacks? I seem to remember saying that it

> looks like we only need one.


get_data_path_id,  gets called during getsockopt(BT_CODEC,...) when populating codec details to user space.

get_codec_config_data, gets called during setsockopt(BT_CODEC,...) 

> 

> Regards

> 

> Marcel


Regards,
Kiran
K, Kiran Aug. 14, 2021, 6:39 a.m. UTC | #3
Hi Marcel,

> -----Original Message-----

> From: K, Kiran <kiran.k@intel.com>

> Sent: Monday, August 2, 2021 5:16 AM

> To: Marcel Holtmann <marcel@holtmann.org>

> Cc: BlueZ <linux-bluetooth@vger.kernel.org>; Srivatsa, Ravishankar

> <ravishankar.srivatsa@intel.com>; Tumkur Narayan, Chethan

> <chethan.tumkur.narayan@intel.com>

> Subject: RE: [PATCH v11 06/10] Bluetooth: Allow setting of codec for HFP

> offload usecase

> 

> Hi Marcel,

> 

> >

> > Hi Kiran,

> >

> > > For HFP offload usecase, controller needs to be configured with

> > > codec data and capabilities. This patch uses Bluetooth SIG defined

> > > command HCI_CONFIGURE_DATA_PATH to specify vendor specific data

> and

> > > allows userspace modules to set the codec via setsockopt systemcall.

> > >

> > > Signed-off-by: Kiran K <kiran.k@intel.com>

> > > Reviewed-by: Chethan T N <chethan.tumkur.narayan@intel.com>

> > > Reviewed-by: Srivatsa Ravishankar <ravishankar.srivatsa@intel.com>

> > > ---

> > > * changes in v11:

> > >  - Remove changes related to Kconfig

> > > * changes in v10:

> > >  - patch refactor - having callback definition and usage in the same

> > > patch

> > >

> > > include/net/bluetooth/bluetooth.h |   2 +

> > > include/net/bluetooth/hci.h       |   8 ++

> > > include/net/bluetooth/hci_core.h  |   3 +

> > > net/bluetooth/sco.c               | 118 ++++++++++++++++++++++++++++++

> > > 4 files changed, 131 insertions(+)

> > >

> > > diff --git a/include/net/bluetooth/bluetooth.h

> > > b/include/net/bluetooth/bluetooth.h

> > > index 64cddff0c9c4..1a48b6732eef 100644

> > > --- a/include/net/bluetooth/bluetooth.h

> > > +++ b/include/net/bluetooth/bluetooth.h

> > > @@ -173,6 +173,8 @@ struct bt_codecs {

> > > 	struct bt_codec	codecs[];

> > > } __packed;

> > >

> > > +#define CODING_FORMAT_CVSD	0x02

> > > +

> > > __printf(1, 2)

> > > void bt_info(const char *fmt, ...);

> > > __printf(1, 2)

> > > diff --git a/include/net/bluetooth/hci.h

> > > b/include/net/bluetooth/hci.h index 22e872e60ff8..c998607fc517

> > > 100644

> > > --- a/include/net/bluetooth/hci.h

> > > +++ b/include/net/bluetooth/hci.h

> > > @@ -1250,6 +1250,14 @@ struct hci_rp_read_local_oob_ext_data {

> > > 	__u8     rand256[16];

> > > } __packed;

> > >

> > > +#define HCI_CONFIGURE_DATA_PATH	0x0c83

> > > +struct hci_op_configure_data_path {

> > > +	__u8	direction;

> > > +	__u8	data_path_id;

> > > +	__u8	vnd_len;

> > > +	__u8	vnd_data[];

> > > +} __packed;

> > > +

> > > #define HCI_OP_READ_LOCAL_VERSION	0x1001

> > > struct hci_rp_read_local_version {

> > > 	__u8     status;

> > > diff --git a/include/net/bluetooth/hci_core.h

> > > b/include/net/bluetooth/hci_core.h

> > > index 71c409c8ab34..eafa6f8114cb 100644

> > > --- a/include/net/bluetooth/hci_core.h

> > > +++ b/include/net/bluetooth/hci_core.h

> > > @@ -618,6 +618,9 @@ struct hci_dev {

> > > 	void (*cmd_timeout)(struct hci_dev *hdev);

> > > 	bool (*prevent_wake)(struct hci_dev *hdev);

> > > 	int (*get_data_path_id)(struct hci_dev *hdev, __u8 *data_path);

> > > +	int (*get_codec_config_data)(struct hci_dev *hdev, __u8 type,

> > > +				     struct bt_codec *codec, __u8 *vnd_len,

> > > +				     __u8 **vnd_data);

> >

> > why are these two independent callbacks? I seem to remember saying

> > that it looks like we only need one.

> 

> get_data_path_id,  gets called during getsockopt(BT_CODEC,...) when

> populating codec details to user space.

> 

> get_codec_config_data, gets called during setsockopt(BT_CODEC,...)

> 

Not sure if I was clear here. The two callbacks serves different purpose. get_data_path_id gets called during getsockopt(BT_CODEC,...) and fetches data_path_path_id.
get_codec_config_data gets called during setsockopt(BT_CODEC,...) to fetch the vendor specific codec data. This is data is used to configure the codec before opening SCO connection. This data is passed on to controller via HCI_CONFIGURE_DATA_PATH command. 
> >

> > Regards

> >

> > Marcel

> 

> Regards,

> Kiran

> 


Thanks,
Kiran
diff mbox series

Patch

diff --git a/include/net/bluetooth/bluetooth.h b/include/net/bluetooth/bluetooth.h
index 64cddff0c9c4..1a48b6732eef 100644
--- a/include/net/bluetooth/bluetooth.h
+++ b/include/net/bluetooth/bluetooth.h
@@ -173,6 +173,8 @@  struct bt_codecs {
 	struct bt_codec	codecs[];
 } __packed;
 
+#define CODING_FORMAT_CVSD	0x02
+
 __printf(1, 2)
 void bt_info(const char *fmt, ...);
 __printf(1, 2)
diff --git a/include/net/bluetooth/hci.h b/include/net/bluetooth/hci.h
index 22e872e60ff8..c998607fc517 100644
--- a/include/net/bluetooth/hci.h
+++ b/include/net/bluetooth/hci.h
@@ -1250,6 +1250,14 @@  struct hci_rp_read_local_oob_ext_data {
 	__u8     rand256[16];
 } __packed;
 
+#define HCI_CONFIGURE_DATA_PATH	0x0c83
+struct hci_op_configure_data_path {
+	__u8	direction;
+	__u8	data_path_id;
+	__u8	vnd_len;
+	__u8	vnd_data[];
+} __packed;
+
 #define HCI_OP_READ_LOCAL_VERSION	0x1001
 struct hci_rp_read_local_version {
 	__u8     status;
diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h
index 71c409c8ab34..eafa6f8114cb 100644
--- a/include/net/bluetooth/hci_core.h
+++ b/include/net/bluetooth/hci_core.h
@@ -618,6 +618,9 @@  struct hci_dev {
 	void (*cmd_timeout)(struct hci_dev *hdev);
 	bool (*prevent_wake)(struct hci_dev *hdev);
 	int (*get_data_path_id)(struct hci_dev *hdev, __u8 *data_path);
+	int (*get_codec_config_data)(struct hci_dev *hdev, __u8 type,
+				     struct bt_codec *codec, __u8 *vnd_len,
+				     __u8 **vnd_data);
 };
 
 #define HCI_PHY_HANDLE(handle)	(handle & 0xff)
diff --git a/net/bluetooth/sco.c b/net/bluetooth/sco.c
index 2f32693f09c1..34541e971dc7 100644
--- a/net/bluetooth/sco.c
+++ b/net/bluetooth/sco.c
@@ -67,6 +67,7 @@  struct sco_pinfo {
 	__u32		flags;
 	__u16		setting;
 	__u8		cmsg_mask;
+	struct bt_codec codec;
 	struct sco_conn	*conn;
 };
 
@@ -438,6 +439,7 @@  static void __sco_sock_close(struct sock *sk)
 		sock_set_flag(sk, SOCK_ZAPPED);
 		break;
 	}
+
 }
 
 /* Must be called on unlocked socket. */
@@ -499,6 +501,10 @@  static struct sock *sco_sock_alloc(struct net *net, struct socket *sock,
 	sk->sk_state    = BT_OPEN;
 
 	sco_pi(sk)->setting = BT_VOICE_CVSD_16BIT;
+	sco_pi(sk)->codec.id = CODING_FORMAT_CVSD;
+	sco_pi(sk)->codec.cid = 0xffff;
+	sco_pi(sk)->codec.vid = 0xffff;
+	sco_pi(sk)->codec.data_path = 0x00;
 
 	timer_setup(&sk->sk_timer, sco_sock_timeout, 0);
 
@@ -807,6 +813,63 @@  static int sco_sock_recvmsg(struct socket *sock, struct msghdr *msg,
 	return bt_sock_recvmsg(sock, msg, len, flags);
 }
 
+static int sco_configure_data_path(struct hci_dev *hdev, struct bt_codec *codec)
+{
+	__u8 vnd_len, *vnd_data = NULL;
+	struct hci_op_configure_data_path *cmd = NULL;
+	struct sk_buff *skb;
+	int err;
+
+	err = hdev->get_codec_config_data(hdev, SCO_LINK, codec, &vnd_len,
+					  &vnd_data);
+	if (err < 0)
+		goto error;
+
+	cmd = kzalloc(sizeof(*cmd) + vnd_len, GFP_KERNEL);
+	if (!cmd) {
+		err = -ENOMEM;
+		goto error;
+	}
+
+	err = hdev->get_data_path_id(hdev, &cmd->data_path_id);
+	if (err < 0)
+		goto error;
+
+	cmd->vnd_len = vnd_len;
+	memcpy(cmd->vnd_data, vnd_data, vnd_len);
+
+	cmd->direction = 0x00;
+	skb = __hci_cmd_sync(hdev, HCI_CONFIGURE_DATA_PATH,
+			     sizeof(*cmd) + vnd_len,
+			     cmd, HCI_INIT_TIMEOUT);
+
+	if (IS_ERR(skb)) {
+		err = PTR_ERR(skb);
+		bt_dev_err(hdev, "configure input data path failed (%ld)",
+			   PTR_ERR(skb));
+		goto error;
+	}
+	kfree_skb(skb);
+
+	cmd->direction = 0x01;
+	skb = __hci_cmd_sync(hdev, HCI_CONFIGURE_DATA_PATH,
+			     sizeof(*cmd) + vnd_len,
+			     cmd, HCI_INIT_TIMEOUT);
+
+	if (IS_ERR(skb)) {
+		err = PTR_ERR(skb);
+		bt_dev_err(hdev, "configure output data path failed (%ld)",
+			   PTR_ERR(skb));
+		goto error;
+	}
+	kfree_skb(skb);
+
+error:
+	kfree(vnd_data);
+	kfree(cmd);
+	return err;
+}
+
 static int sco_sock_setsockopt(struct socket *sock, int level, int optname,
 			       sockptr_t optval, unsigned int optlen)
 {
@@ -814,6 +877,9 @@  static int sco_sock_setsockopt(struct socket *sock, int level, int optname,
 	int len, err = 0;
 	struct bt_voice voice;
 	u32 opt;
+	struct bt_codecs *codecs;
+	struct hci_dev *hdev;
+	__u8 buffer[255];
 
 	BT_DBG("sk %p", sk);
 
@@ -875,6 +941,58 @@  static int sco_sock_setsockopt(struct socket *sock, int level, int optname,
 			sco_pi(sk)->cmsg_mask &= SCO_CMSG_PKT_STATUS;
 		break;
 
+	case BT_CODEC:
+		if (sk->sk_state != BT_OPEN && sk->sk_state != BT_BOUND &&
+		    sk->sk_state != BT_CONNECT2) {
+			err = -EINVAL;
+			break;
+		}
+
+		hdev = hci_get_route(&sco_pi(sk)->dst, &sco_pi(sk)->src,
+				     BDADDR_BREDR);
+		if (!hdev) {
+			err = -EBADFD;
+			break;
+		}
+
+		if (!hdev->get_codec_config_data) {
+			err = -EOPNOTSUPP;
+			break;
+		}
+
+		if (optlen < sizeof(struct bt_codecs) ||
+		    optlen > sizeof(buffer)) {
+			err = -EINVAL;
+			break;
+		}
+
+		if (copy_from_sockptr(buffer, optval, optlen)) {
+			err = -EFAULT;
+			break;
+		}
+
+		codecs = (void *)buffer;
+
+		if (codecs->num_codecs > 1) {
+			err = -EINVAL;
+			break;
+		}
+
+		/* configure data path only non-HCI data path is selected */
+		if (codecs->codecs[0].data_path) {
+			err = sco_configure_data_path(hdev, &codecs->codecs[0]);
+			if (err < 0)
+				break;
+
+			if (codecs->codecs[0].id == 0xff) {
+				sco_pi(sk)->codec.cid = codecs->codecs[0].cid;
+				sco_pi(sk)->codec.vid = codecs->codecs[0].vid;
+			}
+		}
+		sco_pi(sk)->codec.id = codecs->codecs[0].id;
+		sco_pi(sk)->codec.data_path = codecs->codecs[0].data_path;
+		break;
+
 	default:
 		err = -ENOPROTOOPT;
 		break;