From: Aaron Brown <aaron.f.brown@intel.com>
To: davem@davemloft.net
Cc: Ashish Shah <ashish.n.shah@intel.com>,
netdev@vger.kernel.org, gospo@redhat.com, sassmann@redhat.com,
Aaron Brown <aaron.f.brown@intel.com>
Subject: [net-next 11/15] i40evf: future-proof vfr_stat state check
Date: Wed, 30 Jul 2014 17:32:07 -0700 [thread overview]
Message-ID: <1406766731-4209-12-git-send-email-aaron.f.brown@intel.com> (raw)
In-Reply-To: <1406766731-4209-1-git-send-email-aaron.f.brown@intel.com>
From: Ashish Shah <ashish.n.shah@intel.com>
Previously defined state I40E_VFR_VFACTIVE uses bit 1 which is now set to
"reserved." Update the state checks to also include I40E_VFR_COMPLETED.
This change will allow the VF to work with both existing and future PFs.
Change-ID: Ifd1d34f79f3b0ffd6d2550ee4dadc55825ff52f8
Signed-off-by: Ashish Shah <ashish.n.shah@intel.com>
Tested-by: Sibai Li <sibai.li@intel.com>
Signed-off-by: Aaron Brown <aaron.f.brown@intel.com>
---
drivers/net/ethernet/intel/i40evf/i40evf_main.c | 23 +++++++++++++++++------
1 file changed, 17 insertions(+), 6 deletions(-)
diff --git a/drivers/net/ethernet/intel/i40evf/i40evf_main.c b/drivers/net/ethernet/intel/i40evf/i40evf_main.c
index 937785d..4c01079 100644
--- a/drivers/net/ethernet/intel/i40evf/i40evf_main.c
+++ b/drivers/net/ethernet/intel/i40evf/i40evf_main.c
@@ -1298,12 +1298,16 @@ static void i40evf_watchdog_task(struct work_struct *work)
struct i40evf_adapter,
watchdog_task);
struct i40e_hw *hw = &adapter->hw;
+ uint32_t rstat_val;
if (test_and_set_bit(__I40EVF_IN_CRITICAL_TASK, &adapter->crit_section))
goto restart_watchdog;
if (adapter->flags & I40EVF_FLAG_PF_COMMS_FAILED) {
- if ((rd32(hw, I40E_VFGEN_RSTAT) & 0x3) == I40E_VFR_VFACTIVE) {
+ rstat_val = rd32(hw, I40E_VFGEN_RSTAT) &
+ I40E_VFGEN_RSTAT_VFR_STATE_MASK;
+ if ((rstat_val == I40E_VFR_VFACTIVE) ||
+ (rstat_val == I40E_VFR_COMPLETED)) {
/* A chance for redemption! */
dev_err(&adapter->pdev->dev, "Hardware came out of reset. Attempting reinit.\n");
adapter->state = __I40EVF_STARTUP;
@@ -1329,8 +1333,11 @@ static void i40evf_watchdog_task(struct work_struct *work)
goto watchdog_done;
/* check for reset */
+ rstat_val = rd32(hw, I40E_VFGEN_RSTAT) &
+ I40E_VFGEN_RSTAT_VFR_STATE_MASK;
if (!(adapter->flags & I40EVF_FLAG_RESET_PENDING) &&
- (rd32(hw, I40E_VFGEN_RSTAT) & 0x3) != I40E_VFR_VFACTIVE) {
+ (rstat_val != I40E_VFR_VFACTIVE) &&
+ (rstat_val != I40E_VFR_COMPLETED)) {
adapter->state = __I40EVF_RESETTING;
adapter->flags |= I40EVF_FLAG_RESET_PENDING;
dev_err(&adapter->pdev->dev, "Hardware reset detected\n");
@@ -1496,7 +1503,8 @@ static void i40evf_reset_task(struct work_struct *work)
for (i = 0; i < I40EVF_RESET_WAIT_COUNT; i++) {
rstat_val = rd32(hw, I40E_VFGEN_RSTAT) &
I40E_VFGEN_RSTAT_VFR_STATE_MASK;
- if (rstat_val != I40E_VFR_VFACTIVE)
+ if ((rstat_val != I40E_VFR_VFACTIVE) &&
+ (rstat_val != I40E_VFR_COMPLETED))
break;
else
msleep(I40EVF_RESET_WAIT_MS);
@@ -1510,7 +1518,8 @@ static void i40evf_reset_task(struct work_struct *work)
for (i = 0; i < I40EVF_RESET_WAIT_COUNT; i++) {
rstat_val = rd32(hw, I40E_VFGEN_RSTAT) &
I40E_VFGEN_RSTAT_VFR_STATE_MASK;
- if (rstat_val == I40E_VFR_VFACTIVE)
+ if ((rstat_val == I40E_VFR_VFACTIVE) ||
+ (rstat_val == I40E_VFR_COMPLETED))
break;
else
msleep(I40EVF_RESET_WAIT_MS);
@@ -1947,8 +1956,10 @@ static int i40evf_check_reset_complete(struct i40e_hw *hw)
int i;
for (i = 0; i < 100; i++) {
- rstat = rd32(hw, I40E_VFGEN_RSTAT);
- if (rstat == I40E_VFR_VFACTIVE)
+ rstat = rd32(hw, I40E_VFGEN_RSTAT) &
+ I40E_VFGEN_RSTAT_VFR_STATE_MASK;
+ if ((rstat == I40E_VFR_VFACTIVE) ||
+ (rstat == I40E_VFR_COMPLETED))
return 0;
udelay(10);
}
--
1.9.3
next prev parent reply other threads:[~2014-07-31 0:28 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-07-31 0:31 [net-next 00/15] Intel Wired LAN Driver Updates Aaron Brown
2014-07-31 0:31 ` [net-next 01/15] i40e: adds FCoE code to the i40e driver Aaron Brown
2014-07-31 0:31 ` [net-next 02/15] i40e: Adds FCoE related code to i40e core driver Aaron Brown
2014-07-31 0:31 ` [net-next 03/15] i40e: adds FCoE to build and updates its documentation Aaron Brown
2014-07-31 0:32 ` [net-next 04/15] i40e: expose debug_write_register request Aaron Brown
2014-07-31 0:32 ` [net-next 05/15] i40e: use correct vf_id offset for virtchnl message Aaron Brown
2014-07-31 0:32 ` [net-next 06/15] i40e: Move some variable declarations out of a loop Aaron Brown
2014-07-31 21:05 ` David Miller
2014-07-31 23:56 ` Abodunrin, Akeem G
2014-08-01 1:31 ` David Miller
2014-07-31 0:32 ` [net-next 07/15] i40e: disable local loopback on vmdq vsi Aaron Brown
2014-07-31 0:32 ` [net-next 08/15] i40evf: fix scan warning on sprintf Aaron Brown
2014-07-31 0:32 ` [net-next 09/15] i40e: Minor comment changes Aaron Brown
2014-07-31 0:32 ` [net-next 10/15] i40e: remove support for vf unicast promiscuous mode Aaron Brown
2014-07-31 0:32 ` Aaron Brown [this message]
2014-07-31 0:32 ` [net-next 12/15] i40evf: do not re-arm watchdog after remove Aaron Brown
2014-07-31 0:32 ` [net-next 13/15] i40evf: don't leak queue vectors Aaron Brown
2014-07-31 0:32 ` [net-next 14/15] i40evf: fix memory leak on unused interfaces Aaron Brown
2014-07-31 0:32 ` [net-next 15/15] i40evf: Fixed guest OS panic when removing vf driver Aaron Brown
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=1406766731-4209-12-git-send-email-aaron.f.brown@intel.com \
--to=aaron.f.brown@intel.com \
--cc=ashish.n.shah@intel.com \
--cc=davem@davemloft.net \
--cc=gospo@redhat.com \
--cc=netdev@vger.kernel.org \
--cc=sassmann@redhat.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;
as well as URLs for NNTP newsgroup(s).