Netdev List
 help / color / mirror / Atom feed
From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
To: davem@davemloft.net
Cc: Sergey Nemov <sergey.nemov@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 01/12] i40e: Remove duplicated prepare call in i40e_shutdown
Date: Tue,  7 Aug 2018 12:27:46 -0700	[thread overview]
Message-ID: <20180807192757.21592-2-jeffrey.t.kirsher@intel.com> (raw)
In-Reply-To: <20180807192757.21592-1-jeffrey.t.kirsher@intel.com>

From: Sergey Nemov <sergey.nemov@intel.com>

Function call to i40e_prep_for_reset() is duplicated in
i40e_shutdown routine and gets called before
i40e_enable_mc_magic_wake() which blocks it from being executed
correctly on system reboot or shutdown because adminq is already
disabled by first i40e_prep_for_reset() call.

Two register write calls are also duplicated.

Signed-off-by: Sergey Nemov <sergey.nemov@intel.com>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
 drivers/net/ethernet/intel/i40e/i40e_main.c | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c
index 51762428b40e..13940e0ba939 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_main.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c
@@ -14353,12 +14353,6 @@ static void i40e_shutdown(struct pci_dev *pdev)
 
 	set_bit(__I40E_SUSPENDED, pf->state);
 	set_bit(__I40E_DOWN, pf->state);
-	rtnl_lock();
-	i40e_prep_for_reset(pf, true);
-	rtnl_unlock();
-
-	wr32(hw, I40E_PFPM_APM, (pf->wol_en ? I40E_PFPM_APM_APME_MASK : 0));
-	wr32(hw, I40E_PFPM_WUFC, (pf->wol_en ? I40E_PFPM_WUFC_MAG_MASK : 0));
 
 	del_timer_sync(&pf->service_timer);
 	cancel_work_sync(&pf->service_task);
-- 
2.17.1

  reply	other threads:[~2018-08-07 21:44 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-08-07 19:27 [net-next 00/12][pull request] 40GbE Intel Wired LAN Driver Updates 2018-08-07 Jeff Kirsher
2018-08-07 19:27 ` Jeff Kirsher [this message]
2018-08-07 19:27 ` [net-next 02/12] i40e/i40evf: remove redundant functions i40evf_aq_{set/get}_phy_register Jeff Kirsher
2018-08-07 19:27 ` [net-next 03/12] i40e: add helper function for copying strings from stat arrays Jeff Kirsher
2018-08-07 19:27 ` [net-next 04/12] i40e: add helper to copy statistic values into ethtool buffer Jeff Kirsher
2018-08-07 19:27 ` [net-next 05/12] i40e: Set fec_config when forcing link state Jeff Kirsher
2018-08-07 19:27 ` [net-next 06/12] i40e: convert VEB TC stats to use an i40e_stats array Jeff Kirsher
2018-08-07 19:27 ` [net-next 07/12] i40e: convert priority flow control stats to use helpers Jeff Kirsher
2018-08-07 19:27 ` [net-next 08/12] i40e: remove unnecessary i variable causing -Wshadow warning Jeff Kirsher
2018-08-07 19:27 ` [net-next 09/12] i40e: fix warning about shadowed ring parameter Jeff Kirsher
2018-08-07 19:27 ` [net-next 10/12] i40e: Add additional return code to i40e_asq_send_command Jeff Kirsher
2018-08-07 19:27 ` [net-next 11/12] i40e: Add AQ command for rearrange NVM structure Jeff Kirsher
2018-08-07 19:27 ` [net-next 12/12] i40e: fix i40e_add_queue_stats data pointer update Jeff Kirsher
2018-08-07 22:43 ` [net-next 00/12][pull request] 40GbE Intel Wired LAN Driver Updates 2018-08-07 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=20180807192757.21592-2-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=sergey.nemov@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