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

Commit 9f4c045a authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ath10k: configure the vdev listen interval before wow suspend"

parents 05754cb5 1e4bd124

drivers/net/wireless/ath/ath10k/hw.c

+1 −0
Original line number Diff line number Diff line
@@ -509,6 +509,7 @@ const struct ath10k_hw_values wcn3990_values = { 
	.num_target_ce_config_wlan	= 12,

	.ce_desc_meta_data_mask		= 0xFFF0,

	.ce_desc_meta_data_lsb		= 4,

	.default_listen_interval	= 1,

};



struct fw_flag wcn3990_fw_flags = {

drivers/net/wireless/ath/ath10k/hw.h

+1 −0
Original line number Diff line number Diff line
@@ -369,6 +369,7 @@ struct ath10k_hw_values { 
	u8 num_target_ce_config_wlan;

	u16 ce_desc_meta_data_mask;

	u8 ce_desc_meta_data_lsb;

	u8 default_listen_interval;

};



extern const struct ath10k_hw_values qca988x_values;

drivers/net/wireless/ath/ath10k/wow.c

+32 −0
Original line number Diff line number Diff line
@@ -224,6 +224,31 @@ static int ath10k_wow_wakeup(struct ath10k *ar) 
	return 0;

}



static int ath10k_config_wow_listen_interval(struct ath10k *ar)

{

	int ret;

	u32 param = ar->wmi.vdev_param->listen_interval;

	u8 listen_interval = ar->hw_values->default_listen_interval;

	struct ath10k_vif *arvif;



	if (!listen_interval)

		return 0;



	list_for_each_entry(arvif, &ar->arvifs, list) {

		if (arvif->vdev_type != WMI_VDEV_TYPE_STA)

			continue;

		ret = ath10k_wmi_vdev_set_param(ar, arvif->vdev_id,

						param, listen_interval);

		if (ret) {

			ath10k_err(ar, "failed to config LI for vdev_id: %d\n",

				   arvif->vdev_id);

			return ret;

		}

	}



	return 0;

}



int ath10k_wow_op_suspend(struct ieee80211_hw *hw,

			  struct cfg80211_wowlan *wowlan)

{
@@ -252,6 +277,13 @@ int ath10k_wow_op_suspend(struct ieee80211_hw *hw, 
		goto cleanup;

	}



	ret = ath10k_config_wow_listen_interval(ar);

	if (ret) {

		ath10k_warn(ar, "failed to config wow listen interval: %d\n",

			    ret);

		goto cleanup;

	}



	ret = ath10k_wow_enable(ar);

	if (ret) {

		ath10k_warn(ar, "failed to start wow: %d\n", ret);