Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4fb29bdd authored by Adam Ludkiewicz's avatar Adam Ludkiewicz Committed by Jeff Kirsher
Browse files

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



Added the API version in the error message for clarity.

Signed-off-by: default avatarAdam Ludkiewicz <adam.ludkiewicz@intel.com>
Tested-by: default avatarAndrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent cce2dffe

drivers/net/ethernet/intel/i40e/i40e_main.c

+15 −3
Original line number Diff line number Diff line
@@ -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);