Commit 4f4822b7 authored by Mordechay Goodstein's avatar Mordechay Goodstein Committed by Luca Coelho
Browse files

iwlwifi: move txq-specific from trans_pcie to common trans 



We don't want to have txq code in the PCIe transport code, so move all
the relevant elements to a new iwl_txq structure and store it in
iwl_trans.

spatch

@ replace_pcie @
struct iwl_trans_pcie *trans_pcie;
@@

(
-trans_pcie->queue_stopped
+trans->txqs.queue_stopped
|
-trans_pcie->queue_used
+trans->txqs.queue_used
|
-trans_pcie->txq
+trans->txqs.txq
|
-trans_pcie->txq
+trans->txqs.txq
|
-trans_pcie->cmd_queue
+trans->txqs.cmd.q_id
|
-trans_pcie->cmd_fifo
+trans->txqs.cmd.fifo
|
-trans_pcie->cmd_q_wdg_timeout
+trans->txqs.cmd.wdg_timeout
)

// clean all new unused variables
@ depends on replace_pcie @
type T;
identifier i;
expression E;
@@
- T i = E;
 ... when != i

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.20200529092401.a428d3c9d66f.Ie04ae55f33954636a39c98e7ae1e739c0507435b@changeid
parent 4807e736

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

+21 −0
Original line number Diff line number Diff line
@@ -902,6 +902,25 @@ struct iwl_txq { 


	bool overflow_tx;

};



/**

 * struct iwl_trans_txqs - transport tx queues data

 *

 * @queue_used - bit mask of used queues

 * @queue_stopped - bit mask of stopped queues

 */

struct iwl_trans_txqs {

	unsigned long queue_used[BITS_TO_LONGS(IWL_MAX_TVQM_QUEUES)];

	unsigned long queue_stopped[BITS_TO_LONGS(IWL_MAX_TVQM_QUEUES)];

	struct iwl_txq *txq[IWL_MAX_TVQM_QUEUES];

	struct {

		u8 fifo;

		u8 q_id;

		unsigned int wdg_timeout;

	} cmd;



};



/**

 * struct iwl_trans - transport common data

 *
@@ -935,6 +954,7 @@ struct iwl_txq { 
 * @system_pm_mode: the system-wide power management mode in use.

 *	This mode is set dynamically, depending on the WoWLAN values

 *	configured from the userspace at runtime.

 * @iwl_trans_txqs: transport tx queues data.

 */

struct iwl_trans {

	const struct iwl_trans_ops *ops;
@@ -982,6 +1002,7 @@ struct iwl_trans { 
	enum iwl_plat_pm_mode system_pm_mode;



	const char *name;

	struct iwl_trans_txqs txqs;



	/* pointer to trans specific struct */

	/*Ensure that this pointer will always be aligned to sizeof pointer */

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

+1 −1
Original line number Diff line number Diff line
@@ -221,7 +221,7 @@ int iwl_pcie_ctxt_info_gen3_init(struct iwl_trans *trans, 
	ctxt_info_gen3->tr_idx_arr_size =

		cpu_to_le16(IWL_NUM_OF_TRANSFER_RINGS);

	ctxt_info_gen3->mtr_base_addr =

		cpu_to_le64(trans_pcie->txq[trans_pcie->cmd_queue]->dma_addr);

		cpu_to_le64(trans->txqs.txq[trans->txqs.cmd.q_id]->dma_addr);

	ctxt_info_gen3->mcr_base_addr =

		cpu_to_le64(trans_pcie->rxq->used_bd_dma);

	ctxt_info_gen3->mtr_size =

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

+3 −3
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 
 * GPL LICENSE SUMMARY

 *

 * Copyright(c) 2017 Intel Deutschland GmbH

 * Copyright(c) 2018 - 2019 Intel Corporation

 * Copyright(c) 2018 - 2020 Intel Corporation

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of version 2 of the GNU General Public License as
@@ -20,7 +20,7 @@ 
 * BSD LICENSE

 *

 * Copyright(c) 2017 Intel Deutschland GmbH

 * Copyright(c) 2018 - 2019 Intel Corporation

 * Copyright(c) 2018 - 2020 Intel Corporation

 * All rights reserved.

 *

 * Redistribution and use in source and binary forms, with or without
@@ -263,7 +263,7 @@ int iwl_pcie_ctxt_info_init(struct iwl_trans *trans, 


	/* initialize TX command queue */

	ctxt_info->hcmd_cfg.cmd_queue_addr =

		cpu_to_le64(trans_pcie->txq[trans_pcie->cmd_queue]->dma_addr);

		cpu_to_le64(trans->txqs.txq[trans->txqs.cmd.q_id]->dma_addr);

	ctxt_info->hcmd_cfg.cmd_queue_size =

		TFD_QUEUE_CB_SIZE(IWL_CMD_QUEUE_SIZE);

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

+2 −12
Original line number Diff line number Diff line
@@ -454,9 +454,6 @@ struct iwl_trans_pcie { 
	struct dma_pool *bc_pool;



	struct iwl_txq *txq_memory;

	struct iwl_txq *txq[IWL_MAX_TVQM_QUEUES];

	unsigned long queue_used[BITS_TO_LONGS(IWL_MAX_TVQM_QUEUES)];

	unsigned long queue_stopped[BITS_TO_LONGS(IWL_MAX_TVQM_QUEUES)];



	/* PCI bus related data */

	struct pci_dev *pci_dev;
@@ -470,10 +467,7 @@ struct iwl_trans_pcie { 


	u8 page_offs, dev_cmd_offs;



	u8 cmd_queue;

	u8 def_rx_queue;

	u8 cmd_fifo;

	unsigned int cmd_q_wdg_timeout;

	u8 n_no_reclaim_cmds;

	u8 no_reclaim_cmds[MAX_NO_RECLAIM_CMDS];

	u8 max_tbs;
@@ -876,9 +870,7 @@ void iwl_pcie_handle_rfkill_irq(struct iwl_trans *trans); 
static inline void iwl_wake_queue(struct iwl_trans *trans,

				  struct iwl_txq *txq)

{

	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);



	if (test_and_clear_bit(txq->id, trans_pcie->queue_stopped)) {

	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);

	}
@@ -887,9 +879,7 @@ static inline void iwl_wake_queue(struct iwl_trans *trans, 
static inline void iwl_stop_queue(struct iwl_trans *trans,

				  struct iwl_txq *txq)

{

	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);



	if (!test_and_set_bit(txq->id, trans_pcie->queue_stopped)) {

	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

drivers/net/wireless/intel/iwlwifi/pcie/rx.c

+3 −3
Original line number Diff line number Diff line
@@ -1284,7 +1284,7 @@ static void iwl_pcie_rx_handle_rb(struct iwl_trans *trans, 
				int i)

{

	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);

	struct iwl_txq *txq = trans_pcie->txq[trans_pcie->cmd_queue];

	struct iwl_txq *txq = trans->txqs.txq[trans->txqs.cmd.q_id];

	bool page_stolen = false;

	int max_len = trans_pcie->rx_buf_bytes;

	u32 offset = 0;
@@ -1671,9 +1671,9 @@ static void iwl_pcie_irq_handle_error(struct iwl_trans *trans) 
	}



	for (i = 0; i < trans->trans_cfg->base_params->num_of_queues; i++) {

		if (!trans_pcie->txq[i])

		if (!trans->txqs.txq[i])

			continue;

		del_timer(&trans_pcie->txq[i]->stuck_timer);

		del_timer(&trans->txqs.txq[i]->stuck_timer);

	}



	/* The STATUS_FW_ERROR bit is set in this function. This must happen

CRA Git | Maintained and supported by SUSTech CRA and CCSE