iwlwifi: correct return code for log_event
[safe/jmp/linux-2.6] / drivers / net / wireless / iwlwifi / iwl-debugfs.c
index f68fb47..a7ca06d 100644 (file)
@@ -47,9 +47,9 @@
                goto err;                                               \
 } while (0)
 
-#define DEBUGFS_ADD_FILE(name, parent) do {                             \
+#define DEBUGFS_ADD_FILE(name, parent, mode) do {                       \
        dbgfs->dbgfs_##parent##_files.file_##name =                     \
-       debugfs_create_file(#name, S_IWUSR | S_IRUSR,                   \
+       debugfs_create_file(#name, mode,                                \
                                dbgfs->dir_##parent, priv,              \
                                &iwl_dbgfs_##name##_ops);               \
        if (!(dbgfs->dbgfs_##parent##_files.file_##name))               \
@@ -125,27 +125,28 @@ static ssize_t iwl_dbgfs_tx_statistics_read(struct file *file,
                                                char __user *user_buf,
                                                size_t count, loff_t *ppos) {
 
-       struct iwl_priv *priv = (struct iwl_priv *)file->private_data;
+       struct iwl_priv *priv = file->private_data;
        char *buf;
        int pos = 0;
 
        int cnt;
        ssize_t ret;
-       const size_t bufsz = 100 + sizeof(char) * 24 * (MANAGEMENT_MAX + CONTROL_MAX);
+       const size_t bufsz = 100 +
+               sizeof(char) * 50 * (MANAGEMENT_MAX + CONTROL_MAX);
        buf = kzalloc(bufsz, GFP_KERNEL);
        if (!buf)
                return -ENOMEM;
        pos += scnprintf(buf + pos, bufsz - pos, "Management:\n");
        for (cnt = 0; cnt < MANAGEMENT_MAX; cnt++) {
                pos += scnprintf(buf + pos, bufsz - pos,
-                                "\t%s\t\t: %u\n",
+                                "\t%25s\t\t: %u\n",
                                 get_mgmt_string(cnt),
                                 priv->tx_stats.mgmt[cnt]);
        }
        pos += scnprintf(buf + pos, bufsz - pos, "Control\n");
        for (cnt = 0; cnt < CONTROL_MAX; cnt++) {
                pos += scnprintf(buf + pos, bufsz - pos,
-                                "\t%s\t\t: %u\n",
+                                "\t%25s\t\t: %u\n",
                                 get_ctrl_string(cnt),
                                 priv->tx_stats.ctrl[cnt]);
        }
@@ -159,7 +160,7 @@ static ssize_t iwl_dbgfs_tx_statistics_read(struct file *file,
        return ret;
 }
 
-static ssize_t iwl_dbgfs_tx_statistics_write(struct file *file,
+static ssize_t iwl_dbgfs_clear_traffic_statistics_write(struct file *file,
                                        const char __user *user_buf,
                                        size_t count, loff_t *ppos)
 {
@@ -174,8 +175,7 @@ static ssize_t iwl_dbgfs_tx_statistics_write(struct file *file,
                return -EFAULT;
        if (sscanf(buf, "%x", &clear_flag) != 1)
                return -EFAULT;
-       if (clear_flag == 1)
-               iwl_clear_tx_stats(priv);
+       iwl_clear_traffic_stats(priv);
 
        return count;
 }
@@ -184,13 +184,13 @@ static ssize_t iwl_dbgfs_rx_statistics_read(struct file *file,
                                                char __user *user_buf,
                                                size_t count, loff_t *ppos) {
 
-       struct iwl_priv *priv = (struct iwl_priv *)file->private_data;
+       struct iwl_priv *priv = file->private_data;
        char *buf;
        int pos = 0;
        int cnt;
        ssize_t ret;
        const size_t bufsz = 100 +
-               sizeof(char) * 24 * (MANAGEMENT_MAX + CONTROL_MAX);
+               sizeof(char) * 50 * (MANAGEMENT_MAX + CONTROL_MAX);
        buf = kzalloc(bufsz, GFP_KERNEL);
        if (!buf)
                return -ENOMEM;
@@ -198,14 +198,14 @@ static ssize_t iwl_dbgfs_rx_statistics_read(struct file *file,
        pos += scnprintf(buf + pos, bufsz - pos, "Management:\n");
        for (cnt = 0; cnt < MANAGEMENT_MAX; cnt++) {
                pos += scnprintf(buf + pos, bufsz - pos,
-                                "\t%s\t\t: %u\n",
+                                "\t%25s\t\t: %u\n",
                                 get_mgmt_string(cnt),
                                 priv->rx_stats.mgmt[cnt]);
        }
        pos += scnprintf(buf + pos, bufsz - pos, "Control:\n");
        for (cnt = 0; cnt < CONTROL_MAX; cnt++) {
                pos += scnprintf(buf + pos, bufsz - pos,
-                                "\t%s\t\t: %u\n",
+                                "\t%25s\t\t: %u\n",
                                 get_ctrl_string(cnt),
                                 priv->rx_stats.ctrl[cnt]);
        }
@@ -220,26 +220,6 @@ static ssize_t iwl_dbgfs_rx_statistics_read(struct file *file,
        return ret;
 }
 
-static ssize_t iwl_dbgfs_rx_statistics_write(struct file *file,
-                                       const char __user *user_buf,
-                                       size_t count, loff_t *ppos)
-{
-       struct iwl_priv *priv = file->private_data;
-       u32 clear_flag;
-       char buf[8];
-       int buf_size;
-
-       memset(buf, 0, sizeof(buf));
-       buf_size = min(count, sizeof(buf) -  1);
-       if (copy_from_user(buf, user_buf, buf_size))
-               return -EFAULT;
-       if (sscanf(buf, "%x", &clear_flag) != 1)
-               return -EFAULT;
-       if (clear_flag == 1)
-               iwl_clear_rx_stats(priv);
-       return count;
-}
-
 #define BYTE1_MASK 0x000000ff;
 #define BYTE2_MASK 0x0000ffff;
 #define BYTE3_MASK 0x00ffffff;
@@ -248,13 +228,29 @@ static ssize_t iwl_dbgfs_sram_read(struct file *file,
                                        size_t count, loff_t *ppos)
 {
        u32 val;
-       char buf[1024];
+       char *buf;
        ssize_t ret;
        int i;
        int pos = 0;
-       struct iwl_priv *priv = (struct iwl_priv *)file->private_data;
-       const size_t bufsz = sizeof(buf);
-
+       struct iwl_priv *priv = file->private_data;
+       size_t bufsz;
+
+       /* default is to dump the entire data segment */
+       if (!priv->dbgfs->sram_offset && !priv->dbgfs->sram_len) {
+               priv->dbgfs->sram_offset = 0x800000;
+               if (priv->ucode_type == UCODE_INIT)
+                       priv->dbgfs->sram_len = priv->ucode_init_data.len;
+               else
+                       priv->dbgfs->sram_len = priv->ucode_data.len;
+       }
+       bufsz =  30 + priv->dbgfs->sram_len * sizeof(char) * 10;
+       buf = kmalloc(bufsz, GFP_KERNEL);
+       if (!buf)
+               return -ENOMEM;
+       pos += scnprintf(buf + pos, bufsz - pos, "sram_len: 0x%x\n",
+                       priv->dbgfs->sram_len);
+       pos += scnprintf(buf + pos, bufsz - pos, "sram_offset: 0x%x\n",
+                       priv->dbgfs->sram_offset);
        for (i = priv->dbgfs->sram_len; i > 0; i -= 4) {
                val = iwl_read_targ_mem(priv, priv->dbgfs->sram_offset + \
                                        priv->dbgfs->sram_len - i);
@@ -271,11 +267,14 @@ static ssize_t iwl_dbgfs_sram_read(struct file *file,
                                break;
                        }
                }
+               if (!(i % 16))
+                       pos += scnprintf(buf + pos, bufsz - pos, "\n");
                pos += scnprintf(buf + pos, bufsz - pos, "0x%08x ", val);
        }
        pos += scnprintf(buf + pos, bufsz - pos, "\n");
 
        ret = simple_read_from_buffer(user_buf, count, ppos, buf, pos);
+       kfree(buf);
        return ret;
 }
 
@@ -307,7 +306,7 @@ static ssize_t iwl_dbgfs_sram_write(struct file *file,
 static ssize_t iwl_dbgfs_stations_read(struct file *file, char __user *user_buf,
                                        size_t count, loff_t *ppos)
 {
-       struct iwl_priv *priv = (struct iwl_priv *)file->private_data;
+       struct iwl_priv *priv = file->private_data;
        struct iwl_station_entry *station;
        int max_sta = priv->hw_params.max_stations;
        char *buf;
@@ -335,8 +334,6 @@ static ssize_t iwl_dbgfs_stations_read(struct file *file, char __user *user_buf,
                        pos += scnprintf(buf + pos, bufsz - pos,
                                        "flags: 0x%x\n",
                                        station->sta.station_flags_msk);
-                       pos += scnprintf(buf + pos, bufsz - pos,
-                                       "ps_status: %u\n", station->ps_status);
                        pos += scnprintf(buf + pos, bufsz - pos, "tid data:\n");
                        pos += scnprintf(buf + pos, bufsz - pos,
                                        "seq_num\t\ttxq_id");
@@ -379,10 +376,11 @@ static ssize_t iwl_dbgfs_nvm_read(struct file *file,
                                       loff_t *ppos)
 {
        ssize_t ret;
-       struct iwl_priv *priv = (struct iwl_priv *)file->private_data;
+       struct iwl_priv *priv = file->private_data;
        int pos = 0, ofs = 0, buf_size = 0;
        const u8 *ptr;
        char *buf;
+       u16 eeprom_ver;
        size_t eeprom_len = priv->cfg->eeprom_size;
        buf_size = 4 * eeprom_len + 256;
 
@@ -403,14 +401,16 @@ static ssize_t iwl_dbgfs_nvm_read(struct file *file,
                IWL_ERR(priv, "Can not allocate Buffer\n");
                return -ENOMEM;
        }
-       pos += scnprintf(buf + pos, buf_size - pos, "NVM Type: %s\n",
+       eeprom_ver = iwl_eeprom_query16(priv, EEPROM_VERSION);
+       pos += scnprintf(buf + pos, buf_size - pos, "NVM Type: %s, "
+                       "version: 0x%x\n",
                        (priv->nvm_device_type == NVM_DEVICE_TYPE_OTP)
-                       ? "OTP" : "EEPROM");
+                        ? "OTP" : "EEPROM", eeprom_ver);
        for (ofs = 0 ; ofs < eeprom_len ; ofs += 16) {
                pos += scnprintf(buf + pos, buf_size - pos, "0x%.4x ", ofs);
                hex_dump_to_buffer(ptr + ofs, 16 , 16, 2, buf + pos,
                                   buf_size - pos, 0);
-               pos += strlen(buf);
+               pos += strlen(buf + pos);
                if (buf_size - pos > 0)
                        buf[pos++] = '\n';
        }
@@ -420,6 +420,24 @@ static ssize_t iwl_dbgfs_nvm_read(struct file *file,
        return ret;
 }
 
+static ssize_t iwl_dbgfs_log_event_read(struct file *file,
+                                        char __user *user_buf,
+                                        size_t count, loff_t *ppos)
+{
+       struct iwl_priv *priv = file->private_data;
+       char *buf;
+       int pos = 0;
+       ssize_t ret = -ENOMEM;
+
+       ret = pos = priv->cfg->ops->lib->dump_nic_event_log(
+                                       priv, true, &buf, true);
+       if (buf) {
+               ret = simple_read_from_buffer(user_buf, count, ppos, buf, pos);
+               kfree(buf);
+       }
+       return ret;
+}
+
 static ssize_t iwl_dbgfs_log_event_write(struct file *file,
                                        const char __user *user_buf,
                                        size_t count, loff_t *ppos)
@@ -436,7 +454,8 @@ static ssize_t iwl_dbgfs_log_event_write(struct file *file,
        if (sscanf(buf, "%d", &event_log_flag) != 1)
                return -EFAULT;
        if (event_log_flag == 1)
-               iwl_dump_nic_event_log(priv);
+               priv->cfg->ops->lib->dump_nic_event_log(priv, true,
+                                                       NULL, false);
 
        return count;
 }
@@ -446,7 +465,7 @@ static ssize_t iwl_dbgfs_log_event_write(struct file *file,
 static ssize_t iwl_dbgfs_channels_read(struct file *file, char __user *user_buf,
                                       size_t count, loff_t *ppos)
 {
-       struct iwl_priv *priv = (struct iwl_priv *)file->private_data;
+       struct iwl_priv *priv = file->private_data;
        struct ieee80211_channel *channels = NULL;
        const struct ieee80211_supported_band *supp_band = NULL;
        int pos = 0, i, bufsz = PAGE_SIZE;
@@ -519,7 +538,7 @@ static ssize_t iwl_dbgfs_status_read(struct file *file,
                                                char __user *user_buf,
                                                size_t count, loff_t *ppos) {
 
-       struct iwl_priv *priv = (struct iwl_priv *)file->private_data;
+       struct iwl_priv *priv = file->private_data;
        char buf[512];
        int pos = 0;
        const size_t bufsz = sizeof(buf);
@@ -532,6 +551,8 @@ static ssize_t iwl_dbgfs_status_read(struct file *file,
                test_bit(STATUS_INT_ENABLED, &priv->status));
        pos += scnprintf(buf + pos, bufsz - pos, "STATUS_RF_KILL_HW:\t %d\n",
                test_bit(STATUS_RF_KILL_HW, &priv->status));
+       pos += scnprintf(buf + pos, bufsz - pos, "STATUS_CT_KILL:\t\t %d\n",
+               test_bit(STATUS_CT_KILL, &priv->status));
        pos += scnprintf(buf + pos, bufsz - pos, "STATUS_INIT:\t\t %d\n",
                test_bit(STATUS_INIT, &priv->status));
        pos += scnprintf(buf + pos, bufsz - pos, "STATUS_ALIVE:\t\t %d\n",
@@ -565,7 +586,7 @@ static ssize_t iwl_dbgfs_interrupt_read(struct file *file,
                                        char __user *user_buf,
                                        size_t count, loff_t *ppos) {
 
-       struct iwl_priv *priv = (struct iwl_priv *)file->private_data;
+       struct iwl_priv *priv = file->private_data;
        int pos = 0;
        int cnt = 0;
        char *buf;
@@ -652,7 +673,7 @@ static ssize_t iwl_dbgfs_interrupt_write(struct file *file,
 static ssize_t iwl_dbgfs_qos_read(struct file *file, char __user *user_buf,
                                       size_t count, loff_t *ppos)
 {
-       struct iwl_priv *priv = (struct iwl_priv *)file->private_data;
+       struct iwl_priv *priv = file->private_data;
        int pos = 0, i;
        char buf[256];
        const size_t bufsz = sizeof(buf);
@@ -672,11 +693,10 @@ static ssize_t iwl_dbgfs_qos_read(struct file *file, char __user *user_buf,
        return ret;
 }
 
-#ifdef CONFIG_IWLWIFI_LEDS
 static ssize_t iwl_dbgfs_led_read(struct file *file, char __user *user_buf,
                                  size_t count, loff_t *ppos)
 {
-       struct iwl_priv *priv = (struct iwl_priv *)file->private_data;
+       struct iwl_priv *priv = file->private_data;
        int pos = 0;
        char buf[256];
        const size_t bufsz = sizeof(buf);
@@ -697,13 +717,12 @@ static ssize_t iwl_dbgfs_led_read(struct file *file, char __user *user_buf,
        ret = simple_read_from_buffer(user_buf, count, ppos, buf, pos);
        return ret;
 }
-#endif
 
 static ssize_t iwl_dbgfs_thermal_throttling_read(struct file *file,
                                char __user *user_buf,
                                size_t count, loff_t *ppos)
 {
-       struct iwl_priv *priv = (struct iwl_priv *)file->private_data;
+       struct iwl_priv *priv = file->private_data;
        struct iwl_tt_mgmt *tt = &priv->thermal_throttle;
        struct iwl_tt_restriction *restriction;
        char buf[100];
@@ -763,7 +782,7 @@ static ssize_t iwl_dbgfs_disable_ht40_read(struct file *file,
                                         char __user *user_buf,
                                         size_t count, loff_t *ppos)
 {
-       struct iwl_priv *priv = (struct iwl_priv *)file->private_data;
+       struct iwl_priv *priv = file->private_data;
        char buf[100];
        int pos = 0;
        const size_t bufsz = sizeof(buf);
@@ -798,15 +817,20 @@ static ssize_t iwl_dbgfs_sleep_level_override_write(struct file *file,
         * valid here. However, let's not confuse them and present
         * IWL_POWER_INDEX_1 as "1", not "0".
         */
-       if (value > 0)
+       if (value == 0)
+               return -EINVAL;
+       else if (value > 0)
                value -= 1;
 
        if (value != -1 && (value < 0 || value >= IWL_POWER_NUM))
                return -EINVAL;
 
+       if (!iwl_is_ready_rf(priv))
+               return -EAGAIN;
+
        priv->power_data.debug_sleep_level_override = value;
 
-       iwl_power_update_mode(priv, false);
+       iwl_power_update_mode(priv, true);
 
        return count;
 }
@@ -815,7 +839,7 @@ static ssize_t iwl_dbgfs_sleep_level_override_read(struct file *file,
                                                   char __user *user_buf,
                                                   size_t count, loff_t *ppos)
 {
-       struct iwl_priv *priv = (struct iwl_priv *)file->private_data;
+       struct iwl_priv *priv = file->private_data;
        char buf[10];
        int pos, value;
        const size_t bufsz = sizeof(buf);
@@ -833,7 +857,7 @@ static ssize_t iwl_dbgfs_current_sleep_command_read(struct file *file,
                                                    char __user *user_buf,
                                                    size_t count, loff_t *ppos)
 {
-       struct iwl_priv *priv = (struct iwl_priv *)file->private_data;
+       struct iwl_priv *priv = file->private_data;
        char buf[200];
        int pos = 0, i;
        const size_t bufsz = sizeof(buf);
@@ -854,16 +878,14 @@ static ssize_t iwl_dbgfs_current_sleep_command_read(struct file *file,
 }
 
 DEBUGFS_READ_WRITE_FILE_OPS(sram);
-DEBUGFS_WRITE_FILE_OPS(log_event);
+DEBUGFS_READ_WRITE_FILE_OPS(log_event);
 DEBUGFS_READ_FILE_OPS(nvm);
 DEBUGFS_READ_FILE_OPS(stations);
 DEBUGFS_READ_FILE_OPS(channels);
 DEBUGFS_READ_FILE_OPS(status);
 DEBUGFS_READ_WRITE_FILE_OPS(interrupt);
 DEBUGFS_READ_FILE_OPS(qos);
-#ifdef CONFIG_IWLWIFI_LEDS
 DEBUGFS_READ_FILE_OPS(led);
-#endif
 DEBUGFS_READ_FILE_OPS(thermal_throttling);
 DEBUGFS_READ_WRITE_FILE_OPS(disable_ht40);
 DEBUGFS_READ_WRITE_FILE_OPS(sleep_level_override);
@@ -881,10 +903,14 @@ static ssize_t iwl_dbgfs_traffic_log_read(struct file *file,
        struct iwl_rx_queue *rxq = &priv->rxq;
        char *buf;
        int bufsz = ((IWL_TRAFFIC_ENTRIES * IWL_TRAFFIC_ENTRY_SIZE * 64) * 2) +
-               (IWL_MAX_NUM_QUEUES * 32 * 8) + 400;
+               (priv->cfg->num_of_queues * 32 * 8) + 400;
        const u8 *ptr;
        ssize_t ret;
 
+       if (!priv->txq) {
+               IWL_ERR(priv, "txq not ready\n");
+               return -EAGAIN;
+       }
        buf = kzalloc(bufsz, GFP_KERNEL);
        if (!buf) {
                IWL_ERR(priv, "Can not allocate buffer\n");
@@ -909,7 +935,7 @@ static ssize_t iwl_dbgfs_traffic_log_read(struct file *file,
                                                "0x%.4x ", ofs);
                                hex_dump_to_buffer(ptr + ofs, 16, 16, 2,
                                                   buf + pos, bufsz - pos, 0);
-                               pos += strlen(buf);
+                               pos += strlen(buf + pos);
                                if (bufsz - pos > 0)
                                        buf[pos++] = '\n';
                        }
@@ -932,7 +958,7 @@ static ssize_t iwl_dbgfs_traffic_log_read(struct file *file,
                                                "0x%.4x ", ofs);
                                hex_dump_to_buffer(ptr + ofs, 16, 16, 2,
                                                   buf + pos, bufsz - pos, 0);
-                               pos += strlen(buf);
+                               pos += strlen(buf + pos);
                                if (bufsz - pos > 0)
                                        buf[pos++] = '\n';
                        }
@@ -969,15 +995,19 @@ static ssize_t iwl_dbgfs_tx_queue_read(struct file *file,
                                                char __user *user_buf,
                                                size_t count, loff_t *ppos) {
 
-       struct iwl_priv *priv = (struct iwl_priv *)file->private_data;
+       struct iwl_priv *priv = file->private_data;
        struct iwl_tx_queue *txq;
        struct iwl_queue *q;
        char *buf;
        int pos = 0;
        int cnt;
        int ret;
-       const size_t bufsz = sizeof(char) * 60 * IWL_MAX_NUM_QUEUES;
+       const size_t bufsz = sizeof(char) * 64 * priv->cfg->num_of_queues;
 
+       if (!priv->txq) {
+               IWL_ERR(priv, "txq not ready\n");
+               return -EAGAIN;
+       }
        buf = kzalloc(bufsz, GFP_KERNEL);
        if (!buf)
                return -ENOMEM;
@@ -1011,7 +1041,7 @@ static ssize_t iwl_dbgfs_rx_queue_read(struct file *file,
                                                char __user *user_buf,
                                                size_t count, loff_t *ppos) {
 
-       struct iwl_priv *priv = (struct iwl_priv *)file->private_data;
+       struct iwl_priv *priv = file->private_data;
        struct iwl_rx_queue *rxq = &priv->rxq;
        char buf[256];
        int pos = 0;
@@ -1028,10 +1058,6 @@ static ssize_t iwl_dbgfs_rx_queue_read(struct file *file,
        return simple_read_from_buffer(user_buf, count, ppos, buf, pos);
 }
 
-#define UCODE_STATISTICS_CLEAR_MSK             (0x1 << 0)
-#define UCODE_STATISTICS_FREQUENCY_MSK         (0x1 << 1)
-#define UCODE_STATISTICS_NARROW_BAND_MSK       (0x1 << 2)
-
 static int iwl_dbgfs_statistics_flag(struct iwl_priv *priv, char *buf,
                                     int bufsz)
 {
@@ -1056,29 +1082,36 @@ static int iwl_dbgfs_statistics_flag(struct iwl_priv *priv, char *buf,
        return p;
 }
 
+static const char ucode_stats_header[] =
+       "%-32s     current  acumulative       delta         max\n";
+static const char ucode_stats_short_format[] =
+       "  %-30s %10u\n";
+static const char ucode_stats_format[] =
+       "  %-30s %10u  %10u  %10u  %10u\n";
 
 static ssize_t iwl_dbgfs_ucode_rx_stats_read(struct file *file,
                                        char __user *user_buf,
                                        size_t count, loff_t *ppos)
 {
-       struct iwl_priv *priv = (struct iwl_priv *)file->private_data;
+       struct iwl_priv *priv = file->private_data;
        int pos = 0;
        char *buf;
-       int bufsz = sizeof(struct statistics_rx_phy) * 20 +
-               sizeof(struct statistics_rx_non_phy) * 20 +
-               sizeof(struct statistics_rx_ht_phy) * 20 + 400;
+       int bufsz = sizeof(struct statistics_rx_phy) * 40 +
+               sizeof(struct statistics_rx_non_phy) * 40 +
+               sizeof(struct statistics_rx_ht_phy) * 40 + 400;
        ssize_t ret;
-       struct statistics_rx_phy *ofdm;
-       struct statistics_rx_phy *cck;
-       struct statistics_rx_non_phy *general;
-       struct statistics_rx_ht_phy *ht;
+       struct statistics_rx_phy *ofdm, *accum_ofdm, *delta_ofdm, *max_ofdm;
+       struct statistics_rx_phy *cck, *accum_cck, *delta_cck, *max_cck;
+       struct statistics_rx_non_phy *general, *accum_general;
+       struct statistics_rx_non_phy *delta_general, *max_general;
+       struct statistics_rx_ht_phy *ht, *accum_ht, *delta_ht, *max_ht;
 
        if (!iwl_is_alive(priv))
                return -EAGAIN;
 
        /* make request to uCode to retrieve statistics information */
        mutex_lock(&priv->mutex);
-       ret = iwl_send_statistics_request(priv, 0);
+       ret = iwl_send_statistics_request(priv, CMD_SYNC, false);
        mutex_unlock(&priv->mutex);
 
        if (ret) {
@@ -1100,155 +1133,405 @@ static ssize_t iwl_dbgfs_ucode_rx_stats_read(struct file *file,
        cck = &priv->statistics.rx.cck;
        general = &priv->statistics.rx.general;
        ht = &priv->statistics.rx.ofdm_ht;
+       accum_ofdm = &priv->accum_statistics.rx.ofdm;
+       accum_cck = &priv->accum_statistics.rx.cck;
+       accum_general = &priv->accum_statistics.rx.general;
+       accum_ht = &priv->accum_statistics.rx.ofdm_ht;
+       delta_ofdm = &priv->delta_statistics.rx.ofdm;
+       delta_cck = &priv->delta_statistics.rx.cck;
+       delta_general = &priv->delta_statistics.rx.general;
+       delta_ht = &priv->delta_statistics.rx.ofdm_ht;
+       max_ofdm = &priv->max_delta.rx.ofdm;
+       max_cck = &priv->max_delta.rx.cck;
+       max_general = &priv->max_delta.rx.general;
+       max_ht = &priv->max_delta.rx.ofdm_ht;
+
        pos += iwl_dbgfs_statistics_flag(priv, buf, bufsz);
-       pos += scnprintf(buf + pos, bufsz - pos, "Statistics_Rx - OFDM:\n");
-       pos += scnprintf(buf + pos, bufsz - pos, "ina_cnt: %u\n",
-                        le32_to_cpu(ofdm->ina_cnt));
-       pos += scnprintf(buf + pos, bufsz - pos, "fina_cnt: %u\n",
-                        le32_to_cpu(ofdm->fina_cnt));
-       pos += scnprintf(buf + pos, bufsz - pos, "plcp_err: %u\n",
-                        le32_to_cpu(ofdm->plcp_err));
-       pos += scnprintf(buf + pos, bufsz - pos, "crc32_err: %u\n",
-                        le32_to_cpu(ofdm->crc32_err));
-       pos += scnprintf(buf + pos, bufsz - pos, "overrun_err: %u\n",
-                        le32_to_cpu(ofdm->overrun_err));
-       pos += scnprintf(buf + pos, bufsz - pos, "early_overrun_err: %u\n",
-                        le32_to_cpu(ofdm->early_overrun_err));
-       pos += scnprintf(buf + pos, bufsz - pos, "crc32_good: %u\n",
-                        le32_to_cpu(ofdm->crc32_good));
-       pos += scnprintf(buf + pos, bufsz - pos, "false_alarm_cnt: %u\n",
-                        le32_to_cpu(ofdm->false_alarm_cnt));
-       pos += scnprintf(buf + pos, bufsz - pos, "fina_sync_err_cnt: %u\n",
-                        le32_to_cpu(ofdm->fina_sync_err_cnt));
-       pos += scnprintf(buf + pos, bufsz - pos, "sfd_timeout: %u\n",
-                        le32_to_cpu(ofdm->sfd_timeout));
-       pos += scnprintf(buf + pos, bufsz - pos, "fina_timeout: %u\n",
-                        le32_to_cpu(ofdm->fina_timeout));
-       pos += scnprintf(buf + pos, bufsz - pos, "unresponded_rts: %u\n",
-                        le32_to_cpu(ofdm->unresponded_rts));
-       pos += scnprintf(buf + pos, bufsz - pos,
-                       "rxe_frame_limit_overrun: %u\n",
-                       le32_to_cpu(ofdm->rxe_frame_limit_overrun));
-       pos += scnprintf(buf + pos, bufsz - pos, "sent_ack_cnt: %u\n",
-                        le32_to_cpu(ofdm->sent_ack_cnt));
-       pos += scnprintf(buf + pos, bufsz - pos, "sent_cts_cnt: %u\n",
-                        le32_to_cpu(ofdm->sent_cts_cnt));
-       pos += scnprintf(buf + pos, bufsz - pos, "sent_ba_rsp_cnt: %u\n",
-                        le32_to_cpu(ofdm->sent_ba_rsp_cnt));
-       pos += scnprintf(buf + pos, bufsz - pos, "dsp_self_kill: %u\n",
-                        le32_to_cpu(ofdm->dsp_self_kill));
-       pos += scnprintf(buf + pos, bufsz - pos, "mh_format_err: %u\n",
-                        le32_to_cpu(ofdm->mh_format_err));
-       pos += scnprintf(buf + pos, bufsz - pos, "re_acq_main_rssi_sum: %u\n",
-                        le32_to_cpu(ofdm->re_acq_main_rssi_sum));
-
-       pos += scnprintf(buf + pos, bufsz - pos, "Statistics_Rx - CCK:\n");
-       pos += scnprintf(buf + pos, bufsz - pos, "ina_cnt: %u\n",
-                        le32_to_cpu(cck->ina_cnt));
-       pos += scnprintf(buf + pos, bufsz - pos, "fina_cnt: %u\n",
-                        le32_to_cpu(cck->fina_cnt));
-       pos += scnprintf(buf + pos, bufsz - pos, "plcp_err: %u\n",
-                        le32_to_cpu(cck->plcp_err));
-       pos += scnprintf(buf + pos, bufsz - pos, "crc32_err: %u\n",
-                        le32_to_cpu(cck->crc32_err));
-       pos += scnprintf(buf + pos, bufsz - pos, "overrun_err: %u\n",
-                        le32_to_cpu(cck->overrun_err));
-       pos += scnprintf(buf + pos, bufsz - pos, "early_overrun_err: %u\n",
-                        le32_to_cpu(cck->early_overrun_err));
-       pos += scnprintf(buf + pos, bufsz - pos, "crc32_good: %u\n",
-                        le32_to_cpu(cck->crc32_good));
-       pos += scnprintf(buf + pos, bufsz - pos, "false_alarm_cnt: %u\n",
-                        le32_to_cpu(cck->false_alarm_cnt));
-       pos += scnprintf(buf + pos, bufsz - pos, "fina_sync_err_cnt: %u\n",
-                        le32_to_cpu(cck->fina_sync_err_cnt));
-       pos += scnprintf(buf + pos, bufsz - pos, "sfd_timeout: %u\n",
-                        le32_to_cpu(cck->sfd_timeout));
-       pos += scnprintf(buf + pos, bufsz - pos, "fina_timeout: %u\n",
-                        le32_to_cpu(cck->fina_timeout));
-       pos += scnprintf(buf + pos, bufsz - pos, "unresponded_rts: %u\n",
-                        le32_to_cpu(cck->unresponded_rts));
-       pos += scnprintf(buf + pos, bufsz - pos,
-                       "rxe_frame_limit_overrun: %u\n",
-                       le32_to_cpu(cck->rxe_frame_limit_overrun));
-       pos += scnprintf(buf + pos, bufsz - pos, "sent_ack_cnt: %u\n",
-                        le32_to_cpu(cck->sent_ack_cnt));
-       pos += scnprintf(buf + pos, bufsz - pos, "sent_cts_cnt: %u\n",
-                        le32_to_cpu(cck->sent_cts_cnt));
-       pos += scnprintf(buf + pos, bufsz - pos, "sent_ba_rsp_cnt: %u\n",
-                        le32_to_cpu(cck->sent_ba_rsp_cnt));
-       pos += scnprintf(buf + pos, bufsz - pos, "dsp_self_kill: %u\n",
-                        le32_to_cpu(cck->dsp_self_kill));
-       pos += scnprintf(buf + pos, bufsz - pos, "mh_format_err: %u\n",
-                        le32_to_cpu(cck->mh_format_err));
-       pos += scnprintf(buf + pos, bufsz - pos, "re_acq_main_rssi_sum: %u\n",
-                        le32_to_cpu(cck->re_acq_main_rssi_sum));
-
-       pos += scnprintf(buf + pos, bufsz - pos, "Statistics_Rx - GENERAL:\n");
-       pos += scnprintf(buf + pos, bufsz - pos, "bogus_cts: %u\n",
-                        le32_to_cpu(general->bogus_cts));
-       pos += scnprintf(buf + pos, bufsz - pos, "bogus_ack: %u\n",
-                        le32_to_cpu(general->bogus_ack));
-       pos += scnprintf(buf + pos, bufsz - pos, "non_bssid_frames: %u\n",
-                        le32_to_cpu(general->non_bssid_frames));
-       pos += scnprintf(buf + pos, bufsz - pos, "filtered_frames: %u\n",
-                        le32_to_cpu(general->filtered_frames));
-       pos += scnprintf(buf + pos, bufsz - pos, "non_channel_beacons: %u\n",
-                        le32_to_cpu(general->non_channel_beacons));
-       pos += scnprintf(buf + pos, bufsz - pos, "channel_beacons: %u\n",
-                        le32_to_cpu(general->channel_beacons));
-       pos += scnprintf(buf + pos, bufsz - pos, "num_missed_bcon: %u\n",
-                        le32_to_cpu(general->num_missed_bcon));
-       pos += scnprintf(buf + pos, bufsz - pos,
-                       "adc_rx_saturation_time: %u\n",
-                       le32_to_cpu(general->adc_rx_saturation_time));
-       pos += scnprintf(buf + pos, bufsz - pos,
-                       "ina_detection_search_time: %u\n",
-                       le32_to_cpu(general->ina_detection_search_time));
-       pos += scnprintf(buf + pos, bufsz - pos, "beacon_silence_rssi_a: %u\n",
-                        le32_to_cpu(general->beacon_silence_rssi_a));
-       pos += scnprintf(buf + pos, bufsz - pos, "beacon_silence_rssi_b: %u\n",
-                        le32_to_cpu(general->beacon_silence_rssi_b));
-       pos += scnprintf(buf + pos, bufsz - pos, "beacon_silence_rssi_c: %u\n",
-                        le32_to_cpu(general->beacon_silence_rssi_c));
-       pos += scnprintf(buf + pos, bufsz - pos,
-                       "interference_data_flag: %u\n",
-                       le32_to_cpu(general->interference_data_flag));
-       pos += scnprintf(buf + pos, bufsz - pos, "channel_load: %u\n",
-                        le32_to_cpu(general->channel_load));
-       pos += scnprintf(buf + pos, bufsz - pos, "dsp_false_alarms: %u\n",
-                        le32_to_cpu(general->dsp_false_alarms));
-       pos += scnprintf(buf + pos, bufsz - pos, "beacon_rssi_a: %u\n",
-                        le32_to_cpu(general->beacon_rssi_a));
-       pos += scnprintf(buf + pos, bufsz - pos, "beacon_rssi_b: %u\n",
-                        le32_to_cpu(general->beacon_rssi_b));
-       pos += scnprintf(buf + pos, bufsz - pos, "beacon_rssi_c: %u\n",
-                        le32_to_cpu(general->beacon_rssi_c));
-       pos += scnprintf(buf + pos, bufsz - pos, "beacon_energy_a: %u\n",
-                        le32_to_cpu(general->beacon_energy_a));
-       pos += scnprintf(buf + pos, bufsz - pos, "beacon_energy_b: %u\n",
-                        le32_to_cpu(general->beacon_energy_b));
-       pos += scnprintf(buf + pos, bufsz - pos, "beacon_energy_c: %u\n",
-                        le32_to_cpu(general->beacon_energy_c));
+       pos += scnprintf(buf + pos, bufsz - pos, ucode_stats_header,
+                        "Statistics_Rx - OFDM:");
+       pos += scnprintf(buf + pos, bufsz - pos, ucode_stats_format,
+                        "ina_cnt:", le32_to_cpu(ofdm->ina_cnt),
+                        accum_ofdm->ina_cnt,
+                        delta_ofdm->ina_cnt, max_ofdm->ina_cnt);
+       pos += scnprintf(buf + pos, bufsz - pos, ucode_stats_format,
+                        "fina_cnt:",
+                        le32_to_cpu(ofdm->fina_cnt), accum_ofdm->fina_cnt,
+                        delta_ofdm->fina_cnt, max_ofdm->fina_cnt);
+       pos += scnprintf(buf + pos, bufsz - pos, ucode_stats_format,
+                        "plcp_err:",
+                        le32_to_cpu(ofdm->plcp_err), accum_ofdm->plcp_err,
+                        delta_ofdm->plcp_err, max_ofdm->plcp_err);
+       pos += scnprintf(buf + pos, bufsz - pos, ucode_stats_format,
+                        "crc32_err:",
+                        le32_to_cpu(ofdm->crc32_err), accum_ofdm->crc32_err,
+                        delta_ofdm->crc32_err, max_ofdm->crc32_err);
+       pos += scnprintf(buf + pos, bufsz - pos, ucode_stats_format,
+                        "overrun_err:",
+                        le32_to_cpu(ofdm->overrun_err),
+                        accum_ofdm->overrun_err,
+                        delta_ofdm->overrun_err, max_ofdm->overrun_err);
+       pos += scnprintf(buf + pos, bufsz - pos, ucode_stats_format,
+                        "early_overrun_err:",
+                        le32_to_cpu(ofdm->early_overrun_err),
+                        accum_ofdm->early_overrun_err,
+                        delta_ofdm->early_overrun_err,
+                        max_ofdm->early_overrun_err);
+       pos += scnprintf(buf + pos, bufsz - pos, ucode_stats_format,
+                        "crc32_good:",
+                        le32_to_cpu(ofdm->crc32_good),
+                        accum_ofdm->crc32_good,
+                        delta_ofdm->crc32_good, max_ofdm->crc32_good);
+       pos += scnprintf(buf + pos, bufsz - pos, ucode_stats_format,
+                        "false_alarm_cnt:",
+                        le32_to_cpu(ofdm->false_alarm_cnt),
+                        accum_ofdm->false_alarm_cnt,
+                        delta_ofdm->false_alarm_cnt,
+                        max_ofdm->false_alarm_cnt);
+       pos += scnprintf(buf + pos, bufsz - pos, ucode_stats_format,
+                        "fina_sync_err_cnt:",
+                        le32_to_cpu(ofdm->fina_sync_err_cnt),
+                        accum_ofdm->fina_sync_err_cnt,
+                        delta_ofdm->fina_sync_err_cnt,
+                        max_ofdm->fina_sync_err_cnt);
+       pos += scnprintf(buf + pos, bufsz - pos, ucode_stats_format,
+                        "sfd_timeout:",
+                        le32_to_cpu(ofdm->sfd_timeout),
+                        accum_ofdm->sfd_timeout,
+                        delta_ofdm->sfd_timeout,
+                        max_ofdm->sfd_timeout);
+       pos += scnprintf(buf + pos, bufsz - pos, ucode_stats_format,
+                        "fina_timeout:",
+                        le32_to_cpu(ofdm->fina_timeout),
+                        accum_ofdm->fina_timeout,
+                        delta_ofdm->fina_timeout,
+                        max_ofdm->fina_timeout);
+       pos += scnprintf(buf + pos, bufsz - pos, ucode_stats_format,
+                        "unresponded_rts:",
+                        le32_to_cpu(ofdm->unresponded_rts),
+                        accum_ofdm->unresponded_rts,
+                        delta_ofdm->unresponded_rts,
+                        max_ofdm->unresponded_rts);
+       pos += scnprintf(buf + pos, bufsz - pos, ucode_stats_format,
+                       "rxe_frame_lmt_ovrun:",
+                        le32_to_cpu(ofdm->rxe_frame_limit_overrun),
+                        accum_ofdm->rxe_frame_limit_overrun,
+                        delta_ofdm->rxe_frame_limit_overrun,
+                        max_ofdm->rxe_frame_limit_overrun);
+       pos += scnprintf(buf + pos, bufsz - pos, ucode_stats_format,
+                        "sent_ack_cnt:",
+                        le32_to_cpu(ofdm->sent_ack_cnt),
+                        accum_ofdm->sent_ack_cnt,
+                        delta_ofdm->sent_ack_cnt,
+                        max_ofdm->sent_ack_cnt);
+       pos += scnprintf(buf + pos, bufsz - pos, ucode_stats_format,
+                        "sent_cts_cnt:",
+                        le32_to_cpu(ofdm->sent_cts_cnt),
+                        accum_ofdm->sent_cts_cnt,
+                        delta_ofdm->sent_cts_cnt, max_ofdm->sent_cts_cnt);
+       pos += scnprintf(buf + pos, bufsz - pos, ucode_stats_format,
+                        "sent_ba_rsp_cnt:",
+                        le32_to_cpu(ofdm->sent_ba_rsp_cnt),
+                        accum_ofdm->sent_ba_rsp_cnt,
+                        delta_ofdm->sent_ba_rsp_cnt,
+                        max_ofdm->sent_ba_rsp_cnt);
+       pos += scnprintf(buf + pos, bufsz - pos, ucode_stats_format,
+                        "dsp_self_kill:",
+                        le32_to_cpu(ofdm->dsp_self_kill),
+                        accum_ofdm->dsp_self_kill,
+                        delta_ofdm->dsp_self_kill,
+                        max_ofdm->dsp_self_kill);
+       pos += scnprintf(buf + pos, bufsz - pos, ucode_stats_format,
+                        "mh_format_err:",
+                        le32_to_cpu(ofdm->mh_format_err),
+                        accum_ofdm->mh_format_err,
+                        delta_ofdm->mh_format_err,
+                        max_ofdm->mh_format_err);
+       pos += scnprintf(buf + pos, bufsz - pos, ucode_stats_format,
+                        "re_acq_main_rssi_sum:",
+                        le32_to_cpu(ofdm->re_acq_main_rssi_sum),
+                        accum_ofdm->re_acq_main_rssi_sum,
+                        delta_ofdm->re_acq_main_rssi_sum,
+                       max_ofdm->re_acq_main_rssi_sum);
+
+       pos += scnprintf(buf + pos, bufsz - pos, ucode_stats_header,
+                        "Statistics_Rx - CCK:");
+       pos += scnprintf(buf + pos, bufsz - pos, ucode_stats_format,
+                        "ina_cnt:",
+                        le32_to_cpu(cck->ina_cnt), accum_cck->ina_cnt,
+                        delta_cck->ina_cnt, max_cck->ina_cnt);
+       pos += scnprintf(buf + pos, bufsz - pos, ucode_stats_format,
+                        "fina_cnt:",
+                        le32_to_cpu(cck->fina_cnt), accum_cck->fina_cnt,
+                        delta_cck->fina_cnt, max_cck->fina_cnt);
+       pos += scnprintf(buf + pos, bufsz - pos, ucode_stats_format,
+                        "plcp_err:",
+                        le32_to_cpu(cck->plcp_err), accum_cck->plcp_err,
+                        delta_cck->plcp_err, max_cck->plcp_err);
+       pos += scnprintf(buf + pos, bufsz - pos, ucode_stats_format,
+                        "crc32_err:",
+                        le32_to_cpu(cck->crc32_err), accum_cck->crc32_err,
+                        delta_cck->crc32_err, max_cck->crc32_err);
+       pos += scnprintf(buf + pos, bufsz - pos, ucode_stats_format,
+                        "overrun_err:",
+                        le32_to_cpu(cck->overrun_err),
+                        accum_cck->overrun_err,
+                        delta_cck->overrun_err, max_cck->overrun_err);
+       pos += scnprintf(buf + pos, bufsz - pos, ucode_stats_format,
+                        "early_overrun_err:",
+                        le32_to_cpu(cck->early_overrun_err),
+                        accum_cck->early_overrun_err,
+                        delta_cck->early_overrun_err,
+                        max_cck->early_overrun_err);
+       pos += scnprintf(buf + pos, bufsz - pos, ucode_stats_format,
+                        "crc32_good:",
+                        le32_to_cpu(cck->crc32_good), accum_cck->crc32_good,
+                        delta_cck->crc32_good,
+                        max_cck->crc32_good);
+       pos += scnprintf(buf + pos, bufsz - pos, ucode_stats_format,
+                        "false_alarm_cnt:",
+                        le32_to_cpu(cck->false_alarm_cnt),
+                        accum_cck->false_alarm_cnt,
+                        delta_cck->false_alarm_cnt, max_cck->false_alarm_cnt);
+       pos += scnprintf(buf + pos, bufsz - pos, ucode_stats_format,
+                        "fina_sync_err_cnt:",
+                        le32_to_cpu(cck->fina_sync_err_cnt),
+                        accum_cck->fina_sync_err_cnt,
+                        delta_cck->fina_sync_err_cnt,
+                        max_cck->fina_sync_err_cnt);
+       pos += scnprintf(buf + pos, bufsz - pos, ucode_stats_format,
+                        "sfd_timeout:",
+                        le32_to_cpu(cck->sfd_timeout),
+                        accum_cck->sfd_timeout,
+                        delta_cck->sfd_timeout, max_cck->sfd_timeout);
+       pos += scnprintf(buf + pos, bufsz - pos, ucode_stats_format,
+                        "fina_timeout:",
+                        le32_to_cpu(cck->fina_timeout),
+                        accum_cck->fina_timeout,
+                        delta_cck->fina_timeout, max_cck->fina_timeout);
+       pos += scnprintf(buf + pos, bufsz - pos, ucode_stats_format,
+                        "unresponded_rts:",
+                        le32_to_cpu(cck->unresponded_rts),
+                        accum_cck->unresponded_rts,
+                        delta_cck->unresponded_rts,
+                        max_cck->unresponded_rts);
+       pos += scnprintf(buf + pos, bufsz - pos, ucode_stats_format,
+                       "rxe_frame_lmt_ovrun:",
+                        le32_to_cpu(cck->rxe_frame_limit_overrun),
+                        accum_cck->rxe_frame_limit_overrun,
+                        delta_cck->rxe_frame_limit_overrun,
+                        max_cck->rxe_frame_limit_overrun);
+       pos += scnprintf(buf + pos, bufsz - pos, ucode_stats_format,
+                        "sent_ack_cnt:",
+                        le32_to_cpu(cck->sent_ack_cnt),
+                        accum_cck->sent_ack_cnt,
+                        delta_cck->sent_ack_cnt,
+                        max_cck->sent_ack_cnt);
+       pos += scnprintf(buf + pos, bufsz - pos, ucode_stats_format,
+                        "sent_cts_cnt:",
+                        le32_to_cpu(cck->sent_cts_cnt),
+                        accum_cck->sent_cts_cnt,
+                        delta_cck->sent_cts_cnt,
+                        max_cck->sent_cts_cnt);
+       pos += scnprintf(buf + pos, bufsz - pos, ucode_stats_format,
+                        "sent_ba_rsp_cnt:",
+                        le32_to_cpu(cck->sent_ba_rsp_cnt),
+                        accum_cck->sent_ba_rsp_cnt,
+                        delta_cck->sent_ba_rsp_cnt,
+                        max_cck->sent_ba_rsp_cnt);
+       pos += scnprintf(buf + pos, bufsz - pos, ucode_stats_format,
+                        "dsp_self_kill:",
+                        le32_to_cpu(cck->dsp_self_kill),
+                        accum_cck->dsp_self_kill,
+                        delta_cck->dsp_self_kill,
+                        max_cck->dsp_self_kill);
+       pos += scnprintf(buf + pos, bufsz - pos, ucode_stats_format,
+                        "mh_format_err:",
+                        le32_to_cpu(cck->mh_format_err),
+                        accum_cck->mh_format_err,
+                        delta_cck->mh_format_err, max_cck->mh_format_err);
+       pos += scnprintf(buf + pos, bufsz - pos, ucode_stats_format,
+                        "re_acq_main_rssi_sum:",
+                        le32_to_cpu(cck->re_acq_main_rssi_sum),
+                        accum_cck->re_acq_main_rssi_sum,
+                        delta_cck->re_acq_main_rssi_sum,
+                        max_cck->re_acq_main_rssi_sum);
+
+       pos += scnprintf(buf + pos, bufsz - pos, ucode_stats_header,
+                       "Statistics_Rx - GENERAL:");
+       pos += scnprintf(buf + pos, bufsz - pos, ucode_stats_format,
+                        "bogus_cts:",
+                        le32_to_cpu(general->bogus_cts),
+                        accum_general->bogus_cts,
+                        delta_general->bogus_cts, max_general->bogus_cts);
+       pos += scnprintf(buf + pos, bufsz - pos, ucode_stats_format,
+                        "bogus_ack:",
+                        le32_to_cpu(general->bogus_ack),
+                        accum_general->bogus_ack,
+                        delta_general->bogus_ack, max_general->bogus_ack);
+       pos += scnprintf(buf + pos, bufsz - pos, ucode_stats_format,
+                        "non_bssid_frames:",
+                        le32_to_cpu(general->non_bssid_frames),
+                        accum_general->non_bssid_frames,
+                        delta_general->non_bssid_frames,
+                        max_general->non_bssid_frames);
+       pos += scnprintf(buf + pos, bufsz - pos, ucode_stats_format,
+                        "filtered_frames:",
+                        le32_to_cpu(general->filtered_frames),
+                        accum_general->filtered_frames,
+                        delta_general->filtered_frames,
+                        max_general->filtered_frames);
+       pos += scnprintf(buf + pos, bufsz - pos, ucode_stats_format,
+                        "non_channel_beacons:",
+                        le32_to_cpu(general->non_channel_beacons),
+                        accum_general->non_channel_beacons,
+                        delta_general->non_channel_beacons,
+                        max_general->non_channel_beacons);
+       pos += scnprintf(buf + pos, bufsz - pos, ucode_stats_format,
+                        "channel_beacons:",
+                        le32_to_cpu(general->channel_beacons),
+                        accum_general->channel_beacons,
+                        delta_general->channel_beacons,
+                        max_general->channel_beacons);
+       pos += scnprintf(buf + pos, bufsz - pos, ucode_stats_format,
+                        "num_missed_bcon:",
+                        le32_to_cpu(general->num_missed_bcon),
+                        accum_general->num_missed_bcon,
+                        delta_general->num_missed_bcon,
+                        max_general->num_missed_bcon);
+       pos += scnprintf(buf + pos, bufsz - pos, ucode_stats_format,
+                       "adc_rx_saturation_time:",
+                        le32_to_cpu(general->adc_rx_saturation_time),
+                        accum_general->adc_rx_saturation_time,
+                        delta_general->adc_rx_saturation_time,
+                        max_general->adc_rx_saturation_time);
+       pos += scnprintf(buf + pos, bufsz - pos, ucode_stats_format,
+                       "ina_detect_search_tm:",
+                        le32_to_cpu(general->ina_detection_search_time),
+                        accum_general->ina_detection_search_time,
+                        delta_general->ina_detection_search_time,
+                        max_general->ina_detection_search_time);
+       pos += scnprintf(buf + pos, bufsz - pos, ucode_stats_format,
+                        "beacon_silence_rssi_a:",
+                        le32_to_cpu(general->beacon_silence_rssi_a),
+                        accum_general->beacon_silence_rssi_a,
+                        delta_general->beacon_silence_rssi_a,
+                        max_general->beacon_silence_rssi_a);
+       pos += scnprintf(buf + pos, bufsz - pos, ucode_stats_format,
+                        "beacon_silence_rssi_b:",
+                        le32_to_cpu(general->beacon_silence_rssi_b),
+                        accum_general->beacon_silence_rssi_b,
+                        delta_general->beacon_silence_rssi_b,
+                        max_general->beacon_silence_rssi_b);
+       pos += scnprintf(buf + pos, bufsz - pos, ucode_stats_format,
+                        "beacon_silence_rssi_c:",
+                        le32_to_cpu(general->beacon_silence_rssi_c),
+                        accum_general->beacon_silence_rssi_c,
+                        delta_general->beacon_silence_rssi_c,
+                        max_general->beacon_silence_rssi_c);
+       pos += scnprintf(buf + pos, bufsz - pos, ucode_stats_format,
+                       "interference_data_flag:",
+                        le32_to_cpu(general->interference_data_flag),
+                        accum_general->interference_data_flag,
+                        delta_general->interference_data_flag,
+                        max_general->interference_data_flag);
+       pos += scnprintf(buf + pos, bufsz - pos, ucode_stats_format,
+                        "channel_load:",
+                        le32_to_cpu(general->channel_load),
+                        accum_general->channel_load,
+                        delta_general->channel_load,
+                        max_general->channel_load);
+       pos += scnprintf(buf + pos, bufsz - pos, ucode_stats_format,
+                        "dsp_false_alarms:",
+                        le32_to_cpu(general->dsp_false_alarms),
+                        accum_general->dsp_false_alarms,
+                        delta_general->dsp_false_alarms,
+                        max_general->dsp_false_alarms);
+       pos += scnprintf(buf + pos, bufsz - pos, ucode_stats_format,
+                        "beacon_rssi_a:",
+                        le32_to_cpu(general->beacon_rssi_a),
+                        accum_general->beacon_rssi_a,
+                        delta_general->beacon_rssi_a,
+                        max_general->beacon_rssi_a);
+       pos += scnprintf(buf + pos, bufsz - pos, ucode_stats_format,
+                        "beacon_rssi_b:",
+                        le32_to_cpu(general->beacon_rssi_b),
+                        accum_general->beacon_rssi_b,
+                        delta_general->beacon_rssi_b,
+                        max_general->beacon_rssi_b);
+       pos += scnprintf(buf + pos, bufsz - pos, ucode_stats_format,
+                        "beacon_rssi_c:",
+                        le32_to_cpu(general->beacon_rssi_c),
+                        accum_general->beacon_rssi_c,
+                        delta_general->beacon_rssi_c,
+                        max_general->beacon_rssi_c);
+       pos += scnprintf(buf + pos, bufsz - pos, ucode_stats_format,
+                        "beacon_energy_a:",
+                        le32_to_cpu(general->beacon_energy_a),
+                        accum_general->beacon_energy_a,
+                        delta_general->beacon_energy_a,
+                        max_general->beacon_energy_a);
+       pos += scnprintf(buf + pos, bufsz - pos, ucode_stats_format,
+                        "beacon_energy_b:",
+                        le32_to_cpu(general->beacon_energy_b),
+                        accum_general->beacon_energy_b,
+                        delta_general->beacon_energy_b,
+                        max_general->beacon_energy_b);
+       pos += scnprintf(buf + pos, bufsz - pos, ucode_stats_format,
+                        "beacon_energy_c:",
+                        le32_to_cpu(general->beacon_energy_c),
+                        accum_general->beacon_energy_c,
+                        delta_general->beacon_energy_c,
+                        max_general->beacon_energy_c);
 
        pos += scnprintf(buf + pos, bufsz - pos, "Statistics_Rx - OFDM_HT:\n");
-       pos += scnprintf(buf + pos, bufsz - pos, "plcp_err: %u\n",
-                        le32_to_cpu(ht->plcp_err));
-       pos += scnprintf(buf + pos, bufsz - pos, "overrun_err: %u\n",
-                        le32_to_cpu(ht->overrun_err));
-       pos += scnprintf(buf + pos, bufsz - pos, "early_overrun_err: %u\n",
-                        le32_to_cpu(ht->early_overrun_err));
-       pos += scnprintf(buf + pos, bufsz - pos, "crc32_good: %u\n",
-                        le32_to_cpu(ht->crc32_good));
-       pos += scnprintf(buf + pos, bufsz - pos, "crc32_err: %u\n",
-                        le32_to_cpu(ht->crc32_err));
-       pos += scnprintf(buf + pos, bufsz - pos, "mh_format_err: %u\n",
-                        le32_to_cpu(ht->mh_format_err));
-       pos += scnprintf(buf + pos, bufsz - pos, "agg_crc32_good: %u\n",
-                        le32_to_cpu(ht->agg_crc32_good));
-       pos += scnprintf(buf + pos, bufsz - pos, "agg_mpdu_cnt: %u\n",
-                        le32_to_cpu(ht->agg_mpdu_cnt));
-       pos += scnprintf(buf + pos, bufsz - pos, "agg_cnt: %u\n",
-                        le32_to_cpu(ht->agg_cnt));
+       pos += scnprintf(buf + pos, bufsz - pos, ucode_stats_header,
+                       "Statistics_Rx - OFDM_HT:");
+       pos += scnprintf(buf + pos, bufsz - pos, ucode_stats_format,
+                        "plcp_err:",
+                        le32_to_cpu(ht->plcp_err), accum_ht->plcp_err,
+                        delta_ht->plcp_err, max_ht->plcp_err);
+       pos += scnprintf(buf + pos, bufsz - pos, ucode_stats_format,
+                        "overrun_err:",
+                        le32_to_cpu(ht->overrun_err), accum_ht->overrun_err,
+                        delta_ht->overrun_err, max_ht->overrun_err);
+       pos += scnprintf(buf + pos, bufsz - pos, ucode_stats_format,
+                        "early_overrun_err:",
+                        le32_to_cpu(ht->early_overrun_err),
+                        accum_ht->early_overrun_err,
+                        delta_ht->early_overrun_err,
+                        max_ht->early_overrun_err);
+       pos += scnprintf(buf + pos, bufsz - pos, ucode_stats_format,
+                        "crc32_good:",
+                        le32_to_cpu(ht->crc32_good), accum_ht->crc32_good,
+                        delta_ht->crc32_good, max_ht->crc32_good);
+       pos += scnprintf(buf + pos, bufsz - pos, ucode_stats_format,
+                        "crc32_err:",
+                        le32_to_cpu(ht->crc32_err), accum_ht->crc32_err,
+                        delta_ht->crc32_err, max_ht->crc32_err);
+       pos += scnprintf(buf + pos, bufsz - pos, ucode_stats_format,
+                        "mh_format_err:",
+                        le32_to_cpu(ht->mh_format_err),
+                        accum_ht->mh_format_err,
+                        delta_ht->mh_format_err, max_ht->mh_format_err);
+       pos += scnprintf(buf + pos, bufsz - pos, ucode_stats_format,
+                        "agg_crc32_good:",
+                        le32_to_cpu(ht->agg_crc32_good),
+                        accum_ht->agg_crc32_good,
+                        delta_ht->agg_crc32_good, max_ht->agg_crc32_good);
+       pos += scnprintf(buf + pos, bufsz - pos, ucode_stats_format,
+                        "agg_mpdu_cnt:",
+                        le32_to_cpu(ht->agg_mpdu_cnt),
+                        accum_ht->agg_mpdu_cnt,
+                        delta_ht->agg_mpdu_cnt, max_ht->agg_mpdu_cnt);
+       pos += scnprintf(buf + pos, bufsz - pos, ucode_stats_format,
+                        "agg_cnt:",
+                        le32_to_cpu(ht->agg_cnt), accum_ht->agg_cnt,
+                        delta_ht->agg_cnt, max_ht->agg_cnt);
+       pos += scnprintf(buf + pos, bufsz - pos, ucode_stats_format,
+                        "unsupport_mcs:",
+                        le32_to_cpu(ht->unsupport_mcs),
+                        accum_ht->unsupport_mcs,
+                        delta_ht->unsupport_mcs, max_ht->unsupport_mcs);
 
        ret = simple_read_from_buffer(user_buf, count, ppos, buf, pos);
        kfree(buf);
@@ -1259,19 +1542,19 @@ static ssize_t iwl_dbgfs_ucode_tx_stats_read(struct file *file,
                                        char __user *user_buf,
                                        size_t count, loff_t *ppos)
 {
-       struct iwl_priv *priv = (struct iwl_priv *)file->private_data;
+       struct iwl_priv *priv = file->private_data;
        int pos = 0;
        char *buf;
-       int bufsz = (sizeof(struct statistics_tx) * 24) + 250;
+       int bufsz = (sizeof(struct statistics_tx) * 48) + 250;
        ssize_t ret;
-       struct statistics_tx *tx;
+       struct statistics_tx *tx, *accum_tx, *delta_tx, *max_tx;
 
        if (!iwl_is_alive(priv))
                return -EAGAIN;
 
        /* make request to uCode to retrieve statistics information */
        mutex_lock(&priv->mutex);
-       ret = iwl_send_statistics_request(priv, 0);
+       ret = iwl_send_statistics_request(priv, CMD_SYNC, false);
        mutex_unlock(&priv->mutex);
 
        if (ret) {
@@ -1290,62 +1573,149 @@ static ssize_t iwl_dbgfs_ucode_tx_stats_read(struct file *file,
         * might not reflect the current uCode activity
         */
        tx = &priv->statistics.tx;
+       accum_tx = &priv->accum_statistics.tx;
+       delta_tx = &priv->delta_statistics.tx;
+       max_tx = &priv->max_delta.tx;
        pos += iwl_dbgfs_statistics_flag(priv, buf, bufsz);
-       pos += scnprintf(buf + pos, bufsz - pos, "Statistics_Tx:\n");
-       pos += scnprintf(buf + pos, bufsz - pos, "preamble: %u\n",
-                        le32_to_cpu(tx->preamble_cnt));
-       pos += scnprintf(buf + pos, bufsz - pos, "rx_detected_cnt: %u\n",
-                        le32_to_cpu(tx->rx_detected_cnt));
-       pos += scnprintf(buf + pos, bufsz - pos, "bt_prio_defer_cnt: %u\n",
-                        le32_to_cpu(tx->bt_prio_defer_cnt));
-       pos += scnprintf(buf + pos, bufsz - pos, "bt_prio_kill_cnt: %u\n",
-                        le32_to_cpu(tx->bt_prio_kill_cnt));
-       pos += scnprintf(buf + pos, bufsz - pos, "few_bytes_cnt: %u\n",
-                        le32_to_cpu(tx->few_bytes_cnt));
-       pos += scnprintf(buf + pos, bufsz - pos, "cts_timeout: %u\n",
-                        le32_to_cpu(tx->cts_timeout));
-       pos += scnprintf(buf + pos, bufsz - pos, "ack_timeout: %u\n",
-                        le32_to_cpu(tx->ack_timeout));
-       pos += scnprintf(buf + pos, bufsz - pos, "expected_ack_cnt: %u\n",
-                        le32_to_cpu(tx->expected_ack_cnt));
-       pos += scnprintf(buf + pos, bufsz - pos, "actual_ack_cnt: %u\n",
-                        le32_to_cpu(tx->actual_ack_cnt));
-       pos += scnprintf(buf + pos, bufsz - pos, "dump_msdu_cnt: %u\n",
-                        le32_to_cpu(tx->dump_msdu_cnt));
-       pos += scnprintf(buf + pos, bufsz - pos,
-                       "burst_abort_next_frame_mismatch_cnt: %u\n",
-                       le32_to_cpu(tx->burst_abort_next_frame_mismatch_cnt));
-       pos += scnprintf(buf + pos, bufsz - pos,
-                       "burst_abort_missing_next_frame_cnt: %u\n",
-                       le32_to_cpu(tx->burst_abort_missing_next_frame_cnt));
-       pos += scnprintf(buf + pos, bufsz - pos, "cts_timeout_collision: %u\n",
-                        le32_to_cpu(tx->cts_timeout_collision));
-       pos += scnprintf(buf + pos, bufsz - pos,
-                       "ack_or_ba_timeout_collision: %u\n",
-                       le32_to_cpu(tx->ack_or_ba_timeout_collision));
-       pos += scnprintf(buf + pos, bufsz - pos, "agg ba_timeout: %u\n",
-                        le32_to_cpu(tx->agg.ba_timeout));
-       pos += scnprintf(buf + pos, bufsz - pos,
-                       "agg ba_reschedule_frames: %u\n",
-                       le32_to_cpu(tx->agg.ba_reschedule_frames));
-       pos += scnprintf(buf + pos, bufsz - pos,
-                       "agg scd_query_agg_frame_cnt: %u\n",
-                       le32_to_cpu(tx->agg.scd_query_agg_frame_cnt));
-       pos += scnprintf(buf + pos, bufsz - pos, "agg scd_query_no_agg: %u\n",
-                        le32_to_cpu(tx->agg.scd_query_no_agg));
-       pos += scnprintf(buf + pos, bufsz - pos, "agg scd_query_agg: %u\n",
-                        le32_to_cpu(tx->agg.scd_query_agg));
-       pos += scnprintf(buf + pos, bufsz - pos,
-                       "agg scd_query_mismatch: %u\n",
-                       le32_to_cpu(tx->agg.scd_query_mismatch));
-       pos += scnprintf(buf + pos, bufsz - pos, "agg frame_not_ready: %u\n",
-                        le32_to_cpu(tx->agg.frame_not_ready));
-       pos += scnprintf(buf + pos, bufsz - pos, "agg underrun: %u\n",
-                        le32_to_cpu(tx->agg.underrun));
-       pos += scnprintf(buf + pos, bufsz - pos, "agg bt_prio_kill: %u\n",
-                        le32_to_cpu(tx->agg.bt_prio_kill));
-       pos += scnprintf(buf + pos, bufsz - pos, "agg rx_ba_rsp_cnt: %u\n",
-                        le32_to_cpu(tx->agg.rx_ba_rsp_cnt));
+       pos += scnprintf(buf + pos, bufsz - pos,  ucode_stats_header,
+                       "Statistics_Tx:");
+       pos += scnprintf(buf + pos, bufsz - pos, ucode_stats_format,
+                        "preamble:",
+                        le32_to_cpu(tx->preamble_cnt),
+                        accum_tx->preamble_cnt,
+                        delta_tx->preamble_cnt, max_tx->preamble_cnt);
+       pos += scnprintf(buf + pos, bufsz - pos, ucode_stats_format,
+                        "rx_detected_cnt:",
+                        le32_to_cpu(tx->rx_detected_cnt),
+                        accum_tx->rx_detected_cnt,
+                        delta_tx->rx_detected_cnt, max_tx->rx_detected_cnt);
+       pos += scnprintf(buf + pos, bufsz - pos, ucode_stats_format,
+                        "bt_prio_defer_cnt:",
+                        le32_to_cpu(tx->bt_prio_defer_cnt),
+                        accum_tx->bt_prio_defer_cnt,
+                        delta_tx->bt_prio_defer_cnt,
+                        max_tx->bt_prio_defer_cnt);
+       pos += scnprintf(buf + pos, bufsz - pos, ucode_stats_format,
+                        "bt_prio_kill_cnt:",
+                        le32_to_cpu(tx->bt_prio_kill_cnt),
+                        accum_tx->bt_prio_kill_cnt,
+                        delta_tx->bt_prio_kill_cnt,
+                        max_tx->bt_prio_kill_cnt);
+       pos += scnprintf(buf + pos, bufsz - pos, ucode_stats_format,
+                        "few_bytes_cnt:",
+                        le32_to_cpu(tx->few_bytes_cnt),
+                        accum_tx->few_bytes_cnt,
+                        delta_tx->few_bytes_cnt, max_tx->few_bytes_cnt);
+       pos += scnprintf(buf + pos, bufsz - pos, ucode_stats_format,
+                        "cts_timeout:",
+                        le32_to_cpu(tx->cts_timeout), accum_tx->cts_timeout,
+                        delta_tx->cts_timeout, max_tx->cts_timeout);
+       pos += scnprintf(buf + pos, bufsz - pos, ucode_stats_format,
+                        "ack_timeout:",
+                        le32_to_cpu(tx->ack_timeout),
+                        accum_tx->ack_timeout,
+                        delta_tx->ack_timeout, max_tx->ack_timeout);
+       pos += scnprintf(buf + pos, bufsz - pos, ucode_stats_format,
+                        "expected_ack_cnt:",
+                        le32_to_cpu(tx->expected_ack_cnt),
+                        accum_tx->expected_ack_cnt,
+                        delta_tx->expected_ack_cnt,
+                        max_tx->expected_ack_cnt);
+       pos += scnprintf(buf + pos, bufsz - pos, ucode_stats_format,
+                        "actual_ack_cnt:",
+                        le32_to_cpu(tx->actual_ack_cnt),
+                        accum_tx->actual_ack_cnt,
+                        delta_tx->actual_ack_cnt,
+                        max_tx->actual_ack_cnt);
+       pos += scnprintf(buf + pos, bufsz - pos, ucode_stats_format,
+                        "dump_msdu_cnt:",
+                        le32_to_cpu(tx->dump_msdu_cnt),
+                        accum_tx->dump_msdu_cnt,
+                        delta_tx->dump_msdu_cnt,
+                        max_tx->dump_msdu_cnt);
+       pos += scnprintf(buf + pos, bufsz - pos, ucode_stats_format,
+                        "abort_nxt_frame_mismatch:",
+                        le32_to_cpu(tx->burst_abort_next_frame_mismatch_cnt),
+                        accum_tx->burst_abort_next_frame_mismatch_cnt,
+                        delta_tx->burst_abort_next_frame_mismatch_cnt,
+                        max_tx->burst_abort_next_frame_mismatch_cnt);
+       pos += scnprintf(buf + pos, bufsz - pos, ucode_stats_format,
+                        "abort_missing_nxt_frame:",
+                        le32_to_cpu(tx->burst_abort_missing_next_frame_cnt),
+                        accum_tx->burst_abort_missing_next_frame_cnt,
+                        delta_tx->burst_abort_missing_next_frame_cnt,
+                        max_tx->burst_abort_missing_next_frame_cnt);
+       pos += scnprintf(buf + pos, bufsz - pos, ucode_stats_format,
+                        "cts_timeout_collision:",
+                        le32_to_cpu(tx->cts_timeout_collision),
+                        accum_tx->cts_timeout_collision,
+                        delta_tx->cts_timeout_collision,
+                        max_tx->cts_timeout_collision);
+       pos += scnprintf(buf + pos, bufsz - pos, ucode_stats_format,
+                       "ack_ba_timeout_collision:",
+                        le32_to_cpu(tx->ack_or_ba_timeout_collision),
+                        accum_tx->ack_or_ba_timeout_collision,
+                        delta_tx->ack_or_ba_timeout_collision,
+                        max_tx->ack_or_ba_timeout_collision);
+       pos += scnprintf(buf + pos, bufsz - pos, ucode_stats_format,
+                        "agg ba_timeout:",
+                        le32_to_cpu(tx->agg.ba_timeout),
+                        accum_tx->agg.ba_timeout,
+                        delta_tx->agg.ba_timeout,
+                        max_tx->agg.ba_timeout);
+       pos += scnprintf(buf + pos, bufsz - pos, ucode_stats_format,
+                       "agg ba_resched_frames:",
+                        le32_to_cpu(tx->agg.ba_reschedule_frames),
+                        accum_tx->agg.ba_reschedule_frames,
+                        delta_tx->agg.ba_reschedule_frames,
+                        max_tx->agg.ba_reschedule_frames);
+       pos += scnprintf(buf + pos, bufsz - pos, ucode_stats_format,
+                       "agg scd_query_agg_frame:",
+                        le32_to_cpu(tx->agg.scd_query_agg_frame_cnt),
+                        accum_tx->agg.scd_query_agg_frame_cnt,
+                        delta_tx->agg.scd_query_agg_frame_cnt,
+                        max_tx->agg.scd_query_agg_frame_cnt);
+       pos += scnprintf(buf + pos, bufsz - pos, ucode_stats_format,
+                        "agg scd_query_no_agg:",
+                        le32_to_cpu(tx->agg.scd_query_no_agg),
+                        accum_tx->agg.scd_query_no_agg,
+                        delta_tx->agg.scd_query_no_agg,
+                        max_tx->agg.scd_query_no_agg);
+       pos += scnprintf(buf + pos, bufsz - pos, ucode_stats_format,
+                        "agg scd_query_agg:",
+                        le32_to_cpu(tx->agg.scd_query_agg),
+                        accum_tx->agg.scd_query_agg,
+                        delta_tx->agg.scd_query_agg,
+                        max_tx->agg.scd_query_agg);
+       pos += scnprintf(buf + pos, bufsz - pos, ucode_stats_format,
+                       "agg scd_query_mismatch:",
+                        le32_to_cpu(tx->agg.scd_query_mismatch),
+                        accum_tx->agg.scd_query_mismatch,
+                        delta_tx->agg.scd_query_mismatch,
+                        max_tx->agg.scd_query_mismatch);
+       pos += scnprintf(buf + pos, bufsz - pos, ucode_stats_format,
+                        "agg frame_not_ready:",
+                        le32_to_cpu(tx->agg.frame_not_ready),
+                        accum_tx->agg.frame_not_ready,
+                        delta_tx->agg.frame_not_ready,
+                        max_tx->agg.frame_not_ready);
+       pos += scnprintf(buf + pos, bufsz - pos, ucode_stats_format,
+                        "agg underrun:",
+                        le32_to_cpu(tx->agg.underrun),
+                        accum_tx->agg.underrun,
+                        delta_tx->agg.underrun, max_tx->agg.underrun);
+       pos += scnprintf(buf + pos, bufsz - pos, ucode_stats_format,
+                        "agg bt_prio_kill:",
+                        le32_to_cpu(tx->agg.bt_prio_kill),
+                        accum_tx->agg.bt_prio_kill,
+                        delta_tx->agg.bt_prio_kill,
+                        max_tx->agg.bt_prio_kill);
+       pos += scnprintf(buf + pos, bufsz - pos, ucode_stats_format,
+                        "agg rx_ba_rsp_cnt:",
+                        le32_to_cpu(tx->agg.rx_ba_rsp_cnt),
+                        accum_tx->agg.rx_ba_rsp_cnt,
+                        delta_tx->agg.rx_ba_rsp_cnt,
+                        max_tx->agg.rx_ba_rsp_cnt);
 
        ret = simple_read_from_buffer(user_buf, count, ppos, buf, pos);
        kfree(buf);
@@ -1356,21 +1726,22 @@ static ssize_t iwl_dbgfs_ucode_general_stats_read(struct file *file,
                                        char __user *user_buf,
                                        size_t count, loff_t *ppos)
 {
-       struct iwl_priv *priv = (struct iwl_priv *)file->private_data;
+       struct iwl_priv *priv = file->private_data;
        int pos = 0;
        char *buf;
-       int bufsz = sizeof(struct statistics_general) * 4 + 250;
+       int bufsz = sizeof(struct statistics_general) * 10 + 300;
        ssize_t ret;
-       struct statistics_general *general;
-       struct statistics_dbg *dbg;
-       struct statistics_div *div;
+       struct statistics_general *general, *accum_general;
+       struct statistics_general *delta_general, *max_general;
+       struct statistics_dbg *dbg, *accum_dbg, *delta_dbg, *max_dbg;
+       struct statistics_div *div, *accum_div, *delta_div, *max_div;
 
        if (!iwl_is_alive(priv))
                return -EAGAIN;
 
        /* make request to uCode to retrieve statistics information */
        mutex_lock(&priv->mutex);
-       ret = iwl_send_statistics_request(priv, 0);
+       ret = iwl_send_statistics_request(priv, CMD_SYNC, false);
        mutex_unlock(&priv->mutex);
 
        if (ret) {
@@ -1391,34 +1762,79 @@ static ssize_t iwl_dbgfs_ucode_general_stats_read(struct file *file,
        general = &priv->statistics.general;
        dbg = &priv->statistics.general.dbg;
        div = &priv->statistics.general.div;
+       accum_general = &priv->accum_statistics.general;
+       delta_general = &priv->delta_statistics.general;
+       max_general = &priv->max_delta.general;
+       accum_dbg = &priv->accum_statistics.general.dbg;
+       delta_dbg = &priv->delta_statistics.general.dbg;
+       max_dbg = &priv->max_delta.general.dbg;
+       accum_div = &priv->accum_statistics.general.div;
+       delta_div = &priv->delta_statistics.general.div;
+       max_div = &priv->max_delta.general.div;
        pos += iwl_dbgfs_statistics_flag(priv, buf, bufsz);
-       pos += scnprintf(buf + pos, bufsz - pos, "Statistics_General:\n");
-       pos += scnprintf(buf + pos, bufsz - pos, "temperature: %u\n",
+       pos += scnprintf(buf + pos, bufsz - pos, ucode_stats_header,
+                       "Statistics_General:");
+       pos += scnprintf(buf + pos, bufsz - pos, ucode_stats_short_format,
+                        "temperature:",
                         le32_to_cpu(general->temperature));
-       pos += scnprintf(buf + pos, bufsz - pos, "temperature_m: %u\n",
+       pos += scnprintf(buf + pos, bufsz - pos, ucode_stats_short_format,
+                        "temperature_m:",
                         le32_to_cpu(general->temperature_m));
-       pos += scnprintf(buf + pos, bufsz - pos, "burst_check: %u\n",
-                        le32_to_cpu(dbg->burst_check));
-       pos += scnprintf(buf + pos, bufsz - pos, "burst_count: %u\n",
-                        le32_to_cpu(dbg->burst_count));
-       pos += scnprintf(buf + pos, bufsz - pos, "sleep_time: %u\n",
-                        le32_to_cpu(general->sleep_time));
-       pos += scnprintf(buf + pos, bufsz - pos, "slots_out: %u\n",
-                        le32_to_cpu(general->slots_out));
-       pos += scnprintf(buf + pos, bufsz - pos, "slots_idle: %u\n",
-                        le32_to_cpu(general->slots_idle));
-       pos += scnprintf(buf + pos, bufsz - pos, "ttl_timestamp: %u\n",
+       pos += scnprintf(buf + pos, bufsz - pos, ucode_stats_format,
+                        "burst_check:",
+                        le32_to_cpu(dbg->burst_check),
+                        accum_dbg->burst_check,
+                        delta_dbg->burst_check, max_dbg->burst_check);
+       pos += scnprintf(buf + pos, bufsz - pos, ucode_stats_format,
+                        "burst_count:",
+                        le32_to_cpu(dbg->burst_count),
+                        accum_dbg->burst_count,
+                        delta_dbg->burst_count, max_dbg->burst_count);
+       pos += scnprintf(buf + pos, bufsz - pos, ucode_stats_format,
+                        "sleep_time:",
+                        le32_to_cpu(general->sleep_time),
+                        accum_general->sleep_time,
+                        delta_general->sleep_time, max_general->sleep_time);
+       pos += scnprintf(buf + pos, bufsz - pos, ucode_stats_format,
+                        "slots_out:",
+                        le32_to_cpu(general->slots_out),
+                        accum_general->slots_out,
+                        delta_general->slots_out, max_general->slots_out);
+       pos += scnprintf(buf + pos, bufsz - pos, ucode_stats_format,
+                        "slots_idle:",
+                        le32_to_cpu(general->slots_idle),
+                        accum_general->slots_idle,
+                        delta_general->slots_idle, max_general->slots_idle);
+       pos += scnprintf(buf + pos, bufsz - pos, "ttl_timestamp:\t\t\t%u\n",
                         le32_to_cpu(general->ttl_timestamp));
-       pos += scnprintf(buf + pos, bufsz - pos, "tx_on_a: %u\n",
-                        le32_to_cpu(div->tx_on_a));
-       pos += scnprintf(buf + pos, bufsz - pos, "tx_on_b: %u\n",
-                        le32_to_cpu(div->tx_on_b));
-       pos += scnprintf(buf + pos, bufsz - pos, "exec_time: %u\n",
-                        le32_to_cpu(div->exec_time));
-       pos += scnprintf(buf + pos, bufsz - pos, "probe_time: %u\n",
-                        le32_to_cpu(div->probe_time));
-       pos += scnprintf(buf + pos, bufsz - pos, "rx_enable_counter: %u\n",
-                        le32_to_cpu(general->rx_enable_counter));
+       pos += scnprintf(buf + pos, bufsz - pos, ucode_stats_format,
+                        "tx_on_a:",
+                        le32_to_cpu(div->tx_on_a), accum_div->tx_on_a,
+                        delta_div->tx_on_a, max_div->tx_on_a);
+       pos += scnprintf(buf + pos, bufsz - pos, ucode_stats_format,
+                        "tx_on_b:",
+                        le32_to_cpu(div->tx_on_b), accum_div->tx_on_b,
+                        delta_div->tx_on_b, max_div->tx_on_b);
+       pos += scnprintf(buf + pos, bufsz - pos, ucode_stats_format,
+                        "exec_time:",
+                        le32_to_cpu(div->exec_time), accum_div->exec_time,
+                        delta_div->exec_time, max_div->exec_time);
+       pos += scnprintf(buf + pos, bufsz - pos, ucode_stats_format,
+                        "probe_time:",
+                        le32_to_cpu(div->probe_time), accum_div->probe_time,
+                        delta_div->probe_time, max_div->probe_time);
+       pos += scnprintf(buf + pos, bufsz - pos, ucode_stats_format,
+                        "rx_enable_counter:",
+                        le32_to_cpu(general->rx_enable_counter),
+                        accum_general->rx_enable_counter,
+                        delta_general->rx_enable_counter,
+                        max_general->rx_enable_counter);
+       pos += scnprintf(buf + pos, bufsz - pos, ucode_stats_format,
+                        "num_of_sos_states:",
+                        le32_to_cpu(general->num_of_sos_states),
+                        accum_general->num_of_sos_states,
+                        delta_general->num_of_sos_states,
+                        max_general->num_of_sos_states);
        ret = simple_read_from_buffer(user_buf, count, ppos, buf, pos);
        kfree(buf);
        return ret;
@@ -1428,7 +1844,7 @@ static ssize_t iwl_dbgfs_sensitivity_read(struct file *file,
                                        char __user *user_buf,
                                        size_t count, loff_t *ppos) {
 
-       struct iwl_priv *priv = (struct iwl_priv *)file->private_data;
+       struct iwl_priv *priv = file->private_data;
        int pos = 0;
        int cnt = 0;
        char *buf;
@@ -1509,7 +1925,7 @@ static ssize_t iwl_dbgfs_chain_noise_read(struct file *file,
                                        char __user *user_buf,
                                        size_t count, loff_t *ppos) {
 
-       struct iwl_priv *priv = (struct iwl_priv *)file->private_data;
+       struct iwl_priv *priv = file->private_data;
        int pos = 0;
        int cnt = 0;
        char *buf;
@@ -1563,8 +1979,180 @@ static ssize_t iwl_dbgfs_chain_noise_read(struct file *file,
        return ret;
 }
 
-DEBUGFS_READ_WRITE_FILE_OPS(rx_statistics);
-DEBUGFS_READ_WRITE_FILE_OPS(tx_statistics);
+static ssize_t iwl_dbgfs_tx_power_read(struct file *file,
+                                       char __user *user_buf,
+                                       size_t count, loff_t *ppos) {
+
+       struct iwl_priv *priv = file->private_data;
+       char buf[128];
+       int pos = 0;
+       ssize_t ret;
+       const size_t bufsz = sizeof(buf);
+       struct statistics_tx *tx;
+
+       if (!iwl_is_alive(priv))
+               pos += scnprintf(buf + pos, bufsz - pos, "N/A\n");
+       else {
+               /* make request to uCode to retrieve statistics information */
+               mutex_lock(&priv->mutex);
+               ret = iwl_send_statistics_request(priv, CMD_SYNC, false);
+               mutex_unlock(&priv->mutex);
+
+               if (ret) {
+                       IWL_ERR(priv, "Error sending statistics request: %zd\n",
+                               ret);
+                       return -EAGAIN;
+               }
+               tx = &priv->statistics.tx;
+               if (tx->tx_power.ant_a ||
+                   tx->tx_power.ant_b ||
+                   tx->tx_power.ant_c) {
+                       pos += scnprintf(buf + pos, bufsz - pos,
+                               "tx power: (1/2 dB step)\n");
+                       if ((priv->cfg->valid_tx_ant & ANT_A) &&
+                           tx->tx_power.ant_a)
+                               pos += scnprintf(buf + pos, bufsz - pos,
+                                               "\tantenna A: 0x%X\n",
+                                               tx->tx_power.ant_a);
+                       if ((priv->cfg->valid_tx_ant & ANT_B) &&
+                           tx->tx_power.ant_b)
+                               pos += scnprintf(buf + pos, bufsz - pos,
+                                               "\tantenna B: 0x%X\n",
+                                               tx->tx_power.ant_b);
+                       if ((priv->cfg->valid_tx_ant & ANT_C) &&
+                           tx->tx_power.ant_c)
+                               pos += scnprintf(buf + pos, bufsz - pos,
+                                               "\tantenna C: 0x%X\n",
+                                               tx->tx_power.ant_c);
+               } else
+                       pos += scnprintf(buf + pos, bufsz - pos, "N/A\n");
+       }
+       return simple_read_from_buffer(user_buf, count, ppos, buf, pos);
+}
+
+static ssize_t iwl_dbgfs_power_save_status_read(struct file *file,
+                                                   char __user *user_buf,
+                                                   size_t count, loff_t *ppos)
+{
+       struct iwl_priv *priv = file->private_data;
+       char buf[60];
+       int pos = 0;
+       const size_t bufsz = sizeof(buf);
+       u32 pwrsave_status;
+
+       pwrsave_status = iwl_read32(priv, CSR_GP_CNTRL) &
+                       CSR_GP_REG_POWER_SAVE_STATUS_MSK;
+
+       pos += scnprintf(buf + pos, bufsz - pos, "Power Save Status: ");
+       pos += scnprintf(buf + pos, bufsz - pos, "%s\n",
+               (pwrsave_status == CSR_GP_REG_NO_POWER_SAVE) ? "none" :
+               (pwrsave_status == CSR_GP_REG_MAC_POWER_SAVE) ? "MAC" :
+               (pwrsave_status == CSR_GP_REG_PHY_POWER_SAVE) ? "PHY" :
+               "error");
+
+       return simple_read_from_buffer(user_buf, count, ppos, buf, pos);
+}
+
+static ssize_t iwl_dbgfs_clear_ucode_statistics_write(struct file *file,
+                                        const char __user *user_buf,
+                                        size_t count, loff_t *ppos)
+{
+       struct iwl_priv *priv = file->private_data;
+       char buf[8];
+       int buf_size;
+       int clear;
+
+       memset(buf, 0, sizeof(buf));
+       buf_size = min(count, sizeof(buf) -  1);
+       if (copy_from_user(buf, user_buf, buf_size))
+               return -EFAULT;
+       if (sscanf(buf, "%d", &clear) != 1)
+               return -EFAULT;
+
+       /* make request to uCode to retrieve statistics information */
+       mutex_lock(&priv->mutex);
+       iwl_send_statistics_request(priv, CMD_SYNC, true);
+       mutex_unlock(&priv->mutex);
+
+       return count;
+}
+
+static ssize_t iwl_dbgfs_csr_write(struct file *file,
+                                        const char __user *user_buf,
+                                        size_t count, loff_t *ppos)
+{
+       struct iwl_priv *priv = file->private_data;
+       char buf[8];
+       int buf_size;
+       int csr;
+
+       memset(buf, 0, sizeof(buf));
+       buf_size = min(count, sizeof(buf) -  1);
+       if (copy_from_user(buf, user_buf, buf_size))
+               return -EFAULT;
+       if (sscanf(buf, "%d", &csr) != 1)
+               return -EFAULT;
+
+       if (priv->cfg->ops->lib->dump_csr)
+               priv->cfg->ops->lib->dump_csr(priv);
+
+       return count;
+}
+
+static ssize_t iwl_dbgfs_ucode_tracing_read(struct file *file,
+                                       char __user *user_buf,
+                                       size_t count, loff_t *ppos) {
+
+       struct iwl_priv *priv = (struct iwl_priv *)file->private_data;
+       int pos = 0;
+       char buf[128];
+       const size_t bufsz = sizeof(buf);
+       ssize_t ret;
+
+       pos += scnprintf(buf + pos, bufsz - pos, "ucode trace timer is %s\n",
+                       priv->event_log.ucode_trace ? "On" : "Off");
+       pos += scnprintf(buf + pos, bufsz - pos, "non_wraps_count:\t\t %u\n",
+                       priv->event_log.non_wraps_count);
+       pos += scnprintf(buf + pos, bufsz - pos, "wraps_once_count:\t\t %u\n",
+                       priv->event_log.wraps_once_count);
+       pos += scnprintf(buf + pos, bufsz - pos, "wraps_more_count:\t\t %u\n",
+                       priv->event_log.wraps_more_count);
+
+       ret = simple_read_from_buffer(user_buf, count, ppos, buf, pos);
+       return ret;
+}
+
+static ssize_t iwl_dbgfs_ucode_tracing_write(struct file *file,
+                                        const char __user *user_buf,
+                                        size_t count, loff_t *ppos)
+{
+       struct iwl_priv *priv = file->private_data;
+       char buf[8];
+       int buf_size;
+       int trace;
+
+       memset(buf, 0, sizeof(buf));
+       buf_size = min(count, sizeof(buf) -  1);
+       if (copy_from_user(buf, user_buf, buf_size))
+               return -EFAULT;
+       if (sscanf(buf, "%d", &trace) != 1)
+               return -EFAULT;
+
+       if (trace) {
+               priv->event_log.ucode_trace = true;
+               /* schedule the ucode timer to occur in UCODE_TRACE_PERIOD */
+               mod_timer(&priv->ucode_trace,
+                       jiffies + msecs_to_jiffies(UCODE_TRACE_PERIOD));
+       } else {
+               priv->event_log.ucode_trace = false;
+               del_timer_sync(&priv->ucode_trace);
+       }
+
+       return count;
+}
+
+DEBUGFS_READ_FILE_OPS(rx_statistics);
+DEBUGFS_READ_FILE_OPS(tx_statistics);
 DEBUGFS_READ_WRITE_FILE_OPS(traffic_log);
 DEBUGFS_READ_FILE_OPS(rx_queue);
 DEBUGFS_READ_FILE_OPS(tx_queue);
@@ -1573,6 +2161,12 @@ DEBUGFS_READ_FILE_OPS(ucode_tx_stats);
 DEBUGFS_READ_FILE_OPS(ucode_general_stats);
 DEBUGFS_READ_FILE_OPS(sensitivity);
 DEBUGFS_READ_FILE_OPS(chain_noise);
+DEBUGFS_READ_FILE_OPS(tx_power);
+DEBUGFS_READ_FILE_OPS(power_save_status);
+DEBUGFS_WRITE_FILE_OPS(clear_ucode_statistics);
+DEBUGFS_WRITE_FILE_OPS(clear_traffic_statistics);
+DEBUGFS_WRITE_FILE_OPS(csr);
+DEBUGFS_READ_WRITE_FILE_OPS(ucode_tracing);
 
 /*
  * Create the debugfs files and directories
@@ -1601,32 +2195,36 @@ int iwl_dbgfs_register(struct iwl_priv *priv, const char *name)
        DEBUGFS_ADD_DIR(data, dbgfs->dir_drv);
        DEBUGFS_ADD_DIR(rf, dbgfs->dir_drv);
        DEBUGFS_ADD_DIR(debug, dbgfs->dir_drv);
-       DEBUGFS_ADD_FILE(nvm, data);
-       DEBUGFS_ADD_FILE(sram, data);
-       DEBUGFS_ADD_FILE(log_event, data);
-       DEBUGFS_ADD_FILE(stations, data);
-       DEBUGFS_ADD_FILE(channels, data);
-       DEBUGFS_ADD_FILE(status, data);
-       DEBUGFS_ADD_FILE(interrupt, data);
-       DEBUGFS_ADD_FILE(qos, data);
-#ifdef CONFIG_IWLWIFI_LEDS
-       DEBUGFS_ADD_FILE(led, data);
-#endif
-       DEBUGFS_ADD_FILE(sleep_level_override, data);
-       DEBUGFS_ADD_FILE(current_sleep_command, data);
-       DEBUGFS_ADD_FILE(thermal_throttling, data);
-       DEBUGFS_ADD_FILE(disable_ht40, data);
-       DEBUGFS_ADD_FILE(rx_statistics, debug);
-       DEBUGFS_ADD_FILE(tx_statistics, debug);
-       DEBUGFS_ADD_FILE(traffic_log, debug);
-       DEBUGFS_ADD_FILE(rx_queue, debug);
-       DEBUGFS_ADD_FILE(tx_queue, debug);
+       DEBUGFS_ADD_FILE(nvm, data, S_IRUSR);
+       DEBUGFS_ADD_FILE(sram, data, S_IWUSR | S_IRUSR);
+       DEBUGFS_ADD_FILE(log_event, data, S_IWUSR | S_IRUSR);
+       DEBUGFS_ADD_FILE(stations, data, S_IRUSR);
+       DEBUGFS_ADD_FILE(channels, data, S_IRUSR);
+       DEBUGFS_ADD_FILE(status, data, S_IRUSR);
+       DEBUGFS_ADD_FILE(interrupt, data, S_IWUSR | S_IRUSR);
+       DEBUGFS_ADD_FILE(qos, data, S_IRUSR);
+       DEBUGFS_ADD_FILE(led, data, S_IRUSR);
+       DEBUGFS_ADD_FILE(sleep_level_override, data, S_IWUSR | S_IRUSR);
+       DEBUGFS_ADD_FILE(current_sleep_command, data, S_IRUSR);
+       DEBUGFS_ADD_FILE(thermal_throttling, data, S_IRUSR);
+       DEBUGFS_ADD_FILE(disable_ht40, data, S_IWUSR | S_IRUSR);
+       DEBUGFS_ADD_FILE(rx_statistics, debug, S_IRUSR);
+       DEBUGFS_ADD_FILE(tx_statistics, debug, S_IRUSR);
+       DEBUGFS_ADD_FILE(traffic_log, debug, S_IWUSR | S_IRUSR);
+       DEBUGFS_ADD_FILE(rx_queue, debug, S_IRUSR);
+       DEBUGFS_ADD_FILE(tx_queue, debug, S_IRUSR);
+       DEBUGFS_ADD_FILE(tx_power, debug, S_IRUSR);
+       DEBUGFS_ADD_FILE(power_save_status, debug, S_IRUSR);
+       DEBUGFS_ADD_FILE(clear_ucode_statistics, debug, S_IWUSR);
+       DEBUGFS_ADD_FILE(clear_traffic_statistics, debug, S_IWUSR);
+       DEBUGFS_ADD_FILE(csr, debug, S_IWUSR);
        if ((priv->hw_rev & CSR_HW_REV_TYPE_MSK) != CSR_HW_REV_TYPE_3945) {
-               DEBUGFS_ADD_FILE(ucode_rx_stats, debug);
-               DEBUGFS_ADD_FILE(ucode_tx_stats, debug);
-               DEBUGFS_ADD_FILE(ucode_general_stats, debug);
-               DEBUGFS_ADD_FILE(sensitivity, debug);
-               DEBUGFS_ADD_FILE(chain_noise, debug);
+               DEBUGFS_ADD_FILE(ucode_rx_stats, debug, S_IRUSR);
+               DEBUGFS_ADD_FILE(ucode_tx_stats, debug, S_IRUSR);
+               DEBUGFS_ADD_FILE(ucode_general_stats, debug, S_IRUSR);
+               DEBUGFS_ADD_FILE(sensitivity, debug, S_IRUSR);
+               DEBUGFS_ADD_FILE(chain_noise, debug, S_IRUSR);
+               DEBUGFS_ADD_FILE(ucode_tracing, debug, S_IWUSR | S_IRUSR);
        }
        DEBUGFS_ADD_BOOL(disable_sensitivity, rf, &priv->disable_sens_cal);
        DEBUGFS_ADD_BOOL(disable_chain_noise, rf,
@@ -1663,9 +2261,7 @@ void iwl_dbgfs_unregister(struct iwl_priv *priv)
        DEBUGFS_REMOVE(priv->dbgfs->dbgfs_data_files.file_status);
        DEBUGFS_REMOVE(priv->dbgfs->dbgfs_data_files.file_interrupt);
        DEBUGFS_REMOVE(priv->dbgfs->dbgfs_data_files.file_qos);
-#ifdef CONFIG_IWLWIFI_LEDS
        DEBUGFS_REMOVE(priv->dbgfs->dbgfs_data_files.file_led);
-#endif
        DEBUGFS_REMOVE(priv->dbgfs->dbgfs_data_files.file_thermal_throttling);
        DEBUGFS_REMOVE(priv->dbgfs->dbgfs_data_files.file_disable_ht40);
        DEBUGFS_REMOVE(priv->dbgfs->dir_data);
@@ -1674,6 +2270,13 @@ void iwl_dbgfs_unregister(struct iwl_priv *priv)
        DEBUGFS_REMOVE(priv->dbgfs->dbgfs_debug_files.file_traffic_log);
        DEBUGFS_REMOVE(priv->dbgfs->dbgfs_debug_files.file_rx_queue);
        DEBUGFS_REMOVE(priv->dbgfs->dbgfs_debug_files.file_tx_queue);
+       DEBUGFS_REMOVE(priv->dbgfs->dbgfs_debug_files.file_tx_power);
+       DEBUGFS_REMOVE(priv->dbgfs->dbgfs_debug_files.file_power_save_status);
+       DEBUGFS_REMOVE(priv->dbgfs->dbgfs_debug_files.
+                       file_clear_ucode_statistics);
+       DEBUGFS_REMOVE(priv->dbgfs->dbgfs_debug_files.
+                       file_clear_traffic_statistics);
+       DEBUGFS_REMOVE(priv->dbgfs->dbgfs_debug_files.file_csr);
        if ((priv->hw_rev & CSR_HW_REV_TYPE_MSK) != CSR_HW_REV_TYPE_3945) {
                DEBUGFS_REMOVE(priv->dbgfs->dbgfs_debug_files.
                        file_ucode_rx_stats);
@@ -1685,6 +2288,8 @@ void iwl_dbgfs_unregister(struct iwl_priv *priv)
                        file_sensitivity);
                DEBUGFS_REMOVE(priv->dbgfs->dbgfs_debug_files.
                        file_chain_noise);
+               DEBUGFS_REMOVE(priv->dbgfs->dbgfs_debug_files.
+                       file_ucode_tracing);
        }
        DEBUGFS_REMOVE(priv->dbgfs->dir_debug);
        DEBUGFS_REMOVE(priv->dbgfs->dbgfs_rf_files.file_disable_sensitivity);