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

Commit 3d5717ad authored by Zhu, Yi's avatar Zhu, Yi Committed by John W. Linville
Browse files

iwlwifi: use iwl_poll_direct_bit in EEPROM reading 



The patch replaces the current reading EEPROM loop iterations with
iwl_poll_direct_bit(). It also fixes some comment error.

Signed-off-by: default avatarZhu Yi <yi.zhu@intel.com>
Signed-off-by: default avatarReinette Chatre <reinette.chatre@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 9c5f89b3

drivers/net/wireless/iwlwifi/iwl-3945-hw.h

+0 −1
Original line number Diff line number Diff line
@@ -103,7 +103,6 @@ 
 * Driver reads 16-bit value from bits 31-16 of CSR_EEPROM_REG.

 */

#define IWL_EEPROM_ACCESS_TIMEOUT	5000 /* uSec */

#define IWL_EEPROM_ACCESS_DELAY		10   /* uSec */



/*

 * Regulatory channel usage flags in EEPROM struct iwl_eeprom_channel.flags.

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

+2 −0
Original line number Diff line number Diff line
@@ -216,6 +216,8 @@ 
/* EEPROM REG */

#define CSR_EEPROM_REG_READ_VALID_MSK	(0x00000001)

#define CSR_EEPROM_REG_BIT_CMD		(0x00000002)

#define CSR_EEPROM_REG_MSK_ADDR		(0x0000FFFC)

#define CSR_EEPROM_REG_MSK_DATA		(0xFFFF0000)



/* EEPROM GP */

#define CSR_EEPROM_GP_VALID_MSK		(0x00000006)

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

+9 −14
Original line number Diff line number Diff line
@@ -209,10 +209,8 @@ int iwl_eeprom_init(struct iwl_priv *priv) 
{

	u16 *e;

	u32 gp = iwl_read32(priv, CSR_EEPROM_GP);

	u32 r;

	int sz = priv->cfg->eeprom_size;

	int ret;

	int i;

	u16 addr;



	/* allocate eeprom */
@@ -240,22 +238,19 @@ int iwl_eeprom_init(struct iwl_priv *priv) 


	/* eeprom is an array of 16bit values */

	for (addr = 0; addr < sz; addr += sizeof(u16)) {

		_iwl_write32(priv, CSR_EEPROM_REG, addr << 1);

		_iwl_clear_bit(priv, CSR_EEPROM_REG, CSR_EEPROM_REG_BIT_CMD);

		u32 r;



		for (i = 0; i < IWL_EEPROM_ACCESS_TIMEOUT;

					i += IWL_EEPROM_ACCESS_DELAY) {

			r = _iwl_read_direct32(priv, CSR_EEPROM_REG);

			if (r & CSR_EEPROM_REG_READ_VALID_MSK)

				break;

			udelay(IWL_EEPROM_ACCESS_DELAY);

		}

		_iwl_write32(priv, CSR_EEPROM_REG,

			     CSR_EEPROM_REG_MSK_ADDR & (addr << 1));



		if (!(r & CSR_EEPROM_REG_READ_VALID_MSK)) {

		ret = iwl_poll_direct_bit(priv, CSR_EEPROM_REG,

					  CSR_EEPROM_REG_READ_VALID_MSK,

					  IWL_EEPROM_ACCESS_TIMEOUT);

		if (ret < 0) {

			IWL_ERROR("Time out reading EEPROM[%d]\n", addr);

			ret = -ETIMEDOUT;

			goto done;

		}

		r = _iwl_read_direct32(priv, CSR_EEPROM_REG);

		e[addr / 2] = le16_to_cpu((__force __le16)(r >> 16));

	}

	ret = 0;

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

+2 −5
Original line number Diff line number Diff line
@@ -68,17 +68,14 @@ struct iwl_priv; 
/*

 * EEPROM access time values:

 *

 * Driver initiates EEPROM read by writing byte address << 1 to CSR_EEPROM_REG,

 *   then clearing (with subsequent read/modify/write) CSR_EEPROM_REG bit

 *   CSR_EEPROM_REG_BIT_CMD (0x2).

 * Driver initiates EEPROM read by writing byte address << 1 to CSR_EEPROM_REG.

 * Driver then polls CSR_EEPROM_REG for CSR_EEPROM_REG_READ_VALID_MSK (0x1).

 * When polling, wait 10 uSec between polling loops, up to a maximum 5000 uSec.

 * Driver reads 16-bit value from bits 31-16 of CSR_EEPROM_REG.

 */

#define IWL_EEPROM_ACCESS_TIMEOUT	5000 /* uSec */

#define IWL_EEPROM_ACCESS_DELAY		10   /* uSec */



#define IWL_EEPROM_SEM_TIMEOUT 		10   /* milliseconds */

#define IWL_EEPROM_SEM_TIMEOUT 		10   /* microseconds */

#define IWL_EEPROM_SEM_RETRY_LIMIT	1000 /* number of attempts (not time) */

drivers/net/wireless/iwlwifi/iwl3945-base.c

+14 −17
Original line number Diff line number Diff line
@@ -1504,10 +1504,8 @@ int iwl3945_eeprom_init(struct iwl3945_priv *priv) 
{

	u16 *e = (u16 *)&priv->eeprom;

	u32 gp = iwl3945_read32(priv, CSR_EEPROM_GP);

	u32 r;

	int sz = sizeof(priv->eeprom);

	int rc;

	int i;

	int ret;

	u16 addr;



	/* The EEPROM structure has several padding buffers within it
@@ -1522,29 +1520,28 @@ int iwl3945_eeprom_init(struct iwl3945_priv *priv) 
	}



	/* Make sure driver (instead of uCode) is allowed to read EEPROM */

	rc = iwl3945_eeprom_acquire_semaphore(priv);

	if (rc < 0) {

	ret = iwl3945_eeprom_acquire_semaphore(priv);

	if (ret < 0) {

		IWL_ERROR("Failed to acquire EEPROM semaphore.\n");

		return -ENOENT;

	}



	/* eeprom is an array of 16bit values */

	for (addr = 0; addr < sz; addr += sizeof(u16)) {

		_iwl3945_write32(priv, CSR_EEPROM_REG, addr << 1);

		_iwl3945_clear_bit(priv, CSR_EEPROM_REG, CSR_EEPROM_REG_BIT_CMD);



		for (i = 0; i < IWL_EEPROM_ACCESS_TIMEOUT;

					i += IWL_EEPROM_ACCESS_DELAY) {

			r = _iwl3945_read_direct32(priv, CSR_EEPROM_REG);

			if (r & CSR_EEPROM_REG_READ_VALID_MSK)

				break;

			udelay(IWL_EEPROM_ACCESS_DELAY);

		}

		u32 r;



		if (!(r & CSR_EEPROM_REG_READ_VALID_MSK)) {

		_iwl3945_write32(priv, CSR_EEPROM_REG,

				 CSR_EEPROM_REG_MSK_ADDR & (addr << 1));

		_iwl3945_clear_bit(priv, CSR_EEPROM_REG, CSR_EEPROM_REG_BIT_CMD);

		ret = iwl3945_poll_direct_bit(priv, CSR_EEPROM_REG,

					      CSR_EEPROM_REG_READ_VALID_MSK,

					      IWL_EEPROM_ACCESS_TIMEOUT);

		if (ret < 0) {

			IWL_ERROR("Time out reading EEPROM[%d]\n", addr);

			return -ETIMEDOUT;

			return ret;

		}



		r = _iwl3945_read_direct32(priv, CSR_EEPROM_REG);

		e[addr / 2] = le16_to_cpu((__force __le16)(r >> 16));

	}