1 files changed, 429 insertions, 301 deletions

diff --git a/drivers/net/wireless/iwlwifi/iwl-dev.h b/drivers/net/wireless/iwlwifi/iwl-dev.h
index 2e97cd2fa98a..c8de236c141b 100644
--- a/drivers/net/wireless/iwlwifi/iwl-dev.h
+++ b/drivers/net/wireless/iwlwifi/iwl-dev.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2003 - 2010 Intel Corporation. All rights reserved.
+ * Copyright(c) 2003 - 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
@@ -26,7 +26,6 @@
 /*
  * Please use this file (iwl-dev.h) for driver implementation definitions.
  * Please use iwl-commands.h for uCode API definitions.
- * Please use iwl-4965-hw.h for hardware-related definitions.
  */
 
 #ifndef __iwl_dev_h__
@@ -34,6 +33,8 @@
 
 #include <linux/pci.h> /* for struct pci_device_id */
 #include <linux/kernel.h>
+#include <linux/wait.h>
+#include <linux/leds.h>
 #include <net/ieee80211_radiotap.h>
 
 #include "iwl-eeprom.h"
@@ -41,12 +42,11 @@
 #include "iwl-prph.h"
 #include "iwl-fh.h"
 #include "iwl-debug.h"
-#include "iwl-4965-hw.h"
-#include "iwl-3945-hw.h"
 #include "iwl-agn-hw.h"
 #include "iwl-led.h"
 #include "iwl-power.h"
 #include "iwl-agn-rs.h"
+#include "iwl-agn-tt.h"
 
 struct iwl_tx_queue;
 
@@ -81,7 +81,7 @@ struct iwl_tx_queue;
 #define MAX_RTS_THRESHOLD         2347U
 #define MAX_MSDU_SIZE             2304U
 #define MAX_MPDU_SIZE             2346U
-#define DEFAULT_BEACON_INTERVAL   100U
+#define DEFAULT_BEACON_INTERVAL   200U
 #define DEFAULT_SHORT_RETRY_LIMIT 7U
 #define DEFAULT_LONG_RETRY_LIMIT  4U
 
@@ -110,8 +110,6 @@ struct iwl_cmd_meta {
                          struct iwl_device_cmd *cmd,
                          struct iwl_rx_packet *pkt);
 
-        /* The CMD_SIZE_HUGE flag bit indicates that the command
-         * structure is stored at the end of the shared queue memory. */
         u32 flags;
 
         DEFINE_DMA_UNMAP_ADDR(mapping);
@@ -121,16 +119,29 @@ struct iwl_cmd_meta {
 /*
  * Generic queue structure
  *
- * Contains common data for Rx and Tx queues
+ * Contains common data for Rx and Tx queues.
+ *
+ * Note the difference between n_bd and n_window: the hardware
+ * always assumes 256 descriptors, so n_bd is always 256 (unless
+ * there might be HW changes in the future). For the normal TX
+ * queues, n_window, which is the size of the software queue data
+ * is also 256; however, for the command queue, n_window is only
+ * 32 since we don't need so many commands pending. Since the HW
+ * still uses 256 BDs for DMA though, n_bd stays 256. As a result,
+ * the software buffers (in the variables @meta, @txb in struct
+ * iwl_tx_queue) only have 32 entries, while the HW buffers (@tfds
+ * in the same struct) have 256.
+ * This means that we end up with the following:
+ *  HW entries: | 0 | ... | N * 32 | ... | N * 32 + 31 | ... | 255 |
+ *  SW entries:           | 0      | ... | 31          |
+ * where N is a number between 0 and 7. This means that the SW
+ * data is a window overlayed over the HW queue.
  */
 struct iwl_queue {
         int n_bd;              /* number of BDs in this queue */
         int write_ptr;       /* 1-st empty entry (index) host_w*/
         int read_ptr;         /* last used entry (index) host_r*/
         /* use for monitoring and recovering the stuck queue */
-        int last_read_ptr;      /* storing the last read_ptr */
-        /* number of time read_ptr and last_read_ptr are the same */
-        u8 repeat_same_read_ptr;
         dma_addr_t dma_addr;   /* physical addr for BD's */
         int n_window;          /* safe queue window */
         u32 id;
@@ -138,11 +149,12 @@ struct iwl_queue {
                                 * space more than this */
         int high_mark;         /* high watermark, stop queue if free
                                 * space less than this */
-} __packed;
+};
 
 /* One for each TFD */
 struct iwl_tx_info {
         struct sk_buff *skb;
+        struct iwl_rxon_context *ctx;
 };
 
 /**
@@ -153,6 +165,7 @@ struct iwl_tx_info {
  * @meta: array of meta data for each command/tx buffer
  * @dma_addr_cmd: physical address of cmd/tx buffer array
  * @txb: array of per-TFD driver data
+ * @time_stamp: time (in jiffies) of last read_ptr change
  * @need_update: indicates need to update read/write index
  * @sched_retry: indicates queue is high-throughput aggregation (HT AGG) enabled
  *
@@ -164,10 +177,11 @@ struct iwl_tx_info {
 
 struct iwl_tx_queue {
         struct iwl_queue q;
-        void *tfds;
+        struct iwl_tfd *tfds;
         struct iwl_device_cmd **cmd;
         struct iwl_cmd_meta *meta;
         struct iwl_tx_info *txb;
+        unsigned long time_stamp;
         u8 need_update;
         u8 sched_retry;
         u8 active;
@@ -176,53 +190,12 @@ struct iwl_tx_queue {
 
 #define IWL_NUM_SCAN_RATES         (2)
 
-struct iwl4965_channel_tgd_info {
-        u8 type;
-        s8 max_power;
-};
-
-struct iwl4965_channel_tgh_info {
-        s64 last_radar_time;
-};
-
-#define IWL4965_MAX_RATE (33)
-
-struct iwl3945_clip_group {
-        /* maximum power level to prevent clipping for each rate, derived by
-         *   us from this band's saturation power in EEPROM */
-        const s8 clip_powers[IWL_MAX_RATES];
-};
-
-/* current Tx power values to use, one for each rate for each channel.
- * requested power is limited by:
- * -- regulatory EEPROM limits for this channel
- * -- hardware capabilities (clip-powers)
- * -- spectrum management
- * -- user preference (e.g. iwconfig)
- * when requested power is set, base power index must also be set. */
-struct iwl3945_channel_power_info {
-        struct iwl3945_tx_power tpc;    /* actual radio and DSP gain settings */
-        s8 power_table_index;   /* actual (compenst'd) index into gain table */
-        s8 base_power_index;    /* gain index for power at factory temp. */
-        s8 requested_power;     /* power (dBm) requested for this chnl/rate */
-};
-
-/* current scan Tx power values to use, one for each scan rate for each
- * channel. */
-struct iwl3945_scan_power_info {
-        struct iwl3945_tx_power tpc;    /* actual radio and DSP gain settings */
-        s8 power_table_index;   /* actual (compenst'd) index into gain table */
-        s8 requested_power;     /* scan pwr (dBm) requested for chnl/rate */
-};
-
 /*
  * One for each channel, holds all channel setup data
  * Some of the fields (e.g. eeprom and flags/max_power_avg) are redundant
  *     with one another!
  */
 struct iwl_channel_info {
-        struct iwl4965_channel_tgd_info tgd;
-        struct iwl4965_channel_tgh_info tgh;
         struct iwl_eeprom_channel eeprom;       /* EEPROM regulatory limit */
         struct iwl_eeprom_channel ht40_eeprom;  /* EEPROM regulatory limit for
                                                  * HT40 channel */
@@ -242,20 +215,16 @@ struct iwl_channel_info {
         s8 ht40_max_power_avg;  /* (dBm) regul. eeprom, normal Tx, any rate */
         u8 ht40_flags;          /* flags copied from EEPROM */
         u8 ht40_extension_channel; /* HT_IE_EXT_CHANNEL_* */
-
-        /* Radio/DSP gain settings for each "normal" data Tx rate.
-         * These include, in addition to RF and DSP gain, a few fields for
-         *   remembering/modifying gain settings (indexes). */
-        struct iwl3945_channel_power_info power_info[IWL4965_MAX_RATE];
-
-        /* Radio/DSP gain settings for each scan rate, for directed scans. */
-        struct iwl3945_scan_power_info scan_pwr_info[IWL_NUM_SCAN_RATES];
 };
 
-#define IWL_TX_FIFO_BK          0
+#define IWL_TX_FIFO_BK          0       /* shared */
 #define IWL_TX_FIFO_BE          1
-#define IWL_TX_FIFO_VI          2
+#define IWL_TX_FIFO_VI          2       /* shared */
 #define IWL_TX_FIFO_VO          3
+#define IWL_TX_FIFO_BK_IPAN     IWL_TX_FIFO_BK
+#define IWL_TX_FIFO_BE_IPAN     4
+#define IWL_TX_FIFO_VI_IPAN     IWL_TX_FIFO_VI
+#define IWL_TX_FIFO_VO_IPAN     5
 #define IWL_TX_FIFO_UNUSED      -1
 
 /* Minimum number of queues. MAX_NUM is defined in hw specific files.
@@ -264,33 +233,23 @@ struct iwl_channel_info {
 #define IWL_MIN_NUM_QUEUES      10
 
 /*
- * Queue #4 is the command queue for 3945/4965/5x00/1000/6x00,
- * the driver maps it into the appropriate device FIFO for the
- * uCode.
+ * Command queue depends on iPAN support.
  */
-#define IWL_CMD_QUEUE_NUM       4
-
-/* Power management (not Tx power) structures */
+#define IWL_DEFAULT_CMD_QUEUE_NUM       4
+#define IWL_IPAN_CMD_QUEUE_NUM          9
 
-enum iwl_pwr_src {
-        IWL_PWR_SRC_VMAIN,
-        IWL_PWR_SRC_VAUX,
-};
+/*
+ * This queue number is required for proper operation
+ * because the ucode will stop/start the scheduler as
+ * required.
+ */
+#define IWL_IPAN_MCAST_QUEUE            8
 
 #define IEEE80211_DATA_LEN              2304
 #define IEEE80211_4ADDR_LEN             30
 #define IEEE80211_HLEN                  (IEEE80211_4ADDR_LEN)
 #define IEEE80211_FRAME_LEN             (IEEE80211_DATA_LEN + IEEE80211_HLEN)
 
-struct iwl_frame {
-        union {
-                struct ieee80211_hdr frame;
-                struct iwl_tx_beacon_cmd beacon;
-                u8 raw[IEEE80211_FRAME_LEN];
-                u8 cmd[360];
-        } u;
-        struct list_head list;
-};
 
 #define SEQ_TO_SN(seq) (((seq) & IEEE80211_SCTL_SEQ) >> 4)
 #define SN_TO_SEQ(ssn) (((ssn) << 4) & IEEE80211_SCTL_SEQ)
@@ -300,9 +259,9 @@ enum {
         CMD_SYNC = 0,
         CMD_SIZE_NORMAL = 0,
         CMD_NO_SKB = 0,
-        CMD_SIZE_HUGE = (1 << 0),
         CMD_ASYNC = (1 << 1),
         CMD_WANT_SKB = (1 << 2),
+        CMD_MAPPED = (1 << 3),
 };
 
 #define DEF_CMD_PAYLOAD_SIZE 320
@@ -311,8 +270,8 @@ enum {
  * struct iwl_device_cmd
  *
  * For allocation of the command and tx queues, this establishes the overall
- * size of the largest command we send to uCode, except for a scan command
- * (which is relatively huge; space is allocated separately).
+ * size of the largest command we send to uCode, except for commands that
+ * aren't fully copied and use other TFD space.
  */
 struct iwl_device_cmd {
         struct iwl_cmd_header hdr;      /* uCode API */
@@ -329,15 +288,21 @@ struct iwl_device_cmd {
 
 #define TFD_MAX_PAYLOAD_SIZE (sizeof(struct iwl_device_cmd))
 
+#define IWL_MAX_CMD_TFDS        2
+
+enum iwl_hcmd_dataflag {
+        IWL_HCMD_DFL_NOCOPY     = BIT(0),
+};
 
 struct iwl_host_cmd {
-        const void *data;
+        const void *data[IWL_MAX_CMD_TFDS];
         unsigned long reply_page;
         void (*callback)(struct iwl_priv *priv,
                          struct iwl_device_cmd *cmd,
                          struct iwl_rx_packet *pkt);
         u32 flags;
-        u16 len;
+        u16 len[IWL_MAX_CMD_TFDS];
+        u8 dataflags[IWL_MAX_CMD_TFDS];
         u8 id;
 };
 
@@ -410,6 +375,7 @@ struct iwl_ht_agg {
 #define IWL_EMPTYING_HW_QUEUE_ADDBA 2
 #define IWL_EMPTYING_HW_QUEUE_DELBA 3
         u8 state;
+        u8 tx_fifo;
 };
 
 
@@ -420,7 +386,7 @@ struct iwl_tid_data {
 };
 
 struct iwl_hw_key {
-        enum ieee80211_key_alg alg;
+        u32 cipher;
         int keylen;
         u8 keyidx;
         u8 key[32];
@@ -434,7 +400,13 @@ union iwl_ht_rate_supp {
         };
 };
 
-#define CFG_HT_RX_AMPDU_FACTOR_DEF  (0x3)
+#define CFG_HT_RX_AMPDU_FACTOR_8K   (0x0)
+#define CFG_HT_RX_AMPDU_FACTOR_16K  (0x1)
+#define CFG_HT_RX_AMPDU_FACTOR_32K  (0x2)
+#define CFG_HT_RX_AMPDU_FACTOR_64K  (0x3)
+#define CFG_HT_RX_AMPDU_FACTOR_DEF  CFG_HT_RX_AMPDU_FACTOR_64K
+#define CFG_HT_RX_AMPDU_FACTOR_MAX  CFG_HT_RX_AMPDU_FACTOR_64K
+#define CFG_HT_RX_AMPDU_FACTOR_MIN  CFG_HT_RX_AMPDU_FACTOR_8K
 
 /*
  * Maximal MPDU density for TX aggregation
@@ -443,19 +415,17 @@ union iwl_ht_rate_supp {
  * 6 - 8us density
  * 7 - 16us density
  */
+#define CFG_HT_MPDU_DENSITY_2USEC   (0x4)
 #define CFG_HT_MPDU_DENSITY_4USEC   (0x5)
+#define CFG_HT_MPDU_DENSITY_8USEC   (0x6)
+#define CFG_HT_MPDU_DENSITY_16USEC  (0x7)
 #define CFG_HT_MPDU_DENSITY_DEF CFG_HT_MPDU_DENSITY_4USEC
+#define CFG_HT_MPDU_DENSITY_MAX CFG_HT_MPDU_DENSITY_16USEC
+#define CFG_HT_MPDU_DENSITY_MIN     (0x1)
 
 struct iwl_ht_config {
-        /* self configuration data */
-        bool is_ht;
-        bool is_40mhz;
         bool single_chain_sufficient;
         enum ieee80211_smps_mode smps; /* current smps mode */
-        /* BSS related data */
-        u8 extension_chan_offset;
-        u8 ht_protection;
-        u8 non_GF_STA_present;
 };
 
 /* QoS structures */
@@ -473,12 +443,13 @@ struct iwl_qos_info {
 struct iwl_station_entry {
         struct iwl_addsta_cmd sta;
         struct iwl_tid_data tid[MAX_TID_COUNT];
-        u8 used;
+        u8 used, ctxid;
         struct iwl_hw_key keyinfo;
         struct iwl_link_quality_cmd *lq;
 };
 
 struct iwl_station_priv_common {
+        struct iwl_rxon_context *ctx;
         u8 sta_id;
 };
 
@@ -488,9 +459,6 @@ struct iwl_station_priv_common {
  * When mac80211 creates a station it reserves some space (hw->sta_data_size)
  * in the structure for use by driver. This structure is places in that
  * space.
- *
- * The common struct MUST be first because it is shared between
- * 3945 and agn!
  */
 struct iwl_station_priv {
         struct iwl_station_priv_common common;
@@ -498,6 +466,7 @@ struct iwl_station_priv {
         atomic_t pending_frames;
         bool client;
         bool asleep;
+        u8 max_agg_bufsize;
 };
 
 /**
@@ -507,6 +476,7 @@ struct iwl_station_priv {
  * space for us to put data into.
  */
 struct iwl_vif_priv {
+        struct iwl_rxon_context *ctx;
         u8 ibss_bssid_sta_id;
 };
 
@@ -517,6 +487,10 @@ struct fw_desc {
         u32 len;                /* bytes */
 };
 
+struct fw_img {
+        struct fw_desc code, data;
+};
+
 /* v1/v2 uCode file layout */
 struct iwl_ucode_header {
         __le32 ver;     /* major/minor/API/serial */
@@ -564,6 +538,7 @@ enum iwl_ucode_tlv_type {
         IWL_UCODE_TLV_INIT_DATA         = 4,
         IWL_UCODE_TLV_BOOT              = 5,
         IWL_UCODE_TLV_PROBE_MAX_LEN     = 6, /* a u32 value */
+        IWL_UCODE_TLV_PAN               = 7,
         IWL_UCODE_TLV_RUNT_EVTLOG_PTR   = 8,
         IWL_UCODE_TLV_RUNT_EVTLOG_SIZE  = 9,
         IWL_UCODE_TLV_RUNT_ERRLOG_PTR   = 10,
@@ -572,6 +547,22 @@ enum iwl_ucode_tlv_type {
         IWL_UCODE_TLV_INIT_ERRLOG_PTR   = 13,
         IWL_UCODE_TLV_ENHANCE_SENS_TBL  = 14,
         IWL_UCODE_TLV_PHY_CALIBRATION_SIZE = 15,
+        /* 16 and 17 reserved for future use */
+        IWL_UCODE_TLV_FLAGS             = 18,
+};
+
+/**
+ * enum iwl_ucode_tlv_flag - ucode API flags
+ * @IWL_UCODE_TLV_FLAGS_PAN: This is PAN capable microcode; this previously
+ *      was a separate TLV but moved here to save space.
+ * @IWL_UCODE_TLV_FLAGS_NEWSCAN: new uCode scan behaviour on hidden SSID,
+ *      treats good CRC threshold as a boolean
+ * @IWL_UCODE_TLV_FLAGS_MFP: This uCode image supports MFP (802.11w).
+ */
+enum iwl_ucode_tlv_flag {
+        IWL_UCODE_TLV_FLAGS_PAN         = BIT(0),
+        IWL_UCODE_TLV_FLAGS_NEWSCAN     = BIT(1),
+        IWL_UCODE_TLV_FLAGS_MFP         = BIT(2),
 };
 
 struct iwl_ucode_tlv {
@@ -605,14 +596,6 @@ struct iwl_tlv_ucode_header {
         u8 data[0];
 };
 
-struct iwl4965_ibss_seq {
-        u8 mac[ETH_ALEN];
-        u16 seq_num;
-        u16 frag_num;
-        unsigned long packet_time;
-        struct list_head list;
-};
-
 struct iwl_sensitivity_ranges {
         u16 min_nrg_cck;
         u16 max_nrg_cck;
@@ -658,7 +641,6 @@ struct iwl_sensitivity_ranges {
  * @rx_page_order: Rx buffer page order
  * @rx_wrt_ptr_reg: FH{39}_RSCSR_CHNL0_WPTR
  * @max_stations:
- * @bcast_sta_id:
  * @ht40_channel: is 40MHz width possible in band 2.4
  * BIT(IEEE80211_BAND_5GHZ) BIT(IEEE80211_BAND_5GHZ)
  * @sw_crypto: 0 for hw, 1 for sw
@@ -666,6 +648,7 @@ struct iwl_sensitivity_ranges {
  * @ct_kill_threshold: temperature threshold
  * @beacon_time_tsf_bits: number of valid tsf bits for beacon time
  * @calib_init_cfg: setup initial calibrations for the hw
+ * @calib_rt_cfg: setup runtime calibrations for the hw
  * @struct iwl_sensitivity_ranges: range of sensitivity values
  */
 struct iwl_hw_params {
@@ -682,17 +665,16 @@ struct iwl_hw_params {
         u32 rx_page_order;
         u32 rx_wrt_ptr_reg;
         u8  max_stations;
-        u8  bcast_sta_id;
         u8  ht40_channel;
         u8  max_beacon_itrvl;   /* in 1024 ms */
         u32 max_inst_size;
         u32 max_data_size;
-        u32 max_bsm_size;
         u32 ct_kill_threshold; /* value in hw-dependent units */
         u32 ct_kill_exit_threshold; /* value in hw-dependent units */
                                     /* for 1000, 6000 series and up */
         u16 beacon_time_tsf_bits;
         u32 calib_init_cfg;
+        u32 calib_rt_cfg;
         const struct iwl_sensitivity_ranges *sens;
 };
 
@@ -708,12 +690,9 @@ struct iwl_hw_params {
  * Naming convention --
  * iwl_         <-- Is part of iwlwifi
  * iwlXXXX_     <-- Hardware specific (implemented in iwl-XXXX.c for XXXX)
- * iwl4965_bg_      <-- Called from work queue context
- * iwl4965_mac_     <-- mac80211 callback
  *
  ****************************************************************************/
 extern void iwl_update_chain_flags(struct iwl_priv *priv);
-extern int iwl_set_pwr_src(struct iwl_priv *priv, enum iwl_pwr_src src);
 extern const u8 iwl_bcast_addr[ETH_ALEN];
 extern int iwl_rxq_stop(struct iwl_priv *priv);
 extern void iwl_txq_ctx_stop(struct iwl_priv *priv);
@@ -726,17 +705,8 @@ static inline int iwl_queue_used(const struct iwl_queue *q, int i)
 }
 
 
-static inline u8 get_cmd_index(struct iwl_queue *q, u32 index, int is_huge)
+static inline u8 get_cmd_index(struct iwl_queue *q, u32 index)
 {
-        /*
-         * This is for init calibration result and scan command which
-         * required buffer > TFD_MAX_PAYLOAD_SIZE,
-         * the big buffer at end of command array
-         */
-        if (is_huge)
-                return q->n_window;     /* must be power of 2 */
-
-        /* Otherwise, use normal size buffers */
         return index & (q->n_window - 1);
 }
 
@@ -759,7 +729,6 @@ struct iwl_dma_ptr {
 
 /* Sensitivity and chain noise calibration */
 #define INITIALIZATION_VALUE            0xFFFF
-#define IWL4965_CAL_NUM_BEACONS         20
 #define IWL_CAL_NUM_BEACONS             16
 #define MAXIMUM_ALLOWED_PATHLOSS        15
 
@@ -793,24 +762,19 @@ struct iwl_dma_ptr {
 #define NRG_NUM_PREV_STAT_L     20
 #define NUM_RX_CHAINS           3
 
-enum iwl4965_false_alarm_state {
+enum iwlagn_false_alarm_state {
         IWL_FA_TOO_MANY = 0,
         IWL_FA_TOO_FEW = 1,
         IWL_FA_GOOD_RANGE = 2,
 };
 
-enum iwl4965_chain_noise_state {
+enum iwlagn_chain_noise_state {
         IWL_CHAIN_NOISE_ALIVE = 0,  /* must be 0 */
         IWL_CHAIN_NOISE_ACCUMULATE,
         IWL_CHAIN_NOISE_CALIBRATED,
         IWL_CHAIN_NOISE_DONE,
 };
 
-enum iwl4965_calib_enabled_state {
-        IWL_CALIB_DISABLED = 0,  /* must be 0 */
-        IWL_CALIB_ENABLED = 1,
-};
-
 
 /*
  * enum iwl_calib
@@ -824,6 +788,7 @@ enum iwl_calib {
         IWL_CALIB_TX_IQ,
         IWL_CALIB_TX_IQ_PERD,
         IWL_CALIB_BASE_BAND,
+        IWL_CALIB_TEMP_OFFSET,
         IWL_CALIB_MAX
 };
 
@@ -833,12 +798,6 @@ struct iwl_calib_result {
         size_t buf_len;
 };
 
-enum ucode_type {
-        UCODE_NONE = 0,
-        UCODE_INIT,
-        UCODE_RT
-};
-
 /* Sensitivity calib data */
 struct iwl_sensitivity_data {
         u32 auto_corr_ofdm;
@@ -928,7 +887,7 @@ enum iwl_pa_type {
 struct isr_statistics {
         u32 hw;
         u32 sw;
-        u32 sw_err;
+        u32 err_code;
         u32 sch;
         u32 alive;
         u32 rfkill;
@@ -940,7 +899,50 @@ struct isr_statistics {
         u32 unhandled;
 };
 
-#ifdef CONFIG_IWLWIFI_DEBUGFS
+/* reply_tx_statistics (for _agn devices) */
+struct reply_tx_error_statistics {
+        u32 pp_delay;
+        u32 pp_few_bytes;
+        u32 pp_bt_prio;
+        u32 pp_quiet_period;
+        u32 pp_calc_ttak;
+        u32 int_crossed_retry;
+        u32 short_limit;
+        u32 long_limit;
+        u32 fifo_underrun;
+        u32 drain_flow;
+        u32 rfkill_flush;
+        u32 life_expire;
+        u32 dest_ps;
+        u32 host_abort;
+        u32 bt_retry;
+        u32 sta_invalid;
+        u32 frag_drop;
+        u32 tid_disable;
+        u32 fifo_flush;
+        u32 insuff_cf_poll;
+        u32 fail_hw_drop;
+        u32 sta_color_mismatch;
+        u32 unknown;
+};
+
+/* reply_agg_tx_statistics (for _agn devices) */
+struct reply_agg_tx_error_statistics {
+        u32 underrun;
+        u32 bt_prio;
+        u32 few_bytes;
+        u32 abort;
+        u32 last_sent_ttl;
+        u32 last_sent_try;
+        u32 last_sent_bt_kill;
+        u32 scd_query;
+        u32 bad_crc32;
+        u32 response;
+        u32 dump_tx;
+        u32 delay_tx;
+        u32 unknown;
+};
+
 /* management statistics */
 enum iwl_mgmt_stats {
         MANAGEMENT_ASSOC_REQ = 0,
@@ -971,26 +973,12 @@ enum iwl_ctrl_stats {
 };
 
 struct traffic_stats {
+#ifdef CONFIG_IWLWIFI_DEBUGFS
         u32 mgmt[MANAGEMENT_MAX];
         u32 ctrl[CONTROL_MAX];
         u32 data_cnt;
         u64 data_bytes;
-};
-#else
-struct traffic_stats {
-        u64 data_bytes;
-};
 #endif
-
-/*
- * iwl_switch_rxon: "channel switch" structure
- *
- * @ switch_in_progress: channel switch in progress
- * @ channel: new channel
- */
-struct iwl_switch_rxon {
-        bool switch_in_progress;
-        __le16 channel;
 };
 
 /*
@@ -1048,11 +1036,18 @@ struct iwl_event_log {
 #define IWL_DELAY_NEXT_FORCE_RF_RESET  (HZ*3)
 #define IWL_DELAY_NEXT_FORCE_FW_RELOAD (HZ*5)
 
-/* timer constants use to monitor and recover stuck tx queues in mSecs */
-#define IWL_DEF_MONITORING_PERIOD       (1000)
-#define IWL_LONG_MONITORING_PERIOD      (5000)
-#define IWL_ONE_HUNDRED_MSECS   (100)
-#define IWL_SIXTY_SECS          (60000)
+/* TX queue watchdog timeouts in mSecs */
+#define IWL_DEF_WD_TIMEOUT      (2000)
+#define IWL_LONG_WD_TIMEOUT     (10000)
+#define IWL_MAX_WD_TIMEOUT      (120000)
+
+/* BT Antenna Coupling Threshold (dB) */
+#define IWL_BT_ANTENNA_COUPLING_THRESHOLD       (35)
+
+/* Firmware reload counter and Timestamp */
+#define IWL_MIN_RELOAD_DURATION         1000 /* 1000 ms */
+#define IWL_MAX_CONTINUE_RELOAD_CNT     4
+
 
 enum iwl_reset {
         IWL_RF_RESET = 0,
@@ -1070,18 +1065,117 @@ struct iwl_force_reset {
 
 /* extend beacon time format bit shifting  */
 /*
- * for _3945 devices
- * bits 31:24 - extended
- * bits 23:0  - interval
- */
-#define IWL3945_EXT_BEACON_TIME_POS     24
-/*
  * for _agn devices
  * bits 31:22 - extended
  * bits 21:0  - interval
  */
 #define IWLAGN_EXT_BEACON_TIME_POS      22
 
+/**
+ * struct iwl_notification_wait - notification wait entry
+ * @list: list head for global list
+ * @fn: function called with the notification
+ * @cmd: command ID
+ *
+ * This structure is not used directly, to wait for a
+ * notification declare it on the stack, and call
+ * iwlagn_init_notification_wait() with appropriate
+ * parameters. Then do whatever will cause the ucode
+ * to notify the driver, and to wait for that then
+ * call iwlagn_wait_notification().
+ *
+ * Each notification is one-shot. If at some point we
+ * need to support multi-shot notifications (which
+ * can't be allocated on the stack) we need to modify
+ * the code for them.
+ */
+struct iwl_notification_wait {
+        struct list_head list;
+
+        void (*fn)(struct iwl_priv *priv, struct iwl_rx_packet *pkt,
+                   void *data);
+        void *fn_data;
+
+        u8 cmd;
+        bool triggered, aborted;
+};
+
+enum iwl_rxon_context_id {
+        IWL_RXON_CTX_BSS,
+        IWL_RXON_CTX_PAN,
+
+        NUM_IWL_RXON_CTX
+};
+
+struct iwl_rxon_context {
+        struct ieee80211_vif *vif;
+
+        const u8 *ac_to_fifo;
+        const u8 *ac_to_queue;
+        u8 mcast_queue;
+
+        /*
+         * We could use the vif to indicate active, but we
+         * also need it to be active during disabling when
+         * we already removed the vif for type setting.
+         */
+        bool always_active, is_active;
+
+        bool ht_need_multiple_chains;
+
+        enum iwl_rxon_context_id ctxid;
+
+        u32 interface_modes, exclusive_interface_modes;
+        u8 unused_devtype, ap_devtype, ibss_devtype, station_devtype;
+
+        /*
+         * We declare this const so it can only be
+         * changed via explicit cast within the
+         * routines that actually update the physical
+         * hardware.
+         */
+        const struct iwl_rxon_cmd active;
+        struct iwl_rxon_cmd staging;
+
+        struct iwl_rxon_time_cmd timing;
+
+        struct iwl_qos_info qos_data;
+
+        u8 bcast_sta_id, ap_sta_id;
+
+        u8 rxon_cmd, rxon_assoc_cmd, rxon_timing_cmd;
+        u8 qos_cmd;
+        u8 wep_key_cmd;
+
+        struct iwl_wep_key wep_keys[WEP_KEYS_MAX];
+        u8 key_mapping_keys;
+
+        __le32 station_flags;
+
+        struct {
+                bool non_gf_sta_present;
+                u8 protection;
+                bool enabled, is_40mhz;
+                u8 extension_chan_offset;
+        } ht;
+
+        bool last_tx_rejected;
+};
+
+enum iwl_scan_type {
+        IWL_SCAN_NORMAL,
+        IWL_SCAN_RADIO_RESET,
+        IWL_SCAN_OFFCH_TX,
+};
+
+#ifdef CONFIG_IWLWIFI_DEVICE_SVTOOL
+struct iwl_testmode_trace {
+        u8 *cpu_addr;
+        u8 *trace_addr;
+        dma_addr_t dma_addr;
+        bool trace_enabled;
+};
+#endif
 struct iwl_priv {
 
         /* ieee device used by generic ieee processing code */
@@ -1090,13 +1184,10 @@ struct iwl_priv {
         struct ieee80211_rate *ieee_rates;
         struct iwl_cfg *cfg;
 
-        /* temporary frame storage list */
-        struct list_head free_frames;
-        int frames_count;
-
         enum ieee80211_band band;
-        int alloc_rxb_page;
 
+        void (*pre_rx_handler)(struct iwl_priv *priv,
+                               struct iwl_rx_mem_buffer *rxb);
         void (*rx_handlers[REPLY_MAX])(struct iwl_priv *priv,
                                        struct iwl_rx_mem_buffer *rxb);
 
@@ -1110,12 +1201,19 @@ struct iwl_priv {
         u32 ucode_beacon_time;
         int missed_beacon_threshold;
 
-        /* storing the jiffies when the plcp error rate is received */
-        unsigned long plcp_jiffies;
+        /* track IBSS manager (last beacon) status */
+        u32 ibss_manager;
+
+        /* jiffies when last recovery from statistics was performed */
+        unsigned long rx_statistics_jiffies;
 
         /* force reset */
         struct iwl_force_reset force_reset[IWL_MAX_FORCE_RESET];
 
+        /* firmware reload counter and timestamp */
+        unsigned long reload_jiffies;
+        int reload_count;
+
         /* we allocate array of iwl_channel_info for NIC's valid channels.
          *    Access via channel # using indirect index array */
         struct iwl_channel_info *channel_info;  /* channel info array */
@@ -1135,7 +1233,7 @@ struct iwl_priv {
         enum ieee80211_band scan_band;
         struct cfg80211_scan_request *scan_request;
         struct ieee80211_vif *scan_vif;
-        bool is_internal_short_scan;
+        enum iwl_scan_type scan_type;
         u8 scan_tx_ant[IEEE80211_NUM_BANDS];
         u8 mgmt_tx_ant;
 
@@ -1144,16 +1242,23 @@ struct iwl_priv {
         spinlock_t hcmd_lock;   /* protect hcmd */
         spinlock_t reg_lock;    /* protect hw register access */
         struct mutex mutex;
-        struct mutex sync_cmd_mutex; /* enable serialization of sync commands */
 
         /* basic pci-network driver stuff */
         struct pci_dev *pci_dev;
 
         /* pci hardware address support */
         void __iomem *hw_base;
-        u32  hw_rev;
-        u32  hw_wa_rev;
-        u8   rev_id;
+
+        /* microcode/device supports multiple contexts */
+        u8 valid_contexts;
+
+        /* command queue number */
+        u8 cmd_queue;
+
+        /* max number of station keys */
+        u8 sta_key_max_num;
+
+        bool new_scan_threshold_behaviour;
 
         /* EEPROM MAC addresses */
         struct mac_address addresses[2];
@@ -1162,37 +1267,21 @@ struct iwl_priv {
         int fw_index;                   /* firmware we're trying to load */
         u32 ucode_ver;                  /* version of ucode, copy of
                                            iwl_ucode.ver */
-        struct fw_desc ucode_code;      /* runtime inst */
-        struct fw_desc ucode_data;      /* runtime data original */
-        struct fw_desc ucode_data_backup;       /* runtime data save/restore */
-        struct fw_desc ucode_init;      /* initialization inst */
-        struct fw_desc ucode_init_data; /* initialization data */
-        struct fw_desc ucode_boot;      /* bootstrap inst */
-        enum ucode_type ucode_type;
+        struct fw_img ucode_rt;
+        struct fw_img ucode_init;
+
+        enum iwlagn_ucode_subtype ucode_type;
         u8 ucode_write_complete;        /* the image write is complete */
         char firmware_name[25];
 
+        struct iwl_rxon_context contexts[NUM_IWL_RXON_CTX];
 
-        struct iwl_rxon_time_cmd rxon_timing;
-
-        /* We declare this const so it can only be
-         * changed via explicit cast within the
-         * routines that actually update the physical
-         * hardware */
-        const struct iwl_rxon_cmd active_rxon;
-        struct iwl_rxon_cmd staging_rxon;
-
-        struct iwl_switch_rxon switch_rxon;
-
-        /* 1st responses from initialize and runtime uCode images.
-         * _agn's initialize alive response contains some calibration data. */
-        struct iwl_init_alive_resp card_alive_init;
-        struct iwl_alive_resp card_alive;
+        __le16 switch_channel;
 
-        unsigned long last_blink_time;
-        u8 last_blink_rate;
-        u8 allow_blinking;
-        u64 led_tpt;
+        struct {
+                u32 error_event_table;
+                u32 log_event_table;
+        } device_pointers;
 
         u16 active_rate;
 
@@ -1233,17 +1322,12 @@ struct iwl_priv {
         struct iwl_power_mgr power_data;
         struct iwl_tt_mgmt thermal_throttle;
 
-        /* context information */
-        u8 bssid[ETH_ALEN]; /* used only on 3945 but filled by core */
-
         /* station table variables */
 
         /* Note: if lock and sta_lock are needed, lock must be acquired first */
         spinlock_t sta_lock;
         int num_stations;
-        struct iwl_station_entry stations[IWL_STATION_COUNT];
-        struct iwl_wep_key wep_keys[WEP_KEYS_MAX]; /* protected by mutex */
-        u8 key_mapping_key;
+        struct iwl_station_entry stations[IWLAGN_STATION_COUNT];
         unsigned long ucode_key_table;
 
         /* queue refcounts */
@@ -1264,119 +1348,134 @@ struct iwl_priv {
 
         enum nl80211_iftype iw_mode;
 
-        struct sk_buff *ibss_beacon;
-
         /* Last Rx'd beacon timestamp */
         u64 timestamp;
-        struct ieee80211_vif *vif;
-
-        union {
-#if defined(CONFIG_IWL3945) || defined(CONFIG_IWL3945_MODULE)
-                struct {
-                        void *shared_virt;
-                        dma_addr_t shared_phys;
-
-                        struct delayed_work thermal_periodic;
-                        struct delayed_work rfkill_poll;
 
-                        struct iwl3945_notif_statistics statistics;
+        struct {
+                __le32 flag;
+                struct statistics_general_common common;
+                struct statistics_rx_non_phy rx_non_phy;
+                struct statistics_rx_phy rx_ofdm;
+                struct statistics_rx_ht_phy rx_ofdm_ht;
+                struct statistics_rx_phy rx_cck;
+                struct statistics_tx tx;
 #ifdef CONFIG_IWLWIFI_DEBUGFS
-                        struct iwl3945_notif_statistics accum_statistics;
-                        struct iwl3945_notif_statistics delta_statistics;
-                        struct iwl3945_notif_statistics max_delta;
+                struct statistics_bt_activity bt_activity;
+                __le32 num_bt_kills, accum_num_bt_kills;
 #endif
-
-                        u32 sta_supp_rates;
-                        int last_rx_rssi;       /* From Rx packet statistics */
-
-                        /* Rx'd packet timing information */
-                        u32 last_beacon_time;
-                        u64 last_tsf;
-
-                        /*
-                         * each calibration channel group in the
-                         * EEPROM has a derived clip setting for
-                         * each rate.
-                         */
-                        const struct iwl3945_clip_group clip_groups[5];
-
-                } _3945;
-#endif
-#if defined(CONFIG_IWLAGN) || defined(CONFIG_IWLAGN_MODULE)
-                struct {
-                        /* INT ICT Table */
-                        __le32 *ict_tbl;
-                        void *ict_tbl_vir;
-                        dma_addr_t ict_tbl_dma;
-                        dma_addr_t aligned_ict_tbl_dma;
-                        int ict_index;
-                        u32 inta;
-                        bool use_ict;
-                        /*
-                         * reporting the number of tids has AGG on. 0 means
-                         * no AGGREGATION
-                         */
-                        u8 agg_tids_count;
-
-                        struct iwl_rx_phy_res last_phy_res;
-                        bool last_phy_res_valid;
-
-                        struct completion firmware_loading_complete;
-
-                        u32 init_evtlog_ptr, init_evtlog_size, init_errlog_ptr;
-                        u32 inst_evtlog_ptr, inst_evtlog_size, inst_errlog_ptr;
-
-                        /*
-                         * chain noise reset and gain commands are the
-                         * two extra calibration commands follows the standard
-                         * phy calibration commands
-                         */
-                        u8 phy_calib_chain_noise_reset_cmd;
-                        u8 phy_calib_chain_noise_gain_cmd;
-
-                        struct iwl_notif_statistics statistics;
-                        struct iwl_bt_notif_statistics statistics_bt;
+        } statistics;
 #ifdef CONFIG_IWLWIFI_DEBUGFS
-                        struct iwl_notif_statistics accum_statistics;
-                        struct iwl_notif_statistics delta_statistics;
-                        struct iwl_notif_statistics max_delta;
-                        struct iwl_bt_notif_statistics accum_statistics_bt;
-                        struct iwl_bt_notif_statistics delta_statistics_bt;
-                        struct iwl_bt_notif_statistics max_delta_bt;
-#endif
-                } _agn;
+        struct {
+                struct statistics_general_common common;
+                struct statistics_rx_non_phy rx_non_phy;
+                struct statistics_rx_phy rx_ofdm;
+                struct statistics_rx_ht_phy rx_ofdm_ht;
+                struct statistics_rx_phy rx_cck;
+                struct statistics_tx tx;
+                struct statistics_bt_activity bt_activity;
+        } accum_stats, delta_stats, max_delta_stats;
 #endif
-        };
+
+        struct {
+                /* INT ICT Table */
+                __le32 *ict_tbl;
+                void *ict_tbl_vir;
+                dma_addr_t ict_tbl_dma;
+                dma_addr_t aligned_ict_tbl_dma;
+                int ict_index;
+                u32 inta;
+                bool use_ict;
+                /*
+                 * reporting the number of tids has AGG on. 0 means
+                 * no AGGREGATION
+                 */
+                u8 agg_tids_count;
+
+                struct iwl_rx_phy_res last_phy_res;
+                bool last_phy_res_valid;
+
+                struct completion firmware_loading_complete;
+
+                u32 init_evtlog_ptr, init_evtlog_size, init_errlog_ptr;
+                u32 inst_evtlog_ptr, inst_evtlog_size, inst_errlog_ptr;
+
+                /*
+                 * chain noise reset and gain commands are the
+                 * two extra calibration commands follows the standard
+                 * phy calibration commands
+                 */
+                u8 phy_calib_chain_noise_reset_cmd;
+                u8 phy_calib_chain_noise_gain_cmd;
+
+                /* counts reply_tx error */
+                struct reply_tx_error_statistics reply_tx_stats;
+                struct reply_agg_tx_error_statistics reply_agg_tx_stats;
+                /* notification wait support */
+                struct list_head notif_waits;
+                spinlock_t notif_wait_lock;
+                wait_queue_head_t notif_waitq;
+
+                /* remain-on-channel offload support */
+                struct ieee80211_channel *hw_roc_channel;
+                struct delayed_work hw_roc_work;
+                enum nl80211_channel_type hw_roc_chantype;
+                int hw_roc_duration;
+                bool hw_roc_setup;
+
+                struct sk_buff *offchan_tx_skb;
+                int offchan_tx_timeout;
+                struct ieee80211_channel *offchan_tx_chan;
+        } _agn;
+
+        /* bt coex */
+        u8 bt_enable_flag;
+        u8 bt_status;
+        u8 bt_traffic_load, last_bt_traffic_load;
+        bool bt_ch_announce;
+        bool bt_full_concurrent;
+        bool bt_ant_couple_ok;
+        __le32 kill_ack_mask;
+        __le32 kill_cts_mask;
+        __le16 bt_valid;
+        u16 bt_on_thresh;
+        u16 bt_duration;
+        u16 dynamic_frag_thresh;
+        u8 bt_ci_compliance;
+        struct work_struct bt_traffic_change_work;
 
         struct iwl_hw_params hw_params;
 
         u32 inta_mask;
 
-        struct iwl_qos_info qos_data;
-
         struct workqueue_struct *workqueue;
 
         struct work_struct restart;
         struct work_struct scan_completed;
         struct work_struct rx_replenish;
         struct work_struct abort_scan;
+
         struct work_struct beacon_update;
+        struct iwl_rxon_context *beacon_ctx;
+        struct sk_buff *beacon_skb;
+        void *beacon_cmd;
+
         struct work_struct tt_work;
         struct work_struct ct_enter;
         struct work_struct ct_exit;
         struct work_struct start_internal_scan;
         struct work_struct tx_flush;
+        struct work_struct bt_full_concurrency;
+        struct work_struct bt_runtime_config;
 
         struct tasklet_struct irq_tasklet;
 
-        struct delayed_work init_alive_start;
-        struct delayed_work alive_start;
         struct delayed_work scan_check;
 
         /* TX Power */
         s8 tx_power_user_lmt;
         s8 tx_power_device_lmt;
         s8 tx_power_lmt_in_half_dbm; /* max tx power in half-dBm format */
+        s8 tx_power_next;
 
 
 #ifdef CONFIG_IWLWIFI_DEBUG
@@ -1398,14 +1497,21 @@ struct iwl_priv {
         struct work_struct txpower_work;
         u32 disable_sens_cal;
         u32 disable_chain_noise_cal;
-        u32 disable_tx_power_cal;
         struct work_struct run_time_calib_work;
         struct timer_list statistics_periodic;
         struct timer_list ucode_trace;
-        struct timer_list monitor_recover;
-        bool hw_ready;
+        struct timer_list watchdog;
 
         struct iwl_event_log event_log;
+
+        struct led_classdev led;
+        unsigned long blink_on, blink_off;
+        bool led_registered;
+#ifdef CONFIG_IWLWIFI_DEVICE_SVTOOL
+        struct iwl_testmode_trace testmode_trace;
+#endif
+        u32 dbg_fixed_rate;
+
 }; /*iwl_priv */
 
 static inline void iwl_txq_ctx_activate(struct iwl_priv *priv, int txq_id)
@@ -1419,7 +1525,6 @@ static inline void iwl_txq_ctx_deactivate(struct iwl_priv *priv, int txq_id)
 }
 
 #ifdef CONFIG_IWLWIFI_DEBUG
-const char *iwl_get_tx_fail_reason(u32 status);
 /*
  * iwl_get_debug_level: Return active debug level for device
  *
@@ -1435,8 +1540,6 @@ static inline u32 iwl_get_debug_level(struct iwl_priv *priv)
                 return iwl_debug_level;
 }
 #else
-static inline const char *iwl_get_tx_fail_reason(u32 status) { return ""; }
-
 static inline u32 iwl_get_debug_level(struct iwl_priv *priv)
 {
         return iwl_debug_level;
@@ -1453,10 +1556,37 @@ static inline struct ieee80211_hdr *iwl_tx_queue_get_hdr(struct iwl_priv *priv,
         return NULL;
 }
 
+static inline struct iwl_rxon_context *
+iwl_rxon_ctx_from_vif(struct ieee80211_vif *vif)
+{
+        struct iwl_vif_priv *vif_priv = (void *)vif->drv_priv;
+
+        return vif_priv->ctx;
+}
+
+#define for_each_context(priv, ctx)                             \
+        for (ctx = &priv->contexts[IWL_RXON_CTX_BSS];           \
+             ctx < &priv->contexts[NUM_IWL_RXON_CTX]; ctx++)    \
+                if (priv->valid_contexts & BIT(ctx->ctxid))
+
+static inline int iwl_is_associated_ctx(struct iwl_rxon_context *ctx)
+{
+        return (ctx->active.filter_flags & RXON_FILTER_ASSOC_MSK) ? 1 : 0;
+}
+
+static inline int iwl_is_associated(struct iwl_priv *priv,
+                                    enum iwl_rxon_context_id ctxid)
+{
+        return iwl_is_associated_ctx(&priv->contexts[ctxid]);
+}
 
-static inline int iwl_is_associated(struct iwl_priv *priv)
+static inline int iwl_is_any_associated(struct iwl_priv *priv)
 {
-        return (priv->active_rxon.filter_flags & RXON_FILTER_ASSOC_MSK) ? 1 : 0;
+        struct iwl_rxon_context *ctx;
+        for_each_context(priv, ctx)
+                if (iwl_is_associated_ctx(ctx))
+                        return true;
+        return false;
 }
 
 static inline int is_channel_valid(const struct iwl_channel_info *ch_info)
@@ -1494,12 +1624,10 @@ static inline int is_channel_ibss(const struct iwl_channel_info *ch)
 static inline void __iwl_free_pages(struct iwl_priv *priv, struct page *page)
 {
         __free_pages(page, priv->hw_params.rx_page_order);
-        priv->alloc_rxb_page--;
 }
 
 static inline void iwl_free_pages(struct iwl_priv *priv, unsigned long page)
 {
         free_pages(page, priv->hw_params.rx_page_order);
-        priv->alloc_rxb_page--;
 }
 #endif                          /* __iwl_dev_h__ */