Commit c236658f authored by Vladimir Kondratiev's avatar Vladimir Kondratiev Committed by John W. Linville
Browse files

wil6210: add scatter-gather support 



When setting fragmented skb for Tx, assign skb to the last descriptor
and set number of fragments in the 1-st one
On Tx complete, HW sets "DU" bit in Tx descriptor only for the last
descriptor; so search for it using number of fragments field.
Middle descriptors may have "DU" bit not set by the hardware.

Signed-off-by: default avatarVladimir Kondratiev <qca_vkondrat@qca.qualcomm.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent e83eb2fc

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

+41 −20
Original line number Diff line number Diff line
@@ -398,6 +398,44 @@ static const struct file_operations fops_reset = { 
	.open  = simple_open,

};



static void wil_seq_hexdump(struct seq_file *s, void *p, int len,

			    const char *prefix)

{

	char printbuf[16 * 3 + 2];

	int i = 0;

	while (i < len) {

		int l = min(len - i, 16);

		hex_dump_to_buffer(p + i, l, 16, 1, printbuf,

				   sizeof(printbuf), false);

		seq_printf(s, "%s%s\n", prefix, printbuf);

		i += l;

	}

}



static void wil_seq_print_skb(struct seq_file *s, struct sk_buff *skb)

{

	int i = 0;

	int len = skb_headlen(skb);

	void *p = skb->data;

	int nr_frags = skb_shinfo(skb)->nr_frags;



	seq_printf(s, "    len = %d\n", len);

	wil_seq_hexdump(s, p, len, "      : ");



	if (nr_frags) {

		seq_printf(s, "    nr_frags = %d\n", nr_frags);

		for (i = 0; i < nr_frags; i++) {

			const struct skb_frag_struct *frag =

					&skb_shinfo(skb)->frags[i];



			len = skb_frag_size(frag);

			p = skb_frag_address_safe(frag);

			seq_printf(s, "    [%2d] : len = %d\n", i, len);

			wil_seq_hexdump(s, p, len, "      : ");

		}

	}

}



/*---------Tx/Rx descriptor------------*/

static int wil_txdesc_debugfs_show(struct seq_file *s, void *data)

{
@@ -438,26 +476,9 @@ static int wil_txdesc_debugfs_show(struct seq_file *s, void *data) 
		seq_printf(s, "  SKB = %p\n", skb);



		if (skb) {

			char printbuf[16 * 3 + 2];

			int i = 0;

			int len = le16_to_cpu(d->dma.length);

			void *p = skb->data;



			if (len != skb_headlen(skb)) {

				seq_printf(s, "!!! len: desc = %d skb = %d\n",

					   len, skb_headlen(skb));

				len = min_t(int, len, skb_headlen(skb));

			}



			seq_printf(s, "    len = %d\n", len);



			while (i < len) {

				int l = min(len - i, 16);

				hex_dump_to_buffer(p + i, l, 16, 1, printbuf,

						   sizeof(printbuf), false);

				seq_printf(s, "      : %s\n", printbuf);

				i += l;

			}

			skb_get(skb);

			wil_seq_print_skb(s, skb);

			kfree_skb(skb);

		}

		seq_printf(s, "}\n");

	} else {

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

+3 −2
Original line number Diff line number Diff line
@@ -127,8 +127,9 @@ void *wil_if_alloc(struct device *dev, void __iomem *csr) 


	ndev->netdev_ops = &wil_netdev_ops;

	ndev->ieee80211_ptr = wdev;

	ndev->hw_features = NETIF_F_HW_CSUM | NETIF_F_RXCSUM;

	ndev->features |= NETIF_F_HW_CSUM | NETIF_F_RXCSUM;

	ndev->hw_features = NETIF_F_HW_CSUM | NETIF_F_RXCSUM |

			    NETIF_F_SG;

	ndev->features |= ndev->hw_features;

	SET_NETDEV_DEV(ndev, wiphy_dev(wdev->wiphy));

	wdev->netdev = ndev;

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

+70 −45
Original line number Diff line number Diff line
@@ -774,6 +774,13 @@ static int wil_tx_desc_map(struct vring_tx_desc *d, dma_addr_t pa, u32 len, 
	return 0;

}



static inline

void wil_tx_desc_set_nr_frags(struct vring_tx_desc *d, int nr_frags)

{

	d->mac.d[2] |= ((nr_frags + 1) <<

		       MAC_CFG_DESC_TX_2_NUM_OF_DESCRIPTORS_POS);

}



static int wil_tx_desc_offload_cksum_set(struct wil6210_priv *wil,

				struct vring_tx_desc *d,

				struct sk_buff *skb)
@@ -866,8 +873,8 @@ static int wil_tx_vring(struct wil6210_priv *wil, struct vring *vring, 
		goto dma_error;

	}



	d->mac.d[2] |= ((nr_frags + 1) <<

		       MAC_CFG_DESC_TX_2_NUM_OF_DESCRIPTORS_POS);

	vring->ctx[i].nr_frags = nr_frags;

	wil_tx_desc_set_nr_frags(d, nr_frags);

	if (nr_frags)

		*_d = *d;
@@ -883,6 +890,11 @@ static int wil_tx_vring(struct wil6210_priv *wil, struct vring *vring, 
		if (unlikely(dma_mapping_error(dev, pa)))

			goto dma_error;

		wil_tx_desc_map(d, pa, len, vring_index);

		/* no need to check return code -

		 * if it succeeded for 1-st descriptor,

		 * it will succeed here too

		 */

		wil_tx_desc_offload_cksum_set(wil, d, skb);

		vring->ctx[i].mapped_as_page = 1;

		*_d = *d;

	}
@@ -1003,6 +1015,7 @@ int wil_tx_complete(struct wil6210_priv *wil, int ringid) 
	int done = 0;

	int cid = wil->vring2cid_tid[ringid][0];

	struct wil_net_stats *stats = &wil->sta[cid].stats;

	volatile struct vring_tx_desc *_d;



	if (!vring->va) {

		wil_err(wil, "Tx irq[%d]: vring not initialized\n", ringid);
@@ -1012,19 +1025,30 @@ int wil_tx_complete(struct wil6210_priv *wil, int ringid) 
	wil_dbg_txrx(wil, "%s(%d)\n", __func__, ringid);



	while (!wil_vring_is_empty(vring)) {

		volatile struct vring_tx_desc *_d =

					      &vring->va[vring->swtail].tx;

		int new_swtail;

		struct wil_ctx *ctx = &vring->ctx[vring->swtail];

		/**

		 * For the fragmented skb, HW will set DU bit only for the

		 * last fragment. look for it

		 */

		int lf = (vring->swtail + ctx->nr_frags) % vring->size;

		/* TODO: check we are not past head */



		_d = &vring->va[lf].tx;

		if (!(_d->dma.status & TX_DMA_STATUS_DU))

			break;



		new_swtail = (lf + 1) % vring->size;

		while (vring->swtail != new_swtail) {

			struct vring_tx_desc dd, *d = &dd;

			dma_addr_t pa;

			u16 dmalen;

			struct wil_ctx *ctx = &vring->ctx[vring->swtail];

			struct sk_buff *skb = ctx->skb;

			_d = &vring->va[vring->swtail].tx;



			*d = *_d;



		if (!(d->dma.status & TX_DMA_STATUS_DU))

			break;



			dmalen = le16_to_cpu(d->dma.length);

			trace_wil6210_tx_done(ringid, vring->swtail, dmalen,

					      d->dma.error);
@@ -1039,7 +1063,8 @@ int wil_tx_complete(struct wil6210_priv *wil, int ringid) 
			if (ctx->mapped_as_page)

				dma_unmap_page(dev, pa, dmalen, DMA_TO_DEVICE);

			else

			dma_unmap_single(dev, pa, dmalen, DMA_TO_DEVICE);

				dma_unmap_single(dev, pa, dmalen,

						 DMA_TO_DEVICE);



			if (skb) {

				if (d->dma.error == 0) {
@@ -1055,8 +1080,7 @@ int wil_tx_complete(struct wil6210_priv *wil, int ringid) 
				dev_kfree_skb_any(skb);

			}

			memset(ctx, 0, sizeof(*ctx));

		/*

		 * There is no need to touch HW descriptor:

			/* There is no need to touch HW descriptor:

			 * - ststus bit TX_DMA_STATUS_DU is set by design,

			 *   so hardware will not try to process this desc.,

			 * - rest of descriptor will be initialized on Tx.
@@ -1064,6 +1088,7 @@ int wil_tx_complete(struct wil6210_priv *wil, int ringid) 
			vring->swtail = wil_vring_next_tail(vring);

			done++;

		}

	}

	if (wil_vring_avail_tx(vring) > vring->size/4)

		netif_tx_wake_all_queues(wil_to_ndev(wil));

drivers/net/wireless/ath/wil6210/wil6210.h

+1 −0
Original line number Diff line number Diff line
@@ -214,6 +214,7 @@ struct pending_wmi_event { 
 */

struct wil_ctx {

	struct sk_buff *skb;

	u8 nr_frags;

	u8 mapped_as_page:1;

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE