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

Commit c6f600fc authored by Meenakshi Venkataraman's avatar Meenakshi Venkataraman Committed by John W. Linville
Browse files

iwlwifi: move command queue number out of the iwl_shared struct 



The command queue number is required by the transport
layer, but it can be determined only by the op mode.
Move this parameter to the dvm op mode, and configure
the transport layer using an API.

Signed-off-by: default avatarMeenakshi Venkataraman <meenakshi.venkataraman@intel.com>
Signed-off-by: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 8763848e

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

+8 −8
Original line number Diff line number Diff line
@@ -1236,6 +1236,14 @@ static struct iwl_op_mode *iwl_op_mode_dvm_start(struct iwl_trans *trans, 
	 */

	trans_cfg.op_mode = op_mode;



	if (ucode_flags & IWL_UCODE_TLV_FLAGS_PAN) {

		priv->sta_key_max_num = STA_KEY_MAX_NUM_PAN;

		trans_cfg.cmd_queue = IWL_IPAN_CMD_QUEUE_NUM;

	} else {

		priv->sta_key_max_num = STA_KEY_MAX_NUM;

		trans_cfg.cmd_queue = IWL_DEFAULT_CMD_QUEUE_NUM;

	}



	/* Configure transport layer */

	iwl_trans_configure(trans(priv), &trans_cfg);
@@ -1336,14 +1344,6 @@ static struct iwl_op_mode *iwl_op_mode_dvm_start(struct iwl_trans *trans, 
	priv->new_scan_threshold_behaviour =

		!!(ucode_flags & IWL_UCODE_TLV_FLAGS_NEWSCAN);



	if (ucode_flags & IWL_UCODE_TLV_FLAGS_PAN) {

		priv->sta_key_max_num = STA_KEY_MAX_NUM_PAN;

		priv->shrd->cmd_queue = IWL_IPAN_CMD_QUEUE_NUM;

	} else {

		priv->sta_key_max_num = STA_KEY_MAX_NUM;

		priv->shrd->cmd_queue = IWL_DEFAULT_CMD_QUEUE_NUM;

	}



	priv->phy_calib_chain_noise_reset_cmd =

		fw->ucode_capa.standard_phy_calibration_size;

	priv->phy_calib_chain_noise_gain_cmd =

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

+0 −2
Original line number Diff line number Diff line
@@ -368,7 +368,6 @@ struct iwl_cfg { 
/**

 * struct iwl_shared - shared fields for all the layers of the driver

 *

 * @cmd_queue: command queue number

 * @status: STATUS_*

 * @wowlan: are we running wowlan uCode

 * @valid_contexts: microcode/device supports multiple contexts
@@ -385,7 +384,6 @@ struct iwl_cfg { 
 * @device_pointers: pointers to ucode event tables

 */

struct iwl_shared {

	u8 cmd_queue;

	unsigned long status;

	u8 valid_contexts;

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

+2 −0
Original line number Diff line number Diff line
@@ -248,6 +248,7 @@ struct iwl_tx_queue { 
 * @ucode_write_complete: indicates that the ucode has been copied.

 * @ucode_write_waitq: wait queue for uCode load

 * @status - transport specific status flags

 * @cmd_queue - command queue number

 */

struct iwl_trans_pcie {

	struct iwl_rx_queue rxq;
@@ -289,6 +290,7 @@ struct iwl_trans_pcie { 
	bool ucode_write_complete;

	wait_queue_head_t ucode_write_waitq;

	unsigned long status;

	u8 cmd_queue;

};



#define IWL_TRANS_GET_PCIE_TRANS(_iwl_trans) \

drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c

+1 −1
Original line number Diff line number Diff line
@@ -361,7 +361,7 @@ static void iwl_rx_handle_rxbuf(struct iwl_trans *trans, 
{

	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);

	struct iwl_rx_queue *rxq = &trans_pcie->rxq;

	struct iwl_tx_queue *txq = &trans_pcie->txq[trans->shrd->cmd_queue];

	struct iwl_tx_queue *txq = &trans_pcie->txq[trans_pcie->cmd_queue];

	struct iwl_device_cmd *cmd;

	unsigned long flags;

	int len, err;

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

+12 −12
Original line number Diff line number Diff line
@@ -397,7 +397,7 @@ static void iwlagn_txq_inval_byte_cnt_tbl(struct iwl_trans *trans, 


	WARN_ON(read_ptr >= TFD_QUEUE_SIZE_MAX);



	if (txq_id != trans->shrd->cmd_queue)

	if (txq_id != trans_pcie->cmd_queue)

		sta_id = tx_cmd->sta_id;



	bc_ent = cpu_to_le16(1 | (sta_id << 12));
@@ -664,7 +664,7 @@ int iwl_trans_pcie_tx_agg_disable(struct iwl_trans *trans, int sta_id, int tid) 
static int iwl_enqueue_hcmd(struct iwl_trans *trans, struct iwl_host_cmd *cmd)

{

	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);

	struct iwl_tx_queue *txq = &trans_pcie->txq[trans->shrd->cmd_queue];

	struct iwl_tx_queue *txq = &trans_pcie->txq[trans_pcie->cmd_queue];

	struct iwl_queue *q = &txq->q;

	struct iwl_device_cmd *out_cmd;

	struct iwl_cmd_meta *out_meta;
@@ -737,7 +737,7 @@ static int iwl_enqueue_hcmd(struct iwl_trans *trans, struct iwl_host_cmd *cmd) 
	out_cmd->hdr.cmd = cmd->id;

	out_cmd->hdr.flags = 0;

	out_cmd->hdr.sequence =

		cpu_to_le16(QUEUE_TO_SEQ(trans->shrd->cmd_queue) |

		cpu_to_le16(QUEUE_TO_SEQ(trans_pcie->cmd_queue) |

					 INDEX_TO_SEQ(q->write_ptr));



	/* and copy the data that needs to be copied */
@@ -757,7 +757,7 @@ static int iwl_enqueue_hcmd(struct iwl_trans *trans, struct iwl_host_cmd *cmd) 
			get_cmd_string(out_cmd->hdr.cmd),

			out_cmd->hdr.cmd,

			le16_to_cpu(out_cmd->hdr.sequence), cmd_size,

			q->write_ptr, idx, trans->shrd->cmd_queue);

			q->write_ptr, idx, trans_pcie->cmd_queue);



	phys_addr = dma_map_single(trans->dev, &out_cmd->hdr, copy_size,

				DMA_BIDIRECTIONAL);
@@ -881,16 +881,16 @@ void iwl_tx_cmd_complete(struct iwl_trans *trans, struct iwl_rx_cmd_buffer *rxb, 
	struct iwl_device_cmd *cmd;

	struct iwl_cmd_meta *meta;

	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);

	struct iwl_tx_queue *txq = &trans_pcie->txq[trans->shrd->cmd_queue];

	struct iwl_tx_queue *txq = &trans_pcie->txq[trans_pcie->cmd_queue];



	/* If a Tx command is being handled and it isn't in the actual

	 * command queue then there a command routing bug has been introduced

	 * in the queue management code. */

	if (WARN(txq_id != trans->shrd->cmd_queue,

	if (WARN(txq_id != trans_pcie->cmd_queue,

		 "wrong command queue %d (should be %d), sequence 0x%X readp=%d writep=%d\n",

		  txq_id, trans->shrd->cmd_queue, sequence,

		  trans_pcie->txq[trans->shrd->cmd_queue].q.read_ptr,

		  trans_pcie->txq[trans->shrd->cmd_queue].q.write_ptr)) {

		  txq_id, trans_pcie->cmd_queue, sequence,

		  trans_pcie->txq[trans_pcie->cmd_queue].q.read_ptr,

		  trans_pcie->txq[trans_pcie->cmd_queue].q.write_ptr)) {

		iwl_print_hex_error(trans, pkt, 32);

		return;

	}
@@ -997,7 +997,7 @@ static int iwl_send_cmd_sync(struct iwl_trans *trans, struct iwl_host_cmd *cmd) 
	if (!ret) {

		if (test_bit(STATUS_HCMD_ACTIVE, &trans->shrd->status)) {

			struct iwl_tx_queue *txq =

				&trans_pcie->txq[trans->shrd->cmd_queue];

				&trans_pcie->txq[trans_pcie->cmd_queue];

			struct iwl_queue *q = &txq->q;



			IWL_ERR(trans,
@@ -1034,7 +1034,7 @@ static int iwl_send_cmd_sync(struct iwl_trans *trans, struct iwl_host_cmd *cmd) 
		 * in later, it will possibly set an invalid

		 * address (cmd->meta.source).

		 */

		trans_pcie->txq[trans->shrd->cmd_queue].meta[cmd_idx].flags &=

		trans_pcie->txq[trans_pcie->cmd_queue].meta[cmd_idx].flags &=

							~CMD_WANT_SKB;

	}
@@ -1065,7 +1065,7 @@ int iwl_tx_queue_reclaim(struct iwl_trans *trans, int txq_id, int index, 
	int freed = 0;



	/* This function is not meant to release cmd queue*/

	if (WARN_ON(txq_id == trans->shrd->cmd_queue))

	if (WARN_ON(txq_id == trans_pcie->cmd_queue))

		return 0;



	lockdep_assert_held(&txq->lock);