3 files changed, 41 insertions, 0 deletions

diff --git a/drivers/net/wireless/iwlwifi/mvm/debugfs.c b/drivers/net/wireless/iwlwifi/mvm/debugfs.c
index 931723a03a43..e8f62a6a1b57 100644
--- a/drivers/net/wireless/iwlwifi/mvm/debugfs.c
+++ b/drivers/net/wireless/iwlwifi/mvm/debugfs.c
@@ -720,6 +720,19 @@ int iwl_mvm_dbgfs_register(struct iwl_mvm *mvm, struct dentry *dbgfs_dir)
                 goto err;
 #endif
 
+        if (!debugfs_create_blob("nvm_hw", S_IRUSR,
+                                  mvm->debugfs_dir, &mvm->nvm_hw_blob))
+                goto err;
+        if (!debugfs_create_blob("nvm_sw", S_IRUSR,
+                                  mvm->debugfs_dir, &mvm->nvm_sw_blob))
+                goto err;
+        if (!debugfs_create_blob("nvm_calib", S_IRUSR,
+                                  mvm->debugfs_dir, &mvm->nvm_calib_blob))
+                goto err;
+        if (!debugfs_create_blob("nvm_prod", S_IRUSR,
+                                  mvm->debugfs_dir, &mvm->nvm_prod_blob))
+                goto err;
+
         /*
          * Create a symlink with mac80211. It will be removed when mac80211
          * exists (before the opmode exists which removes the target.)
diff --git a/drivers/net/wireless/iwlwifi/mvm/mvm.h b/drivers/net/wireless/iwlwifi/mvm/mvm.h
index e7c97ccec5e8..7dc57cfe5803 100644
--- a/drivers/net/wireless/iwlwifi/mvm/mvm.h
+++ b/drivers/net/wireless/iwlwifi/mvm/mvm.h
@@ -494,6 +494,11 @@ struct iwl_mvm {
         u32 dbgfs_sram_offset, dbgfs_sram_len;
         bool disable_power_off;
         bool disable_power_off_d3;
+
+        struct debugfs_blob_wrapper nvm_hw_blob;
+        struct debugfs_blob_wrapper nvm_sw_blob;
+        struct debugfs_blob_wrapper nvm_calib_blob;
+        struct debugfs_blob_wrapper nvm_prod_blob;
 #endif
 
         struct iwl_mvm_phy_ctxt phy_ctxts[NUM_PHY_CTX];
diff --git a/drivers/net/wireless/iwlwifi/mvm/nvm.c b/drivers/net/wireless/iwlwifi/mvm/nvm.c
index 2beffd028b67..48089b1625ff 100644
--- a/drivers/net/wireless/iwlwifi/mvm/nvm.c
+++ b/drivers/net/wireless/iwlwifi/mvm/nvm.c
@@ -443,6 +443,29 @@ int iwl_nvm_init(struct iwl_mvm *mvm)
                         }
                         mvm->nvm_sections[section].data = temp;
                         mvm->nvm_sections[section].length = ret;
+
+#ifdef CONFIG_IWLWIFI_DEBUGFS
+                        switch (section) {
+                        case NVM_SECTION_TYPE_HW:
+                                mvm->nvm_hw_blob.data = temp;
+                                mvm->nvm_hw_blob.size = ret;
+                                break;
+                        case NVM_SECTION_TYPE_SW:
+                                mvm->nvm_sw_blob.data = temp;
+                                mvm->nvm_sw_blob.size  = ret;
+                                break;
+                        case NVM_SECTION_TYPE_CALIBRATION:
+                                mvm->nvm_calib_blob.data = temp;
+                                mvm->nvm_calib_blob.size  = ret;
+                                break;
+                        case NVM_SECTION_TYPE_PRODUCTION:
+                                mvm->nvm_prod_blob.data = temp;
+                                mvm->nvm_prod_blob.size  = ret;
+                                break;
+                        default:
+                                WARN(1, "section: %d", section);
+                        }
+#endif
                 }
                 kfree(nvm_buffer);
                 if (ret < 0)