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

Commit 9726f347 authored by Emmanuel Grumbach's avatar Emmanuel Grumbach Committed by Wey-Yi Guy
Browse files

iwlagn: fix the bit mask of a FH register in stop Tx DMA flow 



When we stop the Tx DMA channels, we poll bits 16:31 in
FH_TSSR_RX_STATUS_REG. From 4965 and up, only the bits 16:26 are legal.
Bits 27:31 are not used and are always unset.
Polling them will lead to fail on timeout but since the timeout is quite
small, the stall was not felt.

Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
parent 41691de3

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

+5 −2
Original line number Diff line number Diff line
@@ -950,9 +950,12 @@ void iwlagn_txq_ctx_stop(struct iwl_priv *priv) 
	/* Stop each Tx DMA channel, and wait for it to be idle */

	for (ch = 0; ch < priv->hw_params.dma_chnl_num; ch++) {

		iwl_write_direct32(priv, FH_TCSR_CHNL_TX_CONFIG_REG(ch), 0x0);

		iwl_poll_direct_bit(priv, FH_TSSR_TX_STATUS_REG,

		if (iwl_poll_direct_bit(priv, FH_TSSR_TX_STATUS_REG,

				    FH_TSSR_TX_STATUS_REG_MSK_CHNL_IDLE(ch),

				    1000);

				    1000))

			IWL_ERR(priv, "Failing on timeout while stopping"

			    " DMA channel %d [0x%08x]", ch,

			    iwl_read_direct32(priv, FH_TSSR_TX_STATUS_REG));

	}

	spin_unlock_irqrestore(&priv->lock, flags);

}

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

+1 −6
Original line number Diff line number Diff line
@@ -398,12 +398,7 @@ 
 */

#define FH_TSSR_TX_ERROR_REG		(FH_TSSR_LOWER_BOUND + 0x018)



#define FH_TSSR_TX_STATUS_REG_BIT_BUFS_EMPTY(_chnl) ((1 << (_chnl)) << 24)

#define FH_TSSR_TX_STATUS_REG_BIT_NO_PEND_REQ(_chnl) ((1 << (_chnl)) << 16)



#define FH_TSSR_TX_STATUS_REG_MSK_CHNL_IDLE(_chnl) \

	(FH_TSSR_TX_STATUS_REG_BIT_BUFS_EMPTY(_chnl) | \

	FH_TSSR_TX_STATUS_REG_BIT_NO_PEND_REQ(_chnl))

#define FH_TSSR_TX_STATUS_REG_MSK_CHNL_IDLE(_chnl) ((1 << (_chnl)) << 16)



/* Tx service channels */

#define FH_SRVC_CHNL		(9)