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

Commit ad2549d8 authored by Emmanuel Grumbach's avatar Emmanuel Grumbach
Browse files

iwlwifi: remove IWL_UCODE_TLV_FLAGS_PM_CMD_SUPPORT 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 2dae313f

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

+0 −1
Original line number Diff line number Diff line
@@ -107,7 +107,6 @@ enum iwl_ucode_tlv_flag { 
	IWL_UCODE_TLV_FLAGS_MFP			= BIT(2),

	IWL_UCODE_TLV_FLAGS_P2P			= BIT(3),

	IWL_UCODE_TLV_FLAGS_DW_BC_TABLE		= BIT(4),

	IWL_UCODE_TLV_FLAGS_PM_CMD_SUPPORT	= BIT(6),

	IWL_UCODE_TLV_FLAGS_SHORT_BL		= BIT(7),

	IWL_UCODE_TLV_FLAGS_RX_ENERGY_API	= BIT(8),

	IWL_UCODE_TLV_FLAGS_TIME_EVENT_API_V2	= BIT(9),

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

+1 −2
Original line number Diff line number Diff line
@@ -592,8 +592,7 @@ void iwl_mvm_vif_dbgfs_register(struct iwl_mvm *mvm, struct ieee80211_vif *vif) 
		return;

	}



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

	    iwlmvm_mod_params.power_scheme != IWL_POWER_SCHEME_CAM &&

	if (iwlmvm_mod_params.power_scheme != IWL_POWER_SCHEME_CAM &&

	    ((vif->type == NL80211_IFTYPE_STATION && !vif->p2p) ||

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

	      mvm->fw->ucode_capa.flags & IWL_UCODE_TLV_FLAGS_BSS_P2P_PS_DCM)))

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

+0 −6
Original line number Diff line number Diff line
@@ -468,12 +468,6 @@ int iwl_mvm_up(struct iwl_mvm *mvm) 
	/* Initialize tx backoffs to the minimal possible */

	iwl_mvm_tt_tx_backoff(mvm, 0);



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

		ret = iwl_power_legacy_set_cam_mode(mvm);

		if (ret)

			goto error;

	}



	ret = iwl_mvm_power_update_device(mvm);

	if (ret)

		goto error;

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

+0 −2
Original line number Diff line number Diff line
@@ -877,8 +877,6 @@ void iwl_mvm_update_frame_stats(struct iwl_mvm *mvm, 
int rs_pretty_print_rate(char *buf, const u32 rate);



/* power management */

int iwl_power_legacy_set_cam_mode(struct iwl_mvm *mvm);



int iwl_mvm_power_update_device(struct iwl_mvm *mvm);

int iwl_mvm_power_update_mac(struct iwl_mvm *mvm, struct ieee80211_vif *vif);

int iwl_mvm_power_mac_dbgfs_read(struct iwl_mvm *mvm, struct ieee80211_vif *vif,

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

+0 −20
Original line number Diff line number Diff line
@@ -437,9 +437,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_PM_CMD_SUPPORT))

		return 0;



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

		return 0;
@@ -646,9 +643,6 @@ int iwl_mvm_power_update_mac(struct iwl_mvm *mvm, struct ieee80211_vif *vif) 


	lockdep_assert_held(&mvm->mutex);



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

		return 0;



	iwl_mvm_power_set_pm(mvm, &vifs);



	/* disable PS if CAM */
@@ -698,10 +692,6 @@ int iwl_mvm_power_mac_dbgfs_read(struct iwl_mvm *mvm, 
	struct iwl_mac_power_cmd cmd = {};

	int pos = 0;



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

		      IWL_UCODE_TLV_FLAGS_PM_CMD_SUPPORT)))

		return 0;



	mutex_lock(&mvm->mutex);

	memcpy(&cmd, &mvmvif->mac_pwr_cmd, sizeof(cmd));

	mutex_unlock(&mvm->mutex);
@@ -941,13 +931,3 @@ int iwl_mvm_update_beacon_filter(struct iwl_mvm *mvm, 


	return iwl_mvm_enable_beacon_filter(mvm, vif, flags);

}
 


int iwl_power_legacy_set_cam_mode(struct iwl_mvm *mvm)

{

	struct iwl_powertable_cmd cmd = {

		.keep_alive_seconds = POWER_KEEP_ALIVE_PERIOD_SEC,

	};



	return iwl_mvm_send_cmd_pdu(mvm, POWER_TABLE_CMD, CMD_SYNC,

				    sizeof(cmd), &cmd);

}