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

Commit d110cb51 authored by Emmanuel Grumbach's avatar Emmanuel Grumbach Committed by Johannes Berg
Browse files

iwlwifi: mvm: take the radio type / step / dash from TLVs 



This data should taken from TLVs and not from the NVM. This
is true for the value written in CSR_HW_IF_CONFIG_REG too.

Also, no need to set the CSR_HW_IF_CONFIG_REG_BIT_MAC_SI bit
for 7000 devices which are the only devices currently
supported.

Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 53585495

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

+13 −0
Original line number Diff line number Diff line
@@ -154,6 +154,19 @@ struct iwl_tlv_calib_ctrl { 
	__le32 event_trigger;

} __packed;



enum iwl_fw_phy_cfg {

	FW_PHY_CFG_RADIO_TYPE_POS = 0,

	FW_PHY_CFG_RADIO_TYPE = 0x3 << FW_PHY_CFG_RADIO_TYPE_POS,

	FW_PHY_CFG_RADIO_STEP_POS = 2,

	FW_PHY_CFG_RADIO_STEP = 0x3 << FW_PHY_CFG_RADIO_STEP_POS,

	FW_PHY_CFG_RADIO_DASH_POS = 4,

	FW_PHY_CFG_RADIO_DASH = 0x3 << FW_PHY_CFG_RADIO_DASH_POS,

	FW_PHY_CFG_TX_CHAIN_POS = 16,

	FW_PHY_CFG_TX_CHAIN = 0xf << FW_PHY_CFG_TX_CHAIN_POS,

	FW_PHY_CFG_RX_CHAIN_POS = 20,

	FW_PHY_CFG_RX_CHAIN = 0xf << FW_PHY_CFG_RX_CHAIN_POS,

};



/**

 * struct iwl_fw - variables associated with the firmware

 *

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

+6 −16
Original line number Diff line number Diff line
@@ -143,21 +143,12 @@ static void iwl_mvm_nic_config(struct iwl_op_mode *op_mode) 
	u8 radio_cfg_type, radio_cfg_step, radio_cfg_dash;

	u32 reg_val = 0;



	/*

	 * We can't upload the correct value to the INIT image

	 * as we don't have nvm_data by that time.

	 *

	 * TODO: Figure out what we should do here

	 */

	if (mvm->nvm_data) {

		radio_cfg_type = mvm->nvm_data->radio_cfg_type;

		radio_cfg_step = mvm->nvm_data->radio_cfg_step;

		radio_cfg_dash = mvm->nvm_data->radio_cfg_dash;

	} else {

		radio_cfg_type = 0;

		radio_cfg_step = 0;

		radio_cfg_dash = 0;

	}

	radio_cfg_type = (mvm->fw->phy_config & FW_PHY_CFG_RADIO_TYPE) >>

			  FW_PHY_CFG_RADIO_TYPE_POS;

	radio_cfg_step = (mvm->fw->phy_config & FW_PHY_CFG_RADIO_STEP) >>

			  FW_PHY_CFG_RADIO_STEP_POS;

	radio_cfg_dash = (mvm->fw->phy_config & FW_PHY_CFG_RADIO_DASH) >>

			  FW_PHY_CFG_RADIO_DASH_POS;



	/* SKU control */

	reg_val |= CSR_HW_REV_STEP(mvm->trans->hw_rev) <<
@@ -175,7 +166,6 @@ static void iwl_mvm_nic_config(struct iwl_op_mode *op_mode) 


	/* silicon bits */

	reg_val |= CSR_HW_IF_CONFIG_REG_BIT_RADIO_SI;

	reg_val |= CSR_HW_IF_CONFIG_REG_BIT_MAC_SI;



	iwl_trans_set_bits_mask(mvm->trans, CSR_HW_IF_CONFIG_REG,

				CSR_HW_IF_CONFIG_REG_MSK_MAC_DASH |