brcmfmac: new functionality and fixes
cover brcmfmac: new functionality and fixes
This small series contains patches adding support of the new critical protocol API in cfg80211. Another new driver feature is an enhancement to firmware-signalling called credit borrowing.
Other changes are fixes for firmware-signalling feature. One of these patches addresses the issue reported by Wei Yongjun, but solved differrent from the patch that he proposed.
Arend van Spriel (4):
brcmfmac: allow scanning to be suppressed in the driver
brcmfmac: flush queue upon MACDESC_DEL firmware signal
brcmfmac: correct error handling in brcmf_fws_init()
brcmfmac: add credit borrowing mechanism
Piotr Haber (1):
brcmfmac: support critical protocol API for DHCP
drivers/net/wireless/brcm80211/brcmfmac/Makefile | 3 +- drivers/net/wireless/brcm80211/brcmfmac/btcoex.c | 498 ++++++++++++++++++++ drivers/net/wireless/brcm80211/brcmfmac/btcoex.h | 29 ++ .../net/wireless/brcm80211/brcmfmac/dhd_linux.c | 5 +- drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c | 128 ++++- .../net/wireless/brcm80211/brcmfmac/wl_cfg80211.c | 56 +++ .../net/wireless/brcm80211/brcmfmac/wl_cfg80211.h | 6 +- 7 files changed, 704 insertions(+), 21 deletions(-) create mode 100644 drivers/net/wireless/brcm80211/brcmfmac/btcoex.c create mode 100644 drivers/net/wireless/brcm80211/brcmfmac/btcoex.h
Signature · 1 line
1.7.10.4
PATCH 1/5 brcmfmac: allow scanning to be suppressed in the driver
During the DHCP protocol exchange it is benificial to suppress scan requests which may decrease time to complete DHCP protocol.
--- drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c | 10 ++++++++++ drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.h | 4 +++- 2 files changed, 13 insertions(+), 1 deletion(-)
drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c +10 -0
@@ -856,6 +856,11 @@ brcmf_cfg80211_escan(struct wiphy *wiphy, struct brcmf_cfg80211_vif *vif, cfg->scan_status);return -EAGAIN ; } +if (test_bit (BRCMF_SCAN_STATUS_SUPPRESS , &cfg->scan_status)) { +brcmf_err ("Scanning suppressed: status (%lu)\n" , + cfg->scan_status); +return -EAGAIN ; + }if (test_bit (BRCMF_VIF_STATUS_CONNECTING , &ifp->vif->sme_state)) {brcmf_err ("Connecting: status (%lu)\n" , ifp->vif->sme_state);return -EAGAIN ;
@@ -3017,6 +3022,11 @@ brcmf_cfg80211_sched_scan_start(struct wiphy *wiphy,brcmf_err ("Scanning already: status (%lu)\n" , cfg->scan_status);return -EAGAIN ; } +if (test_bit (BRCMF_SCAN_STATUS_SUPPRESS , &cfg->scan_status)) { +brcmf_err ("Scanning suppressed: status (%lu)\n" , + cfg->scan_status); +return -EAGAIN ; + }if (!request->n_ssids || !request->n_match_sets) { brcmf_err("Invalid sched scan req!! n_ssids:%d\n",
drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.h +3 -1
@@ -77,14 +77,16 @@/** -* enum brcmf_scan_status - dongle scan status +* enum brcmf_scan_status - scan engine status * * @BRCMF_SCAN_STATUS_BUSY: scanning in progress on dongle. * @BRCMF_SCAN_STATUS_ABORT: scan being aborted on dongle. +* @BRCMF_SCAN_STATUS_SUPPRESS: scanning is suppressed in driver. */ enum brcmf_scan_status {BRCMF_SCAN_STATUS_BUSY ,BRCMF_SCAN_STATUS_ABORT , +BRCMF_SCAN_STATUS_SUPPRESS , };/**
Signature · 1 line
1.7.10.4
PATCH 2/5 brcmfmac: support critical protocol API for DHCP
In reply to Arend van SprielFrom: Piotr Haber <[email protected]>
Adds support for the critical protocol API provided by nl80211 which gives Wifi traffic priority over a Bluetooth (e)SCO connection and disables scanning during DCHP negotiation.
--- drivers/net/wireless/brcm80211/brcmfmac/Makefile | 3 +- drivers/net/wireless/brcm80211/brcmfmac/btcoex.c | 498 ++++++++++++++++++++ drivers/net/wireless/brcm80211/brcmfmac/btcoex.h | 29 ++ .../net/wireless/brcm80211/brcmfmac/wl_cfg80211.c | 46 ++ .../net/wireless/brcm80211/brcmfmac/wl_cfg80211.h | 2 + 5 files changed, 577 insertions(+), 1 deletion(-) create mode 100644 drivers/net/wireless/brcm80211/brcmfmac/btcoex.c create mode 100644 drivers/net/wireless/brcm80211/brcmfmac/btcoex.h
drivers/net/wireless/brcm80211/brcmfmac/Makefile +2 -1
@@ -30,7 +30,8 @@ brcmfmac-objs += \ p2p.o \ dhd_cdc.o \ dhd_common.o \ - dhd_linux.o + dhd_linux.o \ + btcoex.o brcmfmac-$(CONFIG_BRCMFMAC_SDIO) += \ dhd_sdio.o \ bcmsdh.o \
drivers/net/wireless/brcm80211/brcmfmac/btcoex.c new file +498 -0
498 lines not on this page · raw message
drivers/net/wireless/brcm80211/brcmfmac/btcoex.h new file +29 -0
@@ -0,0 +1,29 @@ +/* +* Copyright (c) 2013 Broadcom Corporation +* +* Permission to use, copy, modify, and/or distribute this software for any +* purpose with or without fee is hereby granted, provided that the above +* copyright notice and this permission notice appear in all copies. +* +* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES +* WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +* MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY +* SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION +* OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN +* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +*/ +#ifndef WL_BTCOEX_H_ +#define WL_BTCOEX_H_ + +enum brcmf_btcoex_mode { +BRCMF_BTCOEX_DISABLED , +BRCMF_BTCOEX_ENABLED +}; + +int brcmf_btcoex_attach (struct brcmf_cfg80211_info *cfg); +void brcmf_btcoex_detach (struct brcmf_cfg80211_info *cfg); +int brcmf_btcoex_set_mode (struct brcmf_cfg80211_vif *vif, +enum brcmf_btcoex_mode mode,u16 duration); + +#endif /* WL_BTCOEX_H_ */
drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c +46 -0
88 lines not on this page · raw message
drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.h +2 -0
@@ -351,6 +351,7 @@ struct brcmf_cfg80211_vif_event {* @wiphy: wiphy object for cfg80211 interface. * @conf: dongle configuration. * @p2p: peer-to-peer specific information. +* @btcoex: Bluetooth coexistence information. * @scan_request: cfg80211 scan request object. * @usr_sync: mainly for dongle up/down synchronization. * @bss_list: bss_list holding scanned ap information.
@@ -384,6 +385,7 @@ struct brcmf_cfg80211_info {struct wiphy *wiphy;struct brcmf_cfg80211_conf *conf;struct brcmf_p2p_info p2p; +struct brcmf_btcoex_info *btcoex;struct cfg80211_scan_request *scan_request;struct mutex usr_sync;struct brcmf_scan_results *bss_list;
Signature · 1 line
1.7.10.4
PATCH 3/5 brcmfmac: flush queue upon MACDESC_DEL firmware signal
In reply to Arend van SprielWhen firmware signals the driver to remove a destination entry it may have sk_buff packets queued for it. These should be freed.
--- drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c +3 -2
@@ -871,9 +871,10 @@ int brcmf_fws_macdesc_indicate(struct brcmf_fws_info *fws, u8 type, u8 *data) entry = &fws->desc.nodes[mac_handle &0x1F ];if (type ==BRCMF_FWS_TYPE_MACDESC_DEL ) {brcmf_dbg (TRACE ,"deleting mac %pM idx %d\n" , addr, ifidx); -if (entry->occupied) +if (entry->occupied) { +brcmf_fws_mac_desc_cleanup (fws, entry,-1 );brcmf_fws_clear_mac_descriptor (entry); -else + }else fws->stats.mac_update_failed++;return 0 ; }
Signature · 1 line
1.7.10.4
PATCH 4/5 brcmfmac: correct error handling in brcmf_fws_init()
In reply to Arend van SprielIn brcmf_fws_init() the error flows were not properly handled and the caller ignored the return value. The only action that is allowed to fail in brcmf_fws_init() is setting the tlv in firmware as the feature is not supported on all devices.
--- .../net/wireless/brcm80211/brcmfmac/dhd_linux.c | 5 +++- drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c | 28 ++++++++++++++------ 2 files changed, 24 insertions(+), 9 deletions(-)
drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c +4 -1
@@ -899,7 +899,10 @@ int brcmf_bus_start(struct device *dev) goto fail; drvr->fw_signals = true; - (void )brcmf_fws_init (drvr); + ret =brcmf_fws_init (drvr); +if (ret <0 ) + goto fail; +brcmf_fws_add_interface (ifp); drvr->config =brcmf_cfg80211_attach (drvr, bus_if->dev);
drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c +20 -8
@@ -1897,16 +1897,20 @@ int brcmf_fws_init(struct brcmf_pub *drvr)BRCMF_FWS_FLAGS_CREDIT_STATUS_SIGNALS |BRCMF_FWS_FLAGS_HOST_PROPTXSTATUS_ACTIVE ; - rc =brcmf_fil_iovar_int_set (drvr->iflist[0 ],"tlv" , tlv); + rc =brcmf_fweh_register (drvr,BRCMF_E_FIFO_CREDIT_MAP , + brcmf_fws_notify_credit_map);if (rc <0 ) { -brcmf_err ("failed to set bdcv2 tlv signaling\n" ); +brcmf_err ("register credit map handler failed\n" ); goto fail; } -if (brcmf_fweh_register (drvr,BRCMF_E_FIFO_CREDIT_MAP , - brcmf_fws_notify_credit_map)) { -brcmf_err ("register credit map handler failed\n" ); - goto fail; +/* setting the iovar may fail if feature is unsupported +* so leave the rc as is so driver initialization can +* continue. +*/ +if (brcmf_fil_iovar_int_set (drvr->iflist[0 ],"tlv" , tlv)) { +brcmf_err ("failed to set bdcv2 tlv signaling\n" ); + goto fail_event; }brcmf_fws_hanger_init (&drvr->fws->hanger);
@@ -1922,9 +1926,9 @@ int brcmf_fws_init(struct brcmf_pub *drvr) drvr->fw_signals ? "enabled" : "disabled", tlv);return 0 ; +fail_event: +brcmf_fweh_unregister (drvr,BRCMF_E_FIFO_CREDIT_MAP ); fail: -/* disable flow control entirely */ - drvr->fw_signals = false;brcmf_fws_deinit (drvr);return rc; }
@@ -1937,6 +1941,14 @@ void brcmf_fws_deinit(struct brcmf_pub *drvr)if (!fws)return ; +/* disable firmware signalling entirely +* to avoid using the workqueue. +*/ + drvr->fw_signals = false; + +if (drvr->fws->fws_wq) +destroy_workqueue (drvr->fws->fws_wq); +/* cleanup */ brcmf_fws_lock (drvr, flags);brcmf_fws_cleanup (fws,-1 );
Signature · 1 line
1.7.10.4
PATCH 5/5 brcmfmac: add credit borrowing mechanism
In reply to Arend van SprielThe firmware provides credits to the driver per WMM-AC. When only AC_BE are to be transmitted to the firmware the driver may use credits from other priorities to send AC_BE packets towards the firmware.
--- drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c | 95 ++++++++++++++++++-- 1 file changed, 87 insertions(+), 8 deletions(-)
drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c +87 -8
@@ -21,6 +21,7 @@#include <linux/netdevice.h> #include <linux/etherdevice.h> #include <linux/err.h> +#include <linux/jiffies.h> #include <uapi/linux/nl80211.h> #include <net/cfg80211.h>
@@ -271,6 +272,9 @@ struct brcmf_skbuff_cb { brcmu_maskget32(txs, BRCMF_FWS_TXSTAT_ ## field ## _MASK, \ BRCMF_FWS_TXSTAT_ ## field ## _SHIFT) +/* How long to defer borrowing in jiffies */ +#define BRCMF_FWS_BORROW_DEFER_PERIOD (HZ / 10) +/** * enum brcmf_fws_fifo - fifo indices used by dongle firmware. *
@@ -425,9 +429,11 @@ struct brcmf_fws_info {struct work_struct fws_dequeue_work;u32 fifo_enqpkt[BRCMF_FWS_FIFO_COUNT ];int fifo_credit[BRCMF_FWS_FIFO_COUNT ]; +int credits_borrowed[BRCMF_FWS_FIFO_AC_VO +1 ];int deq_node_pos[BRCMF_FWS_FIFO_COUNT ];u32 fifo_credit_map;u32 fifo_delay_map; +unsigned long borrow_defer_timestamp; };/*
@@ -997,9 +1003,34 @@ static int brcmf_fws_request_indicate(struct brcmf_fws_info *fws, u8 type,static void brcmf_fws_return_credits (struct brcmf_fws_info *fws,u8 fifo,u8 credits) { +int lender_ac; +int *borrowed; +int *fifo_credit; +if (!credits)return ; +if ((fifo ==BRCMF_FWS_FIFO_AC_BE ) && + (fws->credits_borrowed[0 ])) { +for (lender_ac =BRCMF_FWS_FIFO_AC_VO ; lender_ac >=0 ; + lender_ac--) { + borrowed = &fws->credits_borrowed[lender_ac]; +if (*borrowed) { + fws->fifo_credit_map |= (1 << lender_ac); + fifo_credit = &fws->fifo_credit[lender_ac]; +if (*borrowed >= credits) { + *borrowed -= credits; + *fifo_credit += credits; +return ; + }else { + credits -= *borrowed; + *fifo_credit += *borrowed; + *borrowed =0 ; + } + } + } + } + fws->fifo_credit_map |=1 << fifo; fws->fifo_credit[fifo] += credits; }
@@ -1658,6 +1689,26 @@ fail: fws->stats.rollback_success++; } +static int brcmf_fws_borrow_credit (struct brcmf_fws_info *fws) +{ +int lender_ac; + +if (time_after (fws->borrow_defer_timestamp, jiffies)) +return -ENAVAIL ; + +for (lender_ac =0 ; lender_ac <=BRCMF_FWS_FIFO_AC_VO ; lender_ac++) { +if (fws->fifo_credit[lender_ac]) { + fws->credits_borrowed[lender_ac]++; + fws->fifo_credit[lender_ac]--; +if (fws->fifo_credit[lender_ac] ==0 ) + fws->fifo_credit_map &= ~(1 << lender_ac); +brcmf_dbg (TRACE ,"borrow credit from: %d\n" , lender_ac); +return 0 ; + } + } +return -ENAVAIL ; +} +static int brcmf_fws_consume_credit (struct brcmf_fws_info *fws,int fifo,struct sk_buff *skb) {
@@ -1691,8 +1742,17 @@ static int brcmf_fws_consume_credit(struct brcmf_fws_info *fws, int fifo,return 0 ; } +if (fifo !=BRCMF_FWS_FIFO_AC_BE ) + fws->borrow_defer_timestamp = jiffies + +BRCMF_FWS_BORROW_DEFER_PERIOD ; +if (!(*credit)) { -brcmf_dbg (TRACE ,"exit: credits depleted\n" ); +/* Try to borrow a credit from other queue */ +if (fifo ==BRCMF_FWS_FIFO_AC_BE && +brcmf_fws_borrow_credit (fws) ==0 ) +return 0 ; + +brcmf_dbg (TRACE ,"exit: ac=%d, credits depleted\n" , fifo);return -ENAVAIL ; } (*credit)--;
@@ -1741,6 +1801,7 @@ rollback:int brcmf_fws_process_skb (struct brcmf_if *ifp,struct sk_buff *skb) {struct brcmf_pub *drvr = ifp->drvr; +struct brcmf_fws_info *fws = drvr->fws;struct brcmf_skbuff_cb *skcb =brcmf_skbcb (skb);struct ethhdr *eh = (struct ethhdr *)(skb->data);ulong flags;
@@ -1755,7 +1816,7 @@ int brcmf_fws_process_skb(struct brcmf_if *ifp, struct sk_buff *skb)if (ntohs (eh->h_proto) ==ETH_P_PAE )atomic_inc (&ifp->pend_8021x_cnt); -if (!brcmf_fws_fc_active (drvr->fws)) { +if (!brcmf_fws_fc_active (fws)) {/* If the protocol uses a data header, apply it */ brcmf_proto_hdrpush (drvr, ifp->ifidx,0 , skb);
@@ -1765,7 +1826,7 @@ int brcmf_fws_process_skb(struct brcmf_if *ifp, struct sk_buff *skb)/* set control buffer information */ skcb->if_flags =0 ; - skcb->mac =brcmf_fws_find_mac_desc (drvr->fws, ifp, eh->h_dest); + skcb->mac =brcmf_fws_find_mac_desc (fws, ifp, eh->h_dest); skcb->state =BRCMF_FWS_SKBSTATE_NEW ;brcmf_skb_if_flags_set_field (skb,INDEX , ifp->ifidx);if (!multicast)
@@ -1777,15 +1838,17 @@ int brcmf_fws_process_skb(struct brcmf_if *ifp, struct sk_buff *skb)brcmf_fws_lock (drvr, flags);if (skcb->mac->suppressed || -brcmf_fws_mac_desc_closed (drvr->fws, skcb->mac, fifo) || +brcmf_fws_mac_desc_closed (fws, skcb->mac, fifo) ||brcmu_pktq_mlen (&skcb->mac->psq,3 << (fifo *2 )) || (!multicast && -brcmf_fws_consume_credit (drvr->fws, fifo, skb) <0 )) { +brcmf_fws_consume_credit (fws, fifo, skb) <0 )) {/* enqueue the packet in delayQ */ drvr->fws->fifo_delay_map |=1 << fifo; -brcmf_fws_enq (drvr->fws,BRCMF_FWS_SKBSTATE_DELAYED , fifo, skb); +brcmf_fws_enq (fws,BRCMF_FWS_SKBSTATE_DELAYED , fifo, skb); }else { -brcmf_fws_commit_skb (drvr->fws, fifo, skb); +if (brcmf_fws_commit_skb (fws, fifo, skb)) +if (!multicast) +brcmf_skb_pick_up_credit (fws, fifo, skb); }brcmf_fws_unlock (drvr, flags);return 0 ;
@@ -1858,7 +1921,23 @@ static void brcmf_fws_dequeue_worker(struct work_struct *worker) BRCMF_SKB_IF_FLAGS_CREDITCHECK_MASK) credit++; } - fws->fifo_credit[fifo] -= credit; +if ((fifo ==BRCMF_FWS_FIFO_AC_BE ) && + (credit == fws->fifo_credit[fifo])) { + fws->fifo_credit[fifo] -= credit; +while (brcmf_fws_borrow_credit (fws) ==0 ) { + skb =brcmf_fws_deq (fws, fifo); +if (!skb) { +brcmf_fws_return_credits (fws, fifo,1 ); +break ; + } +if (brcmf_fws_commit_skb (fws, fifo, skb)) { +brcmf_fws_return_credits (fws, fifo,1 ); +break ; + } + } + }else { + fws->fifo_credit[fifo] -= credit; + } }brcmf_fws_unlock (fws->drvr, flags); }
Signature · 1 line
1.7.10.4