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

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

iwlwifi: move txq_ctx_stop into iwl-tx.c 



This patch moves txq_ctx_stop into iwl-tx.c iwlcore module.

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

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

+8 −51
Original line number Diff line number Diff line
@@ -468,25 +468,13 @@ int iwl4965_set_pwr_src(struct iwl_priv *priv, enum iwl_pwr_src src) 
	return ret;

}



static int iwl4965_disable_tx_fifo(struct iwl_priv *priv)

/*

 * Activate/Deactivat Tx DMA/FIFO channels according tx fifos mask

 * must be called under priv->lock and mac access

 */

static void iwl4965_txq_set_sched(struct iwl_priv *priv, u32 mask)

{

	unsigned long flags;

	int ret;



	spin_lock_irqsave(&priv->lock, flags);



	ret = iwl_grab_nic_access(priv);

	if (unlikely(ret)) {

		IWL_ERROR("Tx fifo reset failed");

		spin_unlock_irqrestore(&priv->lock, flags);

		return ret;

	}



	iwl_write_prph(priv, IWL49_SCD_TXFACT, 0);

	iwl_release_nic_access(priv);

	spin_unlock_irqrestore(&priv->lock, flags);



	return 0;

	iwl_write_prph(priv, IWL49_SCD_TXFACT, mask);

}



static int iwl4965_apm_init(struct iwl_priv *priv)
@@ -579,36 +567,6 @@ static void iwl4965_nic_config(struct iwl_priv *priv) 
	spin_unlock_irqrestore(&priv->lock, flags);

}



/**

 * iwl4965_hw_txq_ctx_stop - Stop all Tx DMA channels, free Tx queue memory

 */

void iwl4965_hw_txq_ctx_stop(struct iwl_priv *priv)

{



	int txq_id;

	unsigned long flags;



	/* Stop each Tx DMA channel, and wait for it to be idle */

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

		spin_lock_irqsave(&priv->lock, flags);

		if (iwl_grab_nic_access(priv)) {

			spin_unlock_irqrestore(&priv->lock, flags);

			continue;

		}



		iwl_write_direct32(priv,

				   FH_TCSR_CHNL_TX_CONFIG_REG(txq_id), 0x0);

		iwl_poll_direct_bit(priv, FH_TSSR_TX_STATUS_REG,

				    FH_TSSR_TX_STATUS_REG_MSK_CHNL_IDLE

				    (txq_id), 200);

		iwl_release_nic_access(priv);

		spin_unlock_irqrestore(&priv->lock, flags);

	}



	/* Deallocate memory for all Tx queues */

	iwl_hw_txq_ctx_free(priv);

}



static int iwl4965_apm_stop_master(struct iwl_priv *priv)

{

	int ret = 0;
@@ -995,8 +953,7 @@ int iwl4965_alive_notify(struct iwl_priv *priv) 
				 (1 << priv->hw_params.max_txq_num) - 1);



	/* Activate all Tx DMA/FIFO channels */

	iwl_write_prph(priv, IWL49_SCD_TXFACT,

				 SCD_TXFACT_REG_TXFIFO_MASK(0, 7));

	priv->cfg->ops->lib->txq_set_sched(priv, IWL_MASK(0, 7));



	iwl4965_set_wr_ptrs(priv, IWL_CMD_QUEUE_NUM, 0);
@@ -3622,7 +3579,7 @@ static struct iwl_lib_ops iwl4965_lib = { 
	.free_shared_mem = iwl4965_free_shared_mem,

	.shared_mem_rx_idx = iwl4965_shared_mem_rx_idx,

	.txq_update_byte_cnt_tbl = iwl4965_txq_update_byte_cnt_tbl,

	.disable_tx_fifo = iwl4965_disable_tx_fifo,

	.txq_set_sched = iwl4965_txq_set_sched,

	.rx_handler_setup = iwl4965_rx_handler_setup,

	.is_valid_rtc_data_addr = iwl4965_hw_valid_rtc_data_addr,

	.alive_notify = iwl4965_alive_notify,

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

+10 −22
Original line number Diff line number Diff line
@@ -662,10 +662,10 @@ static int iwl5000_alive_notify(struct iwl_priv *priv) 
	}



	iwl_write_prph(priv, IWL50_SCD_INTERRUPT_MASK,

				 (1 << priv->hw_params.max_txq_num) - 1);

			IWL_MASK(0, priv->hw_params.max_txq_num));



	iwl_write_prph(priv, IWL50_SCD_TXFACT,

				 SCD_TXFACT_REG_TXFIFO_MASK(0, 7));

	/* Activate all Tx DMA/FIFO channels */

	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 */
@@ -839,25 +839,13 @@ static u16 iwl5000_build_addsta_hcmd(const struct iwl_addsta_cmd *cmd, u8 *data) 
}





static int iwl5000_disable_tx_fifo(struct iwl_priv *priv)

/*

 * Activate/Deactivat Tx DMA/FIFO channels according tx fifos mask

 * must be called under priv->lock and mac access

 */

static void iwl5000_txq_set_sched(struct iwl_priv *priv, u32 mask)

{

	unsigned long flags;

	int ret;



	spin_lock_irqsave(&priv->lock, flags);



	ret = iwl_grab_nic_access(priv);

	if (unlikely(ret)) {

		IWL_ERROR("Tx fifo reset failed");

		spin_unlock_irqrestore(&priv->lock, flags);

		return ret;

	}



	iwl_write_prph(priv, IWL50_SCD_TXFACT, 0);

	iwl_release_nic_access(priv);

	spin_unlock_irqrestore(&priv->lock, flags);



	return 0;

	iwl_write_prph(priv, IWL50_SCD_TXFACT, mask);

}



/* Currently 5000 is the supperset of everything */
@@ -894,7 +882,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,

	.disable_tx_fifo = iwl5000_disable_tx_fifo,

	.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,

	.load_ucode = iwl5000_load_ucode,

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

+1 −1
Original line number Diff line number Diff line
@@ -110,7 +110,7 @@ struct iwl_lib_ops { 
	/* setup Rx handler */

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

	/* nic Tx fifo handling */

	int (*disable_tx_fifo)(struct iwl_priv *priv);

	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-dev.h

+1 −1
Original line number Diff line number Diff line
@@ -686,7 +686,7 @@ extern void iwl4965_hw_setup_deferred_work(struct iwl_priv *priv); 
extern void iwl4965_hw_cancel_deferred_work(struct iwl_priv *priv);

extern int iwl4965_hw_rxq_stop(struct iwl_priv *priv);

extern int iwl4965_hw_set_hw_params(struct iwl_priv *priv);

extern void iwl4965_hw_txq_ctx_stop(struct iwl_priv *priv);

extern void iwl_txq_ctx_stop(struct iwl_priv *priv);

extern int iwl4965_hw_get_temperature(struct iwl_priv *priv);

extern unsigned int iwl4965_hw_get_beacon_cmd(struct iwl_priv *priv,

				 struct iwl_frame *frame, u8 rate);

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

+2 −0
Original line number Diff line number Diff line
@@ -136,6 +136,8 @@ static inline void iwl_set_bits16(__le16 *dst, u8 pos, u8 len, int val) 


#define KELVIN_TO_CELSIUS(x) ((x)-273)

#define CELSIUS_TO_KELVIN(x) ((x)+273)

#define IWL_MASK(lo, hi) ((1 << (hi)) | ((1 << (hi)) - (1 << (lo))))





#define IEEE80211_CHAN_W_RADAR_DETECT 0x00000010