netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
To: davem@davemloft.net
Cc: Mitch Williams <mitch.a.williams@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 12/16] i40evf: enable bus master after reset
Date: Tue, 16 Feb 2016 21:34:18 -0800	[thread overview]
Message-ID: <1455687262-20453-13-git-send-email-jeffrey.t.kirsher@intel.com> (raw)
In-Reply-To: <1455687262-20453-1-git-send-email-jeffrey.t.kirsher@intel.com>

From: Mitch Williams <mitch.a.williams@intel.com>

If the VF is reset via VFLR, the device will be knocked out of bus
master mode, and the driver will fail to recover from the reset. Fix
this by enabling bus mastering after every reset. In a non-VFLR case,
the bus master bit will not be disabled, and this call will have no effect.

Change-ID: Id515859ac7a691db478222228add6d149e96801a
Signed-off-by: Mitch Williams <mitch.a.williams@intel.com>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
 drivers/net/ethernet/intel/i40evf/i40evf_main.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/net/ethernet/intel/i40evf/i40evf_main.c b/drivers/net/ethernet/intel/i40evf/i40evf_main.c
index 66964eb..933f1fc 100644
--- a/drivers/net/ethernet/intel/i40evf/i40evf_main.c
+++ b/drivers/net/ethernet/intel/i40evf/i40evf_main.c
@@ -1837,6 +1837,7 @@ static void i40evf_reset_task(struct work_struct *work)
 			break;
 		msleep(I40EVF_RESET_WAIT_MS);
 	}
+	pci_set_master(adapter->pdev);
 	/* extra wait to make sure minimum wait is met */
 	msleep(I40EVF_RESET_WAIT_MS);
 	if (i == I40EVF_RESET_WAIT_COUNT) {
-- 
2.5.0

  parent reply	other threads:[~2016-02-17  5:34 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-02-17  5:34 [net-next 00/16][pull request] 40GbE Intel Wired LAN Driver Updates 2016-02-16 Jeff Kirsher
2016-02-17  5:34 ` [net-next 01/16] i40e: AQ Shared resource flags Jeff Kirsher
2016-02-17  5:34 ` [net-next 02/16] i40e: AQ Add set_switch_config Jeff Kirsher
2016-02-17  5:34 ` [net-next 03/16] i40e: AQ Add VXLAN-GPE tunnel type Jeff Kirsher
2016-02-17  5:34 ` [net-next 04/16] i40e: AQ thermal sensor control struct Jeff Kirsher
2016-02-17  5:34 ` [net-next 05/16] i40e: Bump AQ minor version to 1.5 for new FW features Jeff Kirsher
2016-02-17  5:34 ` [net-next 06/16] i40e: Store lan_vsi_idx and lan_vsi_id in the right size Jeff Kirsher
2016-02-17  5:34 ` [net-next 07/16] i40e: fix write-back-on-itr to work with legacy itr Jeff Kirsher
2016-02-17  5:34 ` [net-next 08/16] i40e: add counter for arq overflows Jeff Kirsher
2016-02-17  5:34 ` [net-next 09/16] i40e: add 20G speed for Tx bandwidth calculations Jeff Kirsher
2016-02-17  5:34 ` [net-next 10/16] i40e: refactor DCB function Jeff Kirsher
2016-02-17  5:34 ` [net-next 11/16] i40e: add a little more to an NVM update debug message Jeff Kirsher
2016-02-17  5:34 ` Jeff Kirsher [this message]
2016-02-17  5:34 ` [net-next 13/16] i40e: add netdev info to VSI dump Jeff Kirsher
2016-02-17  5:34 ` [net-next 14/16] i40e: remove VF device IDs from PF Jeff Kirsher
2016-02-17  5:34 ` [net-next 15/16] i40e: trivial: remove unnecessary local var Jeff Kirsher
2016-02-17  5:34 ` [net-next 16/16] i40e/i40evf: Bump i40e to 1.4.11 and i40evf to 1.4.7 Jeff Kirsher
2016-02-17 14:49 ` [net-next 00/16][pull request] 40GbE Intel Wired LAN Driver Updates 2016-02-16 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=1455687262-20453-13-git-send-email-jeffrey.t.kirsher@intel.com \
    --to=jeffrey.t.kirsher@intel.com \
    --cc=davem@davemloft.net \
    --cc=jogreene@redhat.com \
    --cc=mitch.a.williams@intel.com \
    --cc=netdev@vger.kernel.org \
    --cc=nhorman@redhat.com \
    --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).