diff options
| author |   Shannon Nelson <shannon.nelson@intel.com> | 2014-11-13 08:23:12 +0000 |
|---|---|---|
| committer |   Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2014-12-09 12:57:00 -0800 |
| commit | 4443ec94d246e65fcee8ebf63f4d3abea0ff86df (patch) | |
| tree | 199d5b0bcc35494f0bbcb7844c33d167963a08f4 /drivers/net | |
| parent | net: ethernet: rocker: Add dependency to CONFIG_BRIDGE in Kconfig (diff) | |
| download | linux-dev-4443ec94d246e65fcee8ebf63f4d3abea0ff86df.tar.xz linux-dev-4443ec94d246e65fcee8ebf63f4d3abea0ff86df.zip | |
i40e: clear NVM update state on ethtool test
Once in a great while the NVMUpdate tools and the driver get out
of phase with each other. This gives us a way to reset things
without having to unload the driver.
Change-ID: I353f688236249a666a90ba3e7233e0ed8c1a04e9
Signed-off-by: Shannon Nelson <shannon.nelson@intel.com>
Tested-by: Jim Young <jamesx.m.young@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/ethernet/intel/i40e/i40e_ethtool.c b/drivers/net/ethernet/intel/i40e/i40e_ethtool.c index fcd815dc7d3c..25242f505161 100644 --- a/drivers/net/ethernet/intel/i40e/i40e_ethtool.c +++ b/drivers/net/ethernet/intel/i40e/i40e_ethtool.c @@ -1393,6 +1393,9 @@ static int i40e_eeprom_test(struct net_device *netdev, u64 *data) netif_info(pf, hw, netdev, "eeprom test\n"); *data = i40e_diag_eeprom_test(&pf->hw); + /* forcebly clear the NVM Update state machine */ + pf->hw.nvmupd_state = I40E_NVMUPD_STATE_INIT; + return *data; } |