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

Commit 8d40f4ee authored by Johannes Berg's avatar Johannes Berg
Browse files

iwlwifi: remove sku field from hw_params 



Now that the eeprom parsing code overrides the sku
field directly with 11n_disable parameters, there's
no longer a need to keep a copy of this field.

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

drivers/net/wireless/iwlwifi/dvm/dev.h

+0 −2
Original line number Original line Diff line number Diff line
@@ -568,7 +568,6 @@ enum iwl_scan_type { 
 *

 *

 * @tx_chains_num: Number of TX chains

 * @tx_chains_num: Number of TX chains

 * @rx_chains_num: Number of RX chains

 * @rx_chains_num: Number of RX chains

 * @sku: sku read from EEPROM

 * @ct_kill_threshold: temperature threshold - in hw dependent unit

 * @ct_kill_threshold: temperature threshold - in hw dependent unit

 * @ct_kill_exit_threshold: when to reeable the device - in hw dependent unit

 * @ct_kill_exit_threshold: when to reeable the device - in hw dependent unit

 *	relevant for 1000, 6000 and up

 *	relevant for 1000, 6000 and up
@@ -579,7 +578,6 @@ struct iwl_hw_params { 
	u8  tx_chains_num;

	u8  tx_chains_num;

	u8  rx_chains_num;

	u8  rx_chains_num;

	bool use_rts_for_aggregation;

	bool use_rts_for_aggregation;

	u16 sku;

	u32 ct_kill_threshold;

	u32 ct_kill_threshold;

	u32 ct_kill_exit_threshold;

	u32 ct_kill_exit_threshold;

drivers/net/wireless/iwlwifi/dvm/lib.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -160,7 +160,7 @@ int iwlagn_txfifo_flush(struct iwl_priv *priv, u16 flush_control) 
				IWL_PAN_SCD_BK_MSK | IWL_PAN_SCD_MGMT_MSK |

				IWL_PAN_SCD_BK_MSK | IWL_PAN_SCD_MGMT_MSK |

				IWL_PAN_SCD_MULTICAST_MSK;

				IWL_PAN_SCD_MULTICAST_MSK;





	if (priv->hw_params.sku & EEPROM_SKU_CAP_11N_ENABLE)

	if (priv->eeprom_data->sku & EEPROM_SKU_CAP_11N_ENABLE)

		flush_cmd.fifo_control |= IWL_AGG_TX_QUEUE_MSK;

		flush_cmd.fifo_control |= IWL_AGG_TX_QUEUE_MSK;





	IWL_DEBUG_INFO(priv, "fifo queue control: 0X%x\n",

	IWL_DEBUG_INFO(priv, "fifo queue control: 0X%x\n",

drivers/net/wireless/iwlwifi/dvm/mac80211.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -164,7 +164,7 @@ int iwlagn_mac_setup_register(struct iwl_priv *priv, 
	hw->max_tx_aggregation_subframes = LINK_QUAL_AGG_FRAME_LIMIT_DEF;

	hw->max_tx_aggregation_subframes = LINK_QUAL_AGG_FRAME_LIMIT_DEF;

	 */

	 */





	if (priv->hw_params.sku & EEPROM_SKU_CAP_11N_ENABLE)

	if (priv->eeprom_data->sku & EEPROM_SKU_CAP_11N_ENABLE)

		hw->flags |= IEEE80211_HW_SUPPORTS_DYNAMIC_SMPS |

		hw->flags |= IEEE80211_HW_SUPPORTS_DYNAMIC_SMPS |

			     IEEE80211_HW_SUPPORTS_STATIC_SMPS;

			     IEEE80211_HW_SUPPORTS_STATIC_SMPS;
@@ -649,7 +649,7 @@ static int iwlagn_mac_ampdu_action(struct ieee80211_hw *hw, 
	IWL_DEBUG_HT(priv, "A-MPDU action on addr %pM tid %d\n",

	IWL_DEBUG_HT(priv, "A-MPDU action on addr %pM tid %d\n",

		     sta->addr, tid);

		     sta->addr, tid);





	if (!(priv->hw_params.sku & EEPROM_SKU_CAP_11N_ENABLE))

	if (!(priv->eeprom_data->sku & EEPROM_SKU_CAP_11N_ENABLE))

		return -EACCES;

		return -EACCES;





	IWL_DEBUG_MAC80211(priv, "enter\n");

	IWL_DEBUG_MAC80211(priv, "enter\n");

drivers/net/wireless/iwlwifi/dvm/main.c

+5 −8
Original line number Original line Diff line number Diff line
@@ -1187,9 +1187,6 @@ static void iwl_set_hw_params(struct iwl_priv *priv) 
		priv->hw_params.use_rts_for_aggregation =

		priv->hw_params.use_rts_for_aggregation =

			priv->cfg->ht_params->use_rts_for_aggregation;

			priv->cfg->ht_params->use_rts_for_aggregation;





	if (iwlwifi_mod_params.disable_11n & IWL_DISABLE_HT_ALL)

		priv->hw_params.sku &= ~EEPROM_SKU_CAP_11N_ENABLE;



	/* Device-specific setup */

	/* Device-specific setup */

	priv->lib->set_hw_params(priv);

	priv->lib->set_hw_params(priv);

}

}
@@ -1234,20 +1231,20 @@ static int iwl_eeprom_init_hw_params(struct iwl_priv *priv) 
{

{

	u16 radio_cfg;

	u16 radio_cfg;





	priv->hw_params.sku = priv->eeprom_data->sku;

	priv->eeprom_data->sku = priv->eeprom_data->sku;





	if (priv->hw_params.sku & EEPROM_SKU_CAP_11N_ENABLE &&

	if (priv->eeprom_data->sku & EEPROM_SKU_CAP_11N_ENABLE &&

	    !priv->cfg->ht_params) {

	    !priv->cfg->ht_params) {

		IWL_ERR(priv, "Invalid 11n configuration\n");

		IWL_ERR(priv, "Invalid 11n configuration\n");

		return -EINVAL;

		return -EINVAL;

	}

	}





	if (!priv->hw_params.sku) {

	if (!priv->eeprom_data->sku) {

		IWL_ERR(priv, "Invalid device sku\n");

		IWL_ERR(priv, "Invalid device sku\n");

		return -EINVAL;

		return -EINVAL;

	}

	}





	IWL_INFO(priv, "Device SKU: 0x%X\n", priv->hw_params.sku);

	IWL_INFO(priv, "Device SKU: 0x%X\n", priv->eeprom_data->sku);





	radio_cfg = priv->eeprom_data->radio_cfg;

	radio_cfg = priv->eeprom_data->radio_cfg;
@@ -1453,7 +1450,7 @@ static struct iwl_op_mode *iwl_op_mode_dvm_start(struct iwl_trans *trans, 
	 ************************/

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

	iwl_set_hw_params(priv);

	iwl_set_hw_params(priv);





	if (!(priv->hw_params.sku & EEPROM_SKU_CAP_IPAN_ENABLE)) {

	if (!(priv->eeprom_data->sku & EEPROM_SKU_CAP_IPAN_ENABLE)) {

		IWL_DEBUG_INFO(priv, "Your EEPROM disabled PAN");

		IWL_DEBUG_INFO(priv, "Your EEPROM disabled PAN");

		ucode_flags &= ~IWL_UCODE_TLV_FLAGS_PAN;

		ucode_flags &= ~IWL_UCODE_TLV_FLAGS_PAN;

		/*

		/*