From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
To: davem@davemloft.net
Cc: Shannon Nelson <shannon.nelson@intel.com>,
netdev@vger.kernel.org, nhorman@redhat.com, sassmann@redhat.com,
jogreene@redhat.com, Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Subject: [net-next v2 01/13] i40e: clear NVM update state on ethtool test
Date: Tue, 9 Dec 2014 13:26:08 -0800 [thread overview]
Message-ID: <1418160380-29847-2-git-send-email-jeffrey.t.kirsher@intel.com> (raw)
In-Reply-To: <1418160380-29847-1-git-send-email-jeffrey.t.kirsher@intel.com>
From: Shannon Nelson <shannon.nelson@intel.com>
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>
---
drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/drivers/net/ethernet/intel/i40e/i40e_ethtool.c b/drivers/net/ethernet/intel/i40e/i40e_ethtool.c
index fcd815d..25242f5 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;
}
--
1.9.3
next prev parent reply other threads:[~2014-12-09 21:26 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-12-09 21:26 [net-next v2 00/13][pull request] Intel Wired LAN Driver Updates 2014-12-09 Jeff Kirsher
2014-12-09 21:26 ` Jeff Kirsher [this message]
2014-12-09 21:26 ` [net-next v2 02/13] i40e: better error messages for NVM update issues Jeff Kirsher
2014-12-09 21:26 ` [net-next v2 03/13] i40e: let firmware catch the NVM busy error Jeff Kirsher
2014-12-09 21:26 ` [net-next v2 04/13] i40e: rework debug messages for NVM update Jeff Kirsher
2014-12-09 21:26 ` [net-next v2 05/13] i40e: add range check to i40e_aq_rc_to_posix Jeff Kirsher
2014-12-09 21:26 ` [net-next v2 06/13] i40e: init NVM update state on adminq init Jeff Kirsher
2014-12-09 21:26 ` [net-next v2 07/13] i40e: remove unused nvm_semaphore_wait Jeff Kirsher
2014-12-09 21:26 ` [net-next v2 08/13] i40e: set max limit for access polling Jeff Kirsher
2014-12-09 21:26 ` [net-next v2 09/13] i40e: fix up NVM update sm error handling Jeff Kirsher
2014-12-09 21:26 ` [net-next v2 10/13] i40e: poll on NVM semaphore only if not other error Jeff Kirsher
2014-12-09 21:26 ` [net-next v2 11/13] i40e: check for AQ timeout in aq_rc decode Jeff Kirsher
2014-12-09 21:26 ` [net-next v2 12/13] i40e: add to NVM update debug message Jeff Kirsher
2014-12-09 21:26 ` [net-next v2 13/13] i40e/i40evf: Convert macro to static inline Jeff Kirsher
2014-12-09 22:01 ` [net-next v2 00/13][pull request] Intel Wired LAN Driver Updates 2014-12-09 David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1418160380-29847-2-git-send-email-jeffrey.t.kirsher@intel.com \
--to=jeffrey.t.kirsher@intel.com \
--cc=davem@davemloft.net \
--cc=jogreene@redhat.com \
--cc=netdev@vger.kernel.org \
--cc=nhorman@redhat.com \
--cc=sassmann@redhat.com \
--cc=shannon.nelson@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox