wifi: iwlwifi: move fw_ver debugfs to firmware runtime

This is really where it belongs.

Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@intel.com>
Link: https://patch.msgid.link/20241228223206.98bdc5e62828.Iee7a8365dd63ebf580d324f90e1e04466d8ef5d5@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/drivers/net/wireless/intel/iwlwifi/fw/debugfs.c b/drivers/net/wireless/intel/iwlwifi/fw/debugfs.c
index 893b21fcaf87c6322a7c2df950ab94155274fd63..e79fdb5fe3873870b7b3abe43d58b7dd77992b2f 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/fw/debugfs.c
+++ b/drivers/net/wireless/intel/iwlwifi/fw/debugfs.c
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause
 /*
- * Copyright (C) 2012-2014, 2018-2023 Intel Corporation
+ * Copyright (C) 2012-2014, 2018-2024 Intel Corporation
  * Copyright (C) 2013-2015 Intel Mobile Communications GmbH
  * Copyright (C) 2016-2017 Intel Deutschland GmbH
  */
@@ -282,6 +282,26 @@ static ssize_t iwl_dbgfs_fw_dbg_domain_read(struct iwl_fw_runtime *fwrt,
 
 FWRT_DEBUGFS_READ_FILE_OPS(fw_dbg_domain, 20);
 
+static ssize_t iwl_dbgfs_fw_ver_read(struct iwl_fw_runtime *fwrt,
+                                    size_t size, char *buf)
+{
+       char *pos = buf;
+       char *endpos = buf + size;
+
+       pos += scnprintf(pos, endpos - pos, "FW id: %s\n",
+                        fwrt->fw->fw_version);
+       pos += scnprintf(pos, endpos - pos, "FW: %s\n",
+                        fwrt->fw->human_readable);
+       pos += scnprintf(pos, endpos - pos, "Device: %s\n",
+                        fwrt->trans->name);
+       pos += scnprintf(pos, endpos - pos, "Bus: %s\n",
+                        fwrt->dev->bus->name);
+
+       return pos - buf;
+}
+
+FWRT_DEBUGFS_READ_FILE_OPS(fw_ver, 1024);
+
 struct iwl_dbgfs_fw_info_priv {
        struct iwl_fw_runtime *fwrt;
 };
@@ -404,4 +424,5 @@ void iwl_fwrt_dbgfs_register(struct iwl_fw_runtime *fwrt,
        FWRT_DEBUGFS_ADD_FILE(send_hcmd, dbgfs_dir, 0200);
        FWRT_DEBUGFS_ADD_FILE(enabled_severities, dbgfs_dir, 0200);
        FWRT_DEBUGFS_ADD_FILE(fw_dbg_domain, dbgfs_dir, 0400);
+       FWRT_DEBUGFS_ADD_FILE(fw_ver, dbgfs_dir, 0400);
 }

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c b/drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c
index b8ae860390457bf3978efbb2c96aba4c7883a900..340f3a026c42afe9a1ebe14fe880a180045e30eb 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c
@@ -538,36 +538,6 @@ static ssize_t iwl_dbgfs_disable_power_off_write(struct iwl_mvm *mvm, char *buf,
        return ret ?: count;
 }
 
-static ssize_t iwl_dbgfs_fw_ver_read(struct file *file, char __user *user_buf,
-                                    size_t count, loff_t *ppos)
-{
-       struct iwl_mvm *mvm = file->private_data;
-       char *buff, *pos, *endpos;
-       static const size_t bufsz = 1024;
-       int ret;
-
-       buff = kmalloc(bufsz, GFP_KERNEL);
-       if (!buff)
-               return -ENOMEM;
-
-       pos = buff;
-       endpos = pos + bufsz;
-
-       pos += scnprintf(pos, endpos - pos, "FW id: %s\n",
-                        mvm->fwrt.fw->fw_version);
-       pos += scnprintf(pos, endpos - pos, "FW: %s\n",
-                        mvm->fwrt.fw->human_readable);
-       pos += scnprintf(pos, endpos - pos, "Device: %s\n",
-                        mvm->fwrt.trans->name);
-       pos += scnprintf(pos, endpos - pos, "Bus: %s\n",
-                        mvm->fwrt.dev->bus->name);
-
-       ret = simple_read_from_buffer(user_buf, count, ppos, buff, pos - buff);
-       kfree(buff);
-
-       return ret;
-}
-
 static ssize_t iwl_dbgfs_tas_get_status_read(struct file *file,
                                             char __user *user_buf,
                                             size_t count, loff_t *ppos)
@@ -1969,7 +1939,6 @@ MVM_DEBUGFS_READ_WRITE_FILE_OPS(disable_power_off, 64);
 MVM_DEBUGFS_READ_FILE_OPS(fw_rx_stats);
 MVM_DEBUGFS_READ_FILE_OPS(drv_rx_stats);
 MVM_DEBUGFS_READ_FILE_OPS(fw_system_stats);
-MVM_DEBUGFS_READ_FILE_OPS(fw_ver);
 MVM_DEBUGFS_READ_FILE_OPS(phy_integration_ver);
 MVM_DEBUGFS_READ_FILE_OPS(tas_get_status);
 MVM_DEBUGFS_WRITE_FILE_OPS(fw_restart, 10);
@@ -2169,7 +2138,6 @@ void iwl_mvm_dbgfs_register(struct iwl_mvm *mvm)
        MVM_DEBUGFS_ADD_FILE(force_ctkill, mvm->debugfs_dir, 0200);
        MVM_DEBUGFS_ADD_FILE(stations, mvm->debugfs_dir, 0400);
        MVM_DEBUGFS_ADD_FILE(disable_power_off, mvm->debugfs_dir, 0600);
-       MVM_DEBUGFS_ADD_FILE(fw_ver, mvm->debugfs_dir, 0400);
        MVM_DEBUGFS_ADD_FILE(fw_rx_stats, mvm->debugfs_dir, 0400);
        MVM_DEBUGFS_ADD_FILE(drv_rx_stats, mvm->debugfs_dir, 0400);
        MVM_DEBUGFS_ADD_FILE(fw_system_stats, mvm->debugfs_dir, 0400);