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

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

iwlagn: semaphore and calib cleanup 



All agn devices use the same eeprom semaphore and calib version routines.
Delete the indirection and move the semaphore routines to where they are
used and make static.

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 9d143e9a

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

+0 −3
Original line number Diff line number Diff line
@@ -197,9 +197,6 @@ static struct iwl_lib_ops iwl1000_lib = { 
			EEPROM_REG_BAND_24_HT40_CHANNELS,

			EEPROM_REGULATORY_BAND_NO_HT40,

		},

		.acquire_semaphore = iwlcore_eeprom_acquire_semaphore,

		.release_semaphore = iwlcore_eeprom_release_semaphore,

		.calib_version	= iwlagn_eeprom_calib_version,

		.query_addr = iwlagn_eeprom_query_addr,

	},

	.temp_ops = {

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

+0 −3
Original line number Diff line number Diff line
@@ -280,9 +280,6 @@ static struct iwl_lib_ops iwl2000_lib = { 
			EEPROM_6000_REG_BAND_24_HT40_CHANNELS,

			EEPROM_REGULATORY_BAND_NO_HT40,

		},

		.acquire_semaphore = iwlcore_eeprom_acquire_semaphore,

		.release_semaphore = iwlcore_eeprom_release_semaphore,

		.calib_version  = iwlagn_eeprom_calib_version,

		.query_addr = iwlagn_eeprom_query_addr,

		.update_enhanced_txpower = iwlcore_eeprom_enhanced_txpower,

	},

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

+0 −6
Original line number Diff line number Diff line
@@ -366,9 +366,6 @@ static struct iwl_lib_ops iwl5000_lib = { 
			EEPROM_REG_BAND_24_HT40_CHANNELS,

			EEPROM_REG_BAND_52_HT40_CHANNELS

		},

		.acquire_semaphore = iwlcore_eeprom_acquire_semaphore,

		.release_semaphore = iwlcore_eeprom_release_semaphore,

		.calib_version	= iwlagn_eeprom_calib_version,

		.query_addr = iwlagn_eeprom_query_addr,

	},

	.temp_ops = {
@@ -413,9 +410,6 @@ static struct iwl_lib_ops iwl5150_lib = { 
			EEPROM_REG_BAND_24_HT40_CHANNELS,

			EEPROM_REG_BAND_52_HT40_CHANNELS

		},

		.acquire_semaphore = iwlcore_eeprom_acquire_semaphore,

		.release_semaphore = iwlcore_eeprom_release_semaphore,

		.calib_version	= iwlagn_eeprom_calib_version,

		.query_addr = iwlagn_eeprom_query_addr,

	},

	.temp_ops = {

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

+2 −8
Original line number Diff line number Diff line
@@ -80,7 +80,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 (priv->cfg->ops->lib->eeprom_ops.calib_version(priv) >= 6)

	if (iwlagn_eeprom_calib_version(priv) >= 6)

		iwl_set_bit(priv, CSR_GP_DRIVER_REG,

				CSR_GP_DRIVER_REG_BIT_CALIB_VERSION6);

}
@@ -88,7 +88,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 (priv->cfg->ops->lib->eeprom_ops.calib_version(priv) >= 6)

	if (iwlagn_eeprom_calib_version(priv) >= 6)

		iwl_set_bit(priv, CSR_GP_DRIVER_REG,

				CSR_GP_DRIVER_REG_BIT_CALIB_VERSION6);

	iwl_set_bit(priv, CSR_GP_DRIVER_REG,
@@ -305,9 +305,6 @@ static struct iwl_lib_ops iwl6000_lib = { 
			EEPROM_6000_REG_BAND_24_HT40_CHANNELS,

			EEPROM_REG_BAND_52_HT40_CHANNELS

		},

		.acquire_semaphore = iwlcore_eeprom_acquire_semaphore,

		.release_semaphore = iwlcore_eeprom_release_semaphore,

		.calib_version	= iwlagn_eeprom_calib_version,

		.query_addr = iwlagn_eeprom_query_addr,

		.update_enhanced_txpower = iwlcore_eeprom_enhanced_txpower,

	},
@@ -354,9 +351,6 @@ static struct iwl_lib_ops iwl6030_lib = { 
			EEPROM_6000_REG_BAND_24_HT40_CHANNELS,

			EEPROM_REG_BAND_52_HT40_CHANNELS

		},

		.acquire_semaphore = iwlcore_eeprom_acquire_semaphore,

		.release_semaphore = iwlcore_eeprom_release_semaphore,

		.calib_version	= iwlagn_eeprom_calib_version,

		.query_addr = iwlagn_eeprom_query_addr,

		.update_enhanced_txpower = iwlcore_eeprom_enhanced_txpower,

	},

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

+1 −40
Original line number Diff line number Diff line
@@ -81,52 +81,13 @@ 
 *

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



/*

 * The device's EEPROM semaphore prevents conflicts between driver and uCode

 * when accessing the EEPROM; each access is a series of pulses to/from the

 * EEPROM chip, not a single event, so even reads could conflict if they

 * weren't arbitrated by the semaphore.

 */

int iwlcore_eeprom_acquire_semaphore(struct iwl_priv *priv)

{

	u16 count;

	int ret;



	for (count = 0; count < EEPROM_SEM_RETRY_LIMIT; count++) {

		/* Request semaphore */

		iwl_set_bit(priv, CSR_HW_IF_CONFIG_REG,

			    CSR_HW_IF_CONFIG_REG_BIT_EEPROM_OWN_SEM);



		/* See if we got it */

		ret = iwl_poll_bit(priv, CSR_HW_IF_CONFIG_REG,

				CSR_HW_IF_CONFIG_REG_BIT_EEPROM_OWN_SEM,

				CSR_HW_IF_CONFIG_REG_BIT_EEPROM_OWN_SEM,

				EEPROM_SEM_TIMEOUT);

		if (ret >= 0) {

			IWL_DEBUG_EEPROM(priv,

				"Acquired semaphore after %d tries.\n",

				count+1);

			return ret;

		}

	}



	return ret;

}



void iwlcore_eeprom_release_semaphore(struct iwl_priv *priv)

{

	iwl_clear_bit(priv, CSR_HW_IF_CONFIG_REG,

		CSR_HW_IF_CONFIG_REG_BIT_EEPROM_OWN_SEM);



}



int iwl_eeprom_check_version(struct iwl_priv *priv)

{

	u16 eeprom_ver;

	u16 calib_ver;



	eeprom_ver = iwl_eeprom_query16(priv, EEPROM_VERSION);

	calib_ver = priv->cfg->ops->lib->eeprom_ops.calib_version(priv);

	calib_ver = iwlagn_eeprom_calib_version(priv);



	if (eeprom_ver < priv->cfg->eeprom_ver ||

	    calib_ver < priv->cfg->eeprom_calib_ver)