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

Commit 9c80c502 authored by Winkler, Tomas's avatar Winkler, Tomas Committed by John W. Linville
Browse files

iwlwifi: reorganize flow handler bitology 



This patch cleans up FH bits and adds missing register values
that will be used later in TX initialization rewrite

Signed-off-by: default avatarTomas Winkler <tomas.winkler@intel.com>
Signed-off-by: default avatarReinette Chatre <reinette.chatre@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent c7ab5ef9

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

+4 −4
Original line number Diff line number Diff line
@@ -535,7 +535,7 @@ static int iwl5000_load_section(struct iwl_priv *priv, 
	iwl_write_direct32(priv,

		FH_TCSR_CHNL_TX_CONFIG_REG(FH_SRVC_CHNL),

		FH_TCSR_TX_CONFIG_REG_VAL_DMA_CHNL_ENABLE	|

		FH_TCSR_TX_CONFIG_REG_VAL_DMA_CREDIT_DISABLE_VAL |

		FH_TCSR_TX_CONFIG_REG_VAL_DMA_CREDIT_DISABLE	|

		FH_TCSR_TX_CONFIG_REG_VAL_CIRQ_HOST_ENDTFD);



	iwl_release_nic_access(priv);
@@ -549,8 +549,7 @@ static int iwl5000_load_given_ucode(struct iwl_priv *priv, 
{

	int ret = 0;



	ret = iwl5000_load_section(

		priv, inst_image, RTC_INST_LOWER_BOUND);

	ret = iwl5000_load_section(priv, inst_image, RTC_INST_LOWER_BOUND);

	if (ret)

		return ret;
@@ -753,6 +752,7 @@ static int iwl5000_alive_notify(struct iwl_priv *priv) 
	priv->cfg->ops->lib->txq_set_sched(priv, IWL_MASK(0, 7));



	iwl5000_set_wr_ptrs(priv, IWL_CMD_QUEUE_NUM, 0);



	/* map qos queues to fifos one-to-one */

	for (i = 0; i < ARRAY_SIZE(iwl5000_default_queue_to_tx_fifo); i++) {

		int ac = iwl5000_default_queue_to_tx_fifo[i];

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

+29 −23
Original line number Diff line number Diff line
@@ -318,34 +318,40 @@ 
#define FH_TCSR_UPPER_BOUND  (FH_MEM_LOWER_BOUND + 0xE60)



/* Find Control/Status reg for given Tx DMA/FIFO channel */

#define FH49_TCSR_CHNL_NUM                            (7)

#define FH50_TCSR_CHNL_NUM                            (8)



#define FH_TCSR_CHNL_TX_CONFIG_REG(_chnl)	\

	(FH_TCSR_LOWER_BOUND + 0x20 * _chnl)

		(FH_TCSR_LOWER_BOUND + 0x20 * (_chnl))

#define FH_TCSR_CHNL_TX_CREDIT_REG(_chnl)	\

		(FH_TCSR_LOWER_BOUND + 0x20 * (_chnl) + 0x4)

#define FH_TCSR_CHNL_TX_BUF_STS_REG(_chnl)	\

		(FH_TCSR_LOWER_BOUND + 0x20 * (_chnl) + 0x8)



#define FH_TCSR_TX_CONFIG_REG_VAL_MSG_MODE_TXF		(0x00000000)

#define FH_TCSR_TX_CONFIG_REG_VAL_MSG_MODE_DRV		(0x00000001)



#define FH_TCSR_TX_CONFIG_REG_VAL_DMA_CREDIT_DISABLE	(0x00000000)

#define FH_TCSR_TX_CONFIG_REG_VAL_DMA_CREDIT_ENABLE	(0x00000008)



#define FH_TCSR_TX_CONFIG_REG_VAL_CIRQ_HOST_NOINT	(0x00000000)

#define FH_TCSR_TX_CONFIG_REG_VAL_CIRQ_HOST_ENDTFD	(0x00100000)

#define FH_TCSR_TX_CONFIG_REG_VAL_CIRQ_HOST_IFTFD	(0x00200000)



#define FH_TCSR_TX_CONFIG_REG_VAL_DMA_CREDIT_DISABLE_VAL    (0x00000000)

#define FH_TCSR_TX_CONFIG_REG_VAL_DMA_CREDIT_ENABLE_VAL     (0x00000008)

#define FH_TCSR_TX_CONFIG_REG_VAL_CIRQ_RTC_NOINT	(0x00000000)

#define FH_TCSR_TX_CONFIG_REG_VAL_CIRQ_RTC_ENDTFD	(0x00400000)

#define FH_TCSR_TX_CONFIG_REG_VAL_CIRQ_RTC_IFTFD	(0x00800000)



#define FH_TCSR_TX_CONFIG_REG_VAL_DMA_CHNL_PAUSE	(0x00000000)

#define FH_TCSR_TX_CONFIG_REG_VAL_DMA_CHNL_PAUSE_EOF	(0x40000000)

#define FH_TCSR_TX_CONFIG_REG_VAL_DMA_CHNL_ENABLE	(0x80000000)



#define FH_TCSR_CHNL_NUM                            (7)



#define FH_TCSR_CHNL_TX_BUF_STS_REG_VAL_TFDB_EMPTY	(0x00000000)

#define FH_TCSR_CHNL_TX_BUF_STS_REG_VAL_TFDB_WAIT	(0x00002000)

#define FH_TCSR_CHNL_TX_BUF_STS_REG_VAL_TFDB_VALID	(0x00000003)



#define FH_TCSR_TX_CONFIG_REG_VAL_CIRQ_HOST_NOINT           (0x00000000)

#define FH_TCSR_TX_CONFIG_REG_VAL_CIRQ_HOST_ENDTFD          (0x00100000)

#define FH_TCSR_TX_CONFIG_REG_VAL_CIRQ_HOST_IFTFD           (0x00200000)



#define FH_TCSR_CHNL_TX_BUF_STS_REG_POS_TB_NUM		(20)

#define FH_TCSR_CHNL_TX_BUF_STS_REG_POS_TB_IDX		(12)

#define FH_TCSR_CHNL_TX_CONFIG_REG(_chnl) \

	(FH_TCSR_LOWER_BOUND + 0x20 * _chnl)

#define FH_TCSR_CHNL_TX_CREDIT_REG(_chnl) \

	  (FH_TCSR_LOWER_BOUND + 0x20 * _chnl + 0x4)

#define FH_TCSR_CHNL_TX_BUF_STS_REG(_chnl) \

	 (FH_TCSR_LOWER_BOUND + 0x20 * _chnl + 0x8)



/**

 * Tx Shared Status Registers (TSSR)

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

+2 −2
Original line number Diff line number Diff line
@@ -432,7 +432,7 @@ static int iwl_hw_tx_queue_init(struct iwl_priv *priv, 
	/* Enable DMA channel, using same id as for TFD queue */

	iwl_write_direct32(priv, FH_TCSR_CHNL_TX_CONFIG_REG(txq_id),

			FH_TCSR_TX_CONFIG_REG_VAL_DMA_CHNL_ENABLE |

		FH_TCSR_TX_CONFIG_REG_VAL_DMA_CREDIT_ENABLE_VAL);

			FH_TCSR_TX_CONFIG_REG_VAL_DMA_CREDIT_ENABLE);



	iwl_release_nic_access(priv);

	spin_unlock_irqrestore(&priv->lock, flags);