linux-bluetooth.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Mat Martineau <mathewm@codeaurora.org>
To: linux-bluetooth@vger.kernel.org, gustavo@padovan.org
Cc: sunnyk@codeaurora.org, marcel@holtmann.org
Subject: [PATCH 05/19] Bluetooth: Channel move request handling
Date: Mon, 15 Oct 2012 08:33:54 -0700	[thread overview]
Message-ID: <1350315248-7690-6-git-send-email-mathewm@codeaurora.org> (raw)
In-Reply-To: <1350315248-7690-1-git-send-email-mathewm@codeaurora.org>

On receipt of a channel move request, the request must be validated
based on the L2CAP mode, connection state, and controller
capabilities.  ERTM channels must have their state machines cleared
and transmission paused while the channel move takes place.

If the channel is being moved to an AMP controller then
an AMP physical link must be prepared.  Moving the channel back to
BR/EDR proceeds immediately.

Signed-off-by: Mat Martineau <mathewm@codeaurora.org>
---
 net/bluetooth/l2cap_core.c | 98 +++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 97 insertions(+), 1 deletion(-)

diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
index a55644f..649c06b 100644
--- a/net/bluetooth/l2cap_core.c
+++ b/net/bluetooth/l2cap_core.c
@@ -995,6 +995,41 @@ void l2cap_send_conn_req(struct l2cap_chan *chan)
 	l2cap_send_cmd(conn, chan->ident, L2CAP_CONN_REQ, sizeof(req), &req);
 }
 
+static void l2cap_move_setup(struct l2cap_chan *chan)
+{
+	struct sk_buff *skb;
+
+	BT_DBG("chan %p", chan);
+
+	if (chan->mode != L2CAP_MODE_ERTM)
+		return;
+
+	__clear_retrans_timer(chan);
+	__clear_monitor_timer(chan);
+	__clear_ack_timer(chan);
+
+	chan->retry_count = 0;
+	skb_queue_walk(&chan->tx_q, skb) {
+		if (bt_cb(skb)->control.retries)
+			bt_cb(skb)->control.retries = 1;
+		else
+			break;
+	}
+
+	chan->expected_tx_seq = chan->buffer_seq;
+
+	clear_bit(CONN_REJ_ACT, &chan->conn_state);
+	clear_bit(CONN_SREJ_ACT, &chan->conn_state);
+	l2cap_seq_list_clear(&chan->retrans_list);
+	l2cap_seq_list_clear(&chan->srej_list);
+	skb_queue_purge(&chan->srej_q);
+
+	chan->tx_state = L2CAP_TX_STATE_XMIT;
+	chan->rx_state = L2CAP_RX_STATE_MOVE;
+
+	set_bit(CONN_REMOTE_BUSY, &chan->conn_state);
+}
+
 static void l2cap_chan_ready(struct l2cap_chan *chan)
 {
 	/* This clears all conf flags, including CONF_NOT_COMPLETE */
@@ -4171,7 +4206,68 @@ static inline int l2cap_move_channel_req(struct l2cap_conn *conn,
 
 	chan = l2cap_get_chan_by_dcid(conn, icid);
 
-	/* Placeholder: Always refuse */
+	if (!chan || chan->scid < L2CAP_CID_DYN_START ||
+	    (chan->mode != L2CAP_MODE_ERTM &&
+	     chan->mode != L2CAP_MODE_STREAMING)) {
+		result = L2CAP_MR_NOT_ALLOWED;
+		goto send_move_response;
+	}
+
+	if (chan->local_amp_id == req->dest_amp_id) {
+		result = L2CAP_MR_SAME_ID;
+		goto send_move_response;
+	}
+
+	if (req->dest_amp_id) {
+		struct hci_dev *hdev;
+		hdev = hci_dev_get(req->dest_amp_id);
+		if (!hdev || hdev->dev_type != HCI_AMP ||
+		    !test_bit(HCI_UP, &hdev->flags)) {
+			if (hdev)
+				hci_dev_put(hdev);
+
+			result = L2CAP_MR_BAD_ID;
+			goto send_move_response;
+		}
+		hci_dev_put(hdev);
+	}
+
+	if (((chan->move_state != L2CAP_MOVE_STABLE &&
+	    chan->move_state != L2CAP_MOVE_WAIT_PREPARE) ||
+	    chan->move_role != L2CAP_MOVE_ROLE_NONE) &&
+	    bacmp(conn->src, conn->dst) > 0) {
+		result = L2CAP_MR_COLLISION;
+		goto send_move_response;
+	}
+
+	if (chan->chan_policy == BT_CHANNEL_POLICY_BREDR_ONLY) {
+		result = L2CAP_MR_NOT_ALLOWED;
+		goto send_move_response;
+	}
+
+	chan->ident = cmd->ident;
+	chan->move_role = L2CAP_MOVE_ROLE_RESPONDER;
+	l2cap_move_setup(chan);
+	chan->move_id = req->dest_amp_id;
+	icid = chan->dcid;
+
+	if (req->dest_amp_id == 0) {
+		/* Moving to BR/EDR */
+		if (test_bit(CONN_LOCAL_BUSY, &chan->conn_state)) {
+			chan->move_state = L2CAP_MOVE_WAIT_LOCAL_BUSY;
+			result = L2CAP_MR_PEND;
+		} else {
+			chan->move_state = L2CAP_MOVE_WAIT_CONFIRM;
+			result = L2CAP_MR_SUCCESS;
+		}
+	} else {
+		chan->move_state = L2CAP_MOVE_WAIT_PREPARE;
+		/* Placeholder - uncomment when amp functions are available */
+		/*amp_accept_physical(chan, req->dest_amp_id);*/
+		result = L2CAP_MR_PEND;
+	}
+
+send_move_response:
 	l2cap_send_move_chan_rsp(conn, cmd->ident, icid, result);
 
 	if (chan)
-- 
1.7.12.3

--
Mat Martineau

Employee of Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation

  parent reply	other threads:[~2012-10-15 15:33 UTC|newest]

Thread overview: 45+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-10-15 15:33 [PATCH 00/19] L2CAP signaling for AMP channel create/move Mat Martineau
2012-10-15 15:33 ` [PATCH 01/19] Bluetooth: Add new l2cap_chan struct members for high speed channels Mat Martineau
2012-10-15 15:33 ` [PATCH 02/19] Bluetooth: Add L2CAP create channel request handling Mat Martineau
2012-10-15 15:33 ` [PATCH 03/19] Bluetooth: Remove unnecessary intermediate function Mat Martineau
2012-10-15 18:10   ` Marcel Holtmann
2012-10-15 15:33 ` [PATCH 04/19] Bluetooth: Lookup channel structure based on DCID Mat Martineau
2012-10-15 18:13   ` Marcel Holtmann
2012-10-15 15:33 ` Mat Martineau [this message]
2012-10-15 18:17   ` [PATCH 05/19] Bluetooth: Channel move request handling Marcel Holtmann
2012-10-16 10:18   ` Andrei Emeltchenko
2012-10-15 15:33 ` [PATCH 06/19] Bluetooth: Add new ERTM receive states for channel move Mat Martineau
2012-10-15 18:23   ` Marcel Holtmann
2012-10-16 10:21   ` Andrei Emeltchenko
2012-10-15 15:33 ` [PATCH 07/19] Bluetooth: Add move channel confirm handling Mat Martineau
2012-10-15 18:25   ` Marcel Holtmann
2012-10-16 17:30     ` Mat Martineau
2012-10-17 17:10       ` Marcel Holtmann
2012-10-16 10:27   ` Andrei Emeltchenko
2012-10-16 23:00     ` Mat Martineau
2012-10-15 15:33 ` [PATCH 08/19] Bluetooth: Add state to hci_chan Mat Martineau
2012-10-15 18:26   ` Marcel Holtmann
2012-10-15 15:33 ` [PATCH 09/19] Bluetooth: Move channel response Mat Martineau
2012-10-15 18:29   ` Marcel Holtmann
2012-10-16 17:56     ` Mat Martineau
2012-10-15 15:33 ` [PATCH 10/19] Bluetooth: Add logical link confirm Mat Martineau
2012-10-15 18:37   ` Marcel Holtmann
2012-10-16 10:38   ` Andrei Emeltchenko
2012-10-16 22:25     ` Mat Martineau
2012-10-15 15:34 ` [PATCH 11/19] Bluetooth: Add move confirm response handling Mat Martineau
2012-10-15 18:38   ` Marcel Holtmann
2012-10-15 15:34 ` [PATCH 12/19] Bluetooth: Handle physical link completion Mat Martineau
2012-10-15 18:40   ` Marcel Holtmann
2012-10-15 15:34 ` [PATCH 13/19] Bluetooth: Flag ACL frames as complete for AMP controllers Mat Martineau
2012-10-15 18:41   ` Marcel Holtmann
2012-10-15 15:34 ` [PATCH 14/19] Bluetooth: Do not send data during channel move Mat Martineau
2012-10-15 18:42   ` Marcel Holtmann
2012-10-16 10:50   ` Andrei Emeltchenko
2012-10-15 15:34 ` [PATCH 15/19] Bluetooth: Configure appropriate timeouts for AMP controllers Mat Martineau
2012-10-15 18:44   ` Marcel Holtmann
2012-10-15 15:34 ` [PATCH 16/19] Bluetooth: Ignore BR/EDR packet size constraints when fragmenting for AMP Mat Martineau
2012-10-15 15:34 ` [PATCH 17/19] Bluetooth: Send create channel request instead of connect " Mat Martineau
2012-10-15 15:34 ` [PATCH 18/19] Bluetooth: Do not retransmit data during a channel move Mat Martineau
2012-10-15 18:46   ` Marcel Holtmann
2012-10-15 15:34 ` [PATCH 19/19] Bluetooth: Start channel move when socket option is changed Mat Martineau
2012-10-15 18:47   ` 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=1350315248-7690-6-git-send-email-mathewm@codeaurora.org \
    --to=mathewm@codeaurora.org \
    --cc=gustavo@padovan.org \
    --cc=linux-bluetooth@vger.kernel.org \
    --cc=marcel@holtmann.org \
    --cc=sunnyk@codeaurora.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).