Skip to contentSkip to conversation

brcmfmac: wowlan support and cleanup

PATCH New Arend van Spriel 1 participant 7 messages Sep 30, 2014 Networking drivers (wireless)

lore
Share & tools
lore
#0 lore raw

cover brcmfmac: wowlan support and cleanup

This series contains WoWLAN support for PCIe chipsets. This feature depends on firmware capability. Other changes involve minor fixes that are rare enough to be submitted to wireless-next and cleanups.

The series is intended for 3.18 and applies to the master branch of the wireless-next repository.

Arend van Spriel (1):
brcmfmac: assure P2P discovery is disabled when setting P2P_DEVICE mac
address

Hante Meuleman (5):
brcmfmac: On scan timeout do send received results.
brcmfmac: Fix sign issue with IOCTL return code in msgbuf.
brcmfmac: Avoid usage of GFP_ATOMIC.
brcmfmac: Fix crash on cleanup.
brcmfmac: Add wowl support for PCIE devices.

 drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h  |  11 ++
 drivers/net/wireless/brcm80211/brcmfmac/feature.c  |   2 +
 drivers/net/wireless/brcm80211/brcmfmac/feature.h  |   3 +-
 drivers/net/wireless/brcm80211/brcmfmac/flowring.c |   4 +-
 .../net/wireless/brcm80211/brcmfmac/fwil_types.h   |  56 +++++++++
 drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c |   2 +-
 drivers/net/wireless/brcm80211/brcmfmac/msgbuf.c   | 133 +++++++++++++++++----
 drivers/net/wireless/brcm80211/brcmfmac/p2p.c      |   5 +-
 drivers/net/wireless/brcm80211/brcmfmac/pcie.c     |  74 ++++++++++--
 .../net/wireless/brcm80211/brcmfmac/wl_cfg80211.c  | 114 +++++++++++++-----
 .../net/wireless/brcm80211/brcmfmac/wl_cfg80211.h  |   7 +-
 drivers/net/wireless/brcm80211/include/defs.h      |   5 +-
 12 files changed, 340 insertions(+), 76 deletions(-)
Signature · 1 line
1.9.1
#1 lore raw

PATCH 1/6 brcmfmac: On scan timeout do send received results.

From: Hante Meuleman <[email protected]>

Increase driver scan timeout from 8 to 10 seconds and report results to cfg80211. Without this patch the already received results were dropped on driver timeout.

---
 drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c | 8 +++-----
 drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.h | 3 +--
 2 files changed, 4 insertions(+), 7 deletions(-)
drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c +3 -5
index 12a60ca..6860501 100644
@@ -2426,7 +2426,7 @@ static s32 brcmf_inform_bss(struct brcmf_cfg80211_info *cfg)
 	s32 err = 0;
 	int i;
 
-	bss_list = cfg->bss_list;
+	bss_list = (struct brcmf_scan_results *)cfg->escan_info.escan_buf;
 	if (bss_list->count != 0 &&
 	    bss_list->version != BRCMF_BSS_INFO_VERSION) {
 		brcmf_err("Version %d != WL_BSS_INFO_VERSION\n",
@@ -2602,6 +2602,7 @@ static void brcmf_cfg80211_escan_timeout_worker(struct work_struct *work)
 			container_of(work, struct brcmf_cfg80211_info,
 				     escan_timeout_work);
 
+	brcmf_inform_bss(cfg);
 	brcmf_notify_escan_complete(cfg, cfg->escan_info.ifp, true, true);
 }
 
@@ -2740,12 +2741,9 @@ brcmf_cfg80211_escan_handler(struct brcmf_if *ifp,
 		if (brcmf_p2p_scan_finding_common_channel(cfg, NULL))
 			goto exit;
 		if (cfg->scan_request) {
-			cfg->bss_list = (struct brcmf_scan_results *)
-				cfg->escan_info.escan_buf;
 			brcmf_inform_bss(cfg);
 			aborted = status != BRCMF_E_STATUS_SUCCESS;
-			brcmf_notify_escan_complete(cfg, ifp, aborted,
-						    false);
+			brcmf_notify_escan_complete(cfg, ifp, aborted, false);
 		} else
 			brcmf_dbg(SCAN, "Ignored scan complete result 0x%x\n",
 				  status);
drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.h +1 -2
index f9fb109..82f8778 100644
@@ -35,7 +35,7 @@
 #define WL_SCAN_PASSIVE_TIME		120
 
 #define WL_ESCAN_BUF_SIZE		(1024 * 64)
-#define WL_ESCAN_TIMER_INTERVAL_MS	8000 /* E-Scan timeout */
+#define WL_ESCAN_TIMER_INTERVAL_MS	10000 /* E-Scan timeout */
 
 #define WL_ESCAN_ACTION_START		1
 #define WL_ESCAN_ACTION_CONTINUE	2
@@ -371,7 +371,6 @@ struct brcmf_cfg80211_info {
 	struct brcmf_btcoex_info *btcoex;
 	struct cfg80211_scan_request *scan_request;
 	struct mutex usr_sync;
-	struct brcmf_scan_results *bss_list;
 	struct brcmf_cfg80211_scan_req scan_req_int;
 	struct wl_cfg80211_bss_info *bss_info;
 	struct brcmf_cfg80211_ie ie;
Signature · 1 line
1.9.1
#2 lore raw

PATCH 2/6 brcmfmac: Fix sign issue with IOCTL return code in msgbuf.

In reply to Arend van Spriel

From: Hante Meuleman <[email protected]>

Need a cast to assure correct value is propagated.

---
 drivers/net/wireless/brcm80211/brcmfmac/msgbuf.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/net/wireless/brcm80211/brcmfmac/msgbuf.c +3 -2
index 8f8b937..106e6bf 100644
@@ -230,7 +230,7 @@ struct brcmf_msgbuf {
 	dma_addr_t ioctbuf_handle;
 	u32 ioctbuf_phys_hi;
 	u32 ioctbuf_phys_lo;
-	u32 ioctl_resp_status;
+	int ioctl_resp_status;
 	u32 ioctl_resp_ret_len;
 	u32 ioctl_resp_pktid;
 
@@ -767,7 +767,8 @@ brcmf_msgbuf_process_ioctl_complete(struct brcmf_msgbuf *msgbuf, void *buf)
 
 	ioctl_resp = (struct msgbuf_ioctl_resp_hdr *)buf;
 
-	msgbuf->ioctl_resp_status = le16_to_cpu(ioctl_resp->compl_hdr.status);
+	msgbuf->ioctl_resp_status =
+			(s16)le16_to_cpu(ioctl_resp->compl_hdr.status);
 	msgbuf->ioctl_resp_ret_len = le16_to_cpu(ioctl_resp->resp_len);
 	msgbuf->ioctl_resp_pktid = le32_to_cpu(ioctl_resp->msg.request_id);
 
Signature · 1 line
1.9.1
#3 lore raw

PATCH 3/6 brcmfmac: Avoid usage of GFP_ATOMIC.

In reply to Arend van Spriel

From: Hante Meuleman <[email protected]>

Msgbuf is using GFP_ATOMIC where GFP_KERNEL is also sufficient. On some platforms the coherent DMA memory is very limited when using GFP_ATOMIC. This patch changes usage of GFP_ATOMIC to GFP_KERNEL and uses worker to make this possible for creation of flowring.

---
 drivers/net/wireless/brcm80211/brcmfmac/flowring.c |   4 +-
 drivers/net/wireless/brcm80211/brcmfmac/msgbuf.c   | 128 +++++++++++++++++----
 2 files changed, 108 insertions(+), 24 deletions(-)
drivers/net/wireless/brcm80211/brcmfmac/flowring.c +2 -2
index a1016b8..1faa929 100644
@@ -354,7 +354,7 @@ struct brcmf_flowring *brcmf_flowring_attach(struct device *dev, u16 nrofrings)
 	struct brcmf_flowring *flow;
 	u32 i;
 
-	flow = kzalloc(sizeof(*flow), GFP_ATOMIC);
+	flow = kzalloc(sizeof(*flow), GFP_KERNEL);
 	if (flow) {
 		flow->dev = dev;
 		flow->nrofrings = nrofrings;
@@ -364,7 +364,7 @@ struct brcmf_flowring *brcmf_flowring_attach(struct device *dev, u16 nrofrings)
 		for (i = 0; i < ARRAY_SIZE(flow->hash); i++)
 			flow->hash[i].ifidx = BRCMF_FLOWRING_INVALID_IFIDX;
 		flow->rings = kcalloc(nrofrings, sizeof(*flow->rings),
-				      GFP_ATOMIC);
+				      GFP_KERNEL);
 		if (!flow->rings) {
 			kfree(flow);
 			flow = NULL;
drivers/net/wireless/brcm80211/brcmfmac/msgbuf.c +106 -22

231 lines not on this page · raw message

Signature · 1 line
1.9.1
#4 lore raw

PATCH 4/6 brcmfmac: assure P2P discovery is disabled when setting P2P_DEVICE mac address

In reply to Arend van Spriel

In order to provision the P2P_DEVICE mac address using p2p_da_override iovar the discovery interface must be disabled. On some targets setting the mac address failed so disable the discovery interface to be certain.

---
 drivers/net/wireless/brcm80211/brcmfmac/p2p.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/net/wireless/brcm80211/brcmfmac/p2p.c +4 -1
index 1d78a91..d54c58a 100644
@@ -440,8 +440,11 @@ static int brcmf_p2p_set_firmware(struct brcmf_if *ifp, u8 *p2p_mac)
 
 	/* In case of COB type, firmware has default mac address
 	 * After Initializing firmware, we have to set current mac address to
-	 * firmware for P2P device address
+	 * firmware for P2P device address. This must be done with discovery
+	 * disabled.
 	 */
+	brcmf_fil_iovar_int_set(ifp, "p2p_disc", 0);
+
 	ret = brcmf_fil_iovar_data_set(ifp, "p2p_da_override", p2p_mac,
 				       ETH_ALEN);
 	if (ret)
Signature · 1 line
1.9.1
#5 lore raw

PATCH 5/6 brcmfmac: Fix crash on cleanup.

In reply to Arend van Spriel

From: Hante Meuleman <[email protected]>

When driver gets unloaded due to error situation there is a chance a packet gets received while fws has already been cleaned up. This will result in kernel crash. This patch adds a check to avoid this crash.

---
 drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c +1 -1
index d42f7d0..183f08d 100644
@@ -1636,7 +1636,7 @@ int brcmf_fws_hdrpull(struct brcmf_pub *drvr, int ifidx, s16 signal_len,
 	if (!signal_len)
 		return 0;
 	/* if flow control disabled, skip to packet data and leave */
-	if (!fws->fw_signals) {
+	if ((!fws) || (!fws->fw_signals)) {
 		skb_pull(skb, signal_len);
 		return 0;
 	}
Signature · 1 line
1.9.1
#6 lore raw

PATCH 6/6 brcmfmac: Add wowl support for PCIE devices.

In reply to Arend van Spriel

From: Hante Meuleman <[email protected]>

Add basic wowl (magic packet and disconnect) support. This patch adds this support only for PCIE bus devices. This feature requires FW which has support for wowl built in.

---
 drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h  |  11 +++
 drivers/net/wireless/brcm80211/brcmfmac/feature.c  |   2 +
 drivers/net/wireless/brcm80211/brcmfmac/feature.h  |   3 +-
 .../net/wireless/brcm80211/brcmfmac/fwil_types.h   |  56 +++++++++++
 drivers/net/wireless/brcm80211/brcmfmac/pcie.c     |  74 +++++++++++---
 .../net/wireless/brcm80211/brcmfmac/wl_cfg80211.c  | 106 ++++++++++++++++-----
 .../net/wireless/brcm80211/brcmfmac/wl_cfg80211.h  |   4 +
 drivers/net/wireless/brcm80211/include/defs.h      |   5 +-
 8 files changed, 220 insertions(+), 41 deletions(-)
drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h +11 -0
index 3122b86..80e73a1 100644
@@ -67,6 +67,7 @@ struct brcmf_bus_dcmd {
  * @txctl: transmit a control request message to dongle.
  * @rxctl: receive a control response message from dongle.
  * @gettxq: obtain a reference of bus transmit queue (optional).
+ * @wowl_config: specify if dongle is configured for wowl when going to suspend
  *
  * This structure provides an abstract interface towards the
  * bus specific driver. For control messages to common driver
@@ -80,6 +81,7 @@ struct brcmf_bus_ops {
 	int (*txctl)(struct device *dev, unsigned char *msg, uint len);
 	int (*rxctl)(struct device *dev, unsigned char *msg, uint len);
 	struct pktq * (*gettxq)(struct device *dev);
+	void (*wowl_config)(struct device *dev, bool enabled);
 };
 
 
@@ -114,6 +116,7 @@ struct brcmf_bus_msgbuf {
  * @dstats: dongle-based statistical data.
  * @dcmd_list: bus/device specific dongle initialization commands.
  * @chip: device identifier of the dongle chip.
+ * @wowl_supported: is wowl supported by bus driver.
  * @chiprev: revision of the dongle chip.
  */
 struct brcmf_bus {
@@ -131,6 +134,7 @@ struct brcmf_bus {
 	u32 chip;
 	u32 chiprev;
 	bool always_use_fws_queue;
+	bool wowl_supported;
 
 	struct brcmf_bus_ops *ops;
 	struct brcmf_bus_msgbuf *msgbuf;
@@ -177,6 +181,13 @@ struct pktq *brcmf_bus_gettxq(struct brcmf_bus *bus)
 	return bus->ops->gettxq(bus->dev);
 }
 
+static inline
+void brcmf_bus_wowl_config(struct brcmf_bus *bus, bool enabled)
+{
+	if (bus->ops->wowl_config)
+		bus->ops->wowl_config(bus->dev, enabled);
+}
+
 static inline bool brcmf_bus_ready(struct brcmf_bus *bus)
 {
 	return bus->state == BRCMF_BUS_LOAD || bus->state == BRCMF_BUS_DATA;
drivers/net/wireless/brcm80211/brcmfmac/feature.c +2 -0
index 50877e3..aed53ac 100644
@@ -107,6 +107,8 @@ void brcmf_feat_attach(struct brcmf_pub *drvr)
 	struct brcmf_if *ifp = drvr->iflist[0];
 
 	brcmf_feat_iovar_int_get(ifp, BRCMF_FEAT_MCHAN, "mchan");
+	if (drvr->bus_if->wowl_supported)
+		brcmf_feat_iovar_int_get(ifp, BRCMF_FEAT_WOWL, "wowl");
 
 	/* set chip related quirks */
 	switch (drvr->bus_if->chip) {
drivers/net/wireless/brcm80211/brcmfmac/feature.h +2 -1
index 961d175..b9a796d 100644
@@ -22,7 +22,8 @@
  * MCHAN: multi-channel for concurrent P2P.
  */
 #define BRCMF_FEAT_LIST \
-	BRCMF_FEAT_DEF(MCHAN)
+	BRCMF_FEAT_DEF(MCHAN) \
+	BRCMF_FEAT_DEF(WOWL)
 /*
  * Quirks:
  *
drivers/net/wireless/brcm80211/brcmfmac/fwil_types.h +56 -0

62 lines not on this page · raw message

drivers/net/wireless/brcm80211/brcmfmac/pcie.c +61 -13

146 lines not on this page · raw message

drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c +83 -23

151 lines not on this page · raw message

drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.h +4 -0
index 82f8778..6abf94e 100644
@@ -363,6 +363,8 @@ struct brcmf_cfg80211_vif_event {
  * @vif_list: linked list of vif instances.
  * @vif_cnt: number of vif instances.
  * @vif_event: vif event signalling.
+ * @wowl_enabled; set during suspend, is wowl used.
+ * @pre_wowl_pmmode: intermediate storage of pm mode during wowl.
  */
 struct brcmf_cfg80211_info {
 	struct wiphy *wiphy;
@@ -396,6 +398,8 @@ struct brcmf_cfg80211_info {
 	struct brcmf_cfg80211_vif_event vif_event;
 	struct completion vif_disabled;
 	struct brcmu_d11inf d11inf;
+	bool wowl_enabled;
+	u32 pre_wowl_pmmode;
 };
 
 /**
drivers/net/wireless/brcm80211/include/defs.h +1 -4
index fb7cbcf..8d1e85e 100644
@@ -74,10 +74,6 @@
 #define	BRCM_BAND_2G		2	/* 2.4 Ghz */
 #define	BRCM_BAND_ALL		3	/* all bands */
 
-/* Values for PM */
-#define PM_OFF	0
-#define PM_MAX	1
-
 /* Debug levels */
 #define BRCM_DL_INFO		0x00000001
 #define BRCM_DL_MAC80211	0x00000002
@@ -87,6 +83,7 @@
 #define BRCM_DL_DMA		0x00000020
 #define BRCM_DL_HT		0x00000040
 
+/* Values for PM */
 #define PM_OFF	0
 #define PM_MAX	1
 #define PM_FAST 2
Signature · 1 line
1.9.1