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

Commit 972cf447 authored by Tomas Winkler's avatar Tomas Winkler Committed by John W. Linville
Browse files

iwlwifi: implement txq invalidate byte count table 



This is required to overcome a bug in 5000 HW byte count table.

Signed-off-by: default avatarTomas Winkler <tomas.winkler@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 17b88929

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

+21 −0
Original line number Diff line number Diff line
@@ -955,6 +955,26 @@ static void iwl5000_txq_update_byte_cnt_tbl(struct iwl_priv *priv, 
	}

}



static void iwl5000_txq_inval_byte_cnt_tbl(struct iwl_priv *priv,

					   struct iwl_tx_queue *txq)

{

	int txq_id = txq->q.id;

	struct iwl5000_shared *shared_data = priv->shared_virt;

	u8 sta = 0;



	if (txq_id != IWL_CMD_QUEUE_NUM)

		sta = txq->cmd[txq->q.read_ptr].cmd.tx.sta_id;



	shared_data->queues_byte_cnt_tbls[txq_id].tfd_offset[txq->q.read_ptr].

					val = cpu_to_le16(1 | (sta << 12));



	if (txq->q.write_ptr < IWL50_MAX_WIN_SIZE) {

		shared_data->queues_byte_cnt_tbls[txq_id].

			tfd_offset[IWL50_QUEUE_SIZE + txq->q.read_ptr].

				val = cpu_to_le16(1 | (sta << 12));

	}

}



static u16 iwl5000_build_addsta_hcmd(const struct iwl_addsta_cmd *cmd, u8 *data)

{

	u16 size = (u16)sizeof(struct iwl_addsta_cmd);
@@ -1248,6 +1268,7 @@ static struct iwl_lib_ops iwl5000_lib = { 
	.free_shared_mem = iwl5000_free_shared_mem,

	.shared_mem_rx_idx = iwl5000_shared_mem_rx_idx,

	.txq_update_byte_cnt_tbl = iwl5000_txq_update_byte_cnt_tbl,

	.txq_inval_byte_cnt_tbl = iwl5000_txq_inval_byte_cnt_tbl,

	.txq_set_sched = iwl5000_txq_set_sched,

	.rx_handler_setup = iwl5000_rx_handler_setup,

	.is_valid_rtc_data_addr = iwl5000_hw_valid_rtc_data_addr,

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

+3 −1
Original line number Diff line number Diff line
@@ -107,10 +107,12 @@ struct iwl_lib_ops { 
	void (*txq_update_byte_cnt_tbl)(struct iwl_priv *priv,

					struct iwl_tx_queue *txq,

					u16 byte_cnt);

	void (*txq_inval_byte_cnt_tbl)(struct iwl_priv *priv,

				       struct iwl_tx_queue *txq);

	void (*txq_set_sched)(struct iwl_priv *priv, u32 mask);

	/* setup Rx handler */

	void (*rx_handler_setup)(struct iwl_priv *priv);

	/* nic Tx fifo handling */

	void (*txq_set_sched)(struct iwl_priv *priv, u32 mask);

	/* alive notification after init uCode load */

	void (*init_alive_start)(struct iwl_priv *priv);

	/* alive notification */

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

+4 −1
Original line number Diff line number Diff line
@@ -1080,8 +1080,11 @@ int iwl_tx_queue_reclaim(struct iwl_priv *priv, int txq_id, int index) 
		tx_info = &txq->txb[txq->q.read_ptr];

		ieee80211_tx_status_irqsafe(priv->hw, tx_info->skb[0]);

		tx_info->skb[0] = NULL;

		iwl_hw_txq_free_tfd(priv, txq);



		if (priv->cfg->ops->lib->txq_inval_byte_cnt_tbl)

			priv->cfg->ops->lib->txq_inval_byte_cnt_tbl(priv, txq);



		iwl_hw_txq_free_tfd(priv, txq);

		nfreed++;

	}

	return nfreed;