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

Commit ab36eab2 authored by Don Fry's avatar Don Fry Committed by Wey-Yi Guy
Browse files

iwlwifi: move eeprom pointer from iwl_priv to iwl_shared 



The eeprom image is a device level component, move from iwl_priv
to iwl_shared, with associated code changes.

Signed-off-by: default avatarDon Fry <donald.h.fry@intel.com>
Signed-off-by: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
parent b8deb492

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

+4 −4
Original line number Diff line number Diff line
@@ -134,10 +134,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_priv *priv)

static s32 iwl_temp_calib_to_offset(struct iwl_shared *shrd)

{

	u16 temperature, voltage;

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

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

				EEPROM_KELVIN_TEMPERATURE);



	temperature = le16_to_cpu(temp_calib[0]);
@@ -151,7 +151,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);

			iwl_temp_calib_to_offset(priv->shrd);



	hw_params(priv).ct_kill_threshold = threshold * volt2temp_coef;

}
@@ -223,7 +223,7 @@ static int 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);

	s32 offset =  iwl_temp_calib_to_offset(priv->shrd);



	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 (iwlagn_eeprom_calib_version(priv) >= 6)

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

		iwl_set_bit(bus(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 (iwlagn_eeprom_calib_version(priv) >= 6)

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

		iwl_set_bit(bus(priv), CSR_GP_DRIVER_REG,

				CSR_GP_DRIVER_REG_BIT_CALIB_VERSION6);

	iwl_set_bit(bus(priv), CSR_GP_DRIVER_REG,

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

+16 −16
Original line number Diff line number Diff line
@@ -92,11 +92,11 @@ void iwlagn_temperature(struct iwl_priv *priv) 
	iwl_tt_handler(priv);

}



u16 iwlagn_eeprom_calib_version(struct iwl_priv *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(priv,

	hdr = (struct iwl_eeprom_calib_hdr *)iwl_eeprom_query_addr(shrd,

							EEPROM_CALIB_ALL);

	return hdr->version;
@@ -105,7 +105,7 @@ u16 iwlagn_eeprom_calib_version(struct iwl_priv *priv) 
/*

 * EEPROM

 */

static u32 eeprom_indirect_address(const struct iwl_priv *priv, u32 address)

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

{

	u16 offset = 0;
@@ -114,31 +114,31 @@ static u32 eeprom_indirect_address(const struct iwl_priv *priv, u32 address) 


	switch (address & INDIRECT_TYPE_MSK) {

	case INDIRECT_HOST:

		offset = iwl_eeprom_query16(priv, EEPROM_LINK_HOST);

		offset = iwl_eeprom_query16(shrd, EEPROM_LINK_HOST);

		break;

	case INDIRECT_GENERAL:

		offset = iwl_eeprom_query16(priv, EEPROM_LINK_GENERAL);

		offset = iwl_eeprom_query16(shrd, EEPROM_LINK_GENERAL);

		break;

	case INDIRECT_REGULATORY:

		offset = iwl_eeprom_query16(priv, EEPROM_LINK_REGULATORY);

		offset = iwl_eeprom_query16(shrd, EEPROM_LINK_REGULATORY);

		break;

	case INDIRECT_TXP_LIMIT:

		offset = iwl_eeprom_query16(priv, EEPROM_LINK_TXP_LIMIT);

		offset = iwl_eeprom_query16(shrd, EEPROM_LINK_TXP_LIMIT);

		break;

	case INDIRECT_TXP_LIMIT_SIZE:

		offset = iwl_eeprom_query16(priv, EEPROM_LINK_TXP_LIMIT_SIZE);

		offset = iwl_eeprom_query16(shrd, EEPROM_LINK_TXP_LIMIT_SIZE);

		break;

	case INDIRECT_CALIBRATION:

		offset = iwl_eeprom_query16(priv, EEPROM_LINK_CALIBRATION);

		offset = iwl_eeprom_query16(shrd, EEPROM_LINK_CALIBRATION);

		break;

	case INDIRECT_PROCESS_ADJST:

		offset = iwl_eeprom_query16(priv, EEPROM_LINK_PROCESS_ADJST);

		offset = iwl_eeprom_query16(shrd, EEPROM_LINK_PROCESS_ADJST);

		break;

	case INDIRECT_OTHERS:

		offset = iwl_eeprom_query16(priv, EEPROM_LINK_OTHERS);

		offset = iwl_eeprom_query16(shrd, EEPROM_LINK_OTHERS);

		break;

	default:

		IWL_ERR(priv, "illegal indirect type: 0x%X\n",

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

		address & INDIRECT_TYPE_MSK);

		break;

	}
@@ -147,11 +147,11 @@ static u32 eeprom_indirect_address(const struct iwl_priv *priv, u32 address) 
	return (address & ADDRESS_MSK) + (offset << 1);

}



const u8 *iwl_eeprom_query_addr(const struct iwl_priv *priv, size_t offset)

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

{

	u32 address = eeprom_indirect_address(priv, offset);

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

	return &priv->eeprom[address];

	u32 address = eeprom_indirect_address(shrd, offset);

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

	return &shrd->eeprom[address];

}



struct iwl_mod_params iwlagn_mod_params = {

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

+4 −4
Original line number Diff line number Diff line
@@ -1822,11 +1822,11 @@ int iwl_probe(struct iwl_bus *bus, const struct iwl_trans_ops *trans_ops, 
		goto out_free_eeprom;



	/* extract MAC Address */

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

	iwl_eeprom_get_mac(priv->shrd, 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, EEPROM_NUM_MAC_ADDRESS);

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

	if (num_mac > 1) {

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

		       ETH_ALEN);
@@ -1891,7 +1891,7 @@ out_destroy_workqueue: 
	priv->shrd->workqueue = NULL;

	iwl_uninit_drv(priv);

out_free_eeprom:

	iwl_eeprom_free(priv);

	iwl_eeprom_free(priv->shrd);

out_free_trans:

	iwl_trans_free(trans(priv));

out_free_traffic_mem:
@@ -1930,7 +1930,7 @@ void __devexit iwl_remove(struct iwl_priv * priv) 


	iwl_dealloc_ucode(trans(priv));



	iwl_eeprom_free(priv);

	iwl_eeprom_free(priv->shrd);



	/*netif_stop_queue(dev); */

	flush_workqueue(priv->shrd->workqueue);

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

+2 −2
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ int iwlagn_load_ucode_wait_alive(struct iwl_priv *priv, 
/* lib */

int iwlagn_send_tx_power(struct iwl_priv *priv);

void iwlagn_temperature(struct iwl_priv *priv);

u16 iwlagn_eeprom_calib_version(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);
@@ -354,7 +354,7 @@ static inline __le32 iwl_hw_set_rate_n_flags(u8 rate, u32 flags) 


/* eeprom */

void iwl_eeprom_enhanced_txpower(struct iwl_priv *priv);

void iwl_eeprom_get_mac(const struct iwl_priv *priv, u8 *mac);

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



extern int iwlagn_init_alive_start(struct iwl_priv *priv);

extern int iwl_alive_start(struct iwl_priv *priv);