From: Johan Hedberg <johan.hedberg@gmail.com>
To: linux-bluetooth@vger.kernel.org
Subject: [PATCH 03/17] Bluetooth: Add initial reliable packet support for Three-wire UART
Date: Wed, 27 Jun 2012 14:25:53 +0300 [thread overview]
Message-ID: <1340796367-10321-4-git-send-email-johan.hedberg@gmail.com> (raw)
In-Reply-To: <1340796367-10321-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 | 52 ++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 52 insertions(+)
diff --git a/drivers/bluetooth/hci_h5.c b/drivers/bluetooth/hci_h5.c
index c610ba3..0f97b05 100644
--- a/drivers/bluetooth/hci_h5.c
+++ b/drivers/bluetooth/hci_h5.c
@@ -39,11 +39,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;
@@ -60,6 +83,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;
}
@@ -71,6 +98,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;
@@ -125,6 +154,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) {
@@ -138,6 +168,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 + HZ / 4);
+ 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
next prev parent reply other threads:[~2012-06-27 11:25 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-06-27 11:25 [PATCH 00/17] Bluetooth: Implement Three-wire UART HCI driver Johan Hedberg
2012-06-27 11:25 ` [PATCH 01/17] Bluetooth: Initial skeleton for Three-wire UART (H5) support Johan Hedberg
2012-06-27 11:25 ` [PATCH 02/17] Bluetooth: Add basic state tracking to Three-wire UART driver Johan Hedberg
2012-06-27 11:25 ` Johan Hedberg [this message]
2012-07-09 14:34 ` [PATCH 03/17] Bluetooth: Add initial reliable packet support for Three-wire UART Gustavo Padovan
2012-06-27 11:25 ` [PATCH 04/17] Bluetooth: Add basic packet parsing to Three-wire UART driver Johan Hedberg
2012-07-09 14:44 ` Gustavo Padovan
2012-06-27 11:25 ` [PATCH 05/17] Bluetooth: Add initial packet sending support to Three-wire UART Johan Hedberg
2012-06-27 11:25 ` [PATCH 06/17] Bluetooth: Add Three-wire header value convenience macros Johan Hedberg
2012-06-27 11:25 ` [PATCH 07/17] Bluetooth: Fix/implement Three-wire reliable packet sending Johan Hedberg
2012-06-27 11:25 ` [PATCH 08/17] Bluetooth: Add support for Three-wire Link Control packets Johan Hedberg
2012-07-10 18:51 ` Gustavo Padovan
2012-06-27 11:25 ` [PATCH 09/17] Bluetooth: Simplify hci_uart_tty_close logic Johan Hedberg
2012-06-27 11:26 ` [PATCH 10/17] Bluetooth: Add delayed init sequence support for UART controllers Johan Hedberg
2012-07-10 18:53 ` Gustavo Padovan
2012-06-27 11:26 ` [PATCH 11/17] Bluetooth: Use delayed init for Three-wire UART Johan Hedberg
2012-06-27 11:26 ` [PATCH 12/17] Bluetooth: Improve rx debug logs " Johan Hedberg
2012-06-27 11:26 ` [PATCH 13/17] Bluetooth: Add initial sleep support to " Johan Hedberg
2012-07-10 18:57 ` Gustavo Padovan
2012-06-27 11:26 ` [PATCH 14/17] Bluetooth: Add initialization tracking to HCI Three-wire driver Johan Hedberg
2012-07-10 18:58 ` Gustavo Padovan
2012-06-27 11:26 ` [PATCH 15/17] Bluetooth: Implement proper low-power support for Three-wire UART Johan Hedberg
2012-06-27 11:26 ` [PATCH 16/17] Bluetooth: Remove unnecessary h5_build_pkt function Johan Hedberg
2012-06-27 11:26 ` [PATCH 17/17] Bluetooth: Improve Three-wire UART configuration handling Johan Hedberg
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=1340796367-10321-4-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).