mwifiex: add power save parameters in hs_cfg cmd

This patch adds power save parameters(hs_wake_interval and
hs_inactivity_timeout) in host sleep cfg cmd.

Signed-off-by: Shengzhen Li <szli@marvell.com>
Signed-off-by: Cathy Luo <cluo@marvell.com>
Signed-off-by: Amitkumar Karwar <akarwar@marvell.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>

diff --git a/drivers/net/wireless/marvell/mwifiex/fw.h b/drivers/net/wireless/marvell/mwifiex/fw.h
index 4b1894b4757ffe654d409828c665e1df76668ca3..9b3cceadd707bb1226bcb6fb4dd71a463fc6f5f2 100644 (file)
--- a/drivers/net/wireless/marvell/mwifiex/fw.h
+++ b/drivers/net/wireless/marvell/mwifiex/fw.h
@@ -181,6 +181,7 @@ enum MWIFIEX_802_11_PRIVACY_FILTER {
 #define TLV_TYPE_COALESCE_RULE      (PROPRIETARY_TLV_BASE_ID + 154)
 #define TLV_TYPE_KEY_PARAM_V2       (PROPRIETARY_TLV_BASE_ID + 156)
 #define TLV_TYPE_REPEAT_COUNT       (PROPRIETARY_TLV_BASE_ID + 176)
+#define TLV_TYPE_PS_PARAMS_IN_HS    (PROPRIETARY_TLV_BASE_ID + 181)
 #define TLV_TYPE_MULTI_CHAN_INFO    (PROPRIETARY_TLV_BASE_ID + 183)
 #define TLV_TYPE_MC_GROUP_INFO      (PROPRIETARY_TLV_BASE_ID + 184)
 #define TLV_TYPE_TDLS_IDLE_TIMEOUT  (PROPRIETARY_TLV_BASE_ID + 194)
@@ -986,6 +987,15 @@ struct mwifiex_ps_param {
        __le16 delay_to_ps;
 };
 
+#define HS_DEF_WAKE_INTERVAL          100
+#define HS_DEF_INACTIVITY_TIMEOUT      50
+
+struct mwifiex_ps_param_in_hs {
+       struct mwifiex_ie_types_header header;
+       __le32 hs_wake_int;
+       __le32 hs_inact_timeout;
+};
+
 #define BITMAP_AUTO_DS         0x01
 #define BITMAP_STA_PS          0x10
 

diff --git a/drivers/net/wireless/marvell/mwifiex/sta_cmd.c b/drivers/net/wireless/marvell/mwifiex/sta_cmd.c
index 2a162c33d271a58adf0c54b935de9063c3f6ddd3..11ddfccf9bd53874c70857afc5509e48b1dcf454 100644 (file)
--- a/drivers/net/wireless/marvell/mwifiex/sta_cmd.c
+++ b/drivers/net/wireless/marvell/mwifiex/sta_cmd.c
@@ -368,7 +368,10 @@ mwifiex_cmd_802_11_hs_cfg(struct mwifiex_private *priv,
 {
        struct mwifiex_adapter *adapter = priv->adapter;
        struct host_cmd_ds_802_11_hs_cfg_enh *hs_cfg = &cmd->params.opt_hs_cfg;
+       u8 *tlv = (u8 *)hs_cfg + sizeof(struct host_cmd_ds_802_11_hs_cfg_enh);
+       struct mwifiex_ps_param_in_hs *psparam_tlv = NULL;
        bool hs_activate = false;
+       u16 size;
 
        if (!hscfg_param)
                /* New Activate command */
@@ -385,13 +388,14 @@ mwifiex_cmd_802_11_hs_cfg(struct mwifiex_private *priv,
                memcpy(((u8 *) hs_cfg) +
                       sizeof(struct host_cmd_ds_802_11_hs_cfg_enh),
                       adapter->arp_filter, adapter->arp_filter_size);
-               cmd->size = cpu_to_le16
-                               (adapter->arp_filter_size +
-                                sizeof(struct host_cmd_ds_802_11_hs_cfg_enh)
-                               + S_DS_GEN);
+               size = adapter->arp_filter_size +
+                       sizeof(struct host_cmd_ds_802_11_hs_cfg_enh)
+                       + S_DS_GEN;
+               tlv = (u8 *)hs_cfg
+                       + sizeof(struct host_cmd_ds_802_11_hs_cfg_enh)
+                       + adapter->arp_filter_size;
        } else {
-               cmd->size = cpu_to_le16(S_DS_GEN + sizeof(struct
-                                               host_cmd_ds_802_11_hs_cfg_enh));
+               size = S_DS_GEN + sizeof(struct host_cmd_ds_802_11_hs_cfg_enh);
        }
        if (hs_activate) {
                hs_cfg->action = cpu_to_le16(HS_ACTIVATE);
@@ -401,12 +405,25 @@ mwifiex_cmd_802_11_hs_cfg(struct mwifiex_private *priv,
                hs_cfg->params.hs_config.conditions = hscfg_param->conditions;
                hs_cfg->params.hs_config.gpio = hscfg_param->gpio;
                hs_cfg->params.hs_config.gap = hscfg_param->gap;
+
+               size += sizeof(struct mwifiex_ps_param_in_hs);
+               psparam_tlv = (struct mwifiex_ps_param_in_hs *)tlv;
+               psparam_tlv->header.type =
+                       cpu_to_le16(TLV_TYPE_PS_PARAMS_IN_HS);
+               psparam_tlv->header.len =
+                       cpu_to_le16(sizeof(struct mwifiex_ps_param_in_hs)
+                               - sizeof(struct mwifiex_ie_types_header));
+               psparam_tlv->hs_wake_int = cpu_to_le32(HS_DEF_WAKE_INTERVAL);
+               psparam_tlv->hs_inact_timeout =
+                       cpu_to_le32(HS_DEF_INACTIVITY_TIMEOUT);
+
                mwifiex_dbg(adapter, CMD,
                            "cmd: HS_CFG_CMD: condition:0x%x gpio:0x%x gap:0x%x\n",
                            hs_cfg->params.hs_config.conditions,
                            hs_cfg->params.hs_config.gpio,
                            hs_cfg->params.hs_config.gap);
        }
+       cmd->size = cpu_to_le16(size);
 
        return 0;
 }