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

Commit 02aca585 authored by Emmanuel Grumbach's avatar Emmanuel Grumbach Committed by Wey-Yi Guy
Browse files

iwlagn: move the tx allocation funcs to the transport layer 



These functions allocate all the Tx context. Only the simple tx_init is exported as API.

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

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

+2 −7
Original line number Diff line number Diff line
@@ -699,7 +699,6 @@ int iwlagn_hw_nic_init(struct iwl_priv *priv) 
{

	unsigned long flags;

	struct iwl_rx_queue *rxq = &priv->rxq;

	int ret;



	/* nic_init */

	spin_lock_irqsave(&priv->lock, flags);
@@ -729,12 +728,8 @@ int iwlagn_hw_nic_init(struct iwl_priv *priv) 
	spin_unlock_irqrestore(&priv->lock, flags);



	/* Allocate or reset and init all Tx and Command queues */

	if (!priv->txq) {

		ret = iwlagn_txq_ctx_alloc(priv);

		if (ret)

			return ret;

	} else

		iwlagn_txq_ctx_reset(priv);

	if (priv->trans.ops->tx_init(priv))

		return -ENOMEM;



	if (priv->cfg->base_params->shadow_reg_enable) {

		/* enable shadow regs in HW */

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

+0 −90
Original line number Diff line number Diff line
@@ -877,96 +877,6 @@ void iwlagn_hw_txq_ctx_free(struct iwl_priv *priv) 
	iwl_free_txq_mem(priv);

}



/**

 * iwlagn_txq_ctx_alloc - allocate TX queue context

 * Allocate all Tx DMA structures and initialize them

 *

 * @param priv

 * @return error code

 */

int iwlagn_txq_ctx_alloc(struct iwl_priv *priv)

{

	int ret;

	int txq_id, slots_num;

	unsigned long flags;



	/* Free all tx/cmd queues and keep-warm buffer */

	iwlagn_hw_txq_ctx_free(priv);



	ret = iwlagn_alloc_dma_ptr(priv, &priv->scd_bc_tbls,

				priv->hw_params.scd_bc_tbls_size);

	if (ret) {

		IWL_ERR(priv, "Scheduler BC Table allocation failed\n");

		goto error_bc_tbls;

	}

	/* Alloc keep-warm buffer */

	ret = iwlagn_alloc_dma_ptr(priv, &priv->kw, IWL_KW_SIZE);

	if (ret) {

		IWL_ERR(priv, "Keep Warm allocation failed\n");

		goto error_kw;

	}



	/* allocate tx queue structure */

	ret = iwl_alloc_txq_mem(priv);

	if (ret)

		goto error;



	spin_lock_irqsave(&priv->lock, flags);



	/* Turn off all Tx DMA fifos */

	iwlagn_txq_set_sched(priv, 0);



	/* Tell NIC where to find the "keep warm" buffer */

	iwl_write_direct32(priv, FH_KW_MEM_ADDR_REG, priv->kw.dma >> 4);



	spin_unlock_irqrestore(&priv->lock, flags);



	/* Alloc and init all Tx queues, including the command queue (#4/#9) */

	for (txq_id = 0; txq_id < priv->hw_params.max_txq_num; txq_id++) {

		slots_num = (txq_id == priv->cmd_queue) ?

					TFD_CMD_SLOTS : TFD_TX_CMD_SLOTS;

		ret = iwl_tx_queue_init(priv, &priv->txq[txq_id], slots_num,

				       txq_id);

		if (ret) {

			IWL_ERR(priv, "Tx %d queue init failed\n", txq_id);

			goto error;

		}

	}



	return ret;



 error:

	iwlagn_hw_txq_ctx_free(priv);

	iwlagn_free_dma_ptr(priv, &priv->kw);

 error_kw:

	iwlagn_free_dma_ptr(priv, &priv->scd_bc_tbls);

 error_bc_tbls:

	return ret;

}



void iwlagn_txq_ctx_reset(struct iwl_priv *priv)

{

	int txq_id, slots_num;

	unsigned long flags;



	spin_lock_irqsave(&priv->lock, flags);



	/* Turn off all Tx DMA fifos */

	iwlagn_txq_set_sched(priv, 0);



	/* Tell NIC where to find the "keep warm" buffer */

	iwl_write_direct32(priv, FH_KW_MEM_ADDR_REG, priv->kw.dma >> 4);



	spin_unlock_irqrestore(&priv->lock, flags);



	/* Alloc and init all Tx queues, including the command queue (#4) */

	for (txq_id = 0; txq_id < priv->hw_params.max_txq_num; txq_id++) {

		slots_num = txq_id == priv->cmd_queue ?

			    TFD_CMD_SLOTS : TFD_TX_CMD_SLOTS;

		iwl_tx_queue_reset(priv, &priv->txq[txq_id], slots_num, txq_id);

	}

}



/**

 * iwlagn_txq_ctx_stop - Stop all Tx DMA channels

 */

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

+0 −2
Original line number Diff line number Diff line
@@ -218,8 +218,6 @@ void iwlagn_rx_reply_compressed_ba(struct iwl_priv *priv, 
				struct iwl_rx_mem_buffer *rxb);

int iwlagn_tx_queue_reclaim(struct iwl_priv *priv, int txq_id, int index);

void iwlagn_hw_txq_ctx_free(struct iwl_priv *priv);

int iwlagn_txq_ctx_alloc(struct iwl_priv *priv);

void iwlagn_txq_ctx_reset(struct iwl_priv *priv);

void iwlagn_txq_ctx_stop(struct iwl_priv *priv);



static inline u32 iwl_tx_status_to_mac80211(u32 status)

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

+0 −14
Original line number Diff line number Diff line
@@ -1372,20 +1372,6 @@ void iwl_mac_remove_interface(struct ieee80211_hw *hw, 


}



int iwl_alloc_txq_mem(struct iwl_priv *priv)

{

	if (!priv->txq)

		priv->txq = kzalloc(

			sizeof(struct iwl_tx_queue) *

				priv->cfg->base_params->num_of_queues,

			GFP_KERNEL);

	if (!priv->txq) {

		IWL_ERR(priv, "Not enough memory for txq\n");

		return -ENOMEM;

	}

	return 0;

}



void iwl_free_txq_mem(struct iwl_priv *priv)

{

	kfree(priv->txq);

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

+2 −5
Original line number Diff line number Diff line
@@ -337,7 +337,6 @@ void iwl_mac_remove_interface(struct ieee80211_hw *hw, 
int iwl_mac_change_interface(struct ieee80211_hw *hw,

			     struct ieee80211_vif *vif,

			     enum nl80211_iftype newtype, bool newp2p);

int iwl_alloc_txq_mem(struct iwl_priv *priv);

void iwl_free_txq_mem(struct iwl_priv *priv);



#ifdef CONFIG_IWLWIFI_DEBUGFS
@@ -396,11 +395,9 @@ void iwl_chswitch_done(struct iwl_priv *priv, bool is_success); 
* TX

******************************************************/

void iwl_txq_update_write_ptr(struct iwl_priv *priv, struct iwl_tx_queue *txq);

int iwl_tx_queue_init(struct iwl_priv *priv, struct iwl_tx_queue *txq,

		      int slots_num, u32 txq_id);

void iwl_tx_queue_reset(struct iwl_priv *priv, struct iwl_tx_queue *txq,

			int slots_num, u32 txq_id);

void iwl_tx_queue_free(struct iwl_priv *priv, int txq_id);

int iwl_queue_init(struct iwl_priv *priv, struct iwl_queue *q,

			  int count, int slots_num, u32 id);

void iwl_tx_queue_unmap(struct iwl_priv *priv, int txq_id);

void iwl_setup_watchdog(struct iwl_priv *priv);

/*****************************************************