From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
To: davem@davemloft.net
Cc: Jacob Keller <jacob.e.keller@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/13] fm10k: move fm10k_prepare_for_reset and fm10k_handle_reset
Date: Mon, 2 Oct 2017 08:42:35 -0700 [thread overview]
Message-ID: <20171002154236.84043-13-jeffrey.t.kirsher@intel.com> (raw)
In-Reply-To: <20171002154236.84043-1-jeffrey.t.kirsher@intel.com>
From: Jacob Keller <jacob.e.keller@intel.com>
A future patch needs these functions defined earlier in the file. Move
them closer to above where they will be called.
Signed-off-by: Jacob Keller <jacob.e.keller@intel.com>
Tested-by: Krishneil Singh <krishneil.k.singh@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
drivers/net/ethernet/intel/fm10k/fm10k_pci.c | 58 ++++++++++++++--------------
1 file changed, 29 insertions(+), 29 deletions(-)
diff --git a/drivers/net/ethernet/intel/fm10k/fm10k_pci.c b/drivers/net/ethernet/intel/fm10k/fm10k_pci.c
index 6c2c4bffaedf..41335154d6b1 100644
--- a/drivers/net/ethernet/intel/fm10k/fm10k_pci.c
+++ b/drivers/net/ethernet/intel/fm10k/fm10k_pci.c
@@ -132,35 +132,6 @@ static void fm10k_service_timer(unsigned long data)
fm10k_service_event_schedule(interface);
}
-static void fm10k_detach_subtask(struct fm10k_intfc *interface)
-{
- struct net_device *netdev = interface->netdev;
- u32 __iomem *hw_addr;
- u32 value;
-
- /* do nothing if device is still present or hw_addr is set */
- if (netif_device_present(netdev) || interface->hw.hw_addr)
- return;
-
- /* check the real address space to see if we've recovered */
- hw_addr = READ_ONCE(interface->uc_addr);
- value = readl(hw_addr);
- if (~value) {
- interface->hw.hw_addr = interface->uc_addr;
- netif_device_attach(netdev);
- set_bit(FM10K_FLAG_RESET_REQUESTED, interface->flags);
- netdev_warn(netdev, "PCIe link restored, device now attached\n");
- return;
- }
-
- rtnl_lock();
-
- if (netif_running(netdev))
- dev_close(netdev);
-
- rtnl_unlock();
-}
-
static void fm10k_prepare_for_reset(struct fm10k_intfc *interface)
{
struct net_device *netdev = interface->netdev;
@@ -270,6 +241,35 @@ static int fm10k_handle_reset(struct fm10k_intfc *interface)
return err;
}
+static void fm10k_detach_subtask(struct fm10k_intfc *interface)
+{
+ struct net_device *netdev = interface->netdev;
+ u32 __iomem *hw_addr;
+ u32 value;
+
+ /* do nothing if device is still present or hw_addr is set */
+ if (netif_device_present(netdev) || interface->hw.hw_addr)
+ return;
+
+ /* check the real address space to see if we've recovered */
+ hw_addr = READ_ONCE(interface->uc_addr);
+ value = readl(hw_addr);
+ if (~value) {
+ interface->hw.hw_addr = interface->uc_addr;
+ netif_device_attach(netdev);
+ set_bit(FM10K_FLAG_RESET_REQUESTED, interface->flags);
+ netdev_warn(netdev, "PCIe link restored, device now attached\n");
+ return;
+ }
+
+ rtnl_lock();
+
+ if (netif_running(netdev))
+ dev_close(netdev);
+
+ rtnl_unlock();
+}
+
static void fm10k_reinit(struct fm10k_intfc *interface)
{
int err;
--
2.14.2
next prev parent reply other threads:[~2017-10-02 15:43 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-02 15:42 [net-next 00/13][pull request] 100GbE Intel Wired LAN Driver Updates 2017-10-02 Jeff Kirsher
2017-10-02 15:42 ` [net-next 01/13] fm10k: ensure we process SM mbx when processing VF mbx Jeff Kirsher
2017-10-02 15:42 ` [net-next 02/13] fm10k: reschedule service event if we stall the PF<->SM mailbox Jeff Kirsher
2017-10-02 15:42 ` [net-next 03/13] fm10k: Use seq_putc() in fm10k_dbg_desc_break() Jeff Kirsher
2017-10-02 15:42 ` [net-next 04/13] fm10k: stop spurious link down messages when Tx FIFO is full Jeff Kirsher
2017-10-02 15:42 ` [net-next 05/13] fm10k: fix typos on fall through comments Jeff Kirsher
2017-10-02 15:42 ` [net-next 06/13] fm10k: avoid possible truncation of q_vector->name Jeff Kirsher
2017-10-02 15:42 ` [net-next 07/13] fm10k: add missing fall through comment Jeff Kirsher
2017-10-02 15:42 ` [net-next 08/13] fm10k: avoid needless delay when loading driver Jeff Kirsher
2017-10-02 15:42 ` [net-next 09/13] fm10k: simplify reading PFVFLRE register Jeff Kirsher
2017-10-02 15:42 ` [net-next 10/13] fm10k: don't loop while resetting VFs due to VFLR event Jeff Kirsher
2017-10-02 15:42 ` [net-next 11/13] fm10k: avoid divide by zero in rare cases when device is resetting Jeff Kirsher
2017-10-02 15:42 ` Jeff Kirsher [this message]
2017-10-02 15:42 ` [net-next 13/13] fm10k: prevent race condition of __FM10K_SERVICE_SCHED Jeff Kirsher
2017-10-02 18:59 ` [net-next 00/13][pull request] 100GbE Intel Wired LAN Driver Updates 2017-10-02 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=20171002154236.84043-13-jeffrey.t.kirsher@intel.com \
--to=jeffrey.t.kirsher@intel.com \
--cc=davem@davemloft.net \
--cc=jacob.e.keller@intel.com \
--cc=jogreene@redhat.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