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

Commit 6221d47c authored by Dor Shaish's avatar Dor Shaish Committed by Johannes Berg
Browse files

iwlwifi: mvm: Take the phy_cfg from the TLV value 



The phy_cfg is given from the TLV value and does not have to be
built by us.

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 e07cbb53

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

+1 −15
Original line number Original line Diff line number Diff line
@@ -241,20 +241,6 @@ static int iwl_mvm_load_ucode_wait_alive(struct iwl_mvm *mvm, 




	return 0;

	return 0;

}

}

#define IWL_HW_REV_ID_RAINBOW	0x2

#define IWL_PROJ_TYPE_LHP	0x5



static u32 iwl_mvm_build_phy_cfg(struct iwl_mvm *mvm)

{

	struct iwl_nvm_data *data = mvm->nvm_data;

	/* Temp calls to static definitions, will be changed to CSR calls */

	u8 hw_rev_id = IWL_HW_REV_ID_RAINBOW;

	u8 project_type = IWL_PROJ_TYPE_LHP;



	return data->radio_cfg_dash | (data->radio_cfg_step << 2) |

		(hw_rev_id << 4) | ((project_type & 0x7f) << 6) |

		(data->valid_tx_ant << 16) | (data->valid_rx_ant << 20);

}





static int iwl_send_phy_cfg_cmd(struct iwl_mvm *mvm)

static int iwl_send_phy_cfg_cmd(struct iwl_mvm *mvm)

{

{
@@ -262,7 +248,7 @@ static int iwl_send_phy_cfg_cmd(struct iwl_mvm *mvm) 
	enum iwl_ucode_type ucode_type = mvm->cur_ucode;

	enum iwl_ucode_type ucode_type = mvm->cur_ucode;





	/* Set parameters */

	/* Set parameters */

	phy_cfg_cmd.phy_cfg = cpu_to_le32(iwl_mvm_build_phy_cfg(mvm));

	phy_cfg_cmd.phy_cfg = cpu_to_le32(mvm->fw->phy_config);

	phy_cfg_cmd.calib_control.event_trigger =

	phy_cfg_cmd.calib_control.event_trigger =

		mvm->fw->default_calib[ucode_type].event_trigger;

		mvm->fw->default_calib[ucode_type].event_trigger;

	phy_cfg_cmd.calib_control.flow_trigger =

	phy_cfg_cmd.calib_control.flow_trigger =