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

Commit 639eabad authored by Emmanuel Grumbach's avatar Emmanuel Grumbach
Browse files

iwlwifi: remove IWL_UCODE_TLV_FLAGS_DEVICE_PS_CMD flag 



All the supported firmwares have this flag set.

Reviewed-by: default avatarAlexander Bondar <alexander.bondar@intel.com>
Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
parent f9dc0004

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

+0 −3
Original line number Diff line number Diff line
@@ -83,8 +83,6 @@ 
 *	from the probe request template.

 * @IWL_UCODE_TLV_FLAGS_NEW_NSOFFL_SMALL: new NS offload (small version)

 * @IWL_UCODE_TLV_FLAGS_NEW_NSOFFL_LARGE: new NS offload (large version)

 * @IWL_UCODE_TLV_FLAGS_DEVICE_PS_CMD: support device wide power command

 *	containing CAM (Continuous Active Mode) indication.

 * @IWL_UCODE_TLV_FLAGS_P2P_PM: P2P client supports PM as a stand alone MAC

 * @IWL_UCODE_TLV_FLAGS_P2P_BSS_PS_DCM: support power save on BSS station and

 *	P2P client interfaces simultaneously if they are in different bindings.
@@ -105,7 +103,6 @@ enum iwl_ucode_tlv_flag { 
	IWL_UCODE_TLV_FLAGS_NO_BASIC_SSID	= BIT(12),

	IWL_UCODE_TLV_FLAGS_NEW_NSOFFL_SMALL	= BIT(15),

	IWL_UCODE_TLV_FLAGS_NEW_NSOFFL_LARGE	= BIT(16),

	IWL_UCODE_TLV_FLAGS_DEVICE_PS_CMD	= BIT(20),

	IWL_UCODE_TLV_FLAGS_P2P_PM		= BIT(21),

	IWL_UCODE_TLV_FLAGS_BSS_P2P_PS_DCM	= BIT(22),

	IWL_UCODE_TLV_FLAGS_BSS_P2P_PS_SCM	= BIT(23),

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

+0 −10
Original line number Diff line number Diff line
@@ -103,10 +103,6 @@ static void iwl_dbgfs_update_pm(struct iwl_mvm *mvm, 
		IWL_DEBUG_POWER(mvm, "tx_data_timeout=%d\n", val);

		dbgfs_pm->tx_data_timeout = val;

		break;

	case MVM_DEBUGFS_PM_DISABLE_POWER_OFF:

		IWL_DEBUG_POWER(mvm, "disable_power_off=%d\n", val);

		dbgfs_pm->disable_power_off = val;

		break;

	case MVM_DEBUGFS_PM_LPRX_ENA:

		IWL_DEBUG_POWER(mvm, "lprx %s\n", val ? "enabled" : "disabled");

		dbgfs_pm->lprx_ena = val;
@@ -154,12 +150,6 @@ static ssize_t iwl_dbgfs_pm_params_write(struct ieee80211_vif *vif, char *buf, 
		if (sscanf(buf + 16, "%d", &val) != 1)

			return -EINVAL;

		param = MVM_DEBUGFS_PM_TX_DATA_TIMEOUT;

	} else if (!strncmp("disable_power_off=", buf, 18) &&

		   !(mvm->fw->ucode_capa.flags &

		     IWL_UCODE_TLV_FLAGS_DEVICE_PS_CMD)) {

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

			return -EINVAL;

		param = MVM_DEBUGFS_PM_DISABLE_POWER_OFF;

	} else if (!strncmp("lprx=", buf, 5)) {

		if (sscanf(buf + 5, "%d", &val) != 1)

			return -EINVAL;

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

+2 −3
Original line number Diff line number Diff line
@@ -1135,7 +1135,6 @@ int iwl_mvm_dbgfs_register(struct iwl_mvm *mvm, struct dentry *dbgfs_dir) 
	MVM_DEBUGFS_ADD_FILE(fw_error_dump, dbgfs_dir, S_IRUSR);

	MVM_DEBUGFS_ADD_FILE(bt_notif, dbgfs_dir, S_IRUSR);

	MVM_DEBUGFS_ADD_FILE(bt_cmd, dbgfs_dir, S_IRUSR);

	if (mvm->fw->ucode_capa.flags & IWL_UCODE_TLV_FLAGS_DEVICE_PS_CMD)

	MVM_DEBUGFS_ADD_FILE(disable_power_off, mvm->debugfs_dir,

			     S_IRUSR | S_IWUSR);

	MVM_DEBUGFS_ADD_FILE(fw_rx_stats, mvm->debugfs_dir, S_IRUSR);

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

+0 −2
Original line number Diff line number Diff line
@@ -164,7 +164,6 @@ enum iwl_dbgfs_pm_mask { 
	MVM_DEBUGFS_PM_SKIP_DTIM_PERIODS = BIT(2),

	MVM_DEBUGFS_PM_RX_DATA_TIMEOUT = BIT(3),

	MVM_DEBUGFS_PM_TX_DATA_TIMEOUT = BIT(4),

	MVM_DEBUGFS_PM_DISABLE_POWER_OFF = BIT(5),

	MVM_DEBUGFS_PM_LPRX_ENA = BIT(6),

	MVM_DEBUGFS_PM_LPRX_RSSI_THRESHOLD = BIT(7),

	MVM_DEBUGFS_PM_SNOOZE_ENABLE = BIT(8),
@@ -177,7 +176,6 @@ struct iwl_dbgfs_pm { 
	u32 tx_data_timeout;

	bool skip_over_dtim;

	u8 skip_dtim_periods;

	bool disable_power_off;

	bool lprx_ena;

	u32 lprx_rssi_threshold;

	bool snooze_ena;

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

+0 −13
Original line number Diff line number Diff line
@@ -303,11 +303,6 @@ static void iwl_mvm_power_build_cmd(struct iwl_mvm *mvm, 


	cmd->flags |= cpu_to_le16(POWER_FLAGS_POWER_SAVE_ENA_MSK);



#ifdef CONFIG_IWLWIFI_DEBUGFS

	if (mvmvif->dbgfs_pm.mask & MVM_DEBUGFS_PM_DISABLE_POWER_OFF &&

	    mvmvif->dbgfs_pm.disable_power_off)

		cmd->flags &= cpu_to_le16(~POWER_FLAGS_POWER_SAVE_ENA_MSK);

#endif

	if (!vif->bss_conf.ps || iwl_mvm_vif_low_latency(mvmvif) ||

	    !mvmvif->pm_enabled)

		return;
@@ -437,9 +432,6 @@ int iwl_mvm_power_update_device(struct iwl_mvm *mvm) 
		.flags = cpu_to_le16(DEVICE_POWER_FLAGS_POWER_SAVE_ENA_MSK),

	};



	if (!(mvm->fw->ucode_capa.flags & IWL_UCODE_TLV_FLAGS_DEVICE_PS_CMD))

		return 0;



	if (iwlmvm_mod_params.power_scheme == IWL_POWER_SCHEME_CAM)

		mvm->ps_disabled = true;
@@ -696,11 +688,6 @@ int iwl_mvm_power_mac_dbgfs_read(struct iwl_mvm *mvm, 
	memcpy(&cmd, &mvmvif->mac_pwr_cmd, sizeof(cmd));

	mutex_unlock(&mvm->mutex);



	if (!(mvm->fw->ucode_capa.flags & IWL_UCODE_TLV_FLAGS_DEVICE_PS_CMD))

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

				 (cmd.flags &

				 cpu_to_le16(POWER_FLAGS_POWER_SAVE_ENA_MSK)) ?

				 0 : 1);

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

			 iwlmvm_mod_params.power_scheme);

	pos += scnprintf(buf+pos, bufsz-pos, "flags = 0x%x\n",