mac80211: backport some brcmfmac patches

package/kernel/mac80211/patches/385-brcmfmac-Update-msgbuf-read-pointer-quicker.patch

+From: Hante Meuleman <meuleman@broadcom.com>
+Date: Mon, 8 Jun 2015 14:38:32 +0200
+Subject: [PATCH] brcmfmac: Update msgbuf read pointer quicker.
+
+On device to host data using msgbuf the read pointer gets updated
+once all data is processed. Updating this pointer more frequently
+allows the firmware to add more data quicker. This will result in
+slightly higher and more stable throughput on CPU bounded host
+processors.
+
+Reviewed-by: Arend Van Spriel <arend@broadcom.com>
+Reviewed-by: Franky (Zhenhui) Lin <frankyl@broadcom.com>
+Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
+Signed-off-by: Hante Meuleman <meuleman@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/commonring.c
++++ b/drivers/net/wireless/brcm80211/brcmfmac/commonring.c
+@@ -223,8 +223,6 @@ void brcmf_commonring_write_cancel(struc
+ void *brcmf_commonring_get_read_ptr(struct brcmf_commonring *commonring,
+ 				    u16 *n_items)
+ {
+-	void *ret_addr;
+-
+ 	if (commonring->cr_update_wptr)
+ 		commonring->cr_update_wptr(commonring->cr_ctx);
+ 
+@@ -235,19 +233,18 @@ void *brcmf_commonring_get_read_ptr(stru
+ 	if (*n_items == 0)
+ 		return NULL;
+ 
+-	ret_addr = commonring->buf_addr +
+-		   (commonring->r_ptr * commonring->item_len);
+-
+-	commonring->r_ptr += *n_items;
+-	if (commonring->r_ptr == commonring->depth)
+-		commonring->r_ptr = 0;
+-
+-	return ret_addr;
++	return commonring->buf_addr +
++	       (commonring->r_ptr * commonring->item_len);
+ }
+ 
+ 
+-int brcmf_commonring_read_complete(struct brcmf_commonring *commonring)
++int brcmf_commonring_read_complete(struct brcmf_commonring *commonring,
++				   u16 n_items)
+ {
++	commonring->r_ptr += n_items;
++	if (commonring->r_ptr == commonring->depth)
++		commonring->r_ptr = 0;
++
+ 	if (commonring->cr_write_rptr)
+ 		return commonring->cr_write_rptr(commonring->cr_ctx);
+ 
+--- a/drivers/net/wireless/brcm80211/brcmfmac/commonring.h
++++ b/drivers/net/wireless/brcm80211/brcmfmac/commonring.h
+@@ -62,7 +62,8 @@ void brcmf_commonring_write_cancel(struc
+ 				   u16 n_items);
+ void *brcmf_commonring_get_read_ptr(struct brcmf_commonring *commonring,
+ 				    u16 *n_items);
+-int brcmf_commonring_read_complete(struct brcmf_commonring *commonring);
++int brcmf_commonring_read_complete(struct brcmf_commonring *commonring,
++				   u16 n_items);
+ 
+ #define brcmf_commonring_n_items(commonring) (commonring->depth)
+ #define brcmf_commonring_len_item(commonring) (commonring->item_len)
+--- a/drivers/net/wireless/brcm80211/brcmfmac/msgbuf.c
++++ b/drivers/net/wireless/brcm80211/brcmfmac/msgbuf.c
+@@ -75,6 +75,8 @@
+ 
+ #define BRCMF_MSGBUF_DELAY_TXWORKER_THRS	96
+ #define BRCMF_MSGBUF_TRICKLE_TXWORKER_THRS	32
++#define BRCMF_MSGBUF_UPDATE_RX_PTR_THRS		48
++
+ 
+ struct msgbuf_common_hdr {
+ 	u8				msgtype;
+@@ -1257,19 +1259,27 @@ static void brcmf_msgbuf_process_rx(stru
+ {
+ 	void *buf;
+ 	u16 count;
++	u16 processed;
+ 
+ again:
+ 	buf = brcmf_commonring_get_read_ptr(commonring, &count);
+ 	if (buf == NULL)
+ 		return;
+ 
++	processed = 0;
+ 	while (count) {
+ 		brcmf_msgbuf_process_msgtype(msgbuf,
+ 					     buf + msgbuf->rx_dataoffset);
+ 		buf += brcmf_commonring_len_item(commonring);
++		processed++;
++		if (processed == BRCMF_MSGBUF_UPDATE_RX_PTR_THRS) {
++			brcmf_commonring_read_complete(commonring, processed);
++			processed = 0;
++		}
+ 		count--;
+ 	}
+-	brcmf_commonring_read_complete(commonring);
++	if (processed)
++		brcmf_commonring_read_complete(commonring, processed);
+ 
+ 	if (commonring->r_ptr == 0)
+ 		goto again;

package/kernel/mac80211/patches/386-brcmfmac-remove-chipinfo-debugfs-entry.patch

+From: Arend van Spriel <arend@broadcom.com>
+Date: Mon, 8 Jun 2015 14:38:33 +0200
+Subject: [PATCH] brcmfmac: remove chipinfo debugfs entry
+
+The information provided by chipinfo is also provided by the
+revinfo debugfs entry. Removing it from debugfs.
+
+Reviewed-by: Hante Meuleman <meuleman@broadcom.com>
+Reviewed-by: Pieter-Paul Giesberts <pieterpg@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/debug.c
++++ b/drivers/net/wireless/brcm80211/brcmfmac/debug.c
+@@ -41,15 +41,6 @@ void brcmf_debugfs_exit(void)
+ 	root_folder = NULL;
+ }
+ 
+-static int brcmf_debugfs_chipinfo_read(struct seq_file *seq, void *data)
+-{
+-	struct brcmf_bus *bus = dev_get_drvdata(seq->private);
+-
+-	seq_printf(seq, "chip: %x(%u) rev %u\n",
+-		   bus->chip, bus->chip, bus->chiprev);
+-	return 0;
+-}
+-
+ int brcmf_debugfs_attach(struct brcmf_pub *drvr)
+ {
+ 	struct device *dev = drvr->bus_if->dev;
+@@ -58,7 +49,6 @@ int brcmf_debugfs_attach(struct brcmf_pu
+ 		return -ENODEV;
+ 
+ 	drvr->dbgfs_dir = debugfs_create_dir(dev_name(dev), root_folder);
+-	brcmf_debugfs_add_entry(drvr, "chipinfo", brcmf_debugfs_chipinfo_read);
+ 
+ 	return PTR_ERR_OR_ZERO(drvr->dbgfs_dir);
+ }

package/kernel/mac80211/patches/387-brcmfmac-remove-watchdog-reset-from-brcmf_pcie_busco.patch

+From: Arend van Spriel <arend@broadcom.com>
+Date: Mon, 8 Jun 2015 14:38:34 +0200
+Subject: [PATCH] brcmfmac: remove watchdog reset from
+ brcmf_pcie_buscoreprep()
+
+The watchdog reset as done in brcmf_pcie_buscoreprep() is not
+sufficient. It needs to modify PCIe core registers as well
+which is properly done by brcmf_pcie_reset_device() after the
+chip recognition is done. So the faulty watchdog reset can be
+removed as it was causing driver reload to fail and hang the
+system requiring a power-cycle. Instead the call to to the
+brcmf_pcie_reset_device() function is done twice in the unload.
+
+Reviewed-by: Hante Meuleman <meuleman@broadcom.com>
+Reviewed-by: Daniel (Deognyoun) Kim <dekim@broadcom.com>
+Reviewed-by: Franky (Zhenhui) Lin <frankyl@broadcom.com>
+Reviewed-by: Pieter-Paul Giesberts <pieterpg@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/pcie.c
++++ b/drivers/net/wireless/brcm80211/brcmfmac/pcie.c
+@@ -1629,20 +1629,7 @@ static void brcmf_pcie_buscore_write32(v
+ 
+ static int brcmf_pcie_buscoreprep(void *ctx)
+ {
+-	struct brcmf_pciedev_info *devinfo = (struct brcmf_pciedev_info *)ctx;
+-	int err;
+-
+-	err = brcmf_pcie_get_resource(devinfo);
+-	if (err == 0) {
+-		/* Set CC watchdog to reset all the cores on the chip to bring
+-		 * back dongle to a sane state.
+-		 */
+-		brcmf_pcie_buscore_write32(ctx, CORE_CC_REG(SI_ENUM_BASE,
+-							    watchdog), 4);
+-		msleep(100);
+-	}
+-
+-	return err;
++	return brcmf_pcie_get_resource(ctx);
+ }
+ 
+ 
+@@ -1824,6 +1811,7 @@ brcmf_pcie_remove(struct pci_dev *pdev)
+ 		brcmf_pcie_intr_disable(devinfo);
+ 
+ 	brcmf_detach(&pdev->dev);
++	brcmf_pcie_reset_device(devinfo);
+ 
+ 	kfree(bus->bus_priv.pcie);
+ 	kfree(bus->msgbuf->flowrings);

package/kernel/mac80211/patches/388-brcmfmac-use-debugfs_create_devm_seqfile-helper-func.patch

+From: Arend van Spriel <arend@broadcom.com>
+Date: Mon, 8 Jun 2015 14:38:35 +0200
+Subject: [PATCH] brcmfmac: use debugfs_create_devm_seqfile() helper
+ function
+
+Some time ago the function debugfs_create_devm_seqfile() was
+introduced in debugfs. The caller simply needs to provide a
+device pointer and read function. The function brcmf_debugfs_add_entry()
+is now simply a wrapper only doing the work for CONFIG_BRCMDBG.
+
+Reviewed-by: Hante Meuleman <meuleman@broadcom.com>
+Reviewed-by: Franky (Zhenhui) Lin <frankyl@broadcom.com>
+Reviewed-by: Daniel (Deognyoun) Kim <dekim@broadcom.com>
+Reviewed-by: Pieter-Paul Giesberts <pieterpg@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/debug.c
++++ b/drivers/net/wireless/brcm80211/brcmfmac/debug.c
+@@ -64,44 +64,12 @@ struct dentry *brcmf_debugfs_get_devdir(
+ 	return drvr->dbgfs_dir;
+ }
+ 
+-struct brcmf_debugfs_entry {
+-	int (*read)(struct seq_file *seq, void *data);
+-	struct brcmf_pub *drvr;
+-};
+-
+-static int brcmf_debugfs_entry_open(struct inode *inode, struct file *f)
+-{
+-	struct brcmf_debugfs_entry *entry = inode->i_private;
+-
+-	return single_open(f, entry->read, entry->drvr->bus_if->dev);
+-}
+-
+-static const struct file_operations brcmf_debugfs_def_ops = {
+-	.owner = THIS_MODULE,
+-	.open = brcmf_debugfs_entry_open,
+-	.release = single_release,
+-	.read = seq_read,
+-	.llseek = seq_lseek
+-};
+-
+ int brcmf_debugfs_add_entry(struct brcmf_pub *drvr, const char *fn,
+ 			    int (*read_fn)(struct seq_file *seq, void *data))
+ {
+-	struct dentry *dentry =  drvr->dbgfs_dir;
+-	struct brcmf_debugfs_entry *entry;
+-
+-	if (IS_ERR_OR_NULL(dentry))
+-		return -ENOENT;
+-
+-	entry = devm_kzalloc(drvr->bus_if->dev, sizeof(*entry), GFP_KERNEL);
+-	if (!entry)
+-		return -ENOMEM;
+-
+-	entry->read = read_fn;
+-	entry->drvr = drvr;
+-
+-	dentry = debugfs_create_file(fn, S_IRUGO, dentry, entry,
+-				     &brcmf_debugfs_def_ops);
++	struct dentry *e;
+ 
+-	return PTR_ERR_OR_ZERO(dentry);
++	e = debugfs_create_devm_seqfile(drvr->bus_if->dev, fn,
++					drvr->dbgfs_dir, read_fn);
++	return PTR_ERR_OR_ZERO(e);
+ }

package/kernel/mac80211/patches/389-brcmfmac-Check-if-firmware-supports-p2p.patch

+From: Pontus Fuchs <pontusf@broadcom.com>
+Date: Thu, 11 Jun 2015 00:12:17 +0200
+Subject: [PATCH] brcmfmac: Check if firmware supports p2p
+
+Add a feature flag to reflect the firmware's p2p capability.
+
+Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
+Reviewed-by: Hante Meuleman <meuleman@broadcom.com>
+Reviewed-by: Arend Van Spriel <arend@broadcom.com>
+Signed-off-by: Pontus Fuchs <pontusf@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/feature.c
++++ b/drivers/net/wireless/brcm80211/brcmfmac/feature.c
+@@ -129,6 +129,7 @@ void brcmf_feat_attach(struct brcmf_pub
+ 		brcmf_feat_iovar_int_get(ifp, BRCMF_FEAT_WOWL, "wowl");
+ 	if (drvr->bus_if->chip != BRCM_CC_43362_CHIP_ID)
+ 		brcmf_feat_iovar_int_set(ifp, BRCMF_FEAT_MBSS, "mbss", 0);
++	brcmf_feat_iovar_int_get(ifp, BRCMF_FEAT_P2P, "p2p");
+ 
+ 	/* set chip related quirks */
+ 	switch (drvr->bus_if->chip) {
+--- a/drivers/net/wireless/brcm80211/brcmfmac/feature.h
++++ b/drivers/net/wireless/brcm80211/brcmfmac/feature.h
+@@ -23,12 +23,14 @@
+  * MCHAN: multi-channel for concurrent P2P.
+  * PNO: preferred network offload.
+  * WOWL: Wake-On-WLAN.
++ * P2P: peer-to-peer
+  */
+ #define BRCMF_FEAT_LIST \
+ 	BRCMF_FEAT_DEF(MBSS) \
+ 	BRCMF_FEAT_DEF(MCHAN) \
+ 	BRCMF_FEAT_DEF(PNO) \
+-	BRCMF_FEAT_DEF(WOWL)
++	BRCMF_FEAT_DEF(WOWL) \
++	BRCMF_FEAT_DEF(P2P)
+ /*
+  * Quirks:
+  *

package/kernel/mac80211/patches/390-brcmfmac-Build-wiphy-mode-and-interface-combinations.patch

+From: Pontus Fuchs <pontusf@broadcom.com>
+Date: Thu, 11 Jun 2015 00:12:18 +0200
+Subject: [PATCH] brcmfmac: Build wiphy mode and interface combinations
+ dynamically
+
+Switch from using semi hard coded interface combinations. This makes
+it easier to announce what the firmware actually supports. This fixes
+the case where brcmfmac announces p2p but the firmware doesn't
+support it.
+
+Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
+Reviewed-by: Hante Meuleman <meuleman@broadcom.com>
+Reviewed-by: Arend Van Spriel <arend@broadcom.com>
+Signed-off-by: Pontus Fuchs <pontusf@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/cfg80211.c
++++ b/drivers/net/wireless/brcm80211/brcmfmac/cfg80211.c
+@@ -52,8 +52,6 @@
+ #define BRCMF_PNO_SCAN_COMPLETE		1
+ #define BRCMF_PNO_SCAN_INCOMPLETE	0
+ 
+-#define BRCMF_IFACE_MAX_CNT		3
+-
+ #define WPA_OUI				"\x00\x50\xF2"	/* WPA OUI */
+ #define WPA_OUI_TYPE			1
+ #define RSN_OUI				"\x00\x0F\xAC"	/* RSN OUI */
+@@ -5639,53 +5637,6 @@ static int brcmf_setup_wiphybands(struct
+ 	return 0;
+ }
+ 
+-static const struct ieee80211_iface_limit brcmf_iface_limits_mbss[] = {
+-	{
+-		.max = 1,
+-		.types = BIT(NL80211_IFTYPE_STATION) |
+-			 BIT(NL80211_IFTYPE_ADHOC)
+-	},
+-	{
+-		.max = 4,
+-		.types = BIT(NL80211_IFTYPE_AP)
+-	},
+-	{
+-		.max = 1,
+-		.types = BIT(NL80211_IFTYPE_P2P_CLIENT) |
+-			 BIT(NL80211_IFTYPE_P2P_GO)
+-	},
+-	{
+-		.max = 1,
+-		.types = BIT(NL80211_IFTYPE_P2P_DEVICE)
+-	}
+-};
+-
+-static const struct ieee80211_iface_limit brcmf_iface_limits_sbss[] = {
+-	{
+-		.max = 2,
+-		.types = BIT(NL80211_IFTYPE_STATION) |
+-			 BIT(NL80211_IFTYPE_ADHOC) |
+-			 BIT(NL80211_IFTYPE_AP)
+-	},
+-	{
+-		.max = 1,
+-		.types = BIT(NL80211_IFTYPE_P2P_CLIENT) |
+-			 BIT(NL80211_IFTYPE_P2P_GO)
+-	},
+-	{
+-		.max = 1,
+-		.types = BIT(NL80211_IFTYPE_P2P_DEVICE)
+-	}
+-};
+-static struct ieee80211_iface_combination brcmf_iface_combos[] = {
+-	{
+-		 .max_interfaces = BRCMF_IFACE_MAX_CNT,
+-		 .num_different_channels = 1,
+-		 .n_limits = ARRAY_SIZE(brcmf_iface_limits_sbss),
+-		 .limits = brcmf_iface_limits_sbss,
+-	}
+-};
+-
+ static const struct ieee80211_txrx_stypes
+ brcmf_txrx_stypes[NUM_NL80211_IFTYPES] = {
+ 	[NL80211_IFTYPE_STATION] = {
+@@ -5715,6 +5666,67 @@ brcmf_txrx_stypes[NUM_NL80211_IFTYPES] =
+ 	}
+ };
+ 
++static int brcmf_setup_ifmodes(struct wiphy *wiphy, struct brcmf_if *ifp)
++{
++	struct ieee80211_iface_combination *combo = NULL;
++	struct ieee80211_iface_limit *limits = NULL;
++	int i = 0, max_iface_cnt;
++
++	combo = kzalloc(sizeof(*combo), GFP_KERNEL);
++	if (!combo)
++		goto err;
++
++	limits = kzalloc(sizeof(*limits) * 4, GFP_KERNEL);
++	if (!limits)
++		goto err;
++
++	wiphy->interface_modes = BIT(NL80211_IFTYPE_STATION) |
++				 BIT(NL80211_IFTYPE_ADHOC) |
++				 BIT(NL80211_IFTYPE_AP);
++
++	if (brcmf_feat_is_enabled(ifp, BRCMF_FEAT_MCHAN))
++		combo->num_different_channels = 2;
++	else
++		combo->num_different_channels = 1;
++
++	if (brcmf_feat_is_enabled(ifp, BRCMF_FEAT_MBSS)) {
++		limits[i].max = 1;
++		limits[i++].types = BIT(NL80211_IFTYPE_STATION);
++		limits[i].max = 4;
++		limits[i++].types = BIT(NL80211_IFTYPE_AP);
++		max_iface_cnt = 5;
++	} else {
++		limits[i].max = 2;
++		limits[i++].types = BIT(NL80211_IFTYPE_STATION) |
++				    BIT(NL80211_IFTYPE_AP);
++		max_iface_cnt = 2;
++	}
++
++	if (brcmf_feat_is_enabled(ifp, BRCMF_FEAT_P2P)) {
++		wiphy->interface_modes |= BIT(NL80211_IFTYPE_P2P_CLIENT) |
++					  BIT(NL80211_IFTYPE_P2P_GO) |
++					  BIT(NL80211_IFTYPE_P2P_DEVICE);
++		limits[i].max = 1;
++		limits[i++].types = BIT(NL80211_IFTYPE_P2P_CLIENT) |
++				    BIT(NL80211_IFTYPE_P2P_GO);
++		limits[i].max = 1;
++		limits[i++].types = BIT(NL80211_IFTYPE_P2P_DEVICE);
++		max_iface_cnt += 2;
++	}
++	combo->max_interfaces = max_iface_cnt;
++	combo->limits = limits;
++	combo->n_limits = i;
++
++	wiphy->iface_combinations = combo;
++	wiphy->n_iface_combinations = 1;
++	return 0;
++
++err:
++	kfree(limits);
++	kfree(combo);
++	return -ENOMEM;
++}
++
+ static void brcmf_wiphy_pno_params(struct wiphy *wiphy)
+ {
+ 	/* scheduled scan settings */
+@@ -5745,7 +5757,6 @@ static void brcmf_wiphy_wowl_params(stru
+ static int brcmf_setup_wiphy(struct wiphy *wiphy, struct brcmf_if *ifp)
+ {
+ 	struct ieee80211_supported_band *band;
+-	struct ieee80211_iface_combination ifc_combo;
+ 	__le32 bandlist[3];
+ 	u32 n_bands;
+ 	int err, i;
+@@ -5753,24 +5764,11 @@ static int brcmf_setup_wiphy(struct wiph
+ 	wiphy->max_scan_ssids = WL_NUM_SCAN_MAX;
+ 	wiphy->max_scan_ie_len = BRCMF_SCAN_IE_LEN_MAX;
+ 	wiphy->max_num_pmkids = WL_NUM_PMKIDS_MAX;
+-	wiphy->interface_modes = BIT(NL80211_IFTYPE_STATION) |
+-				 BIT(NL80211_IFTYPE_ADHOC) |
+-				 BIT(NL80211_IFTYPE_AP) |
+-				 BIT(NL80211_IFTYPE_P2P_CLIENT) |
+-				 BIT(NL80211_IFTYPE_P2P_GO) |
+-				 BIT(NL80211_IFTYPE_P2P_DEVICE);
+-	/* need VSDB firmware feature for concurrent channels */
+-	ifc_combo = brcmf_iface_combos[0];
+-	if (brcmf_feat_is_enabled(ifp, BRCMF_FEAT_MCHAN))
+-		ifc_combo.num_different_channels = 2;
+-	if (brcmf_feat_is_enabled(ifp, BRCMF_FEAT_MBSS)) {
+-		ifc_combo.n_limits = ARRAY_SIZE(brcmf_iface_limits_mbss),
+-		ifc_combo.limits = brcmf_iface_limits_mbss;
+-	}
+-	wiphy->iface_combinations = kmemdup(&ifc_combo,
+-					    sizeof(ifc_combo),
+-					    GFP_KERNEL);
+-	wiphy->n_iface_combinations = ARRAY_SIZE(brcmf_iface_combos);
++
++	err = brcmf_setup_ifmodes(wiphy, ifp);
++	if (err)
++		return err;
++
+ 	wiphy->signal_type = CFG80211_SIGNAL_TYPE_MBM;
+ 	wiphy->cipher_suites = __wl_cipher_suites;
+ 	wiphy->n_cipher_suites = ARRAY_SIZE(__wl_cipher_suites);
+@@ -6035,6 +6033,8 @@ static void brcmf_free_wiphy(struct wiph
+ 	if (!wiphy)
+ 		return;
+ 
++	if (wiphy->iface_combinations)
++		kfree(wiphy->iface_combinations->limits);
+ 	kfree(wiphy->iface_combinations);
+ 	if (wiphy->bands[IEEE80211_BAND_2GHZ]) {
+ 		kfree(wiphy->bands[IEEE80211_BAND_2GHZ]->channels);

package/kernel/mac80211/patches/392-brcmfmac-have-sdio-return-EIO-when-device-communicat.patch

+From: Arend van Spriel <arend@broadcom.com>
+Date: Thu, 11 Jun 2015 00:12:20 +0200
+Subject: [PATCH] brcmfmac: have sdio return -EIO when device communication
+ is not possible
+
+The bus interface functions txctl and rxctl may be used while the device
+can not be accessed, eg. upon driver .remove() callback. This patch will
+immediately return -EIO when this is the case which speeds up the module
+unload.
+
+Reviewed-by: Hante Meuleman <meuleman@broadcom.com>
+Reviewed-by: Franky (Zhenhui) Lin <frankyl@broadcom.com>
+Reviewed-by: Pieter-Paul Giesberts <pieterpg@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/bcmsdh.c
++++ b/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c
+@@ -988,6 +988,7 @@ static void brcmf_sdiod_freezer_detach(s
+ 
+ static int brcmf_sdiod_remove(struct brcmf_sdio_dev *sdiodev)
+ {
++	sdiodev->state = BRCMF_SDIOD_DOWN;
+ 	if (sdiodev->bus) {
+ 		brcmf_sdio_remove(sdiodev->bus);
+ 		sdiodev->bus = NULL;
+--- a/drivers/net/wireless/brcm80211/brcmfmac/sdio.c
++++ b/drivers/net/wireless/brcm80211/brcmfmac/sdio.c
+@@ -2820,6 +2820,8 @@ static int brcmf_sdio_bus_txdata(struct
+ 	struct brcmf_sdio *bus = sdiodev->bus;
+ 
+ 	brcmf_dbg(TRACE, "Enter: pkt: data %p len %d\n", pkt->data, pkt->len);
++	if (sdiodev->state != BRCMF_SDIOD_DATA)
++		return -EIO;
+ 
+ 	/* Add space for the header */
+ 	skb_push(pkt, bus->tx_hdrlen);
+@@ -2948,6 +2950,8 @@ brcmf_sdio_bus_txctl(struct device *dev,
+ 	int ret;
+ 
+ 	brcmf_dbg(TRACE, "Enter\n");
++	if (sdiodev->state != BRCMF_SDIOD_DATA)
++		return -EIO;
+ 
+ 	/* Send from dpc */
+ 	bus->ctrl_frame_buf = msg;
+@@ -3238,6 +3242,8 @@ brcmf_sdio_bus_rxctl(struct device *dev,
+ 	struct brcmf_sdio *bus = sdiodev->bus;
+ 
+ 	brcmf_dbg(TRACE, "Enter\n");
++	if (sdiodev->state != BRCMF_SDIOD_DATA)
++		return -EIO;
+ 
+ 	/* Wait until control frame is available */
+ 	timeleft = brcmf_sdio_dcmd_resp_wait(bus, &bus->rxlen, &pending);