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

Commit a0544272 authored by Moshe Harel's avatar Moshe Harel Committed by Emmanuel Grumbach
Browse files

iwlwifi: mvm: support LnP 1x1 antenna configuration 



The antenna configuration has to be read also from OTP
Currently read only from FW image
Guideline: An antenna exists only if appears both in FW image & NVM

Signed-off-by: default avatarMoshe Harel <moshe.harel@intel.com>
Reviewed-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
parent 7074cc42

drivers/net/wireless/iwlwifi/iwl-nvm-parse.c

+6 −0
Original line number Diff line number Diff line
@@ -468,6 +468,8 @@ static void iwl_set_radio_cfg(const struct iwl_cfg *cfg, 
	data->radio_cfg_step = NVM_RF_CFG_STEP_MSK_FAMILY_8000(radio_cfg);

	data->radio_cfg_dash = NVM_RF_CFG_DASH_MSK_FAMILY_8000(radio_cfg);

	data->radio_cfg_pnum = NVM_RF_CFG_FLAVOR_MSK_FAMILY_8000(radio_cfg);

	data->valid_tx_ant = NVM_RF_CFG_TX_ANT_MSK_FAMILY_8000(radio_cfg);

	data->valid_rx_ant = NVM_RF_CFG_RX_ANT_MSK_FAMILY_8000(radio_cfg);

}



static void iwl_set_hw_address(const struct iwl_cfg *cfg,
@@ -592,6 +594,10 @@ iwl_parse_nvm_data(struct device *dev, const struct iwl_cfg *cfg, 


	radio_cfg = iwl_get_radio_cfg(cfg, nvm_sw);

	iwl_set_radio_cfg(cfg, data, radio_cfg);

	if (data->valid_tx_ant)

		tx_chains &= data->valid_tx_ant;

	if (data->valid_rx_ant)

		rx_chains &= data->valid_rx_ant;



	sku = iwl_get_sku(cfg, nvm_sw);

	data->sku_cap_band_24GHz_enable = sku & NVM_SKU_CAP_BAND_24GHZ;

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

+1 −1
Original line number Diff line number Diff line
@@ -933,7 +933,7 @@ iwl_dbgfs_scan_ant_rxchain_write(struct iwl_mvm *mvm, char *buf, 
		return -EINVAL;

	if (scan_rx_ant > ANT_ABC)

		return -EINVAL;

	if (scan_rx_ant & ~mvm->fw->valid_rx_ant)

	if (scan_rx_ant & ~(iwl_mvm_get_valid_rx_ant(mvm)))

		return -EINVAL;



	if (mvm->scan_rx_ant != scan_rx_ant) {

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

+4 −4
Original line number Diff line number Diff line
@@ -269,7 +269,7 @@ static int iwl_send_phy_cfg_cmd(struct iwl_mvm *mvm) 
	enum iwl_ucode_type ucode_type = mvm->cur_ucode;



	/* Set parameters */

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

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

	phy_cfg_cmd.calib_control.event_trigger =

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

	phy_cfg_cmd.calib_control.flow_trigger =
@@ -346,7 +346,7 @@ int iwl_run_init_mvm_ucode(struct iwl_mvm *mvm, bool read_nvm) 
	mvm->calibrating = true;



	/* Send TX valid antennas before triggering calibrations */

	ret = iwl_send_tx_ant_cfg(mvm, mvm->fw->valid_tx_ant);

	ret = iwl_send_tx_ant_cfg(mvm, iwl_mvm_get_valid_tx_ant(mvm));

	if (ret)

		goto error;
@@ -489,7 +489,7 @@ int iwl_mvm_up(struct iwl_mvm *mvm) 
	mvm->fw_dbg_conf = FW_DBG_INVALID;

	iwl_mvm_start_fw_dbg_conf(mvm, FW_DBG_CUSTOM);



	ret = iwl_send_tx_ant_cfg(mvm, mvm->fw->valid_tx_ant);

	ret = iwl_send_tx_ant_cfg(mvm, iwl_mvm_get_valid_tx_ant(mvm));

	if (ret)

		goto error;
@@ -584,7 +584,7 @@ int iwl_mvm_load_d3_fw(struct iwl_mvm *mvm) 
		goto error;

	}



	ret = iwl_send_tx_ant_cfg(mvm, mvm->fw->valid_tx_ant);

	ret = iwl_send_tx_ant_cfg(mvm, iwl_mvm_get_valid_tx_ant(mvm));

	if (ret)

		goto error;

drivers/net/wireless/iwlwifi/mvm/mac-ctxt.c

+1 −1
Original line number Diff line number Diff line
@@ -975,7 +975,7 @@ static int iwl_mvm_mac_ctxt_send_beacon(struct iwl_mvm *mvm, 
	beacon_cmd.tx.tx_flags = cpu_to_le32(tx_flags);



	mvm->mgmt_last_antenna_idx =

		iwl_mvm_next_antenna(mvm, mvm->fw->valid_tx_ant,

		iwl_mvm_next_antenna(mvm, iwl_mvm_get_valid_tx_ant(mvm),

				     mvm->mgmt_last_antenna_idx);



	beacon_cmd.tx.rate_n_flags =

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

+27 −0
Original line number Diff line number Diff line
@@ -937,6 +937,33 @@ int iwl_mvm_rx_statistics(struct iwl_mvm *mvm, 
int iwl_nvm_init(struct iwl_mvm *mvm, bool read_nvm_from_nic);

int iwl_mvm_load_nvm_to_nic(struct iwl_mvm *mvm);



static inline u8 iwl_mvm_get_valid_tx_ant(struct iwl_mvm *mvm)

{

	return mvm->nvm_data && mvm->nvm_data->valid_tx_ant ?

	       mvm->fw->valid_tx_ant & mvm->nvm_data->valid_tx_ant :

	       mvm->fw->valid_tx_ant;

}



static inline u8 iwl_mvm_get_valid_rx_ant(struct iwl_mvm *mvm)

{

	return mvm->nvm_data && mvm->nvm_data->valid_rx_ant ?

	       mvm->fw->valid_rx_ant & mvm->nvm_data->valid_rx_ant :

	       mvm->fw->valid_rx_ant;

}



static inline u32 iwl_mvm_get_phy_config(struct iwl_mvm *mvm)

{

	u32 phy_config = ~(FW_PHY_CFG_TX_CHAIN |

			   FW_PHY_CFG_RX_CHAIN);

	u32 valid_rx_ant = iwl_mvm_get_valid_rx_ant(mvm);

	u32 valid_tx_ant = iwl_mvm_get_valid_tx_ant(mvm);



	phy_config |= valid_tx_ant << FW_PHY_CFG_TX_CHAIN_POS |

		      valid_rx_ant << FW_PHY_CFG_RX_CHAIN_POS;



	return mvm->fw->phy_config & phy_config;

}



int iwl_mvm_up(struct iwl_mvm *mvm);

int iwl_mvm_load_d3_fw(struct iwl_mvm *mvm);