ice_lag.o      \
         ice_ethtool.o  \
         ice_repr.o     \
-        ice_tc_lib.o
+        ice_tc_lib.o   \
+        ice_fwlog.o    \
+        ice_debugfs.o
 ice-$(CONFIG_PCI_IOV) +=       \
        ice_sriov.o             \
        ice_virtchnl.o          \
 
        struct ice_vsi_stats **vsi_stats;
        struct ice_sw *first_sw;        /* first switch created by firmware */
        u16 eswitch_mode;               /* current mode of eswitch */
+       struct dentry *ice_debugfs_pf;
+       struct dentry *ice_debugfs_pf_fwlog;
+       /* keep track of all the dentrys for FW log modules */
+       struct dentry **ice_debugfs_pf_fwlog_modules;
        struct ice_vfs vfs;
        DECLARE_BITMAP(features, ICE_F_MAX);
        DECLARE_BITMAP(state, ICE_STATE_NBITS);
        return false;
 }
 
+void ice_debugfs_fwlog_init(struct ice_pf *pf);
+void ice_debugfs_init(void);
+void ice_debugfs_exit(void);
+void ice_pf_fwlog_update_module(struct ice_pf *pf, int log_level, int module);
+
 bool netif_is_ice(const struct net_device *dev);
 int ice_vsi_setup_tx_rings(struct ice_vsi *vsi);
 int ice_vsi_setup_rx_rings(struct ice_vsi *vsi);
 
        u8 reserved[8];
 };
 
+enum ice_aqc_fw_logging_mod {
+       ICE_AQC_FW_LOG_ID_GENERAL = 0,
+       ICE_AQC_FW_LOG_ID_CTRL,
+       ICE_AQC_FW_LOG_ID_LINK,
+       ICE_AQC_FW_LOG_ID_LINK_TOPO,
+       ICE_AQC_FW_LOG_ID_DNL,
+       ICE_AQC_FW_LOG_ID_I2C,
+       ICE_AQC_FW_LOG_ID_SDP,
+       ICE_AQC_FW_LOG_ID_MDIO,
+       ICE_AQC_FW_LOG_ID_ADMINQ,
+       ICE_AQC_FW_LOG_ID_HDMA,
+       ICE_AQC_FW_LOG_ID_LLDP,
+       ICE_AQC_FW_LOG_ID_DCBX,
+       ICE_AQC_FW_LOG_ID_DCB,
+       ICE_AQC_FW_LOG_ID_XLR,
+       ICE_AQC_FW_LOG_ID_NVM,
+       ICE_AQC_FW_LOG_ID_AUTH,
+       ICE_AQC_FW_LOG_ID_VPD,
+       ICE_AQC_FW_LOG_ID_IOSF,
+       ICE_AQC_FW_LOG_ID_PARSER,
+       ICE_AQC_FW_LOG_ID_SW,
+       ICE_AQC_FW_LOG_ID_SCHEDULER,
+       ICE_AQC_FW_LOG_ID_TXQ,
+       ICE_AQC_FW_LOG_ID_RSVD,
+       ICE_AQC_FW_LOG_ID_POST,
+       ICE_AQC_FW_LOG_ID_WATCHDOG,
+       ICE_AQC_FW_LOG_ID_TASK_DISPATCH,
+       ICE_AQC_FW_LOG_ID_MNG,
+       ICE_AQC_FW_LOG_ID_SYNCE,
+       ICE_AQC_FW_LOG_ID_HEALTH,
+       ICE_AQC_FW_LOG_ID_TSDRV,
+       ICE_AQC_FW_LOG_ID_PFREG,
+       ICE_AQC_FW_LOG_ID_MDLVER,
+       ICE_AQC_FW_LOG_ID_MAX,
+};
+
+/* Set FW Logging configuration (indirect 0xFF30)
+ * Query FW Logging (indirect 0xFF32)
+ */
+struct ice_aqc_fw_log {
+       u8 cmd_flags;
+#define ICE_AQC_FW_LOG_CONF_UART_EN    BIT(0)
+#define ICE_AQC_FW_LOG_CONF_AQ_EN      BIT(1)
+#define ICE_AQC_FW_LOG_QUERY_REGISTERED        BIT(2)
+#define ICE_AQC_FW_LOG_CONF_SET_VALID  BIT(3)
+#define ICE_AQC_FW_LOG_AQ_QUERY                BIT(2)
+
+       u8 rsp_flag;
+       __le16 fw_rt_msb;
+       union {
+               struct {
+                       __le32 fw_rt_lsb;
+               } sync;
+               struct {
+                       __le16 log_resolution;
+#define ICE_AQC_FW_LOG_MIN_RESOLUTION          (1)
+#define ICE_AQC_FW_LOG_MAX_RESOLUTION          (128)
+
+                       __le16 mdl_cnt;
+               } cfg;
+       } ops;
+       __le32 addr_high;
+       __le32 addr_low;
+};
+
+/* Response Buffer for:
+ *    Set Firmware Logging Configuration (0xFF30)
+ *    Query FW Logging (0xFF32)
+ */
+struct ice_aqc_fw_log_cfg_resp {
+       __le16 module_identifier;
+       u8 log_level;
+       u8 rsvd0;
+};
+
 /**
  * struct ice_aq_desc - Admin Queue (AQ) descriptor
  * @flags: ICE_AQ_FLAG_* flags
                struct ice_aqc_get_cgu_ref_prio get_cgu_ref_prio;
                struct ice_aqc_get_cgu_info get_cgu_info;
                struct ice_aqc_driver_shared_params drv_shared_params;
+               struct ice_aqc_fw_log fw_log;
                struct ice_aqc_set_mac_lb set_mac_lb;
                struct ice_aqc_alloc_free_res_cmd sw_res_ctrl;
                struct ice_aqc_set_mac_cfg set_mac_cfg;
 
        /* Standalone Commands/Events */
        ice_aqc_opc_event_lan_overflow                  = 0x1001,
+
+       /* FW Logging Commands */
+       ice_aqc_opc_fw_logs_config                      = 0xFF30,
+       ice_aqc_opc_fw_logs_query                       = 0xFF32,
 };
 
 #endif /* _ICE_ADMINQ_CMD_H_ */
 
        if (status)
                goto err_unroll_cqinit;
 
+       status = ice_fwlog_init(hw);
+       if (status)
+               ice_debug(hw, ICE_DBG_FW_LOG, "Error initializing FW logging: %d\n",
+                         status);
+
        status = ice_clear_pf_cfg(hw);
        if (status)
                goto err_unroll_cqinit;
        ice_free_hw_tbls(hw);
        mutex_destroy(&hw->tnl_lock);
 
+       ice_fwlog_deinit(hw);
        ice_destroy_all_ctrlq(hw);
 
        /* Clear VSI contexts if not already cleared */
 
--- /dev/null
+// SPDX-License-Identifier: GPL-2.0
+/* Copyright (c) 2022, Intel Corporation. */
+
+#include <linux/fs.h>
+#include <linux/debugfs.h>
+#include <linux/random.h>
+#include <linux/vmalloc.h>
+#include "ice.h"
+
+static struct dentry *ice_debugfs_root;
+
+/* create a define that has an extra module that doesn't really exist. this
+ * is so we can add a module 'all' to easily enable/disable all the modules
+ */
+#define ICE_NR_FW_LOG_MODULES (ICE_AQC_FW_LOG_ID_MAX + 1)
+
+/* the ordering in this array is important. it matches the ordering of the
+ * values in the FW so the index is the same value as in ice_aqc_fw_logging_mod
+ */
+static const char * const ice_fwlog_module_string[] = {
+       "general",
+       "ctrl",
+       "link",
+       "link_topo",
+       "dnl",
+       "i2c",
+       "sdp",
+       "mdio",
+       "adminq",
+       "hdma",
+       "lldp",
+       "dcbx",
+       "dcb",
+       "xlr",
+       "nvm",
+       "auth",
+       "vpd",
+       "iosf",
+       "parser",
+       "sw",
+       "scheduler",
+       "txq",
+       "rsvd",
+       "post",
+       "watchdog",
+       "task_dispatch",
+       "mng",
+       "synce",
+       "health",
+       "tsdrv",
+       "pfreg",
+       "mdlver",
+       "all",
+};
+
+/* the ordering in this array is important. it matches the ordering of the
+ * values in the FW so the index is the same value as in ice_fwlog_level
+ */
+static const char * const ice_fwlog_level_string[] = {
+       "none",
+       "error",
+       "warning",
+       "normal",
+       "verbose",
+};
+
+/**
+ * ice_fwlog_print_module_cfg - print current FW logging module configuration
+ * @hw: pointer to the HW structure
+ * @module: module to print
+ * @s: the seq file to put data into
+ */
+static void
+ice_fwlog_print_module_cfg(struct ice_hw *hw, int module, struct seq_file *s)
+{
+       struct ice_fwlog_cfg *cfg = &hw->fwlog_cfg;
+       struct ice_fwlog_module_entry *entry;
+
+       if (module != ICE_AQC_FW_LOG_ID_MAX) {
+               entry = &cfg->module_entries[module];
+
+               seq_printf(s, "\tModule: %s, Log Level: %s\n",
+                          ice_fwlog_module_string[entry->module_id],
+                          ice_fwlog_level_string[entry->log_level]);
+       } else {
+               int i;
+
+               for (i = 0; i < ICE_AQC_FW_LOG_ID_MAX; i++) {
+                       entry = &cfg->module_entries[i];
+
+                       seq_printf(s, "\tModule: %s, Log Level: %s\n",
+                                  ice_fwlog_module_string[entry->module_id],
+                                  ice_fwlog_level_string[entry->log_level]);
+               }
+       }
+}
+
+static int ice_find_module_by_dentry(struct ice_pf *pf, struct dentry *d)
+{
+       int i, module;
+
+       module = -1;
+       /* find the module based on the dentry */
+       for (i = 0; i < ICE_NR_FW_LOG_MODULES; i++) {
+               if (d == pf->ice_debugfs_pf_fwlog_modules[i]) {
+                       module = i;
+                       break;
+               }
+       }
+
+       return module;
+}
+
+/**
+ * ice_debugfs_module_show - read from 'module' file
+ * @s: the opened file
+ * @v: pointer to the offset
+ */
+static int ice_debugfs_module_show(struct seq_file *s, void *v)
+{
+       const struct file *filp = s->file;
+       struct dentry *dentry;
+       struct ice_pf *pf;
+       int module;
+
+       dentry = file_dentry(filp);
+       pf = s->private;
+
+       module = ice_find_module_by_dentry(pf, dentry);
+       if (module < 0) {
+               dev_info(ice_pf_to_dev(pf), "unknown module\n");
+               return -EINVAL;
+       }
+
+       ice_fwlog_print_module_cfg(&pf->hw, module, s);
+
+       return 0;
+}
+
+static int ice_debugfs_module_open(struct inode *inode, struct file *filp)
+{
+       return single_open(filp, ice_debugfs_module_show, inode->i_private);
+}
+
+/**
+ * ice_debugfs_module_write - write into 'module' file
+ * @filp: the opened file
+ * @buf: where to find the user's data
+ * @count: the length of the user's data
+ * @ppos: file position offset
+ */
+static ssize_t
+ice_debugfs_module_write(struct file *filp, const char __user *buf,
+                        size_t count, loff_t *ppos)
+{
+       struct ice_pf *pf = file_inode(filp)->i_private;
+       struct dentry *dentry = file_dentry(filp);
+       struct device *dev = ice_pf_to_dev(pf);
+       char user_val[16], *cmd_buf;
+       int module, log_level, cnt;
+
+       /* don't allow partial writes or invalid input */
+       if (*ppos != 0 || count > 8)
+               return -EINVAL;
+
+       cmd_buf = memdup_user(buf, count);
+       if (IS_ERR(cmd_buf))
+               return PTR_ERR(cmd_buf);
+
+       module = ice_find_module_by_dentry(pf, dentry);
+       if (module < 0) {
+               dev_info(dev, "unknown module\n");
+               return -EINVAL;
+       }
+
+       cnt = sscanf(cmd_buf, "%s", user_val);
+       if (cnt != 1)
+               return -EINVAL;
+
+       log_level = sysfs_match_string(ice_fwlog_level_string, user_val);
+       if (log_level < 0) {
+               dev_info(dev, "unknown log level '%s'\n", user_val);
+               return -EINVAL;
+       }
+
+       if (module != ICE_AQC_FW_LOG_ID_MAX) {
+               ice_pf_fwlog_update_module(pf, log_level, module);
+       } else {
+               /* the module 'all' is a shortcut so that we can set
+                * all of the modules to the same level quickly
+                */
+               int i;
+
+               for (i = 0; i < ICE_AQC_FW_LOG_ID_MAX; i++)
+                       ice_pf_fwlog_update_module(pf, log_level, i);
+       }
+
+       return count;
+}
+
+static const struct file_operations ice_debugfs_module_fops = {
+       .owner = THIS_MODULE,
+       .open  = ice_debugfs_module_open,
+       .read = seq_read,
+       .release = single_release,
+       .write = ice_debugfs_module_write,
+};
+
+/**
+ * ice_debugfs_nr_messages_read - read from 'nr_messages' file
+ * @filp: the opened file
+ * @buffer: where to write the data for the user to read
+ * @count: the size of the user's buffer
+ * @ppos: file position offset
+ */
+static ssize_t ice_debugfs_nr_messages_read(struct file *filp,
+                                           char __user *buffer, size_t count,
+                                           loff_t *ppos)
+{
+       struct ice_pf *pf = filp->private_data;
+       struct ice_hw *hw = &pf->hw;
+       char buff[32] = {};
+
+       snprintf(buff, sizeof(buff), "%d\n",
+                hw->fwlog_cfg.log_resolution);
+
+       return simple_read_from_buffer(buffer, count, ppos, buff, strlen(buff));
+}
+
+/**
+ * ice_debugfs_nr_messages_write - write into 'nr_messages' file
+ * @filp: the opened file
+ * @buf: where to find the user's data
+ * @count: the length of the user's data
+ * @ppos: file position offset
+ */
+static ssize_t
+ice_debugfs_nr_messages_write(struct file *filp, const char __user *buf,
+                             size_t count, loff_t *ppos)
+{
+       struct ice_pf *pf = filp->private_data;
+       struct device *dev = ice_pf_to_dev(pf);
+       struct ice_hw *hw = &pf->hw;
+       char user_val[8], *cmd_buf;
+       s16 nr_messages;
+       ssize_t ret;
+
+       /* don't allow partial writes or invalid input */
+       if (*ppos != 0 || count > 4)
+               return -EINVAL;
+
+       cmd_buf = memdup_user(buf, count);
+       if (IS_ERR(cmd_buf))
+               return PTR_ERR(cmd_buf);
+
+       ret = sscanf(cmd_buf, "%s", user_val);
+       if (ret != 1)
+               return -EINVAL;
+
+       ret = kstrtos16(user_val, 0, &nr_messages);
+       if (ret)
+               return ret;
+
+       if (nr_messages < ICE_AQC_FW_LOG_MIN_RESOLUTION ||
+           nr_messages > ICE_AQC_FW_LOG_MAX_RESOLUTION) {
+               dev_err(dev, "Invalid FW log number of messages %d, value must be between %d - %d\n",
+                       nr_messages, ICE_AQC_FW_LOG_MIN_RESOLUTION,
+                       ICE_AQC_FW_LOG_MAX_RESOLUTION);
+               return -EINVAL;
+       }
+
+       hw->fwlog_cfg.log_resolution = nr_messages;
+
+       return count;
+}
+
+static const struct file_operations ice_debugfs_nr_messages_fops = {
+       .owner = THIS_MODULE,
+       .open  = simple_open,
+       .read = ice_debugfs_nr_messages_read,
+       .write = ice_debugfs_nr_messages_write,
+};
+
+/**
+ * ice_debugfs_fwlog_init - setup the debugfs directory
+ * @pf: the ice that is starting up
+ */
+void ice_debugfs_fwlog_init(struct ice_pf *pf)
+{
+       const char *name = pci_name(pf->pdev);
+       struct dentry *fw_modules_dir;
+       struct dentry **fw_modules;
+       int i;
+
+       /* only support fw log commands on PF 0 */
+       if (pf->hw.bus.func)
+               return;
+
+       /* allocate space for this first because if it fails then we don't
+        * need to unwind
+        */
+       fw_modules = kcalloc(ICE_NR_FW_LOG_MODULES, sizeof(*fw_modules),
+                            GFP_KERNEL);
+       if (!fw_modules)
+               return;
+
+       pf->ice_debugfs_pf = debugfs_create_dir(name, ice_debugfs_root);
+       if (IS_ERR(pf->ice_debugfs_pf))
+               goto err_create_module_files;
+
+       pf->ice_debugfs_pf_fwlog = debugfs_create_dir("fwlog",
+                                                     pf->ice_debugfs_pf);
+       if (IS_ERR(pf->ice_debugfs_pf))
+               goto err_create_module_files;
+
+       fw_modules_dir = debugfs_create_dir("modules",
+                                           pf->ice_debugfs_pf_fwlog);
+       if (IS_ERR(fw_modules_dir))
+               goto err_create_module_files;
+
+       for (i = 0; i < ICE_NR_FW_LOG_MODULES; i++) {
+               fw_modules[i] = debugfs_create_file(ice_fwlog_module_string[i],
+                                                   0600, fw_modules_dir, pf,
+                                                   &ice_debugfs_module_fops);
+               if (IS_ERR(fw_modules[i]))
+                       goto err_create_module_files;
+       }
+
+       debugfs_create_file("nr_messages", 0600,
+                           pf->ice_debugfs_pf_fwlog, pf,
+                           &ice_debugfs_nr_messages_fops);
+
+       pf->ice_debugfs_pf_fwlog_modules = fw_modules;
+
+       return;
+
+err_create_module_files:
+       debugfs_remove_recursive(pf->ice_debugfs_pf_fwlog);
+       kfree(fw_modules);
+}
+
+/**
+ * ice_debugfs_init - create root directory for debugfs entries
+ */
+void ice_debugfs_init(void)
+{
+       ice_debugfs_root = debugfs_create_dir(KBUILD_MODNAME, NULL);
+       if (IS_ERR(ice_debugfs_root))
+               pr_info("init of debugfs failed\n");
+}
+
+/**
+ * ice_debugfs_exit - remove debugfs entries
+ */
+void ice_debugfs_exit(void)
+{
+       debugfs_remove_recursive(ice_debugfs_root);
+       ice_debugfs_root = NULL;
+}
 
--- /dev/null
+// SPDX-License-Identifier: GPL-2.0
+/* Copyright (c) 2022, Intel Corporation. */
+
+#include "ice.h"
+#include "ice_common.h"
+#include "ice_fwlog.h"
+
+/**
+ * ice_fwlog_init - Initialize FW logging configuration
+ * @hw: pointer to the HW structure
+ *
+ * This function should be called on driver initialization during
+ * ice_init_hw().
+ */
+int ice_fwlog_init(struct ice_hw *hw)
+{
+       /* only support fw log commands on PF 0 */
+       if (hw->bus.func)
+               return -EINVAL;
+
+       ice_fwlog_set_supported(hw);
+
+       if (ice_fwlog_supported(hw)) {
+               int status;
+
+               /* read the current config from the FW and store it */
+               status = ice_fwlog_get(hw, &hw->fwlog_cfg);
+               if (status)
+                       return status;
+
+               ice_debugfs_fwlog_init(hw->back);
+       } else {
+               dev_warn(ice_hw_to_dev(hw), "FW logging is not supported in this NVM image. Please update the NVM to get FW log support\n");
+       }
+
+       return 0;
+}
+
+/**
+ * ice_fwlog_deinit - unroll FW logging configuration
+ * @hw: pointer to the HW structure
+ *
+ * This function should be called in ice_deinit_hw().
+ */
+void ice_fwlog_deinit(struct ice_hw *hw)
+{
+       struct ice_pf *pf = hw->back;
+       int status;
+
+       /* only support fw log commands on PF 0 */
+       if (hw->bus.func)
+               return;
+
+       /* make sure FW logging is disabled to not put the FW in a weird state
+        * for the next driver load
+        */
+       hw->fwlog_cfg.options &= ~ICE_FWLOG_OPTION_ARQ_ENA;
+       status = ice_fwlog_set(hw, &hw->fwlog_cfg);
+       if (status)
+               dev_warn(ice_hw_to_dev(hw), "Unable to turn off FW logging, status: %d\n",
+                        status);
+
+       kfree(pf->ice_debugfs_pf_fwlog_modules);
+
+       pf->ice_debugfs_pf_fwlog_modules = NULL;
+}
+
+/**
+ * ice_fwlog_supported - Cached for whether FW supports FW logging or not
+ * @hw: pointer to the HW structure
+ *
+ * This will always return false if called before ice_init_hw(), so it must be
+ * called after ice_init_hw().
+ */
+bool ice_fwlog_supported(struct ice_hw *hw)
+{
+       return hw->fwlog_supported;
+}
+
+/**
+ * ice_aq_fwlog_set - Set FW logging configuration AQ command (0xFF30)
+ * @hw: pointer to the HW structure
+ * @entries: entries to configure
+ * @num_entries: number of @entries
+ * @options: options from ice_fwlog_cfg->options structure
+ * @log_resolution: logging resolution
+ */
+static int
+ice_aq_fwlog_set(struct ice_hw *hw, struct ice_fwlog_module_entry *entries,
+                u16 num_entries, u16 options, u16 log_resolution)
+{
+       struct ice_aqc_fw_log_cfg_resp *fw_modules;
+       struct ice_aqc_fw_log *cmd;
+       struct ice_aq_desc desc;
+       int status;
+       int i;
+
+       fw_modules = kcalloc(num_entries, sizeof(*fw_modules), GFP_KERNEL);
+       if (!fw_modules)
+               return -ENOMEM;
+
+       for (i = 0; i < num_entries; i++) {
+               fw_modules[i].module_identifier =
+                       cpu_to_le16(entries[i].module_id);
+               fw_modules[i].log_level = entries[i].log_level;
+       }
+
+       ice_fill_dflt_direct_cmd_desc(&desc, ice_aqc_opc_fw_logs_config);
+       desc.flags |= cpu_to_le16(ICE_AQ_FLAG_RD);
+
+       cmd = &desc.params.fw_log;
+
+       cmd->cmd_flags = ICE_AQC_FW_LOG_CONF_SET_VALID;
+       cmd->ops.cfg.log_resolution = cpu_to_le16(log_resolution);
+       cmd->ops.cfg.mdl_cnt = cpu_to_le16(num_entries);
+
+       if (options & ICE_FWLOG_OPTION_ARQ_ENA)
+               cmd->cmd_flags |= ICE_AQC_FW_LOG_CONF_AQ_EN;
+       if (options & ICE_FWLOG_OPTION_UART_ENA)
+               cmd->cmd_flags |= ICE_AQC_FW_LOG_CONF_UART_EN;
+
+       status = ice_aq_send_cmd(hw, &desc, fw_modules,
+                                sizeof(*fw_modules) * num_entries,
+                                NULL);
+
+       kfree(fw_modules);
+
+       return status;
+}
+
+/**
+ * ice_fwlog_set - Set the firmware logging settings
+ * @hw: pointer to the HW structure
+ * @cfg: config used to set firmware logging
+ *
+ * This function should be called whenever the driver needs to set the firmware
+ * logging configuration. It can be called on initialization, reset, or during
+ * runtime.
+ *
+ * If the PF wishes to receive FW logging then it must register via
+ * ice_fwlog_register. Note, that ice_fwlog_register does not need to be called
+ * for init.
+ */
+int ice_fwlog_set(struct ice_hw *hw, struct ice_fwlog_cfg *cfg)
+{
+       if (!ice_fwlog_supported(hw))
+               return -EOPNOTSUPP;
+
+       return ice_aq_fwlog_set(hw, cfg->module_entries,
+                               ICE_AQC_FW_LOG_ID_MAX, cfg->options,
+                               cfg->log_resolution);
+}
+
+/**
+ * ice_aq_fwlog_get - Get the current firmware logging configuration (0xFF32)
+ * @hw: pointer to the HW structure
+ * @cfg: firmware logging configuration to populate
+ */
+static int ice_aq_fwlog_get(struct ice_hw *hw, struct ice_fwlog_cfg *cfg)
+{
+       struct ice_aqc_fw_log_cfg_resp *fw_modules;
+       struct ice_aqc_fw_log *cmd;
+       struct ice_aq_desc desc;
+       u16 module_id_cnt;
+       int status;
+       void *buf;
+       int i;
+
+       memset(cfg, 0, sizeof(*cfg));
+
+       buf = kzalloc(ICE_AQ_MAX_BUF_LEN, GFP_KERNEL);
+       if (!buf)
+               return -ENOMEM;
+
+       ice_fill_dflt_direct_cmd_desc(&desc, ice_aqc_opc_fw_logs_query);
+       cmd = &desc.params.fw_log;
+
+       cmd->cmd_flags = ICE_AQC_FW_LOG_AQ_QUERY;
+
+       status = ice_aq_send_cmd(hw, &desc, buf, ICE_AQ_MAX_BUF_LEN, NULL);
+       if (status) {
+               ice_debug(hw, ICE_DBG_FW_LOG, "Failed to get FW log configuration\n");
+               goto status_out;
+       }
+
+       module_id_cnt = le16_to_cpu(cmd->ops.cfg.mdl_cnt);
+       if (module_id_cnt < ICE_AQC_FW_LOG_ID_MAX) {
+               ice_debug(hw, ICE_DBG_FW_LOG, "FW returned less than the expected number of FW log module IDs\n");
+       } else if (module_id_cnt > ICE_AQC_FW_LOG_ID_MAX) {
+               ice_debug(hw, ICE_DBG_FW_LOG, "FW returned more than expected number of FW log module IDs, setting module_id_cnt to software expected max %u\n",
+                         ICE_AQC_FW_LOG_ID_MAX);
+               module_id_cnt = ICE_AQC_FW_LOG_ID_MAX;
+       }
+
+       cfg->log_resolution = le16_to_cpu(cmd->ops.cfg.log_resolution);
+       if (cmd->cmd_flags & ICE_AQC_FW_LOG_CONF_AQ_EN)
+               cfg->options |= ICE_FWLOG_OPTION_ARQ_ENA;
+       if (cmd->cmd_flags & ICE_AQC_FW_LOG_CONF_UART_EN)
+               cfg->options |= ICE_FWLOG_OPTION_UART_ENA;
+
+       fw_modules = (struct ice_aqc_fw_log_cfg_resp *)buf;
+
+       for (i = 0; i < module_id_cnt; i++) {
+               struct ice_aqc_fw_log_cfg_resp *fw_module = &fw_modules[i];
+
+               cfg->module_entries[i].module_id =
+                       le16_to_cpu(fw_module->module_identifier);
+               cfg->module_entries[i].log_level = fw_module->log_level;
+       }
+
+status_out:
+       kfree(buf);
+       return status;
+}
+
+/**
+ * ice_fwlog_get - Get the firmware logging settings
+ * @hw: pointer to the HW structure
+ * @cfg: config to populate based on current firmware logging settings
+ */
+int ice_fwlog_get(struct ice_hw *hw, struct ice_fwlog_cfg *cfg)
+{
+       if (!ice_fwlog_supported(hw))
+               return -EOPNOTSUPP;
+
+       return ice_aq_fwlog_get(hw, cfg);
+}
+
+/**
+ * ice_fwlog_set_supported - Set if FW logging is supported by FW
+ * @hw: pointer to the HW struct
+ *
+ * If FW returns success to the ice_aq_fwlog_get call then it supports FW
+ * logging, else it doesn't. Set the fwlog_supported flag accordingly.
+ *
+ * This function is only meant to be called during driver init to determine if
+ * the FW support FW logging.
+ */
+void ice_fwlog_set_supported(struct ice_hw *hw)
+{
+       struct ice_fwlog_cfg *cfg;
+       int status;
+
+       hw->fwlog_supported = false;
+
+       cfg = kzalloc(sizeof(*cfg), GFP_KERNEL);
+       if (!cfg)
+               return;
+
+       /* don't call ice_fwlog_get() because that would check to see if FW
+        * logging is supported which is what the driver is determining now
+        */
+       status = ice_aq_fwlog_get(hw, cfg);
+       if (status)
+               ice_debug(hw, ICE_DBG_FW_LOG, "ice_aq_fwlog_get failed, FW logging is not supported on this version of FW, status %d\n",
+                         status);
+       else
+               hw->fwlog_supported = true;
+
+       kfree(cfg);
+}
 
--- /dev/null
+/* SPDX-License-Identifier: GPL-2.0 */
+/* Copyright (C) 2022, Intel Corporation. */
+
+#ifndef _ICE_FWLOG_H_
+#define _ICE_FWLOG_H_
+#include "ice_adminq_cmd.h"
+
+struct ice_hw;
+
+/* Only a single log level should be set and all log levels under the set value
+ * are enabled, e.g. if log level is set to ICE_FW_LOG_LEVEL_VERBOSE, then all
+ * other log levels are included (except ICE_FW_LOG_LEVEL_NONE)
+ */
+enum ice_fwlog_level {
+       ICE_FWLOG_LEVEL_NONE = 0,
+       ICE_FWLOG_LEVEL_ERROR = 1,
+       ICE_FWLOG_LEVEL_WARNING = 2,
+       ICE_FWLOG_LEVEL_NORMAL = 3,
+       ICE_FWLOG_LEVEL_VERBOSE = 4,
+       ICE_FWLOG_LEVEL_INVALID, /* all values >= this entry are invalid */
+};
+
+struct ice_fwlog_module_entry {
+       /* module ID for the corresponding firmware logging event */
+       u16 module_id;
+       /* verbosity level for the module_id */
+       u8 log_level;
+};
+
+struct ice_fwlog_cfg {
+       /* list of modules for configuring log level */
+       struct ice_fwlog_module_entry module_entries[ICE_AQC_FW_LOG_ID_MAX];
+       /* options used to configure firmware logging */
+       u16 options;
+#define ICE_FWLOG_OPTION_ARQ_ENA               BIT(0)
+#define ICE_FWLOG_OPTION_UART_ENA              BIT(1)
+       /* set before calling ice_fwlog_init() so the PF registers for firmware
+        * logging on initialization
+        */
+#define ICE_FWLOG_OPTION_REGISTER_ON_INIT      BIT(2)
+       /* set in the ice_fwlog_get() response if the PF is registered for FW
+        * logging events over ARQ
+        */
+#define ICE_FWLOG_OPTION_IS_REGISTERED         BIT(3)
+
+       /* minimum number of log events sent per Admin Receive Queue event */
+       u16 log_resolution;
+};
+
+void ice_fwlog_set_supported(struct ice_hw *hw);
+bool ice_fwlog_supported(struct ice_hw *hw);
+int ice_fwlog_init(struct ice_hw *hw);
+void ice_fwlog_deinit(struct ice_hw *hw);
+int ice_fwlog_set(struct ice_hw *hw, struct ice_fwlog_cfg *cfg);
+int ice_fwlog_get(struct ice_hw *hw, struct ice_fwlog_cfg *cfg);
+#endif /* _ICE_FWLOG_H_ */
 
        dev_info(ice_pf_to_dev(pf), "Wake reason: %s", wake_str);
 }
 
+/**
+ * ice_pf_fwlog_update_module - update 1 module
+ * @pf: pointer to the PF struct
+ * @log_level: log_level to use for the @module
+ * @module: module to update
+ */
+void ice_pf_fwlog_update_module(struct ice_pf *pf, int log_level, int module)
+{
+       struct ice_hw *hw = &pf->hw;
+
+       hw->fwlog_cfg.module_entries[module].log_level = log_level;
+}
+
 /**
  * ice_register_netdev - register netdev
  * @vsi: pointer to the VSI struct
                msleep(100);
        }
 
+       ice_debugfs_exit();
+
        if (test_bit(ICE_FLAG_SRIOV_ENA, pf->flags)) {
                set_bit(ICE_VF_RESETS_DISABLED, pf->state);
                ice_free_vfs(pf);
                goto err_dest_wq;
        }
 
+       ice_debugfs_init();
+
        status = pci_register_driver(&ice_driver);
        if (status) {
                pr_err("failed to register PCI driver, err %d\n", status);
 
 err_dest_lag_wq:
        destroy_workqueue(ice_lag_wq);
+       ice_debugfs_exit();
 err_dest_wq:
        destroy_workqueue(ice_wq);
        return status;
 
 #include "ice_protocol_type.h"
 #include "ice_sbq_cmd.h"
 #include "ice_vlan_mode.h"
+#include "ice_fwlog.h"
 
 static inline bool ice_is_tc_ena(unsigned long bitmap, u8 tc)
 {
        u8 fw_patch;            /* firmware patch version */
        u32 fw_build;           /* firmware build number */
 
+       struct ice_fwlog_cfg fwlog_cfg;
+       bool fwlog_supported; /* does hardware support FW logging? */
+
 /* Device max aggregate bandwidths corresponding to the GL_PWR_MODE_CTL
  * register. Used for determining the ITR/INTRL granularity during
  * initialization.