i40e: The driver now prints the API version in error message

Added the API version in the error message for clarity.

Signed-off-by: Adam Ludkiewicz <adam.ludkiewicz@intel.com>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c
index 0ce9fd6bb0f43f6c4014b94462b973f04c59e499..65c2b9d2652b215de260f1e2d5502bebe73ea957 100644 (file)
--- a/drivers/net/ethernet/intel/i40e/i40e_main.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c
@@ -14070,7 +14070,11 @@ static int i40e_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
        if (err) {
                if (err == I40E_ERR_FIRMWARE_API_VERSION)
                        dev_info(&pdev->dev,
-                                "The driver for the device stopped because the NVM image is newer than expected. You must install the most recent version of the network driver.\n");
+                                "The driver for the device stopped because the NVM image v%u.%u is newer than expected v%u.%u. You must install the most recent version of the network driver.\n",
+                                hw->aq.api_maj_ver,
+                                hw->aq.api_min_ver,
+                                I40E_FW_API_VERSION_MAJOR,
+                                I40E_FW_MINOR_VERSION(hw));
                else
                        dev_info(&pdev->dev,
                                 "The driver for the device stopped because the device firmware failed to init. Try updating your NVM image.\n");
@@ -14088,10 +14092,18 @@ static int i40e_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
        if (hw->aq.api_maj_ver == I40E_FW_API_VERSION_MAJOR &&
            hw->aq.api_min_ver > I40E_FW_MINOR_VERSION(hw))
                dev_info(&pdev->dev,
-                        "The driver for the device detected a newer version of the NVM image than expected. Please install the most recent version of the network driver.\n");
+                        "The driver for the device detected a newer version of the NVM image v%u.%u than expected v%u.%u. Please install the most recent version of the network driver.\n",
+                        hw->aq.api_maj_ver,
+                        hw->aq.api_min_ver,
+                        I40E_FW_API_VERSION_MAJOR,
+                        I40E_FW_MINOR_VERSION(hw));
        else if (hw->aq.api_maj_ver == 1 && hw->aq.api_min_ver < 4)
                dev_info(&pdev->dev,
-                        "The driver for the device detected an older version of the NVM image than expected. Please update the NVM image.\n");
+                        "The driver for the device detected an older version of the NVM image v%u.%u than expected v%u.%u. Please update the NVM image.\n",
+                        hw->aq.api_maj_ver,
+                        hw->aq.api_min_ver,
+                        I40E_FW_API_VERSION_MAJOR,
+                        I40E_FW_MINOR_VERSION(hw));
 
        i40e_verify_eeprom(pf);