[src/trunk]: src/sys/dev/pci/ixgbe Call ixgbe_ifstop() instead of ixgbe_stop_...

[msaitoh <msaitoh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/f162c0e6fc70
branches:  trunk
changeset: 975579:f162c0e6fc70
user:      msaitoh <msaitoh%NetBSD.org@localhost>
date:      Tue Sep 01 04:06:56 2020 +0000

description:
Call ixgbe_ifstop() instead of ixgbe_stop_locked() in
ixgbe_setup_low_power_mode() to stop the timer workqueue.

diffstat:

 sys/dev/pci/ixgbe/ixgbe.c |  25 ++++++++++---------------
 1 files changed, 10 insertions(+), 15 deletions(-)

diffs (87 lines):

diff -r 7f1e68f2dbf0 -r f162c0e6fc70 sys/dev/pci/ixgbe/ixgbe.c
--- a/sys/dev/pci/ixgbe/ixgbe.c Tue Sep 01 01:15:28 2020 +0000
+++ b/sys/dev/pci/ixgbe/ixgbe.c Tue Sep 01 04:06:56 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ixgbe.c,v 1.252 2020/08/31 14:12:50 msaitoh Exp $ */
+/* $NetBSD: ixgbe.c,v 1.253 2020/09/01 04:06:56 msaitoh Exp $ */
 
 /******************************************************************************
 
@@ -3600,12 +3600,10 @@
 
        /*
         * Stop the interface. ixgbe_setup_low_power_mode() calls
-        * ixgbe_stop_locked(), so it's not required to call ixgbe_stop_locked()
+        * ixgbe_ifstop(), so it's not required to call ixgbe_ifstop()
         * directly.
         */
-       IXGBE_CORE_LOCK(adapter);
        ixgbe_setup_low_power_mode(adapter);
-       IXGBE_CORE_UNLOCK(adapter);
 
        callout_halt(&adapter->timer, NULL);
        if (adapter->feat_en & IXGBE_FEATURE_RECOVERY_MODE) {
@@ -3773,16 +3771,15 @@
 {
        struct ixgbe_hw *hw = &adapter->hw;
        device_t        dev = adapter->dev;
+       struct ifnet    *ifp = adapter->ifp;
        s32             error = 0;
 
-       KASSERT(mutex_owned(&adapter->core_mtx));
-
        /* Limit power management flow to X550EM baseT */
        if (hw->device_id == IXGBE_DEV_ID_X550EM_X_10G_T &&
            hw->phy.ops.enter_lplu) {
                /* X550EM baseT adapters need a special LPLU flow */
                hw->phy.reset_disable = true;
-               ixgbe_stop_locked(adapter);
+               ixgbe_ifstop(ifp, 1);
                error = hw->phy.ops.enter_lplu(hw);
                if (error)
                        device_printf(dev,
@@ -3790,8 +3787,10 @@
                hw->phy.reset_disable = false;
        } else {
                /* Just stop for other adapters */
-               ixgbe_stop_locked(adapter);
-       }
+               ixgbe_ifstop(ifp, 1);
+       }
+
+       IXGBE_CORE_LOCK(adapter);
 
        if (!hw->wol_enabled) {
                ixgbe_set_phy_power(hw, FALSE);
@@ -3820,6 +3819,8 @@
 
        }
 
+       IXGBE_CORE_UNLOCK(adapter);
+
        return error;
 } /* ixgbe_setup_low_power_mode */
 
@@ -3835,9 +3836,7 @@
 
        INIT_DEBUGOUT("ixgbe_shutdown: begin");
 
-       IXGBE_CORE_LOCK(adapter);
        error = ixgbe_setup_low_power_mode(adapter);
-       IXGBE_CORE_UNLOCK(adapter);
 
        return (error);
 } /* ixgbe_shutdown */
@@ -3856,12 +3855,8 @@
 
        INIT_DEBUGOUT("ixgbe_suspend: begin");
 
-       IXGBE_CORE_LOCK(adapter);
-
        error = ixgbe_setup_low_power_mode(adapter);
 
-       IXGBE_CORE_UNLOCK(adapter);
-
        return (error);
 } /* ixgbe_suspend */