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

Commit 89d5e833 authored by Golan Ben Ami's avatar Golan Ben Ami Committed by Luca Coelho
Browse files

iwlwifi: pcie: make non-static hcmd and rx code 



Allow other device generations to use the utilities that
are used to send and reclaim host commands and to allocate
rx, by making it non-static.

Signed-off-by: default avatarGolan Ben Ami <golan.ben.ami@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
parent 9b3089bd

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

+8 −0
Original line number Diff line number Diff line
@@ -613,6 +613,7 @@ void iwl_trans_pcie_free(struct iwl_trans *trans); 
/*****************************************************

* RX

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

int _iwl_pcie_rx_init(struct iwl_trans *trans);

int iwl_pcie_rx_init(struct iwl_trans *trans);

int iwl_pcie_gen2_rx_init(struct iwl_trans *trans);

irqreturn_t iwl_pcie_msix_isr(int irq, void *data);
@@ -626,6 +627,7 @@ void iwl_pcie_rx_init_rxb_lists(struct iwl_rxq *rxq); 
int iwl_pcie_dummy_napi_poll(struct napi_struct *napi, int budget);

void iwl_pcie_rxq_alloc_rbs(struct iwl_trans *trans, gfp_t priority,

			    struct iwl_rxq *rxq);

int iwl_pcie_rx_alloc(struct iwl_trans *trans);



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

* ICT - interrupt handling
@@ -658,11 +660,17 @@ int iwl_trans_pcie_tx(struct iwl_trans *trans, struct sk_buff *skb, 
		      struct iwl_device_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_cmdq_reclaim(struct iwl_trans *trans, int txq_id, int idx);

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,

			    struct sk_buff_head *skbs);

void iwl_trans_pcie_tx_reset(struct iwl_trans *trans);

void iwl_pcie_gen2_update_byte_tbl(struct iwl_trans_pcie *trans_pcie,

				   struct iwl_txq *txq, u16 byte_cnt,

				   int num_tbs);



static inline u16 iwl_pcie_tfd_tb_get_len(struct iwl_trans *trans, void *_tfd,

					  u8 idx)

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

+2 −2
Original line number Diff line number Diff line
@@ -776,7 +776,7 @@ static int iwl_pcie_alloc_rxq_dma(struct iwl_trans *trans, 
	return -ENOMEM;

}



static int iwl_pcie_rx_alloc(struct iwl_trans *trans)

int iwl_pcie_rx_alloc(struct iwl_trans *trans)

{

	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);

	struct iwl_rb_allocator *rba = &trans_pcie->rba;
@@ -1002,7 +1002,7 @@ int iwl_pcie_dummy_napi_poll(struct napi_struct *napi, int budget) 
	return 0;

}



static int _iwl_pcie_rx_init(struct iwl_trans *trans)

int _iwl_pcie_rx_init(struct iwl_trans *trans)

{

	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);

	struct iwl_rxq *def_rxq;

drivers/net/wireless/intel/iwlwifi/pcie/tx-gen2.c

+5 −5
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ void iwl_pcie_gen2_tx_stop(struct iwl_trans *trans) 
/*

 * iwl_pcie_txq_update_byte_tbl - Set up entry in Tx byte-count array

 */

static void iwl_pcie_gen2_update_byte_tbl(struct iwl_trans_pcie *trans_pcie,

void iwl_pcie_gen2_update_byte_tbl(struct iwl_trans_pcie *trans_pcie,

				   struct iwl_txq *txq, u16 byte_cnt,

				   int num_tbs)

{
@@ -127,7 +127,7 @@ static void iwl_pcie_gen2_update_byte_tbl(struct iwl_trans_pcie *trans_pcie, 
/*

 * iwl_pcie_gen2_txq_inc_wr_ptr - Send new write index to hardware

 */

static void iwl_pcie_gen2_txq_inc_wr_ptr(struct iwl_trans *trans,

void iwl_pcie_gen2_txq_inc_wr_ptr(struct iwl_trans *trans,

				  struct iwl_txq *txq)

{

	lockdep_assert_held(&txq->lock);

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

+1 −1
Original line number Diff line number Diff line
@@ -1230,7 +1230,7 @@ static int iwl_pcie_set_cmd_in_flight(struct iwl_trans *trans, 
 * need to be reclaimed. As result, some free space forms.  If there is

 * enough free space (> low mark), wake the stack that feeds us.

 */

static void iwl_pcie_cmdq_reclaim(struct iwl_trans *trans, int txq_id, int idx)

void iwl_pcie_cmdq_reclaim(struct iwl_trans *trans, int txq_id, int idx)

{

	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);

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