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

Commit 1739d332 authored by Abhijeet Kolekar's avatar Abhijeet Kolekar Committed by John W. Linville
Browse files

iwlwifi: replace iwl_poll_direct_bit with iwl_poll_bit for CSR access 



Replace iwl_poll_direct_bit with iwl_poll_bit when accessing CSR registers.
There is no need to power up the mac to access CSR registers.

Signed-off-by: default avatarAbhijeet Kolekar <abhijeet.kolekar@intel.com>
Acked-by: default avatarBen M Cahill <ben.m.cahill@intel.com>
Signed-off-by: default avatarReinette Chatre <reinette.chatre@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent d68b603c

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

+6 −4
Original line number Diff line number Diff line
@@ -999,7 +999,8 @@ static int iwl3945_apm_init(struct iwl_priv *priv) 
	* D0U* --> D0A* state */

	iwl_set_bit(priv, CSR_GP_CNTRL, CSR_GP_CNTRL_REG_FLAG_INIT_DONE);



	ret = iwl_poll_direct_bit(priv, CSR_GP_CNTRL,

	ret = iwl_poll_bit(priv, CSR_GP_CNTRL,

			CSR_GP_CNTRL_REG_FLAG_MAC_CLOCK_READY,

			CSR_GP_CNTRL_REG_FLAG_MAC_CLOCK_READY, 25000);

	if (ret < 0) {

		IWL_DEBUG_INFO(priv, "Failed to init the card\n");
@@ -1177,7 +1178,8 @@ static int iwl3945_apm_reset(struct iwl_priv *priv) 


	iwl_set_bit(priv, CSR_GP_CNTRL, CSR_GP_CNTRL_REG_FLAG_INIT_DONE);



	iwl_poll_direct_bit(priv, CSR_GP_CNTRL,

	iwl_poll_bit(priv, CSR_GP_CNTRL,

			CSR_GP_CNTRL_REG_FLAG_MAC_CLOCK_READY,

			CSR_GP_CNTRL_REG_FLAG_MAC_CLOCK_READY, 25000);



	iwl_write_prph(priv, APMG_CLK_CTRL_REG,

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

+4 −2
Original line number Diff line number Diff line
@@ -335,7 +335,8 @@ static int iwl4965_apm_init(struct iwl_priv *priv) 
	iwl_set_bit(priv, CSR_GP_CNTRL, CSR_GP_CNTRL_REG_FLAG_INIT_DONE);



	/* wait for clock stabilization */

	ret = iwl_poll_direct_bit(priv, CSR_GP_CNTRL,

	ret = iwl_poll_bit(priv, CSR_GP_CNTRL,

			CSR_GP_CNTRL_REG_FLAG_MAC_CLOCK_READY,

			CSR_GP_CNTRL_REG_FLAG_MAC_CLOCK_READY, 25000);

	if (ret < 0) {

		IWL_DEBUG_INFO(priv, "Failed to init the card\n");
@@ -411,7 +412,8 @@ static int iwl4965_apm_reset(struct iwl_priv *priv) 


	iwl_set_bit(priv, CSR_GP_CNTRL, CSR_GP_CNTRL_REG_FLAG_INIT_DONE);



	ret = iwl_poll_direct_bit(priv, CSR_GP_CNTRL,

	ret = iwl_poll_bit(priv, CSR_GP_CNTRL,

			CSR_GP_CNTRL_REG_FLAG_MAC_CLOCK_READY,

			CSR_GP_CNTRL_REG_FLAG_MAC_CLOCK_READY, 25000);

	if (ret < 0)

		goto out;

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

+4 −2
Original line number Diff line number Diff line
@@ -98,7 +98,8 @@ int iwl5000_apm_init(struct iwl_priv *priv) 
	iwl_set_bit(priv, CSR_GP_CNTRL, CSR_GP_CNTRL_REG_FLAG_INIT_DONE);



	/* wait for clock stabilization */

	ret = iwl_poll_direct_bit(priv, CSR_GP_CNTRL,

	ret = iwl_poll_bit(priv, CSR_GP_CNTRL,

			CSR_GP_CNTRL_REG_FLAG_MAC_CLOCK_READY,

			CSR_GP_CNTRL_REG_FLAG_MAC_CLOCK_READY, 25000);

	if (ret < 0) {

		IWL_DEBUG_INFO(priv, "Failed to init the card\n");
@@ -138,7 +139,8 @@ int iwl5000_apm_reset(struct iwl_priv *priv) 
	iwl_set_bit(priv, CSR_GP_CNTRL, CSR_GP_CNTRL_REG_FLAG_INIT_DONE);



	/* wait for clock stabilization */

	ret = iwl_poll_direct_bit(priv, CSR_GP_CNTRL,

	ret = iwl_poll_bit(priv, CSR_GP_CNTRL,

			CSR_GP_CNTRL_REG_FLAG_MAC_CLOCK_READY,

			CSR_GP_CNTRL_REG_FLAG_MAC_CLOCK_READY, 25000);

	if (ret < 0) {

		IWL_DEBUG_INFO(priv, "Failed to init the card\n");

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

+1 −1
Original line number Diff line number Diff line
@@ -1338,7 +1338,7 @@ int iwl_apm_stop_master(struct iwl_priv *priv) 
	/* set stop master bit */

	iwl_set_bit(priv, CSR_RESET, CSR_RESET_REG_FLAG_STOP_MASTER);



	iwl_poll_direct_bit(priv, CSR_RESET,

	iwl_poll_bit(priv, CSR_RESET, CSR_RESET_REG_FLAG_MASTER_DISABLED,

			CSR_RESET_REG_FLAG_MASTER_DISABLED, 100);



	spin_unlock_irqrestore(&priv->lock, flags);

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

+8 −4
Original line number Diff line number Diff line
@@ -283,7 +283,8 @@ int iwlcore_eeprom_acquire_semaphore(struct iwl_priv *priv) 
			    CSR_HW_IF_CONFIG_REG_BIT_EEPROM_OWN_SEM);



		/* See if we got it */

		ret = iwl_poll_direct_bit(priv, CSR_HW_IF_CONFIG_REG,

		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) {
@@ -322,7 +323,8 @@ static int iwl_init_otp_access(struct iwl_priv *priv) 
		     CSR_GP_CNTRL_REG_FLAG_INIT_DONE);



	/* wait for clock to be ready */

	ret = iwl_poll_direct_bit(priv, CSR_GP_CNTRL,

	ret = iwl_poll_bit(priv, CSR_GP_CNTRL,

				  CSR_GP_CNTRL_REG_FLAG_MAC_CLOCK_READY,

				  CSR_GP_CNTRL_REG_FLAG_MAC_CLOCK_READY,

				  25000);

	if (ret < 0)
@@ -345,7 +347,8 @@ static int iwl_read_otp_word(struct iwl_priv *priv, u16 addr, u16 *eeprom_data) 


	_iwl_write32(priv, CSR_EEPROM_REG,

		     CSR_EEPROM_REG_MSK_ADDR & (addr << 1));

	ret = iwl_poll_direct_bit(priv, CSR_EEPROM_REG,

	ret = iwl_poll_bit(priv, CSR_EEPROM_REG,

				  CSR_EEPROM_REG_READ_VALID_MSK,

				  CSR_EEPROM_REG_READ_VALID_MSK,

				  IWL_EEPROM_ACCESS_TIMEOUT);

	if (ret < 0) {
@@ -538,7 +541,8 @@ int iwl_eeprom_init(struct iwl_priv *priv) 
			_iwl_write32(priv, CSR_EEPROM_REG,

				     CSR_EEPROM_REG_MSK_ADDR & (addr << 1));



			ret = iwl_poll_direct_bit(priv, CSR_EEPROM_REG,

			ret = iwl_poll_bit(priv, CSR_EEPROM_REG,

						  CSR_EEPROM_REG_READ_VALID_MSK,

						  CSR_EEPROM_REG_READ_VALID_MSK,

						  IWL_EEPROM_ACCESS_TIMEOUT);

			if (ret < 0) {