Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f3ac4e73 authored by Karun Eagalapati's avatar Karun Eagalapati Committed by Kalle Valo
Browse files

rsi: sdio: add WOWLAN support for S3 suspend state 



WoWLAN is supported in RS9113 device through GPIO pin2.
wowlan config frame is internally sent to firmware in mac80211
suspend handler. Also beacon miss threshold and keep-alive time
values are increased to avoid un-necessary disconnection with AP.

Signed-off-by: default avatarKarun Eagalapati <karun256@gmail.com>
Signed-off-by: default avatarAmitkumar Karwar <amit.karwar@redpinesignals.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent c6c65a84

drivers/net/wireless/rsi/rsi_91x_core.c

+6 −0
Original line number Diff line number Diff line
@@ -379,6 +379,12 @@ void rsi_core_xmit(struct rsi_common *common, struct sk_buff *skb) 
		rsi_dbg(ERR_ZONE, "%s: FSM state not open\n", __func__);

		goto xmit_fail;

	}

	if (common->wow_flags & RSI_WOW_ENABLED) {

		rsi_dbg(ERR_ZONE,

			"%s: Blocking Tx_packets when WOWLAN is enabled\n",

			__func__);

		goto xmit_fail;

	}



	info = IEEE80211_SKB_CB(skb);

	tx_params = (struct skb_info *)info->driver_data;

drivers/net/wireless/rsi/rsi_91x_mac80211.c

+118 −0
Original line number Diff line number Diff line
@@ -1746,6 +1746,119 @@ static int rsi_mac80211_cancel_roc(struct ieee80211_hw *hw) 
	return 0;

}



static const struct wiphy_wowlan_support rsi_wowlan_support = {

	.flags = WIPHY_WOWLAN_ANY |

		 WIPHY_WOWLAN_MAGIC_PKT |

		 WIPHY_WOWLAN_DISCONNECT |

		 WIPHY_WOWLAN_GTK_REKEY_FAILURE  |

		 WIPHY_WOWLAN_SUPPORTS_GTK_REKEY |

		 WIPHY_WOWLAN_EAP_IDENTITY_REQ   |

		 WIPHY_WOWLAN_4WAY_HANDSHAKE,

};



static u16 rsi_wow_map_triggers(struct rsi_common *common,

				struct cfg80211_wowlan *wowlan)

{

	u16 wow_triggers = 0;



	rsi_dbg(INFO_ZONE, "Mapping wowlan triggers\n");



	if (wowlan->any)

		wow_triggers |= RSI_WOW_ANY;

	if (wowlan->magic_pkt)

		wow_triggers |= RSI_WOW_MAGIC_PKT;

	if (wowlan->disconnect)

		wow_triggers |= RSI_WOW_DISCONNECT;

	if (wowlan->gtk_rekey_failure || wowlan->eap_identity_req ||

	    wowlan->four_way_handshake)

		wow_triggers |= RSI_WOW_GTK_REKEY;



	return wow_triggers;

}



int rsi_config_wowlan(struct rsi_hw *adapter, struct cfg80211_wowlan *wowlan)

{

	struct rsi_common *common = adapter->priv;

	u16 triggers = 0;

	u16 rx_filter_word = 0;

	struct ieee80211_bss_conf *bss = &adapter->vifs[0]->bss_conf;



	rsi_dbg(INFO_ZONE, "Config WoWLAN to device\n");



	if (WARN_ON(!wowlan)) {

		rsi_dbg(ERR_ZONE, "WoW triggers not enabled\n");

		return -EINVAL;

	}



	triggers = rsi_wow_map_triggers(common, wowlan);

	if (!triggers) {

		rsi_dbg(ERR_ZONE, "%s:No valid WoW triggers\n", __func__);

		return -EINVAL;

	}

	if (!bss->assoc) {

		rsi_dbg(ERR_ZONE,

			"Cannot configure WoWLAN (Station not connected)\n");

		common->wow_flags |= RSI_WOW_NO_CONNECTION;

		return 0;

	}

	rsi_dbg(INFO_ZONE, "TRIGGERS %x\n", triggers);

	rsi_send_wowlan_request(common, triggers, 1);



	/**

	 * Increase the beacon_miss threshold & keep-alive timers in

	 * vap_update frame

	 */

	rsi_send_vap_dynamic_update(common);



	rx_filter_word = (ALLOW_DATA_ASSOC_PEER | DISALLOW_BEACONS);

	rsi_send_rx_filter_frame(common, rx_filter_word);

	common->wow_flags |= RSI_WOW_ENABLED;



	return 0;

}



#ifdef CONFIG_PM

static int rsi_mac80211_suspend(struct ieee80211_hw *hw,

				struct cfg80211_wowlan *wowlan)

{

	struct rsi_hw *adapter = hw->priv;

	struct rsi_common *common = adapter->priv;



	rsi_dbg(INFO_ZONE, "%s: mac80211 suspend\n", __func__);

	mutex_lock(&common->mutex);

	if (rsi_config_wowlan(adapter, wowlan)) {

		rsi_dbg(ERR_ZONE, "Failed to configure WoWLAN\n");

		mutex_unlock(&common->mutex);

		return 1;

	}

	mutex_unlock(&common->mutex);



	return 0;

}



static int rsi_mac80211_resume(struct ieee80211_hw *hw)

{

	u16 rx_filter_word = 0;

	struct rsi_hw *adapter = hw->priv;

	struct rsi_common *common = adapter->priv;



	common->wow_flags = 0;



	rsi_dbg(INFO_ZONE, "%s: mac80211 resume\n", __func__);



	mutex_lock(&common->mutex);

	rsi_send_wowlan_request(common, 0, 0);



	rx_filter_word = (ALLOW_DATA_ASSOC_PEER | ALLOW_CTRL_ASSOC_PEER |

			  ALLOW_MGMT_ASSOC_PEER);

	rsi_send_rx_filter_frame(common, rx_filter_word);

	mutex_unlock(&common->mutex);



	return 0;

}



#endif



static const struct ieee80211_ops mac80211_ops = {

	.tx = rsi_mac80211_tx,

	.start = rsi_mac80211_start,
@@ -1767,6 +1880,10 @@ static const struct ieee80211_ops mac80211_ops = { 
	.rfkill_poll = rsi_mac80211_rfkill_poll,

	.remain_on_channel = rsi_mac80211_roc,

	.cancel_remain_on_channel = rsi_mac80211_cancel_roc,

#ifdef CONFIG_PM

	.suspend = rsi_mac80211_suspend,

	.resume  = rsi_mac80211_resume,

#endif

};



/**
@@ -1850,6 +1967,7 @@ int rsi_mac80211_attach(struct rsi_common *common) 
	wiphy->features |= NL80211_FEATURE_INACTIVITY_TIMER;

	wiphy->reg_notifier = rsi_reg_notify;



	wiphy->wowlan = &rsi_wowlan_support;

	wiphy_ext_feature_set(wiphy, NL80211_EXT_FEATURE_CQM_RSSI_LIST);



	/* Wi-Fi direct parameters */

drivers/net/wireless/rsi/rsi_91x_mgmt.c

+51 −9
Original line number Diff line number Diff line
@@ -1094,9 +1094,18 @@ int rsi_send_vap_dynamic_update(struct rsi_common *common) 
	dynamic_frame->desc_dword0.frame_type = VAP_DYNAMIC_UPDATE;

	dynamic_frame->desc_dword2.pkt_info =

					cpu_to_le32(common->rts_threshold);



	if (common->wow_flags & RSI_WOW_ENABLED) {

		/* Beacon miss threshold */

		dynamic_frame->desc_dword3.token =

					cpu_to_le16(RSI_BCN_MISS_THRESHOLD);

		dynamic_frame->frame_body.keep_alive_period =

					cpu_to_le16(RSI_WOW_KEEPALIVE);

	} else {

		dynamic_frame->frame_body.keep_alive_period =

					cpu_to_le16(RSI_DEF_KEEPALIVE);

	}



	dynamic_frame->desc_dword3.sta_id = 0; /* vap id */



	skb_put(skb, sizeof(struct rsi_dynamic_s));
@@ -1340,12 +1349,11 @@ void rsi_inform_bss_status(struct rsi_common *common, 
	} else {

		if (opmode == RSI_OPMODE_STA)

			common->hw_data_qs_blocked = true;

		rsi_hal_send_sta_notify_frame(common,

					      opmode,

					      STA_DISCONNECTED,

					      addr,

					      qos_enable,

					      aid, sta_id,



		if (!(common->wow_flags & RSI_WOW_ENABLED))

			rsi_hal_send_sta_notify_frame(common, opmode,

						      STA_DISCONNECTED, addr,

						      qos_enable, aid, sta_id,

						      vif);

		if (opmode == RSI_OPMODE_STA)

			rsi_send_block_unblock_frame(common, true);
@@ -1589,6 +1597,40 @@ static int rsi_send_beacon(struct rsi_common *common) 
	return 0;

}



int rsi_send_wowlan_request(struct rsi_common *common, u16 flags,

			    u16 sleep_status)

{

	struct rsi_wowlan_req *cmd_frame;

	struct sk_buff *skb;

	u8 length;



	rsi_dbg(ERR_ZONE, "%s: Sending wowlan request frame\n", __func__);



	length = sizeof(*cmd_frame);

	skb = dev_alloc_skb(length);

	if (!skb)

		return -ENOMEM;

	memset(skb->data, 0, length);

	cmd_frame = (struct rsi_wowlan_req *)skb->data;



	rsi_set_len_qno(&cmd_frame->desc.desc_dword0.len_qno,

			(length - FRAME_DESC_SZ),

			RSI_WIFI_MGMT_Q);

	cmd_frame->desc.desc_dword0.frame_type = WOWLAN_CONFIG_PARAMS;

	cmd_frame->host_sleep_status = sleep_status;

	if (common->secinfo.security_enable &&

	    common->secinfo.gtk_cipher)

		flags |= RSI_WOW_GTK_REKEY;

	if (sleep_status)

		cmd_frame->wow_flags = flags;

	rsi_dbg(INFO_ZONE, "Host_Sleep_Status : %d Flags : %d\n",

		cmd_frame->host_sleep_status, cmd_frame->wow_flags);



	skb_put(skb, length);



	return rsi_send_internal_mgmt_frame(common, skb);

}



/**

 * rsi_handle_ta_confirm_type() - This function handles the confirm frames.

 * @common: Pointer to the driver private structure.

drivers/net/wireless/rsi/rsi_91x_sdio.c

+7 −0
Original line number Diff line number Diff line
@@ -1124,6 +1124,8 @@ static int rsi_sdio_enable_interrupts(struct sdio_func *pfunc) 
{

	u8 data;

	int ret;

	struct rsi_hw *adapter = sdio_get_drvdata(pfunc);

	struct rsi_common *common = adapter->priv;



	sdio_claim_host(pfunc);

	ret = rsi_cmd52readbyte(pfunc->card, RSI_INT_ENABLE_REGISTER, &data);
@@ -1143,6 +1145,11 @@ static int rsi_sdio_enable_interrupts(struct sdio_func *pfunc) 
		goto done;

	}



	if ((common->wow_flags & RSI_WOW_ENABLED) &&

	    (common->wow_flags & RSI_WOW_NO_CONNECTION))

		rsi_dbg(ERR_ZONE,

			"##### Device can not wake up through WLAN\n");



	ret = rsi_cmd52readbyte(pfunc->card, RSI_INT_ENABLE_REGISTER, &data);

	if (ret < 0) {

		rsi_dbg(ERR_ZONE,

drivers/net/wireless/rsi/rsi_common.h

+1 −0
Original line number Diff line number Diff line
@@ -83,6 +83,7 @@ u16 rsi_get_connected_channel(struct ieee80211_vif *vif); 
struct rsi_hw *rsi_91x_init(void);

void rsi_91x_deinit(struct rsi_hw *adapter);

int rsi_read_pkt(struct rsi_common *common, s32 rcv_pkt_len);

int rsi_config_wowlan(struct rsi_hw *adapter, struct cfg80211_wowlan *wowlan);

struct rsi_sta *rsi_find_sta(struct rsi_common *common, u8 *mac_addr);

struct ieee80211_vif *rsi_get_vif(struct rsi_hw *adapter, u8 *mac);

void rsi_roc_timeout(struct timer_list *t);