Linux wireless drivers development
 help / color / mirror / Atom feed
* [PATCH 1/2] wil6210: set vring index for all descriptors
@ 2013-06-20 12:45 Kirshenbaum Erez
  2013-06-20 13:55 ` Vladimir Kondratiev
  0 siblings, 1 reply; 3+ messages in thread
From: Kirshenbaum Erez @ 2013-06-20 12:45 UTC (permalink / raw)
  To: qca_vkondrat; +Cc: linux-wireless, Kirshenbaum Erez

The vring index (MAC queue id) must be set in all TX descriptors
otherwise HW will fail to release descriptors for a specific vring  
(disconnect or vring switch flows).
This is normally occurs when fragmentation required, if vring index 
will not be the same for all SKB descriptors HW will fail to flush this 
MAC queue.

Signed-off-by: Kirshenbaum Erez <erezk@wilocity.com>
---
 drivers/net/wireless/ath/wil6210/txrx.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/drivers/net/wireless/ath/wil6210/txrx.c b/drivers/net/wireless/ath/wil6210/txrx.c
index e1c492b..b79ba10 100644
--- a/drivers/net/wireless/ath/wil6210/txrx.c
+++ b/drivers/net/wireless/ath/wil6210/txrx.c
@@ -621,7 +621,8 @@ static struct vring *wil_find_tx_vring(struct wil6210_priv *wil,
 	return NULL;
 }
 
-static int wil_tx_desc_map(struct vring_tx_desc *d, dma_addr_t pa, u32 len)
+static int wil_tx_desc_map(struct vring_tx_desc *d, dma_addr_t pa, u32 len,
+			   int vring_index)
 {
 	wil_desc_addr_set(&d->dma.addr, pa);
 	d->dma.ip_length = 0;
@@ -631,6 +632,7 @@ static int wil_tx_desc_map(struct vring_tx_desc *d, dma_addr_t pa, u32 len)
 	d->dma.status = 0; /* BIT(0) should be 0 for HW_OWNED */
 	d->dma.length = cpu_to_le16((u16)len);
 	d->dma.d0 = 0;
+	d->dma.d0 = (vring_index << DMA_CFG_DESC_TX_0_QID_POS);
 	d->mac.d[0] = 0;
 	d->mac.d[1] = 0;
 	d->mac.d[2] = 0;
@@ -684,7 +686,7 @@ static int wil_tx_vring(struct wil6210_priv *wil, struct vring *vring,
 	if (unlikely(dma_mapping_error(dev, pa)))
 		return -EINVAL;
 	/* 1-st segment */
-	wil_tx_desc_map(d, pa, skb_headlen(skb));
+	wil_tx_desc_map(d, pa, skb_headlen(skb), vring_index);
 	d->mac.d[2] |= ((nr_frags + 1) <<
 		       MAC_CFG_DESC_TX_2_NUM_OF_DESCRIPTORS_POS);
 	if (nr_frags)
@@ -701,7 +703,7 @@ static int wil_tx_vring(struct wil6210_priv *wil, struct vring *vring,
 				DMA_TO_DEVICE);
 		if (unlikely(dma_mapping_error(dev, pa)))
 			goto dma_error;
-		wil_tx_desc_map(d, pa, len);
+		wil_tx_desc_map(d, pa, len, vring_index);
 		vring->ctx[i] = NULL;
 		*_d = *d;
 	}
@@ -709,7 +711,6 @@ static int wil_tx_vring(struct wil6210_priv *wil, struct vring *vring,
 	d->dma.d0 |= BIT(DMA_CFG_DESC_TX_0_CMD_EOP_POS);
 	d->dma.d0 |= BIT(9); /* BUG: undocumented bit */
 	d->dma.d0 |= BIT(DMA_CFG_DESC_TX_0_CMD_DMA_IT_POS);
-	d->dma.d0 |= (vring_index << DMA_CFG_DESC_TX_0_QID_POS);
 	*_d = *d;
 
 	wil_hex_dump_txrx("Tx ", DUMP_PREFIX_NONE, 32, 4,
-- 
1.7.11.7


^ permalink raw reply related	[flat|nested] 3+ messages in thread
* [PATCH 0/2] wil6210: Tx path improvements
@ 2013-06-23  9:59 Vladimir Kondratiev
  2013-06-23  9:59 ` [PATCH 1/2] wil6210: set vring index for all descriptors Vladimir Kondratiev
  0 siblings, 1 reply; 3+ messages in thread
From: Vladimir Kondratiev @ 2013-06-23  9:59 UTC (permalink / raw)
  To: John W . Linville
  Cc: Kirshenbaum Erez, Vladimir Kondratiev, Johannes Berg,
	linux-wireless, Luis R . Rodriguez, Jouni Malinen

Couple of patches from Erez, addressing Tx path

Kirshenbaum Erez (2):
  wil6210: set vring index for all descriptors
  wil6210: add HW write-back option in TX descriptor

 drivers/net/wireless/ath/wil6210/txrx.c | 12 ++++++------
 drivers/net/wireless/ath/wil6210/txrx.h |  4 ++++
 2 files changed, 10 insertions(+), 6 deletions(-)

-- 
1.8.1.2


^ permalink raw reply	[flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-06-23 10:00 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-06-20 12:45 [PATCH 1/2] wil6210: set vring index for all descriptors Kirshenbaum Erez
2013-06-20 13:55 ` Vladimir Kondratiev
  -- strict thread matches above, loose matches on Subject: below --
2013-06-23  9:59 [PATCH 0/2] wil6210: Tx path improvements Vladimir Kondratiev
2013-06-23  9:59 ` [PATCH 1/2] wil6210: set vring index for all descriptors Vladimir Kondratiev

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox