brcmfmac: handle firmware signals requesting for packets

The firmware can request the host driver for packets, by sending
either the MAC_REQUEST_CREDIT or the MAC_REQUEST_PACKET primitive.
This patch adds handling of these primitives.

Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
Reviewed-by: Hante Meuleman <meuleman@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/brcm80211/brcmfmac/dhd_dbg.h b/drivers/net/wireless/brcm80211/brcmfmac/dhd_dbg.h
index e1058892dccc0741b3c0b24213bf3be260f8d574..d259ae5d22370f0b25ef09764aff784389e79404 100644 (file)
--- a/drivers/net/wireless/brcm80211/brcmfmac/dhd_dbg.h
+++ b/drivers/net/wireless/brcm80211/brcmfmac/dhd_dbg.h
@@ -146,6 +146,8 @@ struct brcmf_fws_stats {
        u32 mac_update_failed;
        u32 mac_ps_update_failed;
        u32 if_update_failed;
+       u32 packet_request_failed;
+       u32 credit_request_failed;
        u32 rollback_success;
        u32 rollback_failed;
        u32 delayq_full_error;

diff --git a/drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c b/drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c
index 57cbfb661d58cb605d5838a2935eb90ab521070e..619fff34c2188d58230e5add59b1f830ffd688a5 100644 (file)
--- a/drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c
@@ -959,6 +959,29 @@ fail:
        return ret;
 }
 
+static int brcmf_fws_request_indicate(struct brcmf_fws_info *fws, u8 type,
+                                     u8 *data)
+{
+       struct brcmf_fws_mac_descriptor *entry;
+
+       entry = &fws->desc.nodes[data[1] & 0x1F];
+       if (!entry->occupied) {
+               if (type == BRCMF_FWS_TYPE_MAC_REQUEST_CREDIT)
+                       fws->stats.credit_request_failed++;
+               else
+                       fws->stats.packet_request_failed++;
+               return -ESRCH;
+       }
+
+       if (type == BRCMF_FWS_TYPE_MAC_REQUEST_CREDIT)
+               entry->requested_credit = data[0];
+       else
+               entry->requested_packet = data[0];
+
+       entry->ac_bitmap = data[2];
+       return 0;
+}
+
 static void brcmf_fws_return_credits(struct brcmf_fws_info *fws,
                                     u8 fifo, u8 credits)
 {
@@ -1366,8 +1389,6 @@ int brcmf_fws_hdrpull(struct brcmf_pub *drvr, int ifidx, s16 signal_len,
                        break;
 
                switch (type) {
-               case BRCMF_FWS_TYPE_MAC_REQUEST_CREDIT:
-               case BRCMF_FWS_TYPE_MAC_REQUEST_PACKET:
                case BRCMF_FWS_TYPE_HOST_REORDER_RXPKTS:
                case BRCMF_FWS_TYPE_COMP_TXSTATUS:
                        break;
@@ -1383,6 +1404,10 @@ int brcmf_fws_hdrpull(struct brcmf_pub *drvr, int ifidx, s16 signal_len,
                case BRCMF_FWS_TYPE_INTERFACE_CLOSE:
                        brcmf_fws_interface_state_indicate(fws, type, data);
                        break;
+               case BRCMF_FWS_TYPE_MAC_REQUEST_CREDIT:
+               case BRCMF_FWS_TYPE_MAC_REQUEST_PACKET:
+                       brcmf_fws_request_indicate(fws, type, data);
+                       break;
                case BRCMF_FWS_TYPE_TXSTATUS:
                        brcmf_fws_txstatus_indicate(fws, data);
                        break;