iwlwifi: show NVM version in debugfs

Show version number along with dumping NVM data, the version information
being removed from sysfs, add it back to debugfs to help debugging.

Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/iwlwifi/iwl-debugfs.c b/drivers/net/wireless/iwlwifi/iwl-debugfs.c
index a198bcf6102287121da544906fe333c6838099e6..037b75ca77f145fdcfc2393c864b0b9074fdd68a 100644 (file)
--- a/drivers/net/wireless/iwlwifi/iwl-debugfs.c
+++ b/drivers/net/wireless/iwlwifi/iwl-debugfs.c
@@ -383,6 +383,7 @@ static ssize_t iwl_dbgfs_nvm_read(struct file *file,
        int pos = 0, ofs = 0, buf_size = 0;
        const u8 *ptr;
        char *buf;
        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;
 
        size_t eeprom_len = priv->cfg->eeprom_size;
        buf_size = 4 * eeprom_len + 256;
 


@@ -403,9 +404,11 @@ static ssize_t iwl_dbgfs_nvm_read(struct file *file,
                IWL_ERR(priv, "Can not allocate Buffer\n");
                return -ENOMEM;
        }
                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)
                        (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,
        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,