[src/netbsd-8]: src/sys/dev/pci/ixgbe Pull up following revision(s) (requeste...

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

details:   https://anonhg.NetBSD.org/src/rev/56246df9fa90
branches:  netbsd-8
changeset: 466572:56246df9fa90
user:      martin <martin%NetBSD.org@localhost>
date:      Thu Dec 26 20:25:07 2019 +0000

description:
Pull up following revision(s) (requested by msaitoh in ticket #1478):

        sys/dev/pci/ixgbe/ixgbe.c: revision 1.218

 Add missing core lock in ixgbe_handle_mod().

diffstat:

 sys/dev/pci/ixgbe/ixgbe.c |  11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)

diffs (47 lines):

diff -r 3072e087bd54 -r 56246df9fa90 sys/dev/pci/ixgbe/ixgbe.c
--- a/sys/dev/pci/ixgbe/ixgbe.c Thu Dec 26 20:23:39 2019 +0000
+++ b/sys/dev/pci/ixgbe/ixgbe.c Thu Dec 26 20:25:07 2019 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ixgbe.c,v 1.88.2.37 2019/11/19 10:48:15 martin Exp $ */
+/* $NetBSD: ixgbe.c,v 1.88.2.38 2019/12/26 20:25:07 martin Exp $ */
 
 /******************************************************************************
 
@@ -4572,6 +4572,7 @@
        device_t        dev = adapter->dev;
        u32             err, cage_full = 0;
 
+       IXGBE_CORE_LOCK(adapter);
        ++adapter->mod_sicount.ev_count;
        if (adapter->hw.need_crosstalk_fix) {
                switch (hw->mac.type) {
@@ -4589,14 +4590,14 @@
                }
 
                if (!cage_full)
-                       return;
+                       goto out;
        }
 
        err = hw->phy.ops.identify_sfp(hw);
        if (err == IXGBE_ERR_SFP_NOT_SUPPORTED) {
                device_printf(dev,
                    "Unsupported SFP+ module type was detected.\n");
-               return;
+               goto out;
        }
 
        if (hw->mac.type == ixgbe_mac_82598EB)
@@ -4607,9 +4608,11 @@
        if (err == IXGBE_ERR_SFP_NOT_SUPPORTED) {
                device_printf(dev,
                    "Setup failure - unsupported SFP+ module type.\n");
-               return;
+               goto out;
        }
        softint_schedule(adapter->msf_si);
+out:
+       IXGBE_CORE_UNLOCK(adapter);
 } /* ixgbe_handle_mod */