mac80211: backport latest patches except for NVRAM support

We sill don't use kernel 4.2 which is required for backporting using
upstream NVRAM support patch.

Signed-off-by: Rafał Miłecki <zajec5@gmail.com>

SVN-Revision: 46724

1 files changed, 87 insertions, 0 deletions

diff --git a/package/kernel/mac80211/patches/314-brcmfmac-add-debugfs-entry-for-msgbuf-statistics.patch b/package/kernel/mac80211/patches/314-brcmfmac-add-debugfs-entry-for-msgbuf-statistics.patch
new file mode 100644
index 0000000000..9768ef2771
--- /dev/null
+++ b/package/kernel/mac80211/patches/314-brcmfmac-add-debugfs-entry-for-msgbuf-statistics.patch
@@ -0,0 +1,87 @@
+From: Franky Lin <frankyl@broadcom.com>
+Date: Thu, 20 Aug 2015 22:06:04 +0200
+Subject: [PATCH] brcmfmac: add debugfs entry for msgbuf statistics
+
+Expose ring buffer read/write pointers and other useful statistics
+through debugfs.
+
+Reviewed-by: Arend Van Spriel <arend@broadcom.com>
+Reviewed-by: Hante Meuleman <meuleman@broadcom.com>
+Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
+Signed-off-by: Franky Lin <frankyl@broadcom.com>
+Signed-off-by: Arend van Spriel <arend@broadcom.com>
+Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
+---
+
+--- a/drivers/net/wireless/brcm80211/brcmfmac/msgbuf.c
++++ b/drivers/net/wireless/brcm80211/brcmfmac/msgbuf.c
+@@ -1360,6 +1360,60 @@ void brcmf_msgbuf_delete_flowring(struct
+ 	}
+ }
+ 
++#ifdef DEBUG
++static int brcmf_msgbuf_stats_read(struct seq_file *seq, void *data)
++{
++	struct brcmf_bus *bus_if = dev_get_drvdata(seq->private);
++	struct brcmf_pub *drvr = bus_if->drvr;
++	struct brcmf_msgbuf *msgbuf = (struct brcmf_msgbuf *)drvr->proto->pd;
++	struct brcmf_commonring *commonring;
++	u16 i;
++	struct brcmf_flowring_ring *ring;
++	struct brcmf_flowring_hash *hash;
++
++	commonring = msgbuf->commonrings[BRCMF_H2D_MSGRING_CONTROL_SUBMIT];
++	seq_printf(seq, "h2d_ctl_submit: rp %4u, wp %4u, depth %4u\n",
++		   commonring->r_ptr, commonring->w_ptr, commonring->depth);
++	commonring = msgbuf->commonrings[BRCMF_H2D_MSGRING_RXPOST_SUBMIT];
++	seq_printf(seq, "h2d_rx_submit:  rp %4u, wp %4u, depth %4u\n",
++		   commonring->r_ptr, commonring->w_ptr, commonring->depth);
++	commonring = msgbuf->commonrings[BRCMF_D2H_MSGRING_CONTROL_COMPLETE];
++	seq_printf(seq, "d2h_ctl_cmplt:  rp %4u, wp %4u, depth %4u\n",
++		   commonring->r_ptr, commonring->w_ptr, commonring->depth);
++	commonring = msgbuf->commonrings[BRCMF_D2H_MSGRING_TX_COMPLETE];
++	seq_printf(seq, "d2h_tx_cmplt:   rp %4u, wp %4u, depth %4u\n",
++		   commonring->r_ptr, commonring->w_ptr, commonring->depth);
++	commonring = msgbuf->commonrings[BRCMF_D2H_MSGRING_RX_COMPLETE];
++	seq_printf(seq, "d2h_rx_cmplt:   rp %4u, wp %4u, depth %4u\n",
++		   commonring->r_ptr, commonring->w_ptr, commonring->depth);
++
++	seq_printf(seq, "\nh2d_flowrings: depth %u\n",
++		   BRCMF_H2D_TXFLOWRING_MAX_ITEM);
++	seq_puts(seq, "Active flowrings:\n");
++	hash = msgbuf->flow->hash;
++	for (i = 0; i < msgbuf->flow->nrofrings; i++) {
++		if (!msgbuf->flow->rings[i])
++			continue;
++		ring = msgbuf->flow->rings[i];
++		if (ring->status != RING_OPEN)
++			continue;
++		commonring = msgbuf->flowrings[i];
++		hash = &msgbuf->flow->hash[ring->hash_id];
++		seq_printf(seq, "id %3u: rp %4u, wp %4u, qlen %4u, blocked %u\n"
++				"        ifidx %u, fifo %u, da %pM\n",
++				i, commonring->r_ptr, commonring->w_ptr,
++				skb_queue_len(&ring->skblist), ring->blocked,
++				hash->ifidx, hash->fifo, hash->mac);
++	}
++
++	return 0;
++}
++#else
++static int brcmf_msgbuf_stats_read(struct seq_file *seq, void *data)
++{
++	return 0;
++}
++#endif
+ 
+ int brcmf_proto_msgbuf_attach(struct brcmf_pub *drvr)
+ {
+@@ -1460,6 +1514,8 @@ int brcmf_proto_msgbuf_attach(struct brc
+ 	spin_lock_init(&msgbuf->flowring_work_lock);
+ 	INIT_LIST_HEAD(&msgbuf->work_queue);
+ 
++	brcmf_debugfs_add_entry(drvr, "msgbuf_stats", brcmf_msgbuf_stats_read);
++
+ 	return 0;
+ 
+ fail: