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

Commit 99b55bd2 authored by Kirshenbaum Erez's avatar Kirshenbaum Erez Committed by John W. Linville
Browse files

wil6210: set vring index for all descriptors 



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: default avatarKirshenbaum Erez <erezk@wilocity.com>
Signed-off-by: default avatarVladimir Kondratiev <qca_vkondrat@qca.qualcomm.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 150cc692

drivers/net/wireless/ath/wil6210/txrx.c

+5 −5
Original line number Diff line number Diff line
@@ -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;
@@ -630,7 +631,7 @@ static int wil_tx_desc_map(struct vring_tx_desc *d, dma_addr_t pa, u32 len) 
	d->dma.error = 0;

	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 +685,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 +702,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 +710,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,