brcmfmac: Configure keep-alive packet on suspend

When entering suspend as a client station with wowlan enabled,
the Wi-Fi link is supposed to be maintained. In that state, no
more data is generated from client side, and the link stays idle
as long the station is suspended and as long the AP as no data to
transmit.

However, most of the APs kick-off such 'inactive' stations after
few minutes, causing unexpected disconnect (reconnect, etc...).

The usual way to prevent this is to submit a Null function frame
periodically as a keep-alive. This is something that can be host
/software generated (e.g. wpa_supplicant), but that needs to be
offloaded to the Wi-Fi controller in case of suspended host.

This change enables firmware generated keep-alive frames when
entering wowlan suspend, using the 'mkeep_alive' IOVAR.

Signed-off-by: Loic Poulain <loic.poulain@linaro.org>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Link: https://lore.kernel.org/r/1637596046-21651-1-git-send-email-loic.poulain@linaro.org

diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
index fb727778312c388015a91491f8135af922c7794f..1679361f187bf33f1b515143c48c9451e3465424 100644 (file)
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
@@ -3901,6 +3901,24 @@ static void brcmf_configure_wowl(struct brcmf_cfg80211_info *cfg,
        cfg->wowl.active = true;
 }
 
+static int brcmf_keepalive_start(struct brcmf_if *ifp, unsigned int interval)
+{
+       struct brcmf_mkeep_alive_pkt_le kalive = {0};
+       int ret = 0;
+
+       /* Configure Null function/data keepalive */
+       kalive.version = cpu_to_le16(1);
+       kalive.period_msec = cpu_to_le16(interval * MSEC_PER_SEC);
+       kalive.len_bytes = cpu_to_le16(0);
+       kalive.keep_alive_id = cpu_to_le16(0);
+
+       ret = brcmf_fil_iovar_data_set(ifp, "mkeep_alive", &kalive, sizeof(kalive));
+       if (ret)
+               brcmf_err("keep-alive packet config failed, ret=%d\n", ret);
+
+       return ret;
+}
+
 static s32 brcmf_cfg80211_suspend(struct wiphy *wiphy,
                                  struct cfg80211_wowlan *wowl)
 {
@@ -3947,6 +3965,9 @@ static s32 brcmf_cfg80211_suspend(struct wiphy *wiphy,
        } else {
                /* Configure WOWL paramaters */
                brcmf_configure_wowl(cfg, ifp, wowl);
+
+               /* Prevent disassociation due to inactivity with keep-alive */
+               brcmf_keepalive_start(ifp, 30);
        }
 
 exit:

diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwil_types.h b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwil_types.h
index ff2ef557f0ead63b0ff394942e24def08d9d4c39..e69d1e56996fe34b7ef8db09abb4ad8b02e5389e 100644 (file)
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwil_types.h
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwil_types.h
@@ -1052,4 +1052,23 @@ struct brcmf_gscan_config {
        struct brcmf_gscan_bucket_config bucket[1];
 };
 
+/**
+ * struct brcmf_mkeep_alive_pkt_le - configuration data for keep-alive frame.
+ *
+ * @version: version for mkeep_alive
+ * @length: length of fixed parameters in the structure.
+ * @period_msec: keep-alive period in milliseconds.
+ * @len_bytes: size of the data.
+ * @keep_alive_id: ID  (0 - 3).
+ * @data: keep-alive frame data.
+ */
+struct brcmf_mkeep_alive_pkt_le {
+       __le16  version;
+       __le16  length;
+       __le32  period_msec;
+       __le16  len_bytes;
+       u8   keep_alive_id;
+       u8   data[0];
+} __packed;
+
 #endif /* FWIL_TYPES_H_ */