Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9495b2ee authored by Andrei Emeltchenko's avatar Andrei Emeltchenko Committed by Gustavo Padovan
Browse files

Bluetooth: AMP: Process Chan Selected event 



Channel Selected event indicates that link information data is available.
Read it with Read Local AMP Assoc command. The data shall be sent in the
A2MP Create Physical Link Request.

Signed-off-by: default avatarAndrei Emeltchenko <andrei.emeltchenko@intel.com>
Signed-off-by: default avatarGustavo Padovan <gustavo.padovan@collabora.co.uk>
parent 2766be48

include/net/bluetooth/a2mp.h

+3 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
enum amp_mgr_state {

	READ_LOC_AMP_INFO,

	READ_LOC_AMP_ASSOC,

	READ_LOC_AMP_ASSOC_FINAL,

};



struct amp_mgr {
@@ -134,6 +135,7 @@ extern struct mutex amp_mgr_list_lock; 


void amp_mgr_get(struct amp_mgr *mgr);

int amp_mgr_put(struct amp_mgr *mgr);

u8 __next_ident(struct amp_mgr *mgr);

struct l2cap_chan *a2mp_channel_create(struct l2cap_conn *conn,

				       struct sk_buff *skb);

struct amp_mgr *amp_mgr_lookup_by_state(u8 state);
@@ -141,5 +143,6 @@ void a2mp_send(struct amp_mgr *mgr, u8 code, u8 ident, u16 len, void *data); 
void a2mp_discover_amp(struct l2cap_chan *chan);

void a2mp_send_getinfo_rsp(struct hci_dev *hdev);

void a2mp_send_getampassoc_rsp(struct hci_dev *hdev, u8 status);

void a2mp_send_create_phy_link_req(struct hci_dev *hdev, u8 status);



#endif /* __A2MP_H */

include/net/bluetooth/amp.h

+2 −0
Original line number Diff line number Diff line
@@ -37,6 +37,8 @@ int phylink_gen_key(struct hci_conn *hcon, u8 *data, u8 *len, u8 *type); 
void amp_read_loc_info(struct hci_dev *hdev, struct amp_mgr *mgr);

void amp_read_loc_assoc_frag(struct hci_dev *hdev, u8 phy_handle);

void amp_read_loc_assoc(struct hci_dev *hdev, struct amp_mgr *mgr);

void amp_read_loc_assoc_final_data(struct hci_dev *hdev,

				   struct hci_conn *hcon);

void amp_create_phylink(struct hci_dev *hdev, struct amp_mgr *mgr,

			struct hci_conn *hcon);

void amp_write_remote_assoc(struct hci_dev *hdev, u8 handle);

include/net/bluetooth/l2cap.h

+2 −0
Original line number Diff line number Diff line
@@ -508,6 +508,8 @@ struct l2cap_chan { 
	__u32		remote_acc_lat;

	__u32		remote_flush_to;



	__u8		ctrl_id;



	struct delayed_work	chan_timer;

	struct delayed_work	retrans_timer;

	struct delayed_work	monitor_timer;

net/bluetooth/a2mp.c

+40 −1
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ void a2mp_send(struct amp_mgr *mgr, u8 code, u8 ident, u16 len, void *data) 
	kfree(cmd);

}



static u8 __next_ident(struct amp_mgr *mgr)

u8 __next_ident(struct amp_mgr *mgr)

{

	if (++mgr->ident == 0)

		mgr->ident = 1;
@@ -420,6 +420,8 @@ static int a2mp_getampassoc_rsp(struct amp_mgr *mgr, struct sk_buff *skb, 


	BT_DBG("Created hcon %p: loc:%d -> rem:%d", hcon, hdev->id, rsp->id);



	mgr->bredr_chan->ctrl_id = rsp->id;



	amp_create_phylink(hdev, mgr, hcon);



done:
@@ -876,6 +878,43 @@ void a2mp_send_getampassoc_rsp(struct hci_dev *hdev, u8 status) 
	kfree(rsp);

}



void a2mp_send_create_phy_link_req(struct hci_dev *hdev, u8 status)

{

	struct amp_mgr *mgr;

	struct amp_assoc *loc_assoc = &hdev->loc_assoc;

	struct a2mp_physlink_req *req;

	struct l2cap_chan *bredr_chan;

	size_t len;



	mgr = amp_mgr_lookup_by_state(READ_LOC_AMP_ASSOC_FINAL);

	if (!mgr)

		return;



	len = sizeof(*req) + loc_assoc->len;



	BT_DBG("%s mgr %p assoc_len %zu", hdev->name, mgr, len);



	req = kzalloc(len, GFP_KERNEL);

	if (!req) {

		amp_mgr_put(mgr);

		return;

	}



	bredr_chan = mgr->bredr_chan;

	if (!bredr_chan)

		goto clean;



	req->local_id = hdev->id;

	req->remote_id = bredr_chan->ctrl_id;

	memcpy(req->amp_assoc, loc_assoc->data, loc_assoc->len);



	a2mp_send(mgr, A2MP_CREATEPHYSLINK_REQ, __next_ident(mgr), len, req);



clean:

	amp_mgr_put(mgr);

	kfree(req);

}



void a2mp_discover_amp(struct l2cap_chan *chan)

{

	struct l2cap_conn *conn = chan->conn;

net/bluetooth/amp.c

+15 −0
Original line number Diff line number Diff line
@@ -233,6 +233,21 @@ void amp_read_loc_assoc(struct hci_dev *hdev, struct amp_mgr *mgr) 
	hci_send_cmd(hdev, HCI_OP_READ_LOCAL_AMP_ASSOC, sizeof(cp), &cp);

}



void amp_read_loc_assoc_final_data(struct hci_dev *hdev,

				   struct hci_conn *hcon)

{

	struct hci_cp_read_local_amp_assoc cp;

	struct amp_mgr *mgr = hcon->amp_mgr;



	cp.phy_handle = hcon->handle;

	cp.len_so_far = cpu_to_le16(0);

	cp.max_len = cpu_to_le16(hdev->amp_assoc_size);



	mgr->state = READ_LOC_AMP_ASSOC_FINAL;



	/* Read Local AMP Assoc final link information data */

	hci_send_cmd(hdev, HCI_OP_READ_LOCAL_AMP_ASSOC, sizeof(cp), &cp);

}



/* Write AMP Assoc data fragments, returns true with last fragment written*/

static bool amp_write_rem_assoc_frag(struct hci_dev *hdev,