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

Commit 309e731a authored by Ben M Cahill's avatar Ben M Cahill Committed by John W. Linville
Browse files

iwlwifi: MAC_ACCESS_REQ cleanup 



Add txq_id info to "Tx queue requesting wakeup" debug message

Add "Rx queue requesting wakeup" debug message

Move clear of CSR_GP_CNTRL_REG_FLAG_MAC_ACCESS_REQ to be after nearby
iwl_write_prph(), since iwl_write_prph() sets it and clears it.  Almost
removed it entirely, but just making sure in case someone removes the
iwl_write_prph()!  Also remove unneeded priv->lock usage; this is now
handled by priv->reg_lock within iwl_clear_bit().

Join a couple of lines that had unneeded line returns.

Signed-off-by: default avatarBen 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 f060face

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

+5 −7
Original line number Diff line number Diff line
@@ -1934,19 +1934,17 @@ static void __iwl_down(struct iwl_priv *priv) 


	/* device going down, Stop using ICT table */

	iwl_disable_ict(priv);

	spin_lock_irqsave(&priv->lock, flags);

	iwl_clear_bit(priv, CSR_GP_CNTRL,

			 CSR_GP_CNTRL_REG_FLAG_MAC_ACCESS_REQ);

	spin_unlock_irqrestore(&priv->lock, flags);



	iwl_txq_ctx_stop(priv);

	iwl_rxq_stop(priv);



	iwl_write_prph(priv, APMG_CLK_DIS_REG,

				APMG_CLK_VAL_DMA_CLK_RQT);



	/* Power-down device's busmaster DMA clocks */

	iwl_write_prph(priv, APMG_CLK_DIS_REG, APMG_CLK_VAL_DMA_CLK_RQT);

	udelay(5);



	/* Make sure (redundant) we've released our request to stay awake */

	iwl_clear_bit(priv, CSR_GP_CNTRL, CSR_GP_CNTRL_REG_FLAG_MAC_ACCESS_REQ);



	/* Stop the device, and put it in low power state */

	priv->cfg->ops->lib->apm_ops.stop(priv);

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

+2 −0
Original line number Diff line number Diff line
@@ -140,6 +140,8 @@ int iwl_rx_queue_update_write_ptr(struct iwl_priv *priv, struct iwl_rx_queue *q) 
		reg = iwl_read32(priv, CSR_UCODE_DRV_GP1);



		if (reg & CSR_UCODE_DRV_GP1_BIT_MAC_SLEEP) {

			IWL_DEBUG_INFO(priv, "Rx queue requesting wakeup, GP1 = 0x%x\n",

				      reg);

			iwl_set_bit(priv, CSR_GP_CNTRL,

				    CSR_GP_CNTRL_REG_FLAG_MAC_ACCESS_REQ);

			goto exit_unlock;

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

+2 −1
Original line number Diff line number Diff line
@@ -96,7 +96,8 @@ int iwl_txq_update_write_ptr(struct iwl_priv *priv, struct iwl_tx_queue *txq) 
		reg = iwl_read32(priv, CSR_UCODE_DRV_GP1);



		if (reg & CSR_UCODE_DRV_GP1_BIT_MAC_SLEEP) {

			IWL_DEBUG_INFO(priv, "Requesting wakeup, GP1 = 0x%x\n", reg);

			IWL_DEBUG_INFO(priv, "Tx queue %d requesting wakeup, GP1 = 0x%x\n",

				      txq_id, reg);

			iwl_set_bit(priv, CSR_GP_CNTRL,

				    CSR_GP_CNTRL_REG_FLAG_MAC_ACCESS_REQ);

			return ret;

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

+2 −3
Original line number Diff line number Diff line
@@ -2600,9 +2600,8 @@ static void __iwl3945_down(struct iwl_priv *priv) 
	iwl3945_hw_txq_ctx_stop(priv);

	iwl3945_hw_rxq_stop(priv);



	iwl_write_prph(priv, APMG_CLK_DIS_REG,

				APMG_CLK_VAL_DMA_CLK_RQT);



	/* Power-down device's busmaster DMA clocks */

	iwl_write_prph(priv, APMG_CLK_DIS_REG, APMG_CLK_VAL_DMA_CLK_RQT);

	udelay(5);



	/* Stop the device, and put it in low power state */