Commit 0cd1ad2d authored by Mordechay Goodstein's avatar Mordechay Goodstein Committed by Luca Coelho
Browse files

iwlwifi: move all bus-independent TX functions to common code 



After moving out all Tx fields not related to pcie-bus
it's time to move the code to a common place.

We also rename all pcie functions name to txq.

Signed-off-by: default avatarMordechay Goodstein <mordechay.goodstein@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
Link: https://lore.kernel.org/r/iwlwifi.20200930161256.3947a5276003.I3fe1bec2b25a965a49532df288f47b8b59eb1500@changeid


Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
parent 0739a7d7

drivers/net/wireless/intel/iwlwifi/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ iwlwifi-$(CONFIG_IWLDVM) += cfg/1000.o cfg/2000.o cfg/5000.o cfg/6000.o 
iwlwifi-$(CONFIG_IWLMVM) += cfg/7000.o cfg/8000.o cfg/9000.o cfg/22000.o

iwlwifi-objs		+= iwl-dbg-tlv.o

iwlwifi-objs		+= iwl-trans.o

iwlwifi-objs		+= queue/tx.o



iwlwifi-objs		+= fw/img.o fw/notif-wait.o

iwlwifi-objs		+= fw/dbg.o

drivers/net/wireless/intel/iwlwifi/iwl-trans.c

+19 −0
Original line number Diff line number Diff line
@@ -66,6 +66,7 @@ 
#include "iwl-trans.h"

#include "iwl-drv.h"

#include "iwl-fh.h"

#include "queue/tx.h"

#include <linux/dmapool.h>



struct iwl_trans *iwl_trans_alloc(unsigned int priv_size,
@@ -150,11 +151,29 @@ struct iwl_trans *iwl_trans_alloc(unsigned int priv_size, 


	WARN_ON(!ops->wait_txq_empty && !ops->wait_tx_queues_empty);



	trans->txqs.tso_hdr_page = alloc_percpu(struct iwl_tso_hdr_page);

	if (!trans->txqs.tso_hdr_page) {

		kmem_cache_destroy(trans->dev_cmd_pool);

		return NULL;

	}



	return trans;

}



void iwl_trans_free(struct iwl_trans *trans)

{

	int i;



	for_each_possible_cpu(i) {

		struct iwl_tso_hdr_page *p =

			per_cpu_ptr(trans->txqs.tso_hdr_page, i);



		if (p->page)

			__free_page(p->page);

	}



	free_percpu(trans->txqs.tso_hdr_page);



	kmem_cache_destroy(trans->dev_cmd_pool);

}

drivers/net/wireless/intel/iwlwifi/iwl-trans.h

+1 −0
Original line number Diff line number Diff line
@@ -928,6 +928,7 @@ struct iwl_trans_txqs { 
	bool bc_table_dword;

	u8 page_offs;

	u8 dev_cmd_offs;

	struct __percpu iwl_tso_hdr_page * tso_hdr_page;



	struct {

		u8 fifo;

drivers/net/wireless/intel/iwlwifi/pcie/ctxt-info.c

+1 −1
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ static void *_iwl_pcie_ctxt_info_dma_alloc_coherent(struct iwl_trans *trans, 
	if (!result)

		return NULL;



	if (unlikely(iwl_pcie_crosses_4g_boundary(*phys, size))) {

	if (unlikely(iwl_txq_crosses_4g_boundary(*phys, size))) {

		void *old = result;

		dma_addr_t oldphys = *phys;

drivers/net/wireless/intel/iwlwifi/pcie/internal.h

+1 −124
Original line number Diff line number Diff line
@@ -79,6 +79,7 @@ 
#include "iwl-io.h"

#include "iwl-op-mode.h"

#include "iwl-drv.h"

#include "queue/tx.h"



/*

 * RX related structures and functions
@@ -240,16 +241,6 @@ struct iwl_rb_allocator { 
	struct work_struct rx_alloc;

};



/**

 * iwl_queue_inc_wrap - increment queue index, wrap back to beginning

 * @index -- current index

 */

static inline int iwl_queue_inc_wrap(struct iwl_trans *trans, int index)

{

	return ++index &

		(trans->trans_cfg->base_params->max_tfd_queue_size - 1);

}



/**

 * iwl_get_closed_rb_stts - get closed rb stts from different structs

 * @rxq - the rxq to get the rb stts from
@@ -268,28 +259,6 @@ static inline __le16 iwl_get_closed_rb_stts(struct iwl_trans *trans, 
	}

}



/**

 * iwl_queue_dec_wrap - decrement queue index, wrap back to end

 * @index -- current index

 */

static inline int iwl_queue_dec_wrap(struct iwl_trans *trans, int index)

{

	return --index &

		(trans->trans_cfg->base_params->max_tfd_queue_size - 1);

}



static inline dma_addr_t

iwl_pcie_get_first_tb_dma(struct iwl_txq *txq, int idx)

{

	return txq->first_tb_dma +

	       sizeof(struct iwl_pcie_first_tb_buf) * idx;

}



struct iwl_tso_hdr_page {

	struct page *page;

	u8 *pos;

};



#ifdef CONFIG_IWLWIFI_DEBUGFS

/**

 * enum iwl_fw_mon_dbgfs_state - the different states of the monitor_data
@@ -427,8 +396,6 @@ struct iwl_trans_pcie { 


	struct net_device napi_dev;



	struct __percpu iwl_tso_hdr_page *tso_hdr_page;



	/* INT ICT Table */

	__le32 *ict_tbl;

	dma_addr_t ict_tbl_dma;
@@ -566,19 +533,7 @@ void iwl_pcie_disable_ict(struct iwl_trans *trans); 
/*****************************************************

* TX / HCMD

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

/*

 * We need this inline in case dma_addr_t is only 32-bits - since the

 * hardware is always 64-bit, the issue can still occur in that case,

 * so use u64 for 'phys' here to force the addition in 64-bit.

 */

static inline bool iwl_pcie_crosses_4g_boundary(u64 phys, u16 len)

{

	return upper_32_bits(phys) != upper_32_bits(phys + len);

}



int iwl_pcie_tx_init(struct iwl_trans *trans);

int iwl_pcie_gen2_tx_init(struct iwl_trans *trans, int txq_id,

			  int queue_size);

void iwl_pcie_tx_start(struct iwl_trans *trans, u32 scd_base_addr);

int iwl_pcie_tx_stop(struct iwl_trans *trans);

void iwl_pcie_tx_free(struct iwl_trans *trans);
@@ -589,14 +544,10 @@ void iwl_trans_pcie_txq_disable(struct iwl_trans *trans, int queue, 
				bool configure_scd);

void iwl_trans_pcie_txq_set_shared_mode(struct iwl_trans *trans, u32 txq_id,

					bool shared_mode);

void iwl_trans_pcie_log_scd_error(struct iwl_trans *trans,

				  struct iwl_txq *txq);

int iwl_trans_pcie_tx(struct iwl_trans *trans, struct sk_buff *skb,

		      struct iwl_device_tx_cmd *dev_cmd, int txq_id);

void iwl_pcie_txq_check_wrptrs(struct iwl_trans *trans);

int iwl_trans_pcie_send_hcmd(struct iwl_trans *trans, struct iwl_host_cmd *cmd);

void iwl_pcie_gen2_txq_inc_wr_ptr(struct iwl_trans *trans,

				  struct iwl_txq *txq);

void iwl_pcie_hcmd_complete(struct iwl_trans *trans,

			    struct iwl_rx_cmd_buffer *rxb);

void iwl_trans_pcie_reclaim(struct iwl_trans *trans, int txq_id, int ssn,
@@ -787,20 +738,6 @@ static inline void iwl_enable_fw_load_int_ctx_info(struct iwl_trans *trans) 
	}

}



static inline u16 iwl_pcie_get_cmd_index(const struct iwl_txq *q, u32 index)

{

	return index & (q->n_window - 1);

}



static inline void *iwl_pcie_get_tfd(struct iwl_trans *trans,

				     struct iwl_txq *txq, int idx)

{

	if (trans->trans_cfg->use_tfh)

		idx = iwl_pcie_get_cmd_index(txq, idx);



	return txq->tfds + trans->txqs.tfd.size * idx;

}



static inline const char *queue_name(struct device *dev,

				     struct iwl_trans_pcie *trans_p, int i)

{
@@ -852,37 +789,6 @@ static inline void iwl_enable_rfkill_int(struct iwl_trans *trans) 


void iwl_pcie_handle_rfkill_irq(struct iwl_trans *trans);



static inline void iwl_wake_queue(struct iwl_trans *trans,

				  struct iwl_txq *txq)

{

	if (test_and_clear_bit(txq->id, trans->txqs.queue_stopped)) {

		IWL_DEBUG_TX_QUEUES(trans, "Wake hwq %d\n", txq->id);

		iwl_op_mode_queue_not_full(trans->op_mode, txq->id);

	}

}



static inline void iwl_stop_queue(struct iwl_trans *trans,

				  struct iwl_txq *txq)

{

	if (!test_and_set_bit(txq->id, trans->txqs.queue_stopped)) {

		iwl_op_mode_queue_full(trans->op_mode, txq->id);

		IWL_DEBUG_TX_QUEUES(trans, "Stop hwq %d\n", txq->id);

	} else

		IWL_DEBUG_TX_QUEUES(trans, "hwq %d already stopped\n",

				    txq->id);

}



static inline bool iwl_queue_used(const struct iwl_txq *q, int i)

{

	int index = iwl_pcie_get_cmd_index(q, i);

	int r = iwl_pcie_get_cmd_index(q, q->read_ptr);

	int w = iwl_pcie_get_cmd_index(q, q->write_ptr);



	return w >= r ?

		(index >= r && index < w) :

		!(index < r && index >= w);

}



static inline bool iwl_is_rfkill_set(struct iwl_trans *trans)

{

	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
@@ -949,23 +855,12 @@ bool iwl_pcie_check_hw_rf_kill(struct iwl_trans *trans); 
void iwl_trans_pcie_handle_stop_rfkill(struct iwl_trans *trans,

				       bool was_in_rfkill);

void iwl_pcie_txq_free_tfd(struct iwl_trans *trans, struct iwl_txq *txq);

int iwl_queue_space(struct iwl_trans *trans, const struct iwl_txq *q);

void iwl_pcie_apm_stop_master(struct iwl_trans *trans);

void iwl_pcie_conf_msix_hw(struct iwl_trans_pcie *trans_pcie);

int iwl_pcie_txq_init(struct iwl_trans *trans, struct iwl_txq *txq,

		      int slots_num, bool cmd_queue);

int iwl_pcie_txq_alloc(struct iwl_trans *trans,

		       struct iwl_txq *txq, int slots_num,  bool cmd_queue);

int iwl_pcie_alloc_dma_ptr(struct iwl_trans *trans,

			   struct iwl_dma_ptr *ptr, size_t size);

void iwl_pcie_free_dma_ptr(struct iwl_trans *trans, struct iwl_dma_ptr *ptr);

void iwl_pcie_apply_destination(struct iwl_trans *trans);

void iwl_pcie_free_tso_page(struct iwl_trans *trans,

			    struct sk_buff *skb);

#ifdef CONFIG_INET

struct iwl_tso_hdr_page *get_page_hdr(struct iwl_trans *trans, size_t len,

				      struct sk_buff *skb);

#endif



/* common functions that are used by gen3 transport */

void iwl_pcie_alloc_fw_monitor(struct iwl_trans *trans, u8 max_power);
@@ -974,28 +869,10 @@ void iwl_pcie_alloc_fw_monitor(struct iwl_trans *trans, u8 max_power); 
int iwl_trans_pcie_gen2_start_fw(struct iwl_trans *trans,

				 const struct fw_img *fw, bool run_in_rfkill);

void iwl_trans_pcie_gen2_fw_alive(struct iwl_trans *trans, u32 scd_addr);

void iwl_pcie_gen2_txq_free_memory(struct iwl_trans *trans,

				   struct iwl_txq *txq);

int iwl_trans_pcie_dyn_txq_alloc_dma(struct iwl_trans *trans,

				     struct iwl_txq **intxq, int size,

				     unsigned int timeout);

int iwl_trans_pcie_txq_alloc_response(struct iwl_trans *trans,

				      struct iwl_txq *txq,

				      struct iwl_host_cmd *hcmd);

int iwl_trans_pcie_dyn_txq_alloc(struct iwl_trans *trans,

				 __le16 flags, u8 sta_id, u8 tid,

				 int cmd_id, int size,

				 unsigned int timeout);

void iwl_trans_pcie_dyn_txq_free(struct iwl_trans *trans, int queue);

int iwl_trans_pcie_gen2_tx(struct iwl_trans *trans, struct sk_buff *skb,

			   struct iwl_device_tx_cmd *dev_cmd, int txq_id);

int iwl_trans_pcie_gen2_send_hcmd(struct iwl_trans *trans,

				  struct iwl_host_cmd *cmd);

void iwl_trans_pcie_gen2_stop_device(struct iwl_trans *trans);

void _iwl_trans_pcie_gen2_stop_device(struct iwl_trans *trans);

void iwl_pcie_gen2_txq_unmap(struct iwl_trans *trans, int txq_id);

void iwl_pcie_gen2_tx_free(struct iwl_trans *trans);

void iwl_pcie_gen2_tx_stop(struct iwl_trans *trans);

void iwl_pcie_d3_complete_suspend(struct iwl_trans *trans,

				  bool test, bool reset);

#endif /* __iwl_trans_int_pcie_h__ */