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

Commit 6942fec9 authored by Wey-Yi Guy's avatar Wey-Yi Guy
Browse files

iwlagn: implement layout-agnostic EEPROM reading 



From: Johannes Berg <johannes.berg@intel.com>

The current EEPROM reading code has some layout
assumptions that now turned out to be false with
some newer versions of the EEPROM. Luckily, we
can avoid all such assumptions by using data in
the EEPROM itself, so implement using that.

However, for risk mitigation purposes, keep the
old reading code for current hardware for now.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
parent cbf68a66

drivers/net/wireless/iwlwifi/iwl-1000.c

+2 −0
Original line number Diff line number Diff line
@@ -315,6 +315,7 @@ struct iwl_cfg iwl100_bgn_cfg = { 
	.mod_params = &iwlagn_mod_params,

	.base_params = &iwl1000_base_params,

	.ht_params = &iwl1000_ht_params,

	.use_new_eeprom_reading = true,

};



struct iwl_cfg iwl100_bg_cfg = {
@@ -330,6 +331,7 @@ struct iwl_cfg iwl100_bg_cfg = { 
	.ops = &iwl1000_ops,

	.mod_params = &iwlagn_mod_params,

	.base_params = &iwl1000_base_params,

	.use_new_eeprom_reading = true,

};



MODULE_FIRMWARE(IWL1000_MODULE_FIRMWARE(IWL1000_UCODE_API_MAX));

drivers/net/wireless/iwlwifi/iwl-6000.c

+12 −0
Original line number Diff line number Diff line
@@ -561,6 +561,7 @@ struct iwl_cfg iwl6000g2a_2agn_cfg = { 
	.ht_params = &iwl6000_ht_params,

	.need_dc_calib = true,

	.need_temp_offset_calib = true,

	.use_new_eeprom_reading = true,

};



struct iwl_cfg iwl6000g2a_2abg_cfg = {
@@ -578,6 +579,7 @@ struct iwl_cfg iwl6000g2a_2abg_cfg = { 
	.base_params = &iwl6000_base_params,

	.need_dc_calib = true,

	.need_temp_offset_calib = true,

	.use_new_eeprom_reading = true,

};



struct iwl_cfg iwl6000g2a_2bg_cfg = {
@@ -595,6 +597,7 @@ struct iwl_cfg iwl6000g2a_2bg_cfg = { 
	.base_params = &iwl6000_base_params,

	.need_dc_calib = true,

	.need_temp_offset_calib = true,

	.use_new_eeprom_reading = true,

};



struct iwl_cfg iwl6000g2b_2agn_cfg = {
@@ -616,6 +619,7 @@ struct iwl_cfg iwl6000g2b_2agn_cfg = { 
	.need_temp_offset_calib = true,

	/* Due to bluetooth, we transmit 2.4 GHz probes only on antenna A */

	.scan_tx_antennas[IEEE80211_BAND_2GHZ] = ANT_A,

	.use_new_eeprom_reading = true,

};



struct iwl_cfg iwl6000g2b_2abg_cfg = {
@@ -636,6 +640,7 @@ struct iwl_cfg iwl6000g2b_2abg_cfg = { 
	.need_temp_offset_calib = true,

	/* Due to bluetooth, we transmit 2.4 GHz probes only on antenna A */

	.scan_tx_antennas[IEEE80211_BAND_2GHZ] = ANT_A,

	.use_new_eeprom_reading = true,

};



struct iwl_cfg iwl6000g2b_2bgn_cfg = {
@@ -657,6 +662,7 @@ struct iwl_cfg iwl6000g2b_2bgn_cfg = { 
	.need_temp_offset_calib = true,

	/* Due to bluetooth, we transmit 2.4 GHz probes only on antenna A */

	.scan_tx_antennas[IEEE80211_BAND_2GHZ] = ANT_A,

	.use_new_eeprom_reading = true,

};



struct iwl_cfg iwl6000g2b_2bg_cfg = {
@@ -677,6 +683,7 @@ struct iwl_cfg iwl6000g2b_2bg_cfg = { 
	.need_temp_offset_calib = true,

	/* Due to bluetooth, we transmit 2.4 GHz probes only on antenna A */

	.scan_tx_antennas[IEEE80211_BAND_2GHZ] = ANT_A,

	.use_new_eeprom_reading = true,

};



struct iwl_cfg iwl6000g2b_bgn_cfg = {
@@ -698,6 +705,7 @@ struct iwl_cfg iwl6000g2b_bgn_cfg = { 
	.need_temp_offset_calib = true,

	/* Due to bluetooth, we transmit 2.4 GHz probes only on antenna A */

	.scan_tx_antennas[IEEE80211_BAND_2GHZ] = ANT_A,

	.use_new_eeprom_reading = true,

};



struct iwl_cfg iwl6000g2b_bg_cfg = {
@@ -718,6 +726,7 @@ struct iwl_cfg iwl6000g2b_bg_cfg = { 
	.need_temp_offset_calib = true,

	/* Due to bluetooth, we transmit 2.4 GHz probes only on antenna A */

	.scan_tx_antennas[IEEE80211_BAND_2GHZ] = ANT_A,

	.use_new_eeprom_reading = true,

};



/*
@@ -804,6 +813,7 @@ struct iwl_cfg iwl6050g2_bgn_cfg = { 
	.base_params = &iwl6050_base_params,

	.ht_params = &iwl6000_ht_params,

	.need_dc_calib = true,

	.use_new_eeprom_reading = true,

};



struct iwl_cfg iwl6050_2abg_cfg = {
@@ -857,6 +867,7 @@ struct iwl_cfg iwl130_bgn_cfg = { 
	.need_dc_calib = true,

	/* Due to bluetooth, we transmit 2.4 GHz probes only on antenna A */

	.scan_tx_antennas[IEEE80211_BAND_2GHZ] = ANT_A,

	.use_new_eeprom_reading = true,

};



struct iwl_cfg iwl130_bg_cfg = {
@@ -876,6 +887,7 @@ struct iwl_cfg iwl130_bg_cfg = { 
	.need_dc_calib = true,

	/* Due to bluetooth, we transmit 2.4 GHz probes only on antenna A */

	.scan_tx_antennas[IEEE80211_BAND_2GHZ] = ANT_A,

	.use_new_eeprom_reading = true,

};



MODULE_FIRMWARE(IWL6000_MODULE_FIRMWARE(IWL6000_UCODE_API_MAX));

drivers/net/wireless/iwlwifi/iwl-agn-eeprom.c

+84 −1
Original line number Diff line number Diff line
@@ -392,7 +392,7 @@ static s8 iwl_update_channel_txpower(struct iwl_priv *priv, 
/**

 * iwlcore_eeprom_enhanced_txpower: process enhanced tx power info

 */

void iwlcore_eeprom_enhanced_txpower(struct iwl_priv *priv)

static void iwlcore_eeprom_enhanced_txpower_old(struct iwl_priv *priv)

{

	int eeprom_section_count = 0;

	int section, element;
@@ -453,3 +453,86 @@ void iwlcore_eeprom_enhanced_txpower(struct iwl_priv *priv) 
		}

	}

}



static void

iwlcore_eeprom_enh_txp_read_element(struct iwl_priv *priv,

				    struct iwl_eeprom_enhanced_txpwr *txp,

				    s8 max_txpower_avg)

{

	int ch_idx;

	bool is_ht40 = txp->flags & IWL_EEPROM_ENH_TXP_FL_40MHZ;

	enum ieee80211_band band;



	band = txp->flags & IWL_EEPROM_ENH_TXP_FL_BAND_52G ?

		IEEE80211_BAND_5GHZ : IEEE80211_BAND_2GHZ;



	for (ch_idx = 0; ch_idx < priv->channel_count; ch_idx++) {

		struct iwl_channel_info *ch_info = &priv->channel_info[ch_idx];



		/* update matching channel or from common data only */

		if (txp->channel != 0 && ch_info->channel != txp->channel)

			continue;



		/* update matching band only */

		if (band != ch_info->band)

			continue;



		if (ch_info->max_power_avg < max_txpower_avg && !is_ht40) {

			ch_info->max_power_avg = max_txpower_avg;

			ch_info->curr_txpow = max_txpower_avg;

			ch_info->scan_power = max_txpower_avg;

		}



		if (is_ht40 && ch_info->ht40_max_power_avg < max_txpower_avg)

			ch_info->ht40_max_power_avg = max_txpower_avg;

	}

}



#define EEPROM_TXP_OFFS	(0x00 | INDIRECT_ADDRESS | INDIRECT_TXP_LIMIT)

#define EEPROM_TXP_ENTRY_LEN sizeof(struct iwl_eeprom_enhanced_txpwr)

#define EEPROM_TXP_SZ_OFFS (0x00 | INDIRECT_ADDRESS | INDIRECT_TXP_LIMIT_SIZE)



static void iwlcore_eeprom_enhanced_txpower_new(struct iwl_priv *priv)

{

	struct iwl_eeprom_enhanced_txpwr *txp_array, *txp;

	int idx, entries;

	__le16 *txp_len;

	s8 max_txp_avg, max_txp_avg_halfdbm;



	BUILD_BUG_ON(sizeof(struct iwl_eeprom_enhanced_txpwr) != 8);



	/* the length is in 16-bit words, but we want entries */

	txp_len = (__le16 *) iwlagn_eeprom_query_addr(priv, EEPROM_TXP_SZ_OFFS);

	entries = le16_to_cpup(txp_len) * 2 / EEPROM_TXP_ENTRY_LEN;



	txp_array = (void *) iwlagn_eeprom_query_addr(priv, EEPROM_TXP_OFFS);

	for (idx = 0; idx < entries; idx++) {

		txp = &txp_array[idx];



		/* skip invalid entries */

		if (!(txp->flags & IWL_EEPROM_ENH_TXP_FL_VALID))

			continue;



		max_txp_avg = iwl_get_max_txpower_avg(priv, txp_array, idx,

						      &max_txp_avg_halfdbm);



		/*

		 * Update the user limit values values to the highest

		 * power supported by any channel

		 */

		if (max_txp_avg > priv->tx_power_user_lmt)

			priv->tx_power_user_lmt = max_txp_avg;

		if (max_txp_avg_halfdbm > priv->tx_power_lmt_in_half_dbm)

			priv->tx_power_lmt_in_half_dbm = max_txp_avg_halfdbm;



		iwlcore_eeprom_enh_txp_read_element(priv, txp, max_txp_avg);

	}

}



void iwlcore_eeprom_enhanced_txpower(struct iwl_priv *priv)

{

	if (priv->cfg->use_new_eeprom_reading)

		iwlcore_eeprom_enhanced_txpower_new(priv);

	else

		iwlcore_eeprom_enhanced_txpower_old(priv);

}

drivers/net/wireless/iwlwifi/iwl-agn-lib.c

+6 −0
Original line number Diff line number Diff line
@@ -569,6 +569,12 @@ static u32 eeprom_indirect_address(const struct iwl_priv *priv, u32 address) 
	case INDIRECT_REGULATORY:

		offset = iwl_eeprom_query16(priv, EEPROM_LINK_REGULATORY);

		break;

	case INDIRECT_TXP_LIMIT:

		offset = iwl_eeprom_query16(priv, EEPROM_LINK_TXP_LIMIT);

		break;

	case INDIRECT_TXP_LIMIT_SIZE:

		offset = iwl_eeprom_query16(priv, EEPROM_LINK_TXP_LIMIT_SIZE);

		break;

	case INDIRECT_CALIBRATION:

		offset = iwl_eeprom_query16(priv, EEPROM_LINK_CALIBRATION);

		break;

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

+1 −0
Original line number Diff line number Diff line
@@ -390,6 +390,7 @@ struct iwl_cfg { 
	const bool need_temp_offset_calib; /* if used set to true */

	u8 scan_rx_antennas[IEEE80211_NUM_BANDS];

	u8 scan_tx_antennas[IEEE80211_NUM_BANDS];

	const bool use_new_eeprom_reading; /* temporary, remove later */

};



/***************************