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

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

iwlagn: move tx transport functions to iwl-trans-tx-pcie.c 



There are still a few functions here and there that should be
put in the transport layer. Mainly the functions that are related to the reclaim flow.

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

drivers/net/wireless/iwlwifi/Makefile

+3 −3
Original line number Diff line number Diff line
@@ -5,8 +5,8 @@ iwlagn-objs += iwl-agn-ucode.o iwl-agn-tx.o 
iwlagn-objs		+= iwl-agn-lib.o iwl-agn-calib.o iwl-io.o

iwlagn-objs		+= iwl-agn-tt.o iwl-agn-sta.o iwl-agn-eeprom.o



iwlagn-objs 		+= iwl-core.o iwl-eeprom.o iwl-hcmd.o iwl-power.o

iwlagn-objs 		+= iwl-rx.o iwl-tx.o iwl-sta.o

iwlagn-objs 		+= iwl-core.o iwl-eeprom.o iwl-power.o

iwlagn-objs 		+= iwl-rx.o iwl-sta.o

iwlagn-objs 		+= iwl-scan.o iwl-led.o

iwlagn-objs             += iwl-agn-rxon.o iwl-agn-ict.o

iwlagn-objs             += iwl-5000.o
@@ -14,7 +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 iwl-trans-rx-pcie.o

iwlagn-objs             += iwl-trans.o iwl-trans-rx-pcie.o iwl-trans-tx-pcie.o



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

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

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

+0 −3
Original line number Diff line number Diff line
@@ -189,9 +189,6 @@ void iwl_rx_dispatch(struct iwl_priv *priv, struct iwl_rx_mem_buffer *rxb); 
/* tx */

void iwlagn_txq_free_tfd(struct iwl_priv *priv, struct iwl_tx_queue *txq,

				int index);

int iwlagn_txq_attach_buf_to_tfd(struct iwl_priv *priv,

				 struct iwl_tx_queue *txq,

				 dma_addr_t addr, u16 len, u8 reset);

void iwlagn_hwrate_to_tx_control(struct iwl_priv *priv, u32 rate_n_flags,

			      struct ieee80211_tx_info *info);

int iwlagn_tx_skb(struct iwl_priv *priv, struct sk_buff *skb);

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

+0 −16
Original line number Diff line number Diff line
@@ -336,18 +336,8 @@ static inline void iwl_update_stats(struct iwl_priv *priv, bool is_tx, 
/*****************************************************

* RX

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

void iwl_tx_cmd_complete(struct iwl_priv *priv, struct iwl_rx_mem_buffer *rxb);



void iwl_chswitch_done(struct iwl_priv *priv, bool is_success);



/* TX helpers */



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

* TX

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

void iwl_txq_update_write_ptr(struct iwl_priv *priv, struct iwl_tx_queue *txq);

int iwl_queue_init(struct iwl_priv *priv, struct iwl_queue *q,

			  int count, int slots_num, u32 id);

void iwl_setup_watchdog(struct iwl_priv *priv);

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

 * TX power
@@ -398,12 +388,6 @@ int __must_check iwl_scan_initiate(struct iwl_priv *priv, 
 *****************************************************/



const char *get_cmd_string(u8 cmd);

int iwl_send_cmd(struct iwl_priv *priv, struct iwl_host_cmd *cmd);

int __must_check iwl_send_cmd_pdu(struct iwl_priv *priv, u8 id, u32 flags,

				  u16 len, const void *data);



int iwl_enqueue_hcmd(struct iwl_priv *priv, struct iwl_host_cmd *cmd);



void iwl_bg_watchdog(unsigned long data);

u32 iwl_usecs_to_beacons(struct iwl_priv *priv, u32 usec, u32 beacon_interval);

__le32 iwl_add_beacon_time(struct iwl_priv *priv, u32 base,

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

deleted100644 → 0
+0 −271
Original line number Diff line number Diff line 
/******************************************************************************

 *

 * GPL LICENSE SUMMARY

 *

 * Copyright(c) 2008 - 2011 Intel Corporation. All rights reserved.

 *

 * 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

 * published by the Free Software Foundation.

 *

 * This program is distributed in the hope that it will be useful, but

 * WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

 * General Public License for more details.

 *

 * You should have received a copy of the GNU General Public License

 * along with this program; if not, write to the Free Software

 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110,

 * USA

 *

 * The full GNU General Public License is included in this distribution

 * in the file called LICENSE.GPL.

 *

 * Contact Information:

 *  Intel Linux Wireless <ilw@linux.intel.com>

 * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497

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



#include <linux/kernel.h>

#include <linux/module.h>

#include <linux/sched.h>

#include <net/mac80211.h>



#include "iwl-dev.h" /* FIXME: remove */

#include "iwl-debug.h"

#include "iwl-eeprom.h"

#include "iwl-core.h"





const char *get_cmd_string(u8 cmd)

{

	switch (cmd) {

		IWL_CMD(REPLY_ALIVE);

		IWL_CMD(REPLY_ERROR);

		IWL_CMD(REPLY_RXON);

		IWL_CMD(REPLY_RXON_ASSOC);

		IWL_CMD(REPLY_QOS_PARAM);

		IWL_CMD(REPLY_RXON_TIMING);

		IWL_CMD(REPLY_ADD_STA);

		IWL_CMD(REPLY_REMOVE_STA);

		IWL_CMD(REPLY_REMOVE_ALL_STA);

		IWL_CMD(REPLY_TXFIFO_FLUSH);

		IWL_CMD(REPLY_WEPKEY);

		IWL_CMD(REPLY_TX);

		IWL_CMD(REPLY_LEDS_CMD);

		IWL_CMD(REPLY_TX_LINK_QUALITY_CMD);

		IWL_CMD(COEX_PRIORITY_TABLE_CMD);

		IWL_CMD(COEX_MEDIUM_NOTIFICATION);

		IWL_CMD(COEX_EVENT_CMD);

		IWL_CMD(REPLY_QUIET_CMD);

		IWL_CMD(REPLY_CHANNEL_SWITCH);

		IWL_CMD(CHANNEL_SWITCH_NOTIFICATION);

		IWL_CMD(REPLY_SPECTRUM_MEASUREMENT_CMD);

		IWL_CMD(SPECTRUM_MEASURE_NOTIFICATION);

		IWL_CMD(POWER_TABLE_CMD);

		IWL_CMD(PM_SLEEP_NOTIFICATION);

		IWL_CMD(PM_DEBUG_STATISTIC_NOTIFIC);

		IWL_CMD(REPLY_SCAN_CMD);

		IWL_CMD(REPLY_SCAN_ABORT_CMD);

		IWL_CMD(SCAN_START_NOTIFICATION);

		IWL_CMD(SCAN_RESULTS_NOTIFICATION);

		IWL_CMD(SCAN_COMPLETE_NOTIFICATION);

		IWL_CMD(BEACON_NOTIFICATION);

		IWL_CMD(REPLY_TX_BEACON);

		IWL_CMD(WHO_IS_AWAKE_NOTIFICATION);

		IWL_CMD(QUIET_NOTIFICATION);

		IWL_CMD(REPLY_TX_PWR_TABLE_CMD);

		IWL_CMD(MEASURE_ABORT_NOTIFICATION);

		IWL_CMD(REPLY_BT_CONFIG);

		IWL_CMD(REPLY_STATISTICS_CMD);

		IWL_CMD(STATISTICS_NOTIFICATION);

		IWL_CMD(REPLY_CARD_STATE_CMD);

		IWL_CMD(CARD_STATE_NOTIFICATION);

		IWL_CMD(MISSED_BEACONS_NOTIFICATION);

		IWL_CMD(REPLY_CT_KILL_CONFIG_CMD);

		IWL_CMD(SENSITIVITY_CMD);

		IWL_CMD(REPLY_PHY_CALIBRATION_CMD);

		IWL_CMD(REPLY_RX_PHY_CMD);

		IWL_CMD(REPLY_RX_MPDU_CMD);

		IWL_CMD(REPLY_RX);

		IWL_CMD(REPLY_COMPRESSED_BA);

		IWL_CMD(CALIBRATION_CFG_CMD);

		IWL_CMD(CALIBRATION_RES_NOTIFICATION);

		IWL_CMD(CALIBRATION_COMPLETE_NOTIFICATION);

		IWL_CMD(REPLY_TX_POWER_DBM_CMD);

		IWL_CMD(TEMPERATURE_NOTIFICATION);

		IWL_CMD(TX_ANT_CONFIGURATION_CMD);

		IWL_CMD(REPLY_BT_COEX_PROFILE_NOTIF);

		IWL_CMD(REPLY_BT_COEX_PRIO_TABLE);

		IWL_CMD(REPLY_BT_COEX_PROT_ENV);

		IWL_CMD(REPLY_WIPAN_PARAMS);

		IWL_CMD(REPLY_WIPAN_RXON);

		IWL_CMD(REPLY_WIPAN_RXON_TIMING);

		IWL_CMD(REPLY_WIPAN_RXON_ASSOC);

		IWL_CMD(REPLY_WIPAN_QOS_PARAM);

		IWL_CMD(REPLY_WIPAN_WEPKEY);

		IWL_CMD(REPLY_WIPAN_P2P_CHANNEL_SWITCH);

		IWL_CMD(REPLY_WIPAN_NOA_NOTIFICATION);

		IWL_CMD(REPLY_WIPAN_DEACTIVATION_COMPLETE);

	default:

		return "UNKNOWN";



	}

}



#define HOST_COMPLETE_TIMEOUT (2 * HZ)



static void iwl_generic_cmd_callback(struct iwl_priv *priv,

				     struct iwl_device_cmd *cmd,

				     struct iwl_rx_packet *pkt)

{

	if (pkt->hdr.flags & IWL_CMD_FAILED_MSK) {

		IWL_ERR(priv, "Bad return from %s (0x%08X)\n",

			get_cmd_string(cmd->hdr.cmd), pkt->hdr.flags);

		return;

	}



#ifdef CONFIG_IWLWIFI_DEBUG

	switch (cmd->hdr.cmd) {

	case REPLY_TX_LINK_QUALITY_CMD:

	case SENSITIVITY_CMD:

		IWL_DEBUG_HC_DUMP(priv, "back from %s (0x%08X)\n",

				get_cmd_string(cmd->hdr.cmd), pkt->hdr.flags);

		break;

	default:

		IWL_DEBUG_HC(priv, "back from %s (0x%08X)\n",

				get_cmd_string(cmd->hdr.cmd), pkt->hdr.flags);

	}

#endif

}



static int iwl_send_cmd_async(struct iwl_priv *priv, struct iwl_host_cmd *cmd)

{

	int ret;



	/* An asynchronous command can not expect an SKB to be set. */

	if (WARN_ON(cmd->flags & CMD_WANT_SKB))

		return -EINVAL;



	/* Assign a generic callback if one is not provided */

	if (!cmd->callback)

		cmd->callback = iwl_generic_cmd_callback;



	if (test_bit(STATUS_EXIT_PENDING, &priv->status))

		return -EBUSY;



	ret = iwl_enqueue_hcmd(priv, cmd);

	if (ret < 0) {

		IWL_ERR(priv, "Error sending %s: enqueue_hcmd failed: %d\n",

			  get_cmd_string(cmd->id), ret);

		return ret;

	}

	return 0;

}



static int iwl_send_cmd_sync(struct iwl_priv *priv, struct iwl_host_cmd *cmd)

{

	int cmd_idx;

	int ret;



	lockdep_assert_held(&priv->mutex);



	 /* A synchronous command can not have a callback set. */

	if (WARN_ON(cmd->callback))

		return -EINVAL;



	IWL_DEBUG_INFO(priv, "Attempting to send sync command %s\n",

			get_cmd_string(cmd->id));



	set_bit(STATUS_HCMD_ACTIVE, &priv->status);

	IWL_DEBUG_INFO(priv, "Setting HCMD_ACTIVE for command %s\n",

			get_cmd_string(cmd->id));



	cmd_idx = iwl_enqueue_hcmd(priv, cmd);

	if (cmd_idx < 0) {

		ret = cmd_idx;

		clear_bit(STATUS_HCMD_ACTIVE, &priv->status);

		IWL_ERR(priv, "Error sending %s: enqueue_hcmd failed: %d\n",

			  get_cmd_string(cmd->id), ret);

		return ret;

	}



	ret = wait_event_interruptible_timeout(priv->wait_command_queue,

			!test_bit(STATUS_HCMD_ACTIVE, &priv->status),

			HOST_COMPLETE_TIMEOUT);

	if (!ret) {

		if (test_bit(STATUS_HCMD_ACTIVE, &priv->status)) {

			IWL_ERR(priv,

				"Error sending %s: time out after %dms.\n",

				get_cmd_string(cmd->id),

				jiffies_to_msecs(HOST_COMPLETE_TIMEOUT));



			clear_bit(STATUS_HCMD_ACTIVE, &priv->status);

			IWL_DEBUG_INFO(priv, "Clearing HCMD_ACTIVE for command %s\n",

				       get_cmd_string(cmd->id));

			ret = -ETIMEDOUT;

			goto cancel;

		}

	}



	if (test_bit(STATUS_RF_KILL_HW, &priv->status)) {

		IWL_ERR(priv, "Command %s aborted: RF KILL Switch\n",

			       get_cmd_string(cmd->id));

		ret = -ECANCELED;

		goto fail;

	}

	if (test_bit(STATUS_FW_ERROR, &priv->status)) {

		IWL_ERR(priv, "Command %s failed: FW Error\n",

			       get_cmd_string(cmd->id));

		ret = -EIO;

		goto fail;

	}

	if ((cmd->flags & CMD_WANT_SKB) && !cmd->reply_page) {

		IWL_ERR(priv, "Error: Response NULL in '%s'\n",

			  get_cmd_string(cmd->id));

		ret = -EIO;

		goto cancel;

	}



	return 0;



cancel:

	if (cmd->flags & CMD_WANT_SKB) {

		/*

		 * Cancel the CMD_WANT_SKB flag for the cmd in the

		 * TX cmd queue. Otherwise in case the cmd comes

		 * in later, it will possibly set an invalid

		 * address (cmd->meta.source).

		 */

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

							~CMD_WANT_SKB;

	}

fail:

	if (cmd->reply_page) {

		iwl_free_pages(priv, cmd->reply_page);

		cmd->reply_page = 0;

	}



	return ret;

}



int iwl_send_cmd(struct iwl_priv *priv, struct iwl_host_cmd *cmd)

{

	if (cmd->flags & CMD_ASYNC)

		return iwl_send_cmd_async(priv, cmd);



	return iwl_send_cmd_sync(priv, cmd);

}



int iwl_send_cmd_pdu(struct iwl_priv *priv, u8 id, u32 flags, u16 len,

		     const void *data)

{

	struct iwl_host_cmd cmd = {

		.id = id,

		.len = { len, },

		.data = { data, },

		.flags = flags,

	};



	return iwl_send_cmd(priv, &cmd);

}

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

+20 −0
Original line number Diff line number Diff line
@@ -32,11 +32,31 @@ 
/*This file includes the declaration that are internal to the

 * trans_pcie layer */



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

* RX

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

void iwl_bg_rx_replenish(struct work_struct *data);

void iwl_irq_tasklet(struct iwl_priv *priv);

void iwlagn_rx_replenish(struct iwl_priv *priv);

void iwl_rx_queue_update_write_ptr(struct iwl_priv *priv,

			struct iwl_rx_queue *q);



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

* TX / HCMD

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

void iwl_txq_update_write_ptr(struct iwl_priv *priv, struct iwl_tx_queue *txq);

void iwlagn_txq_free_tfd(struct iwl_priv *priv, struct iwl_tx_queue *txq,

				int index);

int iwlagn_txq_attach_buf_to_tfd(struct iwl_priv *priv,

				 struct iwl_tx_queue *txq,

				 dma_addr_t addr, u16 len, u8 reset);

int iwl_queue_init(struct iwl_priv *priv, struct iwl_queue *q,

			  int count, int slots_num, u32 id);

int iwl_send_cmd(struct iwl_priv *priv, struct iwl_host_cmd *cmd);

int __must_check iwl_send_cmd_pdu(struct iwl_priv *priv, u8 id, u32 flags,

			u16 len, const void *data);

void iwl_tx_cmd_complete(struct iwl_priv *priv, struct iwl_rx_mem_buffer *rxb);





#endif /* __iwl_trans_int_pcie_h__ */