linux-bluetooth.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Johan Hedberg <johan.hedberg@gmail.com>
To: linux-bluetooth@vger.kernel.org
Subject: [PATCH 03/18 v2] Bluetooth: Add initial reliable packet support for Three-wire UART
Date: Mon, 16 Jul 2012 16:12:04 +0300	[thread overview]
Message-ID: <1342444339-1627-3-git-send-email-johan.hedberg@gmail.com> (raw)
In-Reply-To: <1342444339-1627-1-git-send-email-johan.hedberg@gmail.com>

From: Johan Hedberg <johan.hedberg@intel.com>

This patch adds initial support for reliable packets along with the
necessary retransmission timer for the Three-wire UART HCI driver.

Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
---
 drivers/bluetooth/hci_h5.c |   56 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 56 insertions(+)

diff --git a/drivers/bluetooth/hci_h5.c b/drivers/bluetooth/hci_h5.c
index 6b7ec64..fe711bf 100644
--- a/drivers/bluetooth/hci_h5.c
+++ b/drivers/bluetooth/hci_h5.c
@@ -30,6 +30,10 @@
 
 #include "hci_uart.h"
 
+#define H5_TXWINSIZE	4
+
+#define H5_ACK_TIMEOUT	msecs_to_jiffies(250)
+
 struct h5 {
 	struct sk_buff_head unack;	/* Unack'ed packets queue */
 	struct sk_buff_head rel;	/* Reliable packets queue */
@@ -37,11 +41,34 @@ struct h5 {
 
 	struct sk_buff *rx_skb;
 
+	struct timer_list timer;	/* Retransmission timer */
+
 	bool txack_req;
 
 	u8 msgq_txseq;
 };
 
+static void h5_timed_event(unsigned long arg)
+{
+	struct hci_uart *hu = (struct hci_uart *) arg;
+	struct h5 *h5 = hu->priv;
+	struct sk_buff *skb;
+	unsigned long flags;
+
+	BT_DBG("hu %p retransmitting %u pkts", hu, h5->unack.qlen);
+
+	spin_lock_irqsave_nested(&h5->unack.lock, flags, SINGLE_DEPTH_NESTING);
+
+	while ((skb = __skb_dequeue_tail(&h5->unack)) != NULL) {
+		h5->msgq_txseq = (h5->msgq_txseq - 1) & 0x07;
+		skb_queue_head(&h5->rel, skb);
+	}
+
+	spin_unlock_irqrestore(&h5->unack.lock, flags);
+
+	hci_uart_tx_wakeup(hu);
+}
+
 static int h5_open(struct hci_uart *hu)
 {
 	struct h5 *h5;
@@ -58,6 +85,10 @@ static int h5_open(struct hci_uart *hu)
 	skb_queue_head_init(&h5->rel);
 	skb_queue_head_init(&h5->unrel);
 
+	init_timer(&h5->timer);
+	h5->timer.function = h5_timed_event;
+	h5->timer.data = (unsigned long) hu;
+
 	return 0;
 }
 
@@ -69,6 +100,8 @@ static int h5_close(struct hci_uart *hu)
 	skb_queue_purge(&h5->rel);
 	skb_queue_purge(&h5->unrel);
 
+	del_timer(&h5->timer);
+
 	kfree(h5);
 
 	return 0;
@@ -123,6 +156,7 @@ static struct sk_buff *h5_prepare_ack(struct h5 *h5)
 static struct sk_buff *h5_dequeue(struct hci_uart *hu)
 {
 	struct h5 *h5 = hu->priv;
+	unsigned long flags;
 	struct sk_buff *skb, *nskb;
 
 	if ((skb = skb_dequeue(&h5->unrel)) != NULL) {
@@ -136,6 +170,28 @@ static struct sk_buff *h5_dequeue(struct hci_uart *hu)
 		BT_ERR("Could not dequeue pkt because alloc_skb failed");
 	}
 
+	spin_lock_irqsave_nested(&h5->unack.lock, flags, SINGLE_DEPTH_NESTING);
+
+	if (h5->unack.qlen >= H5_TXWINSIZE)
+	       goto unlock;
+
+	if ((skb = skb_dequeue(&h5->rel)) != NULL) {
+		nskb = h5_prepare_pkt(h5, skb);
+
+		if (nskb) {
+			__skb_queue_tail(&h5->unack, skb);
+			mod_timer(&h5->timer, jiffies + H5_ACK_TIMEOUT);
+			spin_unlock_irqrestore(&h5->unack.lock, flags);
+			return nskb;
+		}
+
+		skb_queue_head(&h5->rel, skb);
+		BT_ERR("Could not dequeue pkt because alloc_skb failed");
+	}
+
+unlock:
+	spin_unlock_irqrestore(&h5->unack.lock, flags);
+
 	if (h5->txack_req)
 		return h5_prepare_ack(h5);
 
-- 
1.7.10.4


  parent reply	other threads:[~2012-07-16 13:12 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-07-16 13:12 [PATCH 01/18 v2] Bluetooth: Initial skeleton for Three-wire UART (H5) support Johan Hedberg
2012-07-16 13:12 ` [PATCH 02/18 v2] Bluetooth: Add basic state tracking to Three-wire UART driver Johan Hedberg
2012-07-16 13:12 ` Johan Hedberg [this message]
2012-07-16 13:12 ` [PATCH 04/18 v2] Bluetooth: Add basic packet parsing " Johan Hedberg
2012-07-16 13:12 ` [PATCH 05/18 v2] Bluetooth: Add initial packet sending support to Three-wire UART Johan Hedberg
2012-07-16 13:12 ` [PATCH 06/18 v2] Bluetooth: Add Three-wire header value convenience macros Johan Hedberg
2012-07-16 13:12 ` [PATCH 07/18 v2] Bluetooth: Fix/implement Three-wire reliable packet sending Johan Hedberg
2012-07-16 13:12 ` [PATCH 08/18 v2] Bluetooth: Add support for Three-wire Link Control packets Johan Hedberg
2012-07-16 13:12 ` [PATCH 09/18 v2] Bluetooth: Simplify hci_uart_tty_close logic Johan Hedberg
2012-07-16 13:12 ` [PATCH 10/18 v2] Bluetooth: Add delayed init sequence support for UART controllers Johan Hedberg
2012-07-16 13:12 ` [PATCH 11/18 v2] Bluetooth: Use delayed init for Three-wire UART Johan Hedberg
2012-07-16 13:12 ` [PATCH 12/18 v2] Bluetooth: Improve rx debug logs " Johan Hedberg
2012-07-16 13:12 ` [PATCH 13/18 v2] Bluetooth: Add initial sleep support to " Johan Hedberg
2012-07-16 13:12 ` [PATCH 14/18 v2] Bluetooth: Add initialization tracking to HCI Three-wire driver Johan Hedberg
2012-07-16 13:12 ` [PATCH 15/18 v2] Bluetooth: Implement proper low-power support for Three-wire UART Johan Hedberg
2012-07-16 13:12 ` [PATCH 16/18 v2] Bluetooth: Remove unnecessary h5_build_pkt function Johan Hedberg
2012-07-16 13:12 ` [PATCH 17/18 v2] Bluetooth: Improve Three-wire UART configuration handling Johan Hedberg
2012-07-16 13:12 ` [PATCH 18/18 v2] Bluetooth: Introduce a flags variable to Three-wire UART state Johan Hedberg
2012-07-17 17:51   ` Gustavo Padovan

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=1342444339-1627-3-git-send-email-johan.hedberg@gmail.com \
    --to=johan.hedberg@gmail.com \
    --cc=linux-bluetooth@vger.kernel.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).