brcm80211: cleanup fixes and out-of-order fix
v2 cover brcm80211: cleanup fixes and out-of-order fix
Resending this series containing a couple of small cleanup fixes and one fix from Hante to get rid of out-of-order transmit seen doing UDP iperf.
This series is now intended for 3.14 and applies to the master branch of the wireless-next repository. It replaces the original patch series with Message-ID:
With the extern removal patch from networking tree that series no longer applied.
Arend van Spriel (5):
brcmfmac: add separate function for passing bus tx overhead
brcmfmac: replace dongle command list with .preinit() callback
brcmfmac: start netif queues only when setup is completed successful
brcmfmac: reduce logging noise accessing SDIO SleepCSR register
brcmsmac: select CONFIG_BCMA when possible
Franky Lin (1):
brcmfmac: remove empty brcmf_proto_stop
Hante Meuleman (1):
brcmfmac: Update fwsignal to fix out of order tx.
drivers/net/wireless/brcm80211/Kconfig | 3 +- .../net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c | 19 ++- drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h | 15 +- drivers/net/wireless/brcm80211/brcmfmac/dhd_cdc.c | 5 - .../net/wireless/brcm80211/brcmfmac/dhd_common.c | 15 +- .../net/wireless/brcm80211/brcmfmac/dhd_linux.c | 36 +++-- .../net/wireless/brcm80211/brcmfmac/dhd_proto.h | 3 - drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c | 60 +++---- drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c | 167 +++++++++++++++++--- drivers/net/wireless/brcm80211/brcmfmac/usb.c | 4 +- 10 files changed, 236 insertions(+), 91 deletions(-)
Signature · 1 line
1.7.10.4
PATCH v2 1/7 brcmfmac: Update fwsignal to fix out of order tx.
From: Hante Meuleman <[email protected]>
When using fwsignal it is possible that tx packets get delivered out of order. This patch fixes that by reordering suppressed packets and tracking generation bit and sequence number per packet.
--- drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c | 167 +++++++++++++++++--- 1 file changed, 146 insertions(+), 21 deletions(-)
drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c +146 -21
@@ -105,6 +105,9 @@ static struct { };#undef BRCMF_FWS_TLV_DEF +#define BRCMF_FWS_TYPE_SEQ_LEN 2 + +static const char *brcmf_fws_get_tlv_name (enum brcmf_fws_tlv_type id) {int i;
@@ -147,8 +150,15 @@ static const char *brcmf_fws_get_tlv_name(enum brcmf_fws_tlv_type id)#define BRCMF_FWS_HTOD_FLAG_PKTFROMHOST 0x01#define BRCMF_FWS_HTOD_FLAG_PKT_REQUESTED 0x02 -#define BRCMF_FWS_RET_OK_NOSCHEDULE 0 -#define BRCMF_FWS_RET_OK_SCHEDULE 1 +#define BRCMF_FWS_RET_OK_NOSCHEDULE 0 +#define BRCMF_FWS_RET_OK_SCHEDULE 1 + +#define BRCMF_FWS_MODE_REUSESEQ_SHIFT 3/* seq reuse */ +#define BRCMF_FWS_MODE_SET_REUSESEQ (x, val) ((x) = \ + ((x) & ~(1 << BRCMF_FWS_MODE_REUSESEQ_SHIFT)) | \ + (((val) & 1) << BRCMF_FWS_MODE_REUSESEQ_SHIFT)) +#define BRCMF_FWS_MODE_GET_REUSESEQ (x) \ + (((x) >> BRCMF_FWS_MODE_REUSESEQ_SHIFT) & 1)/** * enum brcmf_fws_skb_state - indicates processing state of skb.
@@ -171,6 +181,7 @@ enum brcmf_fws_skb_state {* @bus_flags: 2 bytes reserved for bus specific parameters * @if_flags: holds interface index and packet related flags. * @htod: host to device packet identifier (used in PKTTAG tlv). +* @htod_seq: this 16-bit is original seq number for every suppress packet. * @state: transmit state of the packet. * @mac: descriptor related to destination for this packet. *
@@ -181,6 +192,7 @@ struct brcmf_skbuff_cb {u16 bus_flags;u16 if_flags;u32 htod; +u16 htod_seq;enum brcmf_fws_skb_state state;struct brcmf_fws_mac_descriptor *mac; };
@@ -257,6 +269,22 @@ struct brcmf_skbuff_cb { BRCMF_SKB_HTOD_TAG_ ## field ## _MASK, \ BRCMF_SKB_HTOD_TAG_ ## field ## _SHIFT) +#define BRCMF_SKB_HTOD_SEQ_FROMFW_MASK 0x2000 +#define BRCMF_SKB_HTOD_SEQ_FROMFW_SHIFT 13 +#define BRCMF_SKB_HTOD_SEQ_FROMDRV_MASK 0x1000 +#define BRCMF_SKB_HTOD_SEQ_FROMDRV_SHIFT 12 +#define BRCMF_SKB_HTOD_SEQ_NR_MASK 0x0fff +#define BRCMF_SKB_HTOD_SEQ_NR_SHIFT 0 + +#define brcmf_skb_htod_seq_set_field (skb, field, value) \ + brcmu_maskset16(&(brcmf_skbcb(skb)->htod_seq), \ + BRCMF_SKB_HTOD_SEQ_ ## field ## _MASK, \ + BRCMF_SKB_HTOD_SEQ_ ## field ## _SHIFT, (value)) +#define brcmf_skb_htod_seq_get_field (skb, field) \ + brcmu_maskget16(brcmf_skbcb(skb)->htod_seq, \ + BRCMF_SKB_HTOD_SEQ_ ## field ## _MASK, \ + BRCMF_SKB_HTOD_SEQ_ ## field ## _SHIFT) +#define BRCMF_FWS_TXSTAT_GENERATION_MASK 0x80000000#define BRCMF_FWS_TXSTAT_GENERATION_SHIFT 31#define BRCMF_FWS_TXSTAT_FLAGS_MASK 0x78000000
@@ -265,8 +293,8 @@ struct brcmf_skbuff_cb {#define BRCMF_FWS_TXSTAT_FIFO_SHIFT 24#define BRCMF_FWS_TXSTAT_HSLOT_MASK 0x00FFFF00#define BRCMF_FWS_TXSTAT_HSLOT_SHIFT 8 -#define BRCMF_FWS_TXSTAT_PKTID_MASK 0x00FFFFFF -#define BRCMF_FWS_TXSTAT_PKTID_SHIFT 0 +#define BRCMF_FWS_TXSTAT_FREERUN_MASK 0x000000FF +#define BRCMF_FWS_TXSTAT_FREERUN_SHIFT 0#define brcmf_txstatus_get_field (txs, field) \ brcmu_maskget32(txs, BRCMF_FWS_TXSTAT_ ## field ## _MASK, \
@@ -443,6 +471,7 @@ struct brcmf_fws_info {unsigned long borrow_defer_timestamp;bool bus_flow_blocked;bool creditmap_received; +u8 mode; };/*
@@ -812,13 +841,16 @@ static int brcmf_fws_hdrpush(struct brcmf_fws_info *fws, struct sk_buff *skb)u16 data_offset =0 ;u8 fillers;__le32 pkttag =cpu_to_le32 (brcmf_skbcb (skb)->htod); +__le16 pktseq =cpu_to_le16 (brcmf_skbcb (skb)->htod_seq); -brcmf_dbg (TRACE ,"enter: %s, idx=%d pkttag=0x%08X, hslot=%d\n" , +brcmf_dbg (TRACE ,"enter: %s, idx=%d hslot=%d htod %X seq %X\n" , entry->name,brcmf_skb_if_flags_get_field (skb,INDEX ), -le32_to_cpu (pkttag), (le32_to_cpu (pkttag) >>8 ) &0xffff ); + (le32_to_cpu (pkttag) >>8 ) &0xffff , +brcmf_skbcb (skb)->htod,brcmf_skbcb (skb)->htod_seq);if (entry->send_tim_signal) data_offset +=2 +BRCMF_FWS_TYPE_PENDING_TRAFFIC_BMP_LEN ; - +if (BRCMF_FWS_MODE_GET_REUSESEQ (fws->mode)) + data_offset +=BRCMF_FWS_TYPE_SEQ_LEN ;/* +2 is for Type[1] and Len[1] in TLV, plus TIM signal */ data_offset +=2 +BRCMF_FWS_TYPE_PKTTAG_LEN ; fillers =round_up (data_offset,4 ) - data_offset;
@@ -830,7 +862,12 @@ static int brcmf_fws_hdrpush(struct brcmf_fws_info *fws, struct sk_buff *skb) wlh[0 ] =BRCMF_FWS_TYPE_PKTTAG ; wlh[1 ] =BRCMF_FWS_TYPE_PKTTAG_LEN ;memcpy (&wlh[2 ], &pkttag,sizeof (pkttag)); - wlh +=BRCMF_FWS_TYPE_PKTTAG_LEN +2 ; +if (BRCMF_FWS_MODE_GET_REUSESEQ (fws->mode)) { + wlh[1 ] +=BRCMF_FWS_TYPE_SEQ_LEN ; +memcpy (&wlh[2 +BRCMF_FWS_TYPE_PKTTAG_LEN ], &pktseq, +sizeof (pktseq)); + } + wlh += wlh[1 ] +2 ;if (entry->send_tim_signal) { entry->send_tim_signal =0 ;
@@ -875,6 +912,7 @@ static bool brcmf_fws_tim_update(struct brcmf_fws_info *fws,/* create a dummy packet and sent that. The traffic */ /* bitmap info will automatically be attached to that packet */ len =BRCMF_FWS_TYPE_PKTTAG_LEN +2 + +BRCMF_FWS_TYPE_SEQ_LEN +BRCMF_FWS_TYPE_PENDING_TRAFFIC_BMP_LEN +2 +4 + fws->drvr->hdrlen; skb =brcmu_pkt_buf_get_skb (len);
@@ -884,6 +922,8 @@ static bool brcmf_fws_tim_update(struct brcmf_fws_info *fws, skcb =brcmf_skbcb (skb); skcb->mac = entry; skcb->state =BRCMF_FWS_SKBSTATE_TIM ; + skcb->htod =0 ; + skcb->htod_seq =0 ; bus = fws->drvr->bus_if; err =brcmf_fws_hdrpush (fws, skb);if (err ==0 ) {
@@ -1172,8 +1212,13 @@ static int brcmf_fws_enq(struct brcmf_fws_info *fws, {int prec =2 * fifo;u32 *qfull_stat = &fws->stats.delayq_full_error; -struct brcmf_fws_mac_descriptor *entry; +struct pktq *pq; +struct sk_buff_head *queue; +struct sk_buff *p_head; +struct sk_buff *p_tail; +u32 fr_new; +u32 fr_compare; entry =brcmf_skbcb (p)->mac;if (entry ==NULL ) {
@@ -1185,9 +1230,55 @@ static int brcmf_fws_enq(struct brcmf_fws_info *fws,if (state ==BRCMF_FWS_SKBSTATE_SUPPRESSED ) { prec +=1 ; qfull_stat = &fws->stats.supprq_full_error; - } -if (brcmu_pktq_penq (&entry->psq, prec, p) ==NULL ) { +/* Fix out of order delivery of frames. Dont assume frame */ +/* can be inserted at the end, but look for correct position */ + pq = &entry->psq; +if (pktq_full (pq) ||pktq_pfull (pq, prec)) { + *qfull_stat +=1 ; +return -ENFILE ; + } + queue = &pq->q[prec].skblist; + + p_head =skb_peek (queue); + p_tail =skb_peek_tail (queue); + fr_new =brcmf_skb_htod_tag_get_field (p,FREERUN ); + +while (p_head != p_tail) { + fr_compare =brcmf_skb_htod_tag_get_field (p_tail, +FREERUN ); +/* be sure to handle wrap of 256 */ +if (((fr_new > fr_compare) && + ((fr_new - fr_compare) <128 )) || + ((fr_new < fr_compare) && + ((fr_compare - fr_new) >128 ))) +break ; + p_tail =skb_queue_prev (queue, p_tail); + } +/* Position found. Determine what to do */ +if (p_tail ==NULL ) { +/* empty list */ +__skb_queue_tail (queue, p); + }else { + fr_compare =brcmf_skb_htod_tag_get_field (p_tail, +FREERUN ); +if (((fr_new > fr_compare) && + ((fr_new - fr_compare) <128 )) || + ((fr_new < fr_compare) && + ((fr_compare - fr_new) >128 ))) { +/* After tail */ +__skb_queue_after (queue, p_tail, p); + }else { +/* Before tail */ +__skb_insert (p, p_tail->prev, p_tail, queue); + } + } + +/* Complete the counters and statistics */ + pq->len++; +if (pq->hi_prec < prec) + pq->hi_prec = (u8 ) prec; + }else if (brcmu_pktq_penq (&entry->psq, prec, p) ==NULL ) { *qfull_stat +=1 ;return -ENFILE ; }
@@ -1277,7 +1368,8 @@ done: }static int brcmf_fws_txstatus_suppressed (struct brcmf_fws_info *fws,int fifo, -struct sk_buff *skb,u32 genbit) +struct sk_buff *skb,u32 genbit, +u16 seq) {struct brcmf_fws_mac_descriptor *entry =brcmf_skbcb (skb)->mac;u32 hslot;
@@ -1298,6 +1390,14 @@ static int brcmf_fws_txstatus_suppressed(struct brcmf_fws_info *fws, int fifo, ret =brcmf_proto_hdrpull (fws->drvr, false, &ifidx, skb);if (ret ==0 ) +brcmf_skb_htod_tag_set_field (skb,GENERATION , genbit); +brcmf_skbcb (skb)->htod_seq = seq; +if (brcmf_skb_htod_seq_get_field (skb,FROMFW )) { +brcmf_skb_htod_seq_set_field (skb,FROMDRV ,1 ); +brcmf_skb_htod_seq_set_field (skb,FROMFW ,0 ); + }else { +brcmf_skb_htod_seq_set_field (skb,FROMDRV ,0 ); + } ret =brcmf_fws_enq (fws,BRCMF_FWS_SKBSTATE_SUPPRESSED , fifo, skb);if (ret !=0 ) {
@@ -1317,7 +1417,7 @@ static int brcmf_fws_txstatus_suppressed(struct brcmf_fws_info *fws, int fifo,static int brcmf_fws_txs_process (struct brcmf_fws_info *fws,u8 flags,u32 hslot, -u32 genbit) +u32 genbit,u16 seq) {u32 fifo;int ret;
@@ -1360,8 +1460,8 @@ brcmf_fws_txs_process(struct brcmf_fws_info *fws, u8 flags, u32 hslot,if (entry->suppressed && entry->suppr_transit_count) entry->suppr_transit_count--; -brcmf_dbg (DATA ,"%s flags %X htod %X\n" , entry->name, skcb->if_flags, - skcb->htod); +brcmf_dbg (DATA ,"%s flags %d htod %X seq %X\n" , entry->name, flags, + skcb->htod, seq);/* pick up the implicit credit from this packet */ fifo =brcmf_skb_htod_tag_get_field (skb,FIFO );
@@ -1374,7 +1474,8 @@ brcmf_fws_txs_process(struct brcmf_fws_info *fws, u8 flags, u32 hslot,brcmf_fws_macdesc_return_req_credit (skb);if (!remove_from_hanger) - ret =brcmf_fws_txstatus_suppressed (fws, fifo, skb, genbit); + ret =brcmf_fws_txstatus_suppressed (fws, fifo, skb, genbit, + seq);if (remove_from_hanger || ret)brcmf_txfinalize (fws->drvr, skb, true);
@@ -1406,10 +1507,12 @@ static int brcmf_fws_fifocreditback_indicate(struct brcmf_fws_info *fws,static int brcmf_fws_txstatus_indicate (struct brcmf_fws_info *fws,u8 *data) {__le32 status_le; +__le16 seq_le;u32 status;u32 hslot;u32 genbit;u8 flags; +u16 seq; fws->stats.txs_indicate++;memcpy (&status_le, data,sizeof (status_le));
@@ -1417,9 +1520,16 @@ static int brcmf_fws_txstatus_indicate(struct brcmf_fws_info *fws, u8 *data) flags =brcmf_txstatus_get_field (status,FLAGS ); hslot =brcmf_txstatus_get_field (status,HSLOT ); genbit =brcmf_txstatus_get_field (status,GENERATION ); +if (BRCMF_FWS_MODE_GET_REUSESEQ (fws->mode)) { +memcpy (&seq_le, &data[BRCMF_FWS_TYPE_PKTTAG_LEN ], +sizeof (seq_le)); + seq =le16_to_cpu (seq_le); + }else { + seq =0 ; + }brcmf_fws_lock (fws); -brcmf_fws_txs_process (fws, flags, hslot, genbit); +brcmf_fws_txs_process (fws, flags, hslot, genbit, seq);brcmf_fws_unlock (fws);return BRCMF_FWS_RET_OK_NOSCHEDULE ; }
@@ -1610,8 +1720,8 @@ static void brcmf_fws_precommit_skb(struct brcmf_fws_info *fws, int fifo,struct brcmf_fws_mac_descriptor *entry = skcb->mac;u8 flags; -brcmf_skb_if_flags_set_field (p,TRANSMIT ,1 ); -brcmf_skb_htod_tag_set_field (p,GENERATION , entry->generation); +if (skcb->state !=BRCMF_FWS_SKBSTATE_SUPPRESSED ) +brcmf_skb_htod_tag_set_field (p,GENERATION , entry->generation); flags =BRCMF_FWS_HTOD_FLAG_PKTFROMHOST ;if (brcmf_skb_if_flags_get_field (p,REQUESTED )) {/*
@@ -1652,7 +1762,7 @@ static void brcmf_fws_rollback_toq(struct brcmf_fws_info *fws, fws->stats.rollback_failed++; hslot =brcmf_skb_htod_tag_get_field (skb,HSLOT );brcmf_fws_txs_process (fws,BRCMF_FWS_TXSTATUS_HOST_TOSSED , - hslot,0 ); + hslot,0 ,0 ); }else { fws->stats.rollback_success++;brcmf_fws_return_credits (fws, fifo,1 );
@@ -1732,6 +1842,8 @@ static int brcmf_fws_assign_htod(struct brcmf_fws_info *fws, struct sk_buff *p,struct brcmf_skbuff_cb *skcb =brcmf_skbcb (p);int rc, hslot; + skcb->htod =0 ; + skcb->htod_seq =0 ; hslot =brcmf_fws_hanger_get_free_slot (&fws->hanger);brcmf_skb_htod_tag_set_field (p,HSLOT , hslot);brcmf_skb_htod_tag_set_field (p,FREERUN , skcb->mac->seq[fifo]);
@@ -1908,6 +2020,7 @@ int brcmf_fws_init(struct brcmf_pub *drvr)struct brcmf_fws_info *fws;u32 tlv =BRCMF_FWS_FLAGS_RSSI_SIGNALS ;int rc; +u32 mode; drvr->fws =kzalloc (sizeof (*(drvr->fws)),GFP_KERNEL );if (!drvr->fws) {
@@ -1966,6 +2079,18 @@ int brcmf_fws_init(struct brcmf_pub *drvr)if (brcmf_fil_iovar_int_set (drvr->iflist[0 ],"ampdu_hostreorder" ,1 ))brcmf_dbg (INFO ,"enabling AMPDU host-reorder failed\n" ); +/* Enable seq number reuse, if supported */ +if (brcmf_fil_iovar_int_get (drvr->iflist[0 ],"wlfc_mode" , &mode) ==0 ) { +if (BRCMF_FWS_MODE_GET_REUSESEQ (mode)) { + mode =0 ; +BRCMF_FWS_MODE_SET_REUSESEQ (mode,1 ); +if (brcmf_fil_iovar_int_set (drvr->iflist[0 ], +"wlfc_mode" , mode) ==0 ) { +BRCMF_FWS_MODE_SET_REUSESEQ (fws->mode,1 ); + } + } + } +brcmf_fws_hanger_init (&fws->hanger);brcmf_fws_macdesc_init (&fws->desc.other,NULL ,0 );brcmf_fws_macdesc_set_name (fws, &fws->desc.other);
@@ -2022,7 +2147,7 @@ void brcmf_fws_bustxfail(struct brcmf_fws_info *fws, struct sk_buff *skb) }brcmf_fws_lock (fws); hslot =brcmf_skb_htod_tag_get_field (skb,HSLOT ); -brcmf_fws_txs_process (fws,BRCMF_FWS_TXSTATUS_HOST_TOSSED , hslot,0 ); +brcmf_fws_txs_process (fws,BRCMF_FWS_TXSTATUS_HOST_TOSSED , hslot,0 ,0 );brcmf_fws_unlock (fws); }
Signature · 1 line
1.7.10.4
PATCH v2 2/7 brcmfmac: add separate function for passing bus tx overhead
In reply to Arend van SprielThe common driver needs the packet overhead for the bus in order to reserve headroom for sk_buffs. For the SDIO driver this depends on firmware features so it is not possible to provide it in the brcmf_attach() call.
--- drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h | 3 ++- drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c | 14 ++++++++++++-- drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c | 4 +++- drivers/net/wireless/brcm80211/brcmfmac/usb.c | 4 ++-- 4 files changed, 19 insertions(+), 6 deletions(-)
drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h +2 -1
@@ -139,7 +139,7 @@ bool brcmf_c_prec_enq(struct device *dev, struct pktq *q, struct sk_buff *pkt,void brcmf_rx_frame (struct device *dev,struct sk_buff *rxp);/* Indication from bus module regarding presence/insertion of dongle. */ -int brcmf_attach (uint bus_hdrlen,struct device *dev); +int brcmf_attach (struct device *dev);/* Indication from bus module regarding removal/absence of dongle */ void brcmf_detach (struct device *dev);/* Indication from bus module that dongle should be reset */
@@ -151,6 +151,7 @@ void brcmf_txflowblock(struct device *dev, bool state);void brcmf_txcomplete (struct device *dev,struct sk_buff *txp,bool success);int brcmf_bus_start (struct device *dev); +void brcmf_bus_add_txhdrlen (struct device *dev,uint len);#ifdef CONFIG_BRCMFMAC_SDIO void brcmf_sdio_exit (void );
drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c +12 -2
@@ -1016,7 +1016,7 @@ void brcmf_del_if(struct brcmf_pub *drvr, s32 bssidx) } } -int brcmf_attach (uint bus_hdrlen,struct device *dev) +int brcmf_attach (struct device *dev) {struct brcmf_pub *drvr =NULL ;int ret =0 ;
@@ -1031,7 +1031,7 @@ int brcmf_attach(uint bus_hdrlen, struct device *dev)mutex_init (&drvr->proto_block);/* Link to bus module */ - drvr->hdrlen = bus_hdrlen; + drvr->hdrlen =0 ; drvr->bus_if =dev_get_drvdata (dev); drvr->bus_if->drvr = drvr;
@@ -1138,6 +1138,16 @@ fail:return 0 ; } +void brcmf_bus_add_txhdrlen (struct device *dev,uint len) +{ +struct brcmf_bus *bus_if =dev_get_drvdata (dev); +struct brcmf_pub *drvr = bus_if->drvr; + +if (drvr) { + drvr->hdrlen += len; + } +} +static void brcmf_bus_detach (struct brcmf_pub *drvr) {brcmf_dbg (TRACE ,"Enter\n" );
drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c +3 -1
@@ -3983,7 +3983,7 @@ void *brcmf_sdbrcm_probe(u32 regsva, struct brcmf_sdio_dev *sdiodev) bus->tx_hdrlen =SDPCM_HWHDR_LEN +SDPCM_SWHDR_LEN ;/* Attach to the common layer, reserve hdr space */ - ret =brcmf_attach (bus->tx_hdrlen, bus->sdiodev->dev); + ret =brcmf_attach (bus->sdiodev->dev);if (ret !=0 ) {brcmf_err ("brcmf_attach failed\n" ); goto fail;
@@ -4027,6 +4027,8 @@ void *brcmf_sdbrcm_probe(u32 regsva, struct brcmf_sdio_dev *sdiodev)list_add (&dlst->list, &bus->sdiodev->bus_if->dcmd_list); } +brcmf_bus_add_txhdrlen (bus->sdiodev->dev, bus->tx_hdrlen); +/* if firmware path present try to download and bring up bus */ ret =brcmf_bus_start (bus->sdiodev->dev);if (ret !=0 ) {
drivers/net/wireless/brcm80211/brcmfmac/usb.c +2 -2
@@ -1255,7 +1255,7 @@ static int brcmf_usb_probe_cb(struct brcmf_usbdev_info *devinfo) bus->chiprev = bus_pub->chiprev;/* Attach to the common driver interface */ - ret =brcmf_attach (0 , dev); + ret =brcmf_attach (dev);if (ret) {brcmf_err ("brcmf_attach failed\n" ); goto fail;
@@ -1454,7 +1454,7 @@ static int brcmf_usb_resume(struct usb_interface *intf)struct brcmf_usbdev_info *devinfo =brcmf_usb_get_businfo (&usb->dev);brcmf_dbg (USB ,"Enter\n" ); -if (!brcmf_attach (0 , devinfo->dev)) +if (!brcmf_attach (devinfo->dev))return brcmf_bus_start (&usb->dev);return 0 ;
Signature · 1 line
1.7.10.4
PATCH v2 3/7 brcmfmac: replace dongle command list with .preinit() callback
In reply to Arend van SprielThe bus-specific interface allowed a list of dongle commands to be provided to the common driver part. However, upcoming functionality requires a more dynamic behaviour. Hence the list is replaced by a new callback function so the bus-specific driver part can implement this behaviour.
--- drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h | 12 +++- .../net/wireless/brcm80211/brcmfmac/dhd_common.c | 15 +---- .../net/wireless/brcm80211/brcmfmac/dhd_linux.c | 10 +++- drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c | 58 ++++++++++---------- 4 files changed, 51 insertions(+), 44 deletions(-)
drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h +11 -1
@@ -34,6 +34,7 @@ struct brcmf_bus_dcmd {/** * struct brcmf_bus_ops - bus callback operations. * +* @preinit: execute bus/device specific dongle init commands (optional). * @init: prepare for communication with dongle. * @stop: clear pending frames, disable data flow. * @txdata: send a data frame to the dongle. When the data
@@ -51,6 +52,7 @@ struct brcmf_bus_dcmd {* indicated otherwise these callbacks are mandatory. */ struct brcmf_bus_ops { +int (*preinit)(struct device *dev);int (*init)(struct device *dev);void (*stop)(struct device *dev);int (*txdata)(struct device *dev,struct sk_buff *skb);
@@ -85,7 +87,6 @@ struct brcmf_bus {unsigned long tx_realloc;u32 chip;u32 chiprev; -struct list_head dcmd_list;struct brcmf_bus_ops *ops; };
@@ -93,6 +94,13 @@ struct brcmf_bus {/* * callback wrappers */ +static inline int brcmf_bus_preinit (struct brcmf_bus *bus) +{ +if (!bus->ops->preinit) +return 0 ; +return bus->ops->preinit (bus->dev); +} +static inline int brcmf_bus_init (struct brcmf_bus *bus) {return bus->ops->init (bus->dev);
@@ -151,6 +159,8 @@ void brcmf_txflowblock(struct device *dev, bool state);void brcmf_txcomplete (struct device *dev,struct sk_buff *txp,bool success);int brcmf_bus_start (struct device *dev); +s32 brcmf_iovar_data_set (struct device *dev,char *name,void *data, +u32 len);void brcmf_bus_add_txhdrlen (struct device *dev,uint len);#ifdef CONFIG_BRCMFMAC_SDIO
drivers/net/wireless/brcm80211/brcmfmac/dhd_common.c +2 -13
@@ -257,8 +257,6 @@ int brcmf_c_preinit_dcmds(struct brcmf_if *ifp)u8 buf[BRCMF_DCMD_SMLEN ];char *ptr;s32 err; -struct brcmf_bus_dcmd *cmdlst; -struct list_head *cur, *q;/* retreive mac address */ err = brcmf_fil_iovar_data_get(ifp, "cur_etheraddr", ifp->mac_addr,
@@ -342,17 +340,8 @@ int brcmf_c_preinit_dcmds(struct brcmf_if *ifp)brcmf_c_pktfilter_offload_enable (ifp,BRCMF_DEFAULT_PACKET_FILTER ,0 , true); -/* set bus specific command if there is any */ -list_for_each_safe (cur, q, &ifp->drvr->bus_if->dcmd_list) { - cmdlst = list_entry(cur, struct brcmf_bus_dcmd, list); -if (cmdlst->name && cmdlst->param && cmdlst->param_len) { -brcmf_fil_iovar_data_set (ifp, cmdlst->name, - cmdlst->param, - cmdlst->param_len); - } -list_del (cur); -kfree (cmdlst); - } +/* do bus specific preinit here */ + err =brcmf_bus_preinit (ifp->drvr->bus_if); done:return err; }
drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c +8 -2
@@ -1048,8 +1048,6 @@ int brcmf_attach(struct device *dev)/* attach firmware event handler */ brcmf_fweh_attach (drvr); -INIT_LIST_HEAD (&drvr->bus_if->dcmd_list); -return ret; fail:
@@ -1206,6 +1204,14 @@ void brcmf_detach(struct device *dev)kfree (drvr); } +s32 brcmf_iovar_data_set (struct device *dev,char *name,void *data,u32 len) +{ +struct brcmf_bus *bus_if =dev_get_drvdata (dev); +struct brcmf_if *ifp = bus_if->drvr->iflist[0 ]; + +return brcmf_fil_iovar_data_set (ifp, name, data, len); +} +static int brcmf_get_pend_8021x_cnt (struct brcmf_if *ifp) {return atomic_read (&ifp->pend_8021x_cnt);
drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c +30 -28
82 lines not on this page · raw message
Signature · 1 line
1.7.10.4
PATCH v2 4/7 brcmfmac: start netif queues only when setup is completed successful
In reply to Arend van SprielMoving the call to netif_start_queue() after brcmf_cfg80211_up() is completed successful. If not return -EIO instead of -1 as that results in 'Operation not permitted' which can put user on wrong track.
--- drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)
drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c +4 -5
@@ -769,7 +769,6 @@ static int brcmf_netdev_open(struct net_device *ndev)struct brcmf_pub *drvr = ifp->drvr;struct brcmf_bus *bus_if = drvr->bus_if;u32 toe_ol; -s32 ret =0 ;brcmf_dbg (TRACE ,"Enter, idx=%d\n" , ifp->bssidx);
@@ -788,14 +787,14 @@ static int brcmf_netdev_open(struct net_device *ndev)else ndev->features &= ~NETIF_F_IP_CSUM ; -/* Allow transmit calls */ -netif_start_queue (ndev);if (brcmf_cfg80211_up (ndev)) {brcmf_err ("failed to bring up cfg80211\n" ); -return -1 ; +return -EIO ; } -return ret; +/* Allow transmit calls */ +netif_start_queue (ndev); +return 0 ; }static const struct net_device_ops brcmf_netdev_ops_pri = {
Signature · 1 line
1.7.10.4
PATCH v2 5/7 brcmfmac: remove empty brcmf_proto_stop
In reply to Arend van SprielFrom: Franky Lin <[email protected]>
remove empty brcmf_proto_stop from protocol layer
--- drivers/net/wireless/brcm80211/brcmfmac/dhd_cdc.c | 5 ----- drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c | 3 --- drivers/net/wireless/brcm80211/brcmfmac/dhd_proto.h | 3 --- 3 files changed, 11 deletions(-)
drivers/net/wireless/brcm80211/brcmfmac/dhd_cdc.c +0 -5
@@ -385,8 +385,3 @@ void brcmf_proto_detach(struct brcmf_pub *drvr)kfree (drvr->prot); drvr->prot =NULL ; } - -void brcmf_proto_stop (struct brcmf_pub *drvr) -{ -/* Nothing to do for CDC */ -}
drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c +0 -3
@@ -1150,9 +1150,6 @@ static void brcmf_bus_detach(struct brcmf_pub *drvr)brcmf_dbg (TRACE ,"Enter\n" );if (drvr) { -/* Stop the protocol module */ -brcmf_proto_stop (drvr); -/* Stop the bus module */ brcmf_bus_stop (drvr->bus_if); }
drivers/net/wireless/brcm80211/brcmfmac/dhd_proto.h +0 -3
@@ -27,9 +27,6 @@ int brcmf_proto_attach(struct brcmf_pub *drvr);/* Unlink, frees allocated protocol memory (including brcmf_proto) */ void brcmf_proto_detach (struct brcmf_pub *drvr); -/* Stop protocol: sync w/dongle state. */ -void brcmf_proto_stop (struct brcmf_pub *drvr); -/* Add any protocol-specific data header. * Caller must reserve prot_hdrlen prepend space. */
Signature · 1 line
1.7.10.4
PATCH v2 6/7 brcmfmac: reduce logging noise accessing SDIO SleepCSR register
In reply to Arend van SprielThe SleepCSR register is accessed to wakeup the device from the host side. Depending on the state of the device this may take multiple attempts. The failed attempt are not real failures so reduce the log level specifically for this register. The calling function will scream when the multiple attempts all failed.
--- .../net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-)
drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c +15 -4
@@ -156,10 +156,21 @@ int brcmf_sdioh_request_byte(struct brcmf_sdio_dev *sdiodev, uint rw, uint func, } } -if (err_ret) -brcmf_err ("Failed to %s byte F%d:@0x%05x=%02x, Err: %d\n" , - rw ?"write" :"read" , func, regaddr, *byte, err_ret); - +if (err_ret) { +/* +* SleepCSR register access can fail when +* waking up the device so reduce this noise +* in the logs. +*/ +if (regaddr !=SBSDIO_FUNC1_SLEEPCSR ) +brcmf_err ("Failed to %s byte F%d:@0x%05x=%02x, Err: %d\n" , + rw ?"write" :"read" , func, regaddr, *byte, + err_ret); +else +brcmf_dbg (SDIO ,"Failed to %s byte F%d:@0x%05x=%02x, Err: %d\n" , + rw ?"write" :"read" , func, regaddr, *byte, + err_ret); + }return err_ret; }
Signature · 1 line
1.7.10.4
PATCH v2 7/7 brcmsmac: select CONFIG_BCMA when possible
In reply to Arend van SprielThe brcmsmac relies BCMA functionality to access the device. This patch selects CONFIG_BCMA when CONFIG_BCMA_POSSIBLE is set. This way the user does not need to be select BCMA to make the brcmsmac driver show up in his menuconfig.
--- drivers/net/wireless/brcm80211/Kconfig | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/net/wireless/brcm80211/Kconfig +2 -1
@@ -4,7 +4,8 @@ config BRCMUTIL config BRCMSMAC tristate "Broadcom IEEE802.11n PCIe SoftMAC WLAN driver" depends on MAC80211 - depends on BCMA + depends on BCMA_POSSIBLE + select BCMA select BRCMUTIL select FW_LOADER select CRC_CCITT
Signature · 1 line
1.7.10.4