Commit fea7795f authored by Johannes Berg's avatar Johannes Berg Committed by Emmanuel Grumbach
Browse files

iwlwifi: trans: refactor txq_enable arguments 



Instead of having all arguments passed to the function,
add a struct to hold them and only pass some directly.

This will make future work in this area cleaner.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
parent 680073b7

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

+17 −4
Original line number Diff line number Diff line
@@ -401,6 +401,13 @@ struct iwl_trans_dump_data { 


struct iwl_trans;



struct iwl_trans_txq_scd_cfg {

	u8 fifo;

	s8 sta_id;

	u8 tid;

	int frame_limit;

};



/**

 * struct iwl_trans_ops - transport specific operations

 *
@@ -492,8 +499,8 @@ struct iwl_trans_ops { 
	void (*reclaim)(struct iwl_trans *trans, int queue, int ssn,

			struct sk_buff_head *skbs);



	void (*txq_enable)(struct iwl_trans *trans, int queue, int fifo,

			   int sta_id, int tid, int frame_limit, u16 ssn);

	void (*txq_enable)(struct iwl_trans *trans, int queue, u16 ssn,

			   const struct iwl_trans_txq_scd_cfg *cfg);

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



	int (*dbgfs_register)(struct iwl_trans *trans, struct dentry* dir);
@@ -775,13 +782,19 @@ static inline void iwl_trans_txq_enable(struct iwl_trans *trans, int queue, 
					int fifo, int sta_id, int tid,

					int frame_limit, u16 ssn)

{

	struct iwl_trans_txq_scd_cfg cfg = {

		.fifo = fifo,

		.sta_id = sta_id,

		.tid = tid,

		.frame_limit = frame_limit,

	};



	might_sleep();



	if (unlikely((trans->state != IWL_TRANS_FW_ALIVE)))

		IWL_ERR(trans, "%s bad state = %d\n", __func__, trans->state);



	trans->ops->txq_enable(trans, queue, fifo, sta_id, tid,

				 frame_limit, ssn);

	trans->ops->txq_enable(trans, queue, ssn, &cfg);

}



static inline void iwl_trans_ac_txq_enable(struct iwl_trans *trans, int queue,

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

+2 −2
Original line number Diff line number Diff line
@@ -364,8 +364,8 @@ int iwl_pcie_tx_init(struct iwl_trans *trans); 
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);

void iwl_trans_pcie_txq_enable(struct iwl_trans *trans, int txq_id, int fifo,

			       int sta_id, int tid, int frame_limit, u16 ssn);

void iwl_trans_pcie_txq_enable(struct iwl_trans *trans, int queue, u16 ssn,

			       const struct iwl_trans_txq_scd_cfg *cfg);

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

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

		      struct iwl_device_cmd *dev_cmd, int txq_id);

drivers/net/wireless/iwlwifi/pcie/tx.c

+7 −6
Original line number Diff line number Diff line
@@ -1066,10 +1066,11 @@ static int iwl_pcie_txq_set_ratid_map(struct iwl_trans *trans, u16 ra_tid, 
 * combined with Traffic ID (QOS priority), in format used by Tx Scheduler */

#define BUILD_RAxTID(sta_id, tid)	(((sta_id) << 4) + (tid))



void iwl_trans_pcie_txq_enable(struct iwl_trans *trans, int txq_id, int fifo,

			       int sta_id, int tid, int frame_limit, u16 ssn)

void iwl_trans_pcie_txq_enable(struct iwl_trans *trans, int txq_id, u16 ssn,

			       const struct iwl_trans_txq_scd_cfg *cfg)

{

	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);

	u8 frame_limit = cfg->frame_limit;



	if (test_and_set_bit(txq_id, trans_pcie->queue_used))

		WARN_ONCE(1, "queue %d already used - expect issues", txq_id);
@@ -1082,8 +1083,8 @@ void iwl_trans_pcie_txq_enable(struct iwl_trans *trans, int txq_id, int fifo, 
		iwl_scd_txq_set_chain(trans, txq_id);



	/* If this queue is mapped to a certain station: it is an AGG queue */

	if (sta_id >= 0) {

		u16 ra_tid = BUILD_RAxTID(sta_id, tid);

	if (cfg->sta_id >= 0) {

		u16 ra_tid = BUILD_RAxTID(cfg->sta_id, cfg->tid);



		/* Map receiver-address / traffic-ID to this queue */

		iwl_pcie_txq_set_ratid_map(trans, ra_tid, txq_id);
@@ -1124,12 +1125,12 @@ void iwl_trans_pcie_txq_enable(struct iwl_trans *trans, int txq_id, int fifo, 
	/* Set up Status area in SRAM, map to Tx DMA/FIFO, activate the queue */

	iwl_write_prph(trans, SCD_QUEUE_STATUS_BITS(txq_id),

		       (1 << SCD_QUEUE_STTS_REG_POS_ACTIVE) |

		       (fifo << SCD_QUEUE_STTS_REG_POS_TXF) |

		       (cfg->fifo << SCD_QUEUE_STTS_REG_POS_TXF) |

		       (1 << SCD_QUEUE_STTS_REG_POS_WSL) |

		       SCD_QUEUE_STTS_REG_MSK);

	trans_pcie->txq[txq_id].active = true;

	IWL_DEBUG_TX_QUEUES(trans, "Activate queue %d on FIFO %d WrPtr: %d\n",

			    txq_id, fifo, ssn & 0xff);

			    txq_id, cfg->fifo, ssn & 0xff);

}



void iwl_trans_pcie_txq_disable(struct iwl_trans *trans, int txq_id)

CRA Git | Maintained and supported by SUSTech CRA and CCSE