ice: (re)initialize NVM fields when rebuilding

After performing a flash update, a device EMP reset may occur. This
reset will cause the newly downloaded firmware to be initialized. When
this happens, the driver still reports the previous NVM version
information.

This is because the NVM versions are cached within the hw structure.
This can be confusing, as the new firmware is in fact running in this
case.

Handle this by calling ice_init_nvm when rebuilding the driver state.
This will update the flash version information and ensures that the
current values are displayed when reporting the NVM versions to the
stack.

Signed-off-by: Jacob Keller <jacob.e.keller@intel.com>
Tested-by: Tony Brelinski <tonyx.brelinski@intel.com>
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>

diff --git a/drivers/net/ethernet/intel/ice/ice_main.c b/drivers/net/ethernet/intel/ice/ice_main.c
index a89ca799109f642b3f9b408244c3d1832ebf1cbc..7606ded59a84c5da33f35e41250d155081144946 100644 (file)
--- a/drivers/net/ethernet/intel/ice/ice_main.c
+++ b/drivers/net/ethernet/intel/ice/ice_main.c
@@ -6218,6 +6218,12 @@ static void ice_rebuild(struct ice_pf *pf, enum ice_reset_req reset_type)
 
        ice_clear_pxe_mode(hw);
 
+       ret = ice_init_nvm(hw);
+       if (ret) {
+               dev_err(dev, "ice_init_nvm failed %s\n", ice_stat_str(ret));
+               goto err_init_ctrlq;
+       }
+
        ret = ice_get_caps(hw);
        if (ret) {
                dev_err(dev, "ice_get_caps failed %s\n", ice_stat_str(ret));