Commit 9798fbde authored by Kiran K's avatar Kiran K Committed by Luiz Augusto von Dentz
Browse files

Bluetooth: Configure codec for HFP offload use case 



For HFP offload use case, codec needs to be configured
before opening SCO connection. This patch sends
HCI_CONFIGURE_DATA_PATH command to configure doec before
opening SCO connection.

Signed-off-by: default avatarKiran K <kiran.k@intel.com>
Signed-off-by: default avatarLuiz Augusto von Dentz <luiz.von.dentz@intel.com>
parent b2af264a

include/net/bluetooth/hci.h

+8 −0
Original line number Diff line number Diff line
@@ -1286,6 +1286,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;

include/net/bluetooth/hci_core.h

+3 −0
Original line number Diff line number Diff line
@@ -620,6 +620,9 @@ struct hci_dev { 
	bool (*prevent_wake)(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_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)

net/bluetooth/hci_conn.c

+4 −0
Original line number Diff line number Diff line
@@ -315,6 +315,10 @@ static bool hci_enhanced_setup_sync_conn(struct hci_conn *conn, __u16 handle) 


	bt_dev_dbg(hdev, "hcon %p", conn);



	/* for offload use case, codec needs to configured before opening SCO */

	if (conn->codec.data_path)

		hci_req_configure_datapath(hdev, &conn->codec);



	conn->state = BT_CONNECT;

	conn->out = true;

net/bluetooth/hci_request.c

+47 −0
Original line number Diff line number Diff line
@@ -3327,6 +3327,53 @@ bool hci_req_stop_discovery(struct hci_request *req) 
	return ret;

}



static void config_data_path_complete(struct hci_dev *hdev, u8 status,

				      u16 opcode)

{

	bt_dev_dbg(hdev, "status %u", status);

}



int hci_req_configure_datapath(struct hci_dev *hdev, struct bt_codec *codec)

{

	struct hci_request req;

	int err;

	__u8 vnd_len, *vnd_data = NULL;

	struct hci_op_configure_data_path *cmd = NULL;



	hci_req_init(&req, hdev);



	err = hdev->get_codec_config_data(hdev, ESCO_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;

	hci_req_add(&req, HCI_CONFIGURE_DATA_PATH, sizeof(*cmd) + vnd_len, cmd);



	cmd->direction = 0x01;

	hci_req_add(&req, HCI_CONFIGURE_DATA_PATH, sizeof(*cmd) + vnd_len, cmd);



	err = hci_req_run(&req, config_data_path_complete);

error:



	kfree(cmd);

	kfree(vnd_data);

	return err;

}



static int stop_discovery(struct hci_request *req, unsigned long opt)

{

	hci_dev_lock(req->hdev);

net/bluetooth/hci_request.h

+2 −0
Original line number Diff line number Diff line
@@ -101,6 +101,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);



static inline void hci_req_update_scan(struct hci_dev *hdev)

{

	queue_work(hdev->req_workqueue, &hdev->scan_update);