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

Commit 11483b5c authored by Johannes Berg's avatar Johannes Berg Committed by John W. Linville
Browse files

iwlwifi: move eeprom into priv 



The whole code around eeprom is distributed
across whole bunch of different files, most
of which belong to the to-be-DVM code. As a
result, it is currently very hard to split
out the EEPROM code to be generic. However,
it is also quite unlikely that the current
EEPROM code will be needed by the MVM code
as that has different mechanisms to query
the EEPROM (it does so through the uCode.)

So, at least temporarily, move everything
into priv. If it becomes necessary to use
the code from MVM, we will have to split it
out, but then it's also easier since we'll
know what pieces we need.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 48dffd39

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

+4 −4
Original line number Diff line number Diff line
@@ -126,10 +126,10 @@ static struct iwl_sensitivity_ranges iwl5150_sensitivity = { 


#define IWL_5150_VOLTAGE_TO_TEMPERATURE_COEFF	(-5)



static s32 iwl_temp_calib_to_offset(struct iwl_shared *shrd)

static s32 iwl_temp_calib_to_offset(struct iwl_priv *priv)

{

	u16 temperature, voltage;

	__le16 *temp_calib = (__le16 *)iwl_eeprom_query_addr(shrd,

	__le16 *temp_calib = (__le16 *)iwl_eeprom_query_addr(priv,

				EEPROM_KELVIN_TEMPERATURE);



	temperature = le16_to_cpu(temp_calib[0]);
@@ -143,7 +143,7 @@ static void iwl5150_set_ct_threshold(struct iwl_priv *priv) 
{

	const s32 volt2temp_coef = IWL_5150_VOLTAGE_TO_TEMPERATURE_COEFF;

	s32 threshold = (s32)CELSIUS_TO_KELVIN(CT_KILL_THRESHOLD_LEGACY) -

			iwl_temp_calib_to_offset(priv->shrd);

			iwl_temp_calib_to_offset(priv);



	priv->hw_params.ct_kill_threshold = threshold * volt2temp_coef;

}
@@ -189,7 +189,7 @@ static void iwl5150_hw_set_hw_params(struct iwl_priv *priv) 
static void iwl5150_temperature(struct iwl_priv *priv)

{

	u32 vt = 0;

	s32 offset =  iwl_temp_calib_to_offset(priv->shrd);

	s32 offset =  iwl_temp_calib_to_offset(priv);



	vt = le32_to_cpu(priv->statistics.common.temperature);

	vt = vt / IWL_5150_VOLTAGE_TO_TEMPERATURE_COEFF + offset;

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

+2 −2
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ static void iwl6000_set_ct_threshold(struct iwl_priv *priv) 
static void iwl6050_additional_nic_config(struct iwl_priv *priv)

{

	/* Indicate calibration version to uCode. */

	if (iwl_eeprom_calib_version(priv->shrd) >= 6)

	if (iwl_eeprom_calib_version(priv) >= 6)

		iwl_set_bit(trans(priv), CSR_GP_DRIVER_REG,

				CSR_GP_DRIVER_REG_BIT_CALIB_VERSION6);

}
@@ -89,7 +89,7 @@ static void iwl6050_additional_nic_config(struct iwl_priv *priv) 
static void iwl6150_additional_nic_config(struct iwl_priv *priv)

{

	/* Indicate calibration version to uCode. */

	if (iwl_eeprom_calib_version(priv->shrd) >= 6)

	if (iwl_eeprom_calib_version(priv) >= 6)

		iwl_set_bit(trans(priv), CSR_GP_DRIVER_REG,

				CSR_GP_DRIVER_REG_BIT_CALIB_VERSION6);

	iwl_set_bit(trans(priv), CSR_GP_DRIVER_REG,

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

+0 −62
Original line number Diff line number Diff line
@@ -94,68 +94,6 @@ void iwlagn_temperature(struct iwl_priv *priv) 
	iwl_tt_handler(priv);

}



u16 iwl_eeprom_calib_version(struct iwl_shared *shrd)

{

	struct iwl_eeprom_calib_hdr *hdr;



	hdr = (struct iwl_eeprom_calib_hdr *)iwl_eeprom_query_addr(shrd,

							EEPROM_CALIB_ALL);

	return hdr->version;



}



/*

 * EEPROM

 */

static u32 eeprom_indirect_address(const struct iwl_shared *shrd, u32 address)

{

	u16 offset = 0;



	if ((address & INDIRECT_ADDRESS) == 0)

		return address;



	switch (address & INDIRECT_TYPE_MSK) {

	case INDIRECT_HOST:

		offset = iwl_eeprom_query16(shrd, EEPROM_LINK_HOST);

		break;

	case INDIRECT_GENERAL:

		offset = iwl_eeprom_query16(shrd, EEPROM_LINK_GENERAL);

		break;

	case INDIRECT_REGULATORY:

		offset = iwl_eeprom_query16(shrd, EEPROM_LINK_REGULATORY);

		break;

	case INDIRECT_TXP_LIMIT:

		offset = iwl_eeprom_query16(shrd, EEPROM_LINK_TXP_LIMIT);

		break;

	case INDIRECT_TXP_LIMIT_SIZE:

		offset = iwl_eeprom_query16(shrd, EEPROM_LINK_TXP_LIMIT_SIZE);

		break;

	case INDIRECT_CALIBRATION:

		offset = iwl_eeprom_query16(shrd, EEPROM_LINK_CALIBRATION);

		break;

	case INDIRECT_PROCESS_ADJST:

		offset = iwl_eeprom_query16(shrd, EEPROM_LINK_PROCESS_ADJST);

		break;

	case INDIRECT_OTHERS:

		offset = iwl_eeprom_query16(shrd, EEPROM_LINK_OTHERS);

		break;

	default:

		IWL_ERR(shrd->trans, "illegal indirect type: 0x%X\n",

		address & INDIRECT_TYPE_MSK);

		break;

	}



	/* translate the offset from words to byte */

	return (address & ADDRESS_MSK) + (offset << 1);

}



const u8 *iwl_eeprom_query_addr(const struct iwl_shared *shrd, size_t offset)

{

	u32 address = eeprom_indirect_address(shrd, offset);

	BUG_ON(address >= shrd->cfg->base_params->eeprom_size);

	return &shrd->eeprom[address];

}



struct iwl_mod_params iwlagn_mod_params = {

	.amsdu_size_8K = 1,

	.restart_fw = 1,

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

+5 −8
Original line number Diff line number Diff line
@@ -1550,11 +1550,8 @@ static struct iwl_op_mode *iwl_op_mode_dvm_start(struct iwl_trans *trans, 
	if (iwl_trans_start_hw(trans(priv)))

		goto out_free_traffic_mem;



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

	 * 3. Read EEPROM

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

	/* Read the EEPROM */

	if (iwl_eeprom_init(trans(priv), trans(priv)->hw_rev)) {

	if (iwl_eeprom_init(priv, trans(priv)->hw_rev)) {

		IWL_ERR(priv, "Unable to init EEPROM\n");

		goto out_free_traffic_mem;

	}
@@ -1568,11 +1565,11 @@ static struct iwl_op_mode *iwl_op_mode_dvm_start(struct iwl_trans *trans, 
		goto out_free_eeprom;



	/* extract MAC Address */

	iwl_eeprom_get_mac(priv->shrd, priv->addresses[0].addr);

	iwl_eeprom_get_mac(priv, priv->addresses[0].addr);

	IWL_DEBUG_INFO(priv, "MAC address: %pM\n", priv->addresses[0].addr);

	priv->hw->wiphy->addresses = priv->addresses;

	priv->hw->wiphy->n_addresses = 1;

	num_mac = iwl_eeprom_query16(priv->shrd, EEPROM_NUM_MAC_ADDRESS);

	num_mac = iwl_eeprom_query16(priv, EEPROM_NUM_MAC_ADDRESS);

	if (num_mac > 1) {

		memcpy(priv->addresses[1].addr, priv->addresses[0].addr,

		       ETH_ALEN);
@@ -1670,7 +1667,7 @@ static struct iwl_op_mode *iwl_op_mode_dvm_start(struct iwl_trans *trans, 
	priv->workqueue = NULL;

	iwl_uninit_drv(priv);

out_free_eeprom:

	iwl_eeprom_free(priv->shrd);

	iwl_eeprom_free(priv);

out_free_traffic_mem:

	iwl_free_traffic_mem(priv);

	ieee80211_free_hw(priv->hw);
@@ -1696,7 +1693,7 @@ static void iwl_op_mode_dvm_stop(struct iwl_op_mode *op_mode) 
	priv->ucode_loaded = false;

	iwl_trans_stop_device(trans(priv));



	iwl_eeprom_free(priv->shrd);

	iwl_eeprom_free(priv);



	/*netif_stop_queue(dev); */

	flush_workqueue(priv->workqueue);

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

+0 −4
Original line number Diff line number Diff line
@@ -138,7 +138,6 @@ int iwl_dump_nic_event_log(struct iwl_priv *priv, bool full_log, 
/* lib */

int iwlagn_send_tx_power(struct iwl_priv *priv);

void iwlagn_temperature(struct iwl_priv *priv);

u16 iwl_eeprom_calib_version(struct iwl_shared *shrd);

int iwlagn_txfifo_flush(struct iwl_priv *priv, u16 flush_control);

void iwlagn_dev_txfifo_flush(struct iwl_priv *priv, u16 flush_control);

int iwlagn_send_beacon_cmd(struct iwl_priv *priv);
@@ -312,9 +311,6 @@ static inline __le32 iwl_hw_set_rate_n_flags(u8 rate, u32 flags) 
	return cpu_to_le32(flags|(u32)rate);

}



/* eeprom */

void iwl_eeprom_get_mac(const struct iwl_shared *shrd, u8 *mac);



extern int iwl_alive_start(struct iwl_priv *priv);

/* svtool */

#ifdef CONFIG_IWLWIFI_DEVICE_TESTMODE