1 From 82bc9ab6a8f577d2174a736c33f3d4ecf7d9ef47 Mon Sep 17 00:00:00 2001
2 From: Arend Van Spriel <arend.vanspriel@broadcom.com>
3 Date: Fri, 15 Jul 2016 12:16:12 +0200
4 Subject: [PATCH] brcmfmac: restore stopping netdev queue when bus clogs up
6 Content-Type: text/plain; charset=UTF-8
7 Content-Transfer-Encoding: 8bit
9 When the host-interface bus has hard time handling transmit packets
10 it informs higher layer about this and it would stop the netdev
11 queue when needed. However, since commit 9cd18359d31e ("brcmfmac:
12 Make FWS queueing configurable.") this was broken. With this patch
13 the behaviour is restored.
15 Cc: stable@vger.kernel.org # v4.5, v4.6, v4.7
16 Fixes: 9cd18359d31e ("brcmfmac: Make FWS queueing configurable.")
17 Tested-by: Per Förlin <per.forlin@gmail.com>
18 Reviewed-by: Hante Meuleman <hante.meuleman@broadcom.com>
19 Reviewed-by: Pieter-Paul Giesberts <pieter-paul.giesberts@broadcom.com>
20 Reviewed-by: Franky Lin <franky.lin@broadcom.com>
21 Signed-off-by: Arend van Spriel <arend.vanspriel@broadcom.com>
22 Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
24 .../broadcom/brcm80211/brcmfmac/fwsignal.c | 22 +++++++++++++++++-----
25 1 file changed, 17 insertions(+), 5 deletions(-)
27 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwsignal.c
28 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwsignal.c
29 @@ -2469,10 +2469,22 @@ void brcmf_fws_bustxfail(struct brcmf_fw
30 void brcmf_fws_bus_blocked(struct brcmf_pub *drvr, bool flow_blocked)
32 struct brcmf_fws_info *fws = drvr->fws;
33 + struct brcmf_if *ifp;
36 - fws->bus_flow_blocked = flow_blocked;
38 - brcmf_fws_schedule_deq(fws);
40 - fws->stats.bus_flow_block++;
41 + if (fws->avoid_queueing) {
42 + for (i = 0; i < BRCMF_MAX_IFS; i++) {
43 + ifp = drvr->iflist[i];
44 + if (!ifp || !ifp->ndev)
46 + brcmf_txflowblock_if(ifp, BRCMF_NETIF_STOP_REASON_FLOW,
50 + fws->bus_flow_blocked = flow_blocked;
52 + brcmf_fws_schedule_deq(fws);
54 + fws->stats.bus_flow_block++;