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

Commit 5dca7c24 authored by Hila Gonen's avatar Hila Gonen Committed by Johannes Berg
Browse files

iwlwifi: mvm: Change beacon filtering command 



Change beacon filtering command due to a change in the API.

In case the FW supports the old API, we do not send the
BF HCMD and assume that since the corresponding struct in
the FW is zeroed by default then we don't need to disable
it in the FW actively.

Signed-off-by: default avatarHila Gonen <hila.gonen@intel.com>
Signed-off-by: default avatarDor Shaish <dor.shaish@intel.com>
Reviewed-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 77740cb4

drivers/net/wireless/iwlwifi/iwl-fw.h

+2 −0
Original line number Diff line number Diff line
@@ -78,6 +78,7 @@ 
 * @IWL_UCODE_TLV_FLAGS_RX_ENERGY_API: supports rx signal strength api

 * @IWL_UCODE_TLV_FLAGS_D3_6_IPV6_ADDRS: D3 image supports up to six

 *	(rather than two) IPv6 addresses

 * @IWL_UCODE_TLV_FLAGS_BF_UPDATED: new beacon filtering API

 */

enum iwl_ucode_tlv_flag {

	IWL_UCODE_TLV_FLAGS_PAN			= BIT(0),
@@ -88,6 +89,7 @@ enum iwl_ucode_tlv_flag { 
	IWL_UCODE_TLV_FLAGS_UAPSD		= BIT(6),

	IWL_UCODE_TLV_FLAGS_RX_ENERGY_API	= BIT(8),

	IWL_UCODE_TLV_FLAGS_D3_6_IPV6_ADDRS	= BIT(10),

	IWL_UCODE_TLV_FLAGS_BF_UPDATED		= BIT(11),

};



/* The default calibrate table size if not specified by firmware file */

drivers/net/wireless/iwlwifi/mvm/debugfs.c

+47 −27
Original line number Diff line number Diff line
@@ -632,8 +632,14 @@ static void iwl_dbgfs_update_bf(struct ieee80211_vif *vif, 
	case MVM_DEBUGFS_BF_ROAMING_STATE:

		dbgfs_bf->bf_roaming_state = value;

		break;

	case MVM_DEBUGFS_BF_TEMPERATURE_DELTA:

		dbgfs_bf->bf_temperature_delta = value;

	case MVM_DEBUGFS_BF_TEMP_THRESHOLD:

		dbgfs_bf->bf_temp_threshold = value;

		break;

	case MVM_DEBUGFS_BF_TEMP_FAST_FILTER:

		dbgfs_bf->bf_temp_fast_filter = value;

		break;

	case MVM_DEBUGFS_BF_TEMP_SLOW_FILTER:

		dbgfs_bf->bf_temp_slow_filter = value;

		break;

	case MVM_DEBUGFS_BF_ENABLE_BEACON_FILTER:

		dbgfs_bf->bf_enable_beacon_filter = value;
@@ -692,13 +698,27 @@ static ssize_t iwl_dbgfs_bf_params_write(struct file *file, 
		    value > IWL_BF_ROAMING_STATE_MAX)

			return -EINVAL;

		param = MVM_DEBUGFS_BF_ROAMING_STATE;

	} else if (!strncmp("bf_temperature_delta=", buf, 21)) {

		if (sscanf(buf+21, "%d", &value) != 1)

	} else if (!strncmp("bf_temp_threshold=", buf, 18)) {

		if (sscanf(buf+18, "%d", &value) != 1)

			return -EINVAL;

		if (value < IWL_BF_TEMP_THRESHOLD_MIN ||

		    value > IWL_BF_TEMP_THRESHOLD_MAX)

			return -EINVAL;

		param = MVM_DEBUGFS_BF_TEMP_THRESHOLD;

	} else if (!strncmp("bf_temp_fast_filter=", buf, 20)) {

		if (sscanf(buf+20, "%d", &value) != 1)

			return -EINVAL;

		if (value < IWL_BF_TEMP_FAST_FILTER_MIN ||

		    value > IWL_BF_TEMP_FAST_FILTER_MAX)

			return -EINVAL;

		param = MVM_DEBUGFS_BF_TEMP_FAST_FILTER;

	} else if (!strncmp("bf_temp_slow_filter=", buf, 20)) {

		if (sscanf(buf+20, "%d", &value) != 1)

			return -EINVAL;

		if (value < IWL_BF_TEMPERATURE_DELTA_MIN ||

		    value > IWL_BF_TEMPERATURE_DELTA_MAX)

		if (value < IWL_BF_TEMP_SLOW_FILTER_MIN ||

		    value > IWL_BF_TEMP_SLOW_FILTER_MAX)

			return -EINVAL;

		param = MVM_DEBUGFS_BF_TEMPERATURE_DELTA;

		param = MVM_DEBUGFS_BF_TEMP_SLOW_FILTER;

	} else if (!strncmp("bf_enable_beacon_filter=", buf, 24)) {

		if (sscanf(buf+24, "%d", &value) != 1)

			return -EINVAL;
@@ -760,41 +780,41 @@ static ssize_t iwl_dbgfs_bf_params_read(struct file *file, 
	int pos = 0;

	const size_t bufsz = sizeof(buf);

	struct iwl_beacon_filter_cmd cmd = {

		.bf_energy_delta = IWL_BF_ENERGY_DELTA_DEFAULT,

		.bf_roaming_energy_delta = IWL_BF_ROAMING_ENERGY_DELTA_DEFAULT,

		.bf_roaming_state = IWL_BF_ROAMING_STATE_DEFAULT,

		.bf_temperature_delta = IWL_BF_TEMPERATURE_DELTA_DEFAULT,

		.bf_enable_beacon_filter = IWL_BF_ENABLE_BEACON_FILTER_DEFAULT,

		.bf_debug_flag = IWL_BF_DEBUG_FLAG_DEFAULT,

		.bf_escape_timer = cpu_to_le32(IWL_BF_ESCAPE_TIMER_DEFAULT),

		.ba_escape_timer = cpu_to_le32(IWL_BA_ESCAPE_TIMER_DEFAULT),

		.ba_enable_beacon_abort = IWL_BA_ENABLE_BEACON_ABORT_DEFAULT,

		IWL_BF_CMD_CONFIG_DEFAULTS,

		.bf_enable_beacon_filter =

			cpu_to_le32(IWL_BF_ENABLE_BEACON_FILTER_DEFAULT),

		.ba_enable_beacon_abort =

			cpu_to_le32(IWL_BA_ENABLE_BEACON_ABORT_DEFAULT),

	};



	iwl_mvm_beacon_filter_debugfs_parameters(vif, &cmd);

	if (mvmvif->bf_enabled)

		cmd.bf_enable_beacon_filter = 1;

		cmd.bf_enable_beacon_filter = cpu_to_le32(1);

	else

		cmd.bf_enable_beacon_filter = 0;



	pos += scnprintf(buf+pos, bufsz-pos, "bf_energy_delta = %d\n",

			 cmd.bf_energy_delta);

			 le32_to_cpu(cmd.bf_energy_delta));

	pos += scnprintf(buf+pos, bufsz-pos, "bf_roaming_energy_delta = %d\n",

			 cmd.bf_roaming_energy_delta);

			 le32_to_cpu(cmd.bf_roaming_energy_delta));

	pos += scnprintf(buf+pos, bufsz-pos, "bf_roaming_state = %d\n",

			 cmd.bf_roaming_state);

	pos += scnprintf(buf+pos, bufsz-pos, "bf_temperature_delta = %d\n",

			 cmd.bf_temperature_delta);

			 le32_to_cpu(cmd.bf_roaming_state));

	pos += scnprintf(buf+pos, bufsz-pos, "bf_temp_threshold = %d\n",

			 le32_to_cpu(cmd.bf_temp_threshold));

	pos += scnprintf(buf+pos, bufsz-pos, "bf_temp_fast_filter = %d\n",

			 le32_to_cpu(cmd.bf_temp_fast_filter));

	pos += scnprintf(buf+pos, bufsz-pos, "bf_temp_slow_filter = %d\n",

			 le32_to_cpu(cmd.bf_temp_slow_filter));

	pos += scnprintf(buf+pos, bufsz-pos, "bf_enable_beacon_filter = %d\n",

			 cmd.bf_enable_beacon_filter);

			 le32_to_cpu(cmd.bf_enable_beacon_filter));

	pos += scnprintf(buf+pos, bufsz-pos, "bf_debug_flag = %d\n",

			 cmd.bf_debug_flag);

			 le32_to_cpu(cmd.bf_debug_flag));

	pos += scnprintf(buf+pos, bufsz-pos, "bf_escape_timer = %d\n",

			 cmd.bf_escape_timer);

			 le32_to_cpu(cmd.bf_escape_timer));

	pos += scnprintf(buf+pos, bufsz-pos, "ba_escape_timer = %d\n",

			 cmd.ba_escape_timer);

			 le32_to_cpu(cmd.ba_escape_timer));

	pos += scnprintf(buf+pos, bufsz-pos, "ba_enable_beacon_abort = %d\n",

			 cmd.ba_enable_beacon_abort);

			 le32_to_cpu(cmd.ba_enable_beacon_abort));



	return simple_read_from_buffer(user_buf, count, ppos, buf, pos);

}

drivers/net/wireless/iwlwifi/mvm/fw-api-power.h

+43 −22
Original line number Diff line number Diff line
@@ -216,7 +216,17 @@ struct iwl_mac_power_cmd { 
 *      calculated for current beacon is less than the threshold, use

 *      Roaming Energy Delta Threshold, otherwise use normal Energy Delta

 *      Threshold. Typical energy threshold is -72dBm.

 * @bf_temperature_delta: Send Beacon to driver if delta in temperature values

 * @bf_temp_threshold: This threshold determines the type of temperature

 *	filtering (Slow or Fast) that is selected (Units are in Celsuis):

 *      If the current temperature is above this threshold - Fast filter

 *	will be used, If the current temperature is below this threshold -

 *	Slow filter will be used.

 * @bf_temp_fast_filter: Send Beacon to driver if delta in temperature values

 *      calculated for this and the last passed beacon is greater than this

 *      threshold. Zero value means that the temperature change is ignored for

 *      beacon filtering; beacons will not be  forced to be sent to driver

 *      regardless of whether its temerature has been changed.

 * @bf_temp_slow_filter: Send Beacon to driver if delta in temperature values

 *      calculated for this and the last passed beacon is greater than this

 *      threshold. Zero value means that the temperature change is ignored for

 *      beacon filtering; beacons will not be forced to be sent to driver
@@ -229,17 +239,17 @@ struct iwl_mac_power_cmd { 
 * @ba_enable_beacon_abort: 1, beacon abort is enabled; 0, disabled.

 */

struct iwl_beacon_filter_cmd {

	u8 bf_energy_delta;

	u8 bf_roaming_energy_delta;

	u8 bf_roaming_state;

	u8 bf_temperature_delta;

	u8 bf_enable_beacon_filter;

	u8 bf_debug_flag;

	__le16 reserved1;

	__le32 bf_energy_delta;

	__le32 bf_roaming_energy_delta;

	__le32 bf_roaming_state;

	__le32 bf_temp_threshold;

	__le32 bf_temp_fast_filter;

	__le32 bf_temp_slow_filter;

	__le32 bf_enable_beacon_filter;

	__le32 bf_debug_flag;

	__le32 bf_escape_timer;

	__le32 ba_escape_timer;

	u8 ba_enable_beacon_abort;

	u8 reserved2[3];

	__le32 ba_enable_beacon_abort;

} __packed;



/* Beacon filtering and beacon abort */
@@ -255,9 +265,17 @@ struct iwl_beacon_filter_cmd { 
#define IWL_BF_ROAMING_STATE_MAX 255

#define IWL_BF_ROAMING_STATE_MIN 0



#define IWL_BF_TEMPERATURE_DELTA_DEFAULT 5

#define IWL_BF_TEMPERATURE_DELTA_MAX 255

#define IWL_BF_TEMPERATURE_DELTA_MIN 0

#define IWL_BF_TEMP_THRESHOLD_DEFAULT 112

#define IWL_BF_TEMP_THRESHOLD_MAX 255

#define IWL_BF_TEMP_THRESHOLD_MIN 0



#define IWL_BF_TEMP_FAST_FILTER_DEFAULT 1

#define IWL_BF_TEMP_FAST_FILTER_MAX 255

#define IWL_BF_TEMP_FAST_FILTER_MIN 0



#define IWL_BF_TEMP_SLOW_FILTER_DEFAULT 5

#define IWL_BF_TEMP_SLOW_FILTER_MAX 255

#define IWL_BF_TEMP_SLOW_FILTER_MIN 0



#define IWL_BF_ENABLE_BEACON_FILTER_DEFAULT 1
@@ -274,11 +292,14 @@ struct iwl_beacon_filter_cmd { 
#define IWL_BA_ENABLE_BEACON_ABORT_DEFAULT 1



#define IWL_BF_CMD_CONFIG_DEFAULTS					     \

	.bf_energy_delta = IWL_BF_ENERGY_DELTA_DEFAULT,			\

	.bf_roaming_energy_delta = IWL_BF_ROAMING_ENERGY_DELTA_DEFAULT,	\

	.bf_roaming_state = IWL_BF_ROAMING_STATE_DEFAULT,		\

	.bf_temperature_delta = IWL_BF_TEMPERATURE_DELTA_DEFAULT,	\

	.bf_debug_flag = IWL_BF_DEBUG_FLAG_DEFAULT,			\

	.bf_energy_delta = cpu_to_le32(IWL_BF_ENERGY_DELTA_DEFAULT),	     \

	.bf_roaming_energy_delta =					     \

		cpu_to_le32(IWL_BF_ROAMING_ENERGY_DELTA_DEFAULT),	     \

	.bf_roaming_state = cpu_to_le32(IWL_BF_ROAMING_STATE_DEFAULT),	     \

	.bf_temp_threshold = cpu_to_le32(IWL_BF_TEMP_THRESHOLD_DEFAULT),     \

	.bf_temp_fast_filter = cpu_to_le32(IWL_BF_TEMP_FAST_FILTER_DEFAULT), \

	.bf_temp_slow_filter = cpu_to_le32(IWL_BF_TEMP_SLOW_FILTER_DEFAULT), \

	.bf_debug_flag = cpu_to_le32(IWL_BF_DEBUG_FLAG_DEFAULT),	     \

	.bf_escape_timer = cpu_to_le32(IWL_BF_ESCAPE_TIMER_DEFAULT),	     \

	.ba_escape_timer = cpu_to_le32(IWL_BA_ESCAPE_TIMER_DEFAULT)

drivers/net/wireless/iwlwifi/mvm/mac80211.c

+2 −1
Original line number Diff line number Diff line
@@ -563,7 +563,8 @@ static int iwl_mvm_mac_add_interface(struct ieee80211_hw *hw, 


	/* beacon filtering */

	if (!mvm->bf_allowed_vif &&

	    vif->type == NL80211_IFTYPE_STATION && !vif->p2p){

	    vif->type == NL80211_IFTYPE_STATION && !vif->p2p &&

	    mvm->fw->ucode_capa.flags & IWL_UCODE_TLV_FLAGS_BF_UPDATED){

		mvm->bf_allowed_vif = mvmvif;

		vif->driver_flags |= IEEE80211_VIF_BEACON_FILTER;

	}

drivers/net/wireless/iwlwifi/mvm/mvm.h

+17 −13
Original line number Diff line number Diff line
@@ -195,24 +195,28 @@ enum iwl_dbgfs_bf_mask { 
	MVM_DEBUGFS_BF_ENERGY_DELTA = BIT(0),

	MVM_DEBUGFS_BF_ROAMING_ENERGY_DELTA = BIT(1),

	MVM_DEBUGFS_BF_ROAMING_STATE = BIT(2),

	MVM_DEBUGFS_BF_TEMPERATURE_DELTA = BIT(3),

	MVM_DEBUGFS_BF_ENABLE_BEACON_FILTER = BIT(4),

	MVM_DEBUGFS_BF_DEBUG_FLAG = BIT(5),

	MVM_DEBUGFS_BF_ESCAPE_TIMER = BIT(6),

	MVM_DEBUGFS_BA_ESCAPE_TIMER = BIT(7),

	MVM_DEBUGFS_BA_ENABLE_BEACON_ABORT = BIT(8),

	MVM_DEBUGFS_BF_TEMP_THRESHOLD = BIT(3),

	MVM_DEBUGFS_BF_TEMP_FAST_FILTER = BIT(4),

	MVM_DEBUGFS_BF_TEMP_SLOW_FILTER = BIT(5),

	MVM_DEBUGFS_BF_ENABLE_BEACON_FILTER = BIT(6),

	MVM_DEBUGFS_BF_DEBUG_FLAG = BIT(7),

	MVM_DEBUGFS_BF_ESCAPE_TIMER = BIT(8),

	MVM_DEBUGFS_BA_ESCAPE_TIMER = BIT(9),

	MVM_DEBUGFS_BA_ENABLE_BEACON_ABORT = BIT(10),

};



struct iwl_dbgfs_bf {

	u8 bf_energy_delta;

	u8 bf_roaming_energy_delta;

	u8 bf_roaming_state;

	u8 bf_temperature_delta;

	u8 bf_enable_beacon_filter;

	u8 bf_debug_flag;

	u32 bf_energy_delta;

	u32 bf_roaming_energy_delta;

	u32 bf_roaming_state;

	u32 bf_temp_threshold;

	u32 bf_temp_fast_filter;

	u32 bf_temp_slow_filter;

	u32 bf_enable_beacon_filter;

	u32 bf_debug_flag;

	u32 bf_escape_timer;

	u32 ba_escape_timer;

	u8 ba_enable_beacon_abort;

	u32 ba_enable_beacon_abort;

	int mask;

};

#endif