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

Commit c85eb619 authored by Emmanuel Grumbach's avatar Emmanuel Grumbach Committed by Wey-Yi Guy
Browse files

iwlagn: introduce transport layer and implement rx_init 



The transport layer is responsible for all the queues, DMA rings etc...
This is the beginning of the separation of all the code that is tighly
related to HW design to the aforementioned transport layer.

Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
parent 300d0834

drivers/net/wireless/iwlwifi/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ iwlagn-objs += iwl-6000.o 
iwlagn-objs             += iwl-1000.o

iwlagn-objs             += iwl-2000.o

iwlagn-objs             += iwl-pci.o

iwlagn-objs             += iwl-trans.o



iwlagn-$(CONFIG_IWLWIFI_DEBUGFS) += iwl-debugfs.o

iwlagn-$(CONFIG_IWLWIFI_DEVICE_TRACING) += iwl-devtrace.o

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

+1 −40
Original line number Diff line number Diff line
@@ -628,38 +628,6 @@ struct iwl_mod_params iwlagn_mod_params = { 
	/* the rest are 0 by default */

};



void iwlagn_rx_queue_reset(struct iwl_priv *priv, struct iwl_rx_queue *rxq)

{

	unsigned long flags;

	int i;

	spin_lock_irqsave(&rxq->lock, flags);

	INIT_LIST_HEAD(&rxq->rx_free);

	INIT_LIST_HEAD(&rxq->rx_used);

	/* Fill the rx_used queue with _all_ of the Rx buffers */

	for (i = 0; i < RX_FREE_BUFFERS + RX_QUEUE_SIZE; i++) {

		/* In the reset function, these buffers may have been allocated

		 * to an SKB, so we need to unmap and free potential storage */

		if (rxq->pool[i].page != NULL) {

			dma_unmap_page(priv->bus.dev, rxq->pool[i].page_dma,

				PAGE_SIZE << priv->hw_params.rx_page_order,

				DMA_FROM_DEVICE);

			__iwl_free_pages(priv, rxq->pool[i].page);

			rxq->pool[i].page = NULL;

		}

		list_add_tail(&rxq->pool[i].list, &rxq->rx_used);

	}



	for (i = 0; i < RX_QUEUE_SIZE; i++)

		rxq->queue[i] = NULL;



	/* Set us so that we have processed and used all buffers, but have

	 * not restocked the Rx queue with fresh buffers */

	rxq->read = rxq->write = 0;

	rxq->write_actual = 0;

	rxq->free_count = 0;

	spin_unlock_irqrestore(&rxq->lock, flags);

}



int iwlagn_rx_init(struct iwl_priv *priv, struct iwl_rx_queue *rxq)

{

	u32 rb_size;
@@ -747,14 +715,7 @@ int iwlagn_hw_nic_init(struct iwl_priv *priv) 
	priv->cfg->ops->lib->apm_ops.config(priv);



	/* Allocate the RX queue, or reset if it is already allocated */

	if (!rxq->bd) {

		ret = iwl_rx_queue_alloc(priv);

		if (ret) {

			IWL_ERR(priv, "Unable to initialize Rx queue\n");

			return -ENOMEM;

		}

	} else

		iwlagn_rx_queue_reset(priv, rxq);

	priv->trans.ops->rx_init(priv);



	iwlagn_rx_replenish(priv);

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

+3 −1
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ 
#include "iwl-agn-calib.h"

#include "iwl-agn.h"

#include "iwl-pci.h"



#include "iwl-trans.h"



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

 *
@@ -3517,6 +3517,8 @@ int iwl_probe(void *bus_specific, struct iwl_bus_ops *bus_ops, 
	priv->bus.ops->set_drv_data(&priv->bus, priv);

	priv->bus.dev = priv->bus.ops->get_dev(&priv->bus);



	iwl_trans_register(&priv->trans);



	/* At this point both hw and priv are allocated. */



	SET_IEEE80211_DEV(hw, priv->bus.dev);

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

+0 −1
Original line number Diff line number Diff line
@@ -182,7 +182,6 @@ void iwlagn_temperature(struct iwl_priv *priv); 
u16 iwlagn_eeprom_calib_version(struct iwl_priv *priv);

const u8 *iwlagn_eeprom_query_addr(const struct iwl_priv *priv,

				   size_t offset);

void iwlagn_rx_queue_reset(struct iwl_priv *priv, struct iwl_rx_queue *rxq);

int iwlagn_rx_init(struct iwl_priv *priv, struct iwl_rx_queue *rxq);

int iwlagn_hw_nic_init(struct iwl_priv *priv);

int iwlagn_wait_tx_queue_empty(struct iwl_priv *priv);

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

+0 −1
Original line number Diff line number Diff line
@@ -383,7 +383,6 @@ static inline void iwl_update_stats(struct iwl_priv *priv, bool is_tx, 
******************************************************/

void iwl_cmd_queue_free(struct iwl_priv *priv);

void iwl_cmd_queue_unmap(struct iwl_priv *priv);

int iwl_rx_queue_alloc(struct iwl_priv *priv);

void iwl_rx_queue_update_write_ptr(struct iwl_priv *priv,

				  struct iwl_rx_queue *q);

int iwl_rx_queue_space(const struct iwl_rx_queue *q);