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

Commit 188cf6c7 authored by Samuel Ortiz's avatar Samuel Ortiz Committed by John W. Linville
Browse files

iwl3945: sync tx queue data structure with iwlagn 



We are now using the iwl_tx_queue for iwl3945. To reach that goal, we
included the 3945 specific tfd frame structure to iwl_tx_queue. This
has no effect on the current iwlagn code.

Signed-off-by: default avatarSamuel Ortiz <samuel.ortiz@intel.com>
Signed-off-by: default avatarAbhijeet Kolekar <abhijeet.kolekar@intel.com>
Signed-off-by: default avatarZhu Yi <yi.zhu@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 42427b4e

drivers/net/wireless/iwlwifi/iwl-3945-hw.h

+0 −4
Original line number Diff line number Diff line
@@ -240,7 +240,6 @@ struct iwl3945_eeprom { 


#define TFD_QUEUE_MIN           0

#define TFD_QUEUE_MAX           6

#define TFD_QUEUE_SIZE_MAX      (256)



#define IWL_NUM_SCAN_RATES         (2)
@@ -262,9 +261,6 @@ struct iwl3945_eeprom { 
#define TFD_CTL_PAD_SET(n)         (n << 28)

#define TFD_CTL_PAD_GET(ctl)       (ctl >> 28)



#define TFD_TX_CMD_SLOTS 256

#define TFD_CMD_SLOTS 32



/*

 * RX related structures and functions

 */

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

+7 −7
Original line number Diff line number Diff line
@@ -306,7 +306,7 @@ int iwl3945_rs_next_rate(struct iwl_priv *priv, int rate) 
static void iwl3945_tx_queue_reclaim(struct iwl_priv *priv,

				     int txq_id, int index)

{

	struct iwl3945_tx_queue *txq = &priv->txq39[txq_id];

	struct iwl_tx_queue *txq = &priv->txq[txq_id];

	struct iwl_queue *q = &txq->q;

	struct iwl_tx_info *tx_info;
@@ -337,7 +337,7 @@ static void iwl3945_rx_reply_tx(struct iwl_priv *priv, 
	u16 sequence = le16_to_cpu(pkt->hdr.sequence);

	int txq_id = SEQ_TO_QUEUE(sequence);

	int index = SEQ_TO_INDEX(sequence);

	struct iwl3945_tx_queue *txq = &priv->txq39[txq_id];

	struct iwl_tx_queue *txq = &priv->txq[txq_id];

	struct ieee80211_tx_info *info;

	struct iwl3945_tx_resp *tx_resp = (void *)&pkt->u.raw[0];

	u32  status = le32_to_cpu(tx_resp->status);
@@ -756,9 +756,9 @@ int iwl3945_hw_txq_attach_buf_to_tfd(struct iwl_priv *priv, void *ptr, 
 *

 * Does NOT advance any indexes

 */

int iwl3945_hw_txq_free_tfd(struct iwl_priv *priv, struct iwl3945_tx_queue *txq)

int iwl3945_hw_txq_free_tfd(struct iwl_priv *priv, struct iwl_tx_queue *txq)

{

	struct iwl3945_tfd *tfd_tmp = (struct iwl3945_tfd *)&txq->tfds[0];

	struct iwl3945_tfd *tfd_tmp = (struct iwl3945_tfd *)&txq->tfds39[0];

	struct iwl3945_tfd *tfd = &tfd_tmp[txq->q.read_ptr];

	struct pci_dev *dev = priv->pci_dev;

	int i;
@@ -1061,7 +1061,7 @@ static int iwl3945_txq_ctx_reset(struct iwl_priv *priv) 
	for (txq_id = 0; txq_id < TFD_QUEUE_MAX; txq_id++) {

		slots_num = (txq_id == IWL_CMD_QUEUE_NUM) ?

				TFD_CMD_SLOTS : TFD_TX_CMD_SLOTS;

		rc = iwl3945_tx_queue_init(priv, &priv->txq39[txq_id], slots_num,

		rc = iwl3945_tx_queue_init(priv, &priv->txq[txq_id], slots_num,

				txq_id);

		if (rc) {

			IWL_ERR(priv, "Tx %d queue init failed\n", txq_id);
@@ -1251,7 +1251,7 @@ void iwl3945_hw_txq_ctx_free(struct iwl_priv *priv) 


	/* Tx queues */

	for (txq_id = 0; txq_id < TFD_QUEUE_MAX; txq_id++)

		iwl3945_tx_queue_free(priv, &priv->txq39[txq_id]);

		iwl3945_tx_queue_free(priv, &priv->txq[txq_id]);

}



void iwl3945_hw_txq_ctx_stop(struct iwl_priv *priv)
@@ -2342,7 +2342,7 @@ int iwl3945_hw_rxq_stop(struct iwl_priv *priv) 
	return 0;

}



int iwl3945_hw_tx_queue_init(struct iwl_priv *priv, struct iwl3945_tx_queue *txq)

int iwl3945_hw_tx_queue_init(struct iwl_priv *priv, struct iwl_tx_queue *txq)

{

	int rc;

	unsigned long flags;

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

+4 −4
Original line number Diff line number Diff line
@@ -219,9 +219,9 @@ extern void iwl3945_rx_queue_reset(struct iwl_priv *priv, 
extern int iwl3945_calc_db_from_ratio(int sig_ratio);

extern int iwl3945_calc_sig_qual(int rssi_dbm, int noise_dbm);

extern int iwl3945_tx_queue_init(struct iwl_priv *priv,

			     struct iwl3945_tx_queue *txq, int count, u32 id);

			     struct iwl_tx_queue *txq, int count, u32 id);

extern void iwl3945_rx_replenish(void *data);

extern void iwl3945_tx_queue_free(struct iwl_priv *priv, struct iwl3945_tx_queue *txq);

extern void iwl3945_tx_queue_free(struct iwl_priv *priv, struct iwl_tx_queue *txq);

extern int iwl3945_send_cmd_pdu(struct iwl_priv *priv, u8 id, u16 len,

			    const void *data);

extern int __must_check iwl3945_send_cmd(struct iwl_priv *priv,
@@ -270,10 +270,10 @@ extern void iwl3945_hw_txq_ctx_stop(struct iwl_priv *priv); 
extern int iwl3945_hw_nic_reset(struct iwl_priv *priv);

extern int iwl3945_hw_txq_attach_buf_to_tfd(struct iwl_priv *priv, void *tfd,

					dma_addr_t addr, u16 len);

extern int iwl3945_hw_txq_free_tfd(struct iwl_priv *priv, struct iwl3945_tx_queue *txq);

extern int iwl3945_hw_txq_free_tfd(struct iwl_priv *priv, struct iwl_tx_queue *txq);

extern int iwl3945_hw_get_temperature(struct iwl_priv *priv);

extern int iwl3945_hw_tx_queue_init(struct iwl_priv *priv,

				struct iwl3945_tx_queue *txq);

				struct iwl_tx_queue *txq);

extern unsigned int iwl3945_hw_get_beacon_cmd(struct iwl_priv *priv,

				 struct iwl3945_frame *frame, u8 rate);

void iwl3945_hw_build_tx_cmd_rate(struct iwl_priv *priv, struct iwl_cmd *cmd,

drivers/net/wireless/iwlwifi/iwl-4965-hw.h

+0 −3
Original line number Diff line number Diff line
@@ -114,9 +114,6 @@ 
#define RX_QUEUE_MASK                         255

#define RX_QUEUE_SIZE_LOG                     8



#define TFD_TX_CMD_SLOTS 256

#define TFD_CMD_SLOTS 32



/*

 * RX related structures and functions

 */

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

+4 −24
Original line number Diff line number Diff line
@@ -134,9 +134,13 @@ struct iwl_tx_info { 
 * A Tx queue consists of circular buffer of BDs (a.k.a. TFDs, transmit frame

 * descriptors) and required locking structures.

 */

#define TFD_TX_CMD_SLOTS 256

#define TFD_CMD_SLOTS 32



struct iwl_tx_queue {

	struct iwl_queue q;

	struct iwl_tfd *tfds;

	struct iwl3945_tfd *tfds39;

	struct iwl_cmd *cmd[TFD_TX_CMD_SLOTS];

	struct iwl_tx_info *txb;

	u8 need_update;
@@ -226,28 +230,6 @@ struct iwl_channel_info { 
	struct iwl3945_scan_power_info scan_pwr_info[IWL_NUM_SCAN_RATES];

};



/**

 * struct iwl3945_tx_queue - Tx Queue for DMA

 * @q: generic Rx/Tx queue descriptor

 * @bd: base of circular buffer of TFDs

 * @cmd: array of command/Tx buffers

 * @dma_addr_cmd: physical address of cmd/tx buffer array

 * @txb: array of per-TFD driver data

 * @need_update: indicates need to update read/write index

 *

 * A Tx queue consists of circular buffer of BDs (a.k.a. TFDs, transmit frame

 * descriptors) and required locking structures.

 */

struct iwl3945_tx_queue {

	struct iwl_queue q;

	struct iwl3945_tfd *tfds;

	struct iwl_cmd *cmd;

	dma_addr_t dma_addr_cmd;

	struct iwl_tx_info *txb;

	int need_update;

	int active;

};



#define IWL_TX_FIFO_AC0	0

#define IWL_TX_FIFO_AC1	1

#define IWL_TX_FIFO_AC2	2
@@ -1099,8 +1081,6 @@ struct iwl_priv { 
	struct iwl3945_rxon_cmd staging39_rxon;

	struct iwl3945_rxon_cmd recovery39_rxon;



	struct iwl3945_tx_queue txq39[IWL39_MAX_NUM_QUEUES];



	struct iwl3945_power_mgr power_data_39;

	struct iwl3945_notif_statistics statistics_39;