Module Name: src
Committed By: msaitoh
Date: Fri Oct 6 14:46:31 UTC 2023
Modified Files:
src/sys/dev/pci/ixgbe: ixgbe.c ixv.c
Log Message:
ixgbe: Enable interrupt after setting IFF_RUNNING. Same as FreeBSD x-3.3.35.
To generate a diff of this commit:
cvs rdiff -u -r1.336 -r1.337 src/sys/dev/pci/ixgbe/ixgbe.c
cvs rdiff -u -r1.188 -r1.189 src/sys/dev/pci/ixgbe/ixv.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/ixgbe/ixgbe.c
diff -u src/sys/dev/pci/ixgbe/ixgbe.c:1.336 src/sys/dev/pci/ixgbe/ixgbe.c:1.337
--- src/sys/dev/pci/ixgbe/ixgbe.c:1.336 Fri Oct 6 14:44:08 2023
+++ src/sys/dev/pci/ixgbe/ixgbe.c Fri Oct 6 14:46:31 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: ixgbe.c,v 1.336 2023/10/06 14:44:08 msaitoh Exp $ */
+/* $NetBSD: ixgbe.c,v 1.337 2023/10/06 14:46:31 msaitoh Exp $ */
/******************************************************************************
@@ -64,7 +64,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ixgbe.c,v 1.336 2023/10/06 14:44:08 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ixgbe.c,v 1.337 2023/10/06 14:46:31 msaitoh Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -4294,9 +4294,6 @@ ixgbe_init_locked(struct ixgbe_softc *sc
/* OK to schedule workqueues. */
sc->schedule_wqs_ok = true;
- /* And now turn on interrupts */
- ixgbe_enable_intr(sc);
-
/* Enable the use of the MBX by the VF's */
if (sc->feat_en & IXGBE_FEATURE_SRIOV) {
ctrl_ext = IXGBE_READ_REG(hw, IXGBE_CTRL_EXT);
@@ -4308,9 +4305,12 @@ ixgbe_init_locked(struct ixgbe_softc *sc
sc->if_flags = ifp->if_flags;
sc->ec_capenable = sc->osdep.ec.ec_capenable;
- /* Now inform the stack we're ready */
+ /* Inform the stack we're ready */
ifp->if_flags |= IFF_RUNNING;
+ /* And now turn on interrupts */
+ ixgbe_enable_intr(sc);
+
return;
} /* ixgbe_init_locked */
Index: src/sys/dev/pci/ixgbe/ixv.c
diff -u src/sys/dev/pci/ixgbe/ixv.c:1.188 src/sys/dev/pci/ixgbe/ixv.c:1.189
--- src/sys/dev/pci/ixgbe/ixv.c:1.188 Fri Oct 6 14:44:08 2023
+++ src/sys/dev/pci/ixgbe/ixv.c Fri Oct 6 14:46:31 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: ixv.c,v 1.188 2023/10/06 14:44:08 msaitoh Exp $ */
+/* $NetBSD: ixv.c,v 1.189 2023/10/06 14:46:31 msaitoh Exp $ */
/******************************************************************************
@@ -35,7 +35,7 @@
/*$FreeBSD: head/sys/dev/ixgbe/if_ixv.c 331224 2018-03-19 20:55:05Z erj $*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ixv.c,v 1.188 2023/10/06 14:44:08 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ixv.c,v 1.189 2023/10/06 14:46:31 msaitoh Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -823,17 +823,17 @@ ixv_init_locked(struct ixgbe_softc *sc)
/* OK to schedule workqueues. */
sc->schedule_wqs_ok = true;
- /* And now turn on interrupts */
- ixv_enable_intr(sc);
-
/* Update saved flags. See ixgbe_ifflags_cb() */
sc->if_flags = ifp->if_flags;
sc->ec_capenable = sc->osdep.ec.ec_capenable;
- /* Now inform the stack we're ready */
+ /* Inform the stack we're ready */
ifp->if_flags |= IFF_RUNNING;
ifp->if_flags &= ~IFF_OACTIVE;
+ /* And now turn on interrupts */
+ ixv_enable_intr(sc);
+
return;
} /* ixv_init_locked */
