]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
eth: fbnic: Enable firmware logging
authorLee Trager <lee@trager.us>
Wed, 2 Jul 2025 19:12:11 +0000 (12:12 -0700)
committerJakub Kicinski <kuba@kernel.org>
Wed, 9 Jul 2025 00:05:46 +0000 (17:05 -0700)
The firmware log buffer is enabled during probe and freed during remove.
Early versions of firmware do not support sending logs. Once the mailbox is
up driver will enable logging when supported firmware versions are detected.
Logging is disabled before the mailbox is freed.

Signed-off-by: Lee Trager <lee@trager.us>
Reviewed-by: Jacob Keller <jacob.e.keller@intel.com>
Link: https://patch.msgid.link/20250702192207.697368-6-lee@trager.us
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
drivers/net/ethernet/meta/fbnic/fbnic_fw_log.c
drivers/net/ethernet/meta/fbnic/fbnic_fw_log.h
drivers/net/ethernet/meta/fbnic/fbnic_pci.c

index caedbe7844f7e0aca6b55aaf542c285e3fdc93a5..38749d47cee6700db906fe2369c75715220a2fd3 100644 (file)
@@ -8,6 +8,31 @@
 #include "fbnic_fw.h"
 #include "fbnic_fw_log.h"
 
+void fbnic_fw_log_enable(struct fbnic_dev *fbd, bool send_hist)
+{
+       int err;
+
+       if (!fbnic_fw_log_ready(fbd))
+               return;
+
+       if (fbd->fw_cap.running.mgmt.version < MIN_FW_VER_CODE_HIST)
+               send_hist = false;
+
+       err = fbnic_fw_xmit_send_logs(fbd, true, send_hist);
+       if (err && err != -EOPNOTSUPP)
+               dev_warn(fbd->dev, "Unable to enable firmware logs: %d\n", err);
+}
+
+void fbnic_fw_log_disable(struct fbnic_dev *fbd)
+{
+       int err;
+
+       err = fbnic_fw_xmit_send_logs(fbd, false, false);
+       if (err && err != -EOPNOTSUPP)
+               dev_warn(fbd->dev, "Unable to disable firmware logs: %d\n",
+                        err);
+}
+
 int fbnic_fw_log_init(struct fbnic_dev *fbd)
 {
        struct fbnic_fw_log *log = &fbd->fw_log;
@@ -26,6 +51,8 @@ int fbnic_fw_log_init(struct fbnic_dev *fbd)
        log->data_start = data;
        log->data_end = data + FBNIC_FW_LOG_SIZE;
 
+       fbnic_fw_log_enable(fbd, true);
+
        return 0;
 }
 
@@ -36,6 +63,7 @@ void fbnic_fw_log_free(struct fbnic_dev *fbd)
        if (!fbnic_fw_log_ready(fbd))
                return;
 
+       fbnic_fw_log_disable(fbd);
        INIT_LIST_HEAD(&log->entries);
        log->size = 0;
        vfree(log->data_start);
index 881ee298ede7607a04c37a303da70021cf295e47..cb6555f40a24084a227e4cc3d602a0620984beff 100644 (file)
@@ -36,6 +36,8 @@ struct fbnic_fw_log {
 
 #define fbnic_fw_log_ready(_fbd)       (!!(_fbd)->fw_log.data_start)
 
+void fbnic_fw_log_enable(struct fbnic_dev *fbd, bool send_hist);
+void fbnic_fw_log_disable(struct fbnic_dev *fbd);
 int fbnic_fw_log_init(struct fbnic_dev *fbd);
 void fbnic_fw_log_free(struct fbnic_dev *fbd);
 int fbnic_fw_log_write(struct fbnic_dev *fbd, u64 index, u32 timestamp,
index 249d3ef862d5a97f19e271da26245a6c6625d306..b70e4cadb37bdf7bf9ed431a04ce3fcf8295c194 100644 (file)
@@ -291,6 +291,17 @@ static int fbnic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
                goto free_irqs;
        }
 
+       /* Send the request to enable the FW logging to host. Note if this
+        * fails we ignore the error and just display a message as it is
+        * possible the FW is just too old to support the logging and needs
+        * to be updated.
+        */
+       err = fbnic_fw_log_init(fbd);
+       if (err)
+               dev_warn(fbd->dev,
+                        "Unable to initialize firmware log buffer: %d\n",
+                        err);
+
        fbnic_devlink_register(fbd);
        fbnic_dbg_fbd_init(fbd);
        spin_lock_init(&fbd->hw_stats_lock);
@@ -365,6 +376,7 @@ static void fbnic_remove(struct pci_dev *pdev)
        fbnic_hwmon_unregister(fbd);
        fbnic_dbg_fbd_exit(fbd);
        fbnic_devlink_unregister(fbd);
+       fbnic_fw_log_free(fbd);
        fbnic_fw_free_mbx(fbd);
        fbnic_free_irqs(fbd);
 
@@ -389,6 +401,8 @@ static int fbnic_pm_suspend(struct device *dev)
        rtnl_unlock();
 
 null_uc_addr:
+       fbnic_fw_log_disable(fbd);
+
        devl_lock(priv_to_devlink(fbd));
 
        fbnic_fw_free_mbx(fbd);
@@ -434,6 +448,11 @@ static int __fbnic_pm_resume(struct device *dev)
 
        devl_unlock(priv_to_devlink(fbd));
 
+       /* Only send log history if log buffer is empty to prevent duplicate
+        * log entries.
+        */
+       fbnic_fw_log_enable(fbd, list_empty(&fbd->fw_log.entries));
+
        /* No netdev means there isn't a network interface to bring up */
        if (fbnic_init_failure(fbd))
                return 0;
@@ -455,6 +474,8 @@ static int __fbnic_pm_resume(struct device *dev)
 
        return 0;
 err_free_mbx:
+       fbnic_fw_log_disable(fbd);
+
        rtnl_unlock();
        fbnic_fw_free_mbx(fbd);
 err_free_irqs: