Commit b1703d5f authored by Sergey Temerkhanov's avatar Sergey Temerkhanov Committed by Tony Nguyen
Browse files

ice: Report NVM version numbers on mismatch during load 



Report NVM version numbers (both detected and expected) when a mismatch b/w
driver and firmware is detected. This provides more useful information
about which NVM version the driver expects, rather than requiring manual
code inspection.

Signed-off-by: default avatarSergey Temerkhanov <sergey.temerkhanov@intel.com>
Signed-off-by: default avatarJacob Keller <jacob.e.keller@intel.com>
Reviewed-by: default avatarPrzemek Kitszel <przemyslaw.kitszel@intel.com>
Tested-by: Pucha Himasekhar Reddy <himasekharx.reddy.pucha@intel.com> (A Contingent worker at Intel)
Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
parent 448711c1

drivers/net/ethernet/intel/ice/ice_controlq.c

+10 −4
Original line number Diff line number Diff line
@@ -488,7 +488,7 @@ static int ice_shutdown_sq(struct ice_hw *hw, struct ice_ctl_q_info *cq) 
}



/**

 * ice_aq_ver_check - Check the reported AQ API version.

 * ice_aq_ver_check - Check the reported AQ API version

 * @hw: pointer to the hardware structure

 *

 * Checks if the driver should load on a given AQ API version.
@@ -508,14 +508,20 @@ static bool ice_aq_ver_check(struct ice_hw *hw) 
	} else if (hw->api_maj_ver == exp_fw_api_ver_major) {

		if (hw->api_min_ver > (exp_fw_api_ver_minor + 2))

			dev_info(ice_hw_to_dev(hw),

				 "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 (%u.%u) of the NVM image than expected (%u.%u). Please install the most recent version of the network driver.\n",

				 hw->api_maj_ver, hw->api_min_ver,

				 exp_fw_api_ver_major, exp_fw_api_ver_minor);

		else if ((hw->api_min_ver + 2) < exp_fw_api_ver_minor)

			dev_info(ice_hw_to_dev(hw),

				 "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 (%u.%u) of the NVM image than expected (%u.%u). Please update the NVM image.\n",

				 hw->api_maj_ver, hw->api_min_ver,

				 exp_fw_api_ver_major, exp_fw_api_ver_minor);

	} else {

		/* Major API version is older than expected, log a warning */

		dev_info(ice_hw_to_dev(hw),

			 "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 (%u.%u) of the NVM image than expected (%u.%u). Please update the NVM image.\n",

			 hw->api_maj_ver, hw->api_min_ver,

			 exp_fw_api_ver_major, exp_fw_api_ver_minor);

	}

	return true;

}