Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/dev/pci/ixgbe Move PF mailbox initialization from ixgbe_...



details:   https://anonhg.NetBSD.org/src/rev/369a1e50b433
branches:  trunk
changeset: 1027205:369a1e50b433
user:      msaitoh <msaitoh%NetBSD.org@localhost>
date:      Fri Dec 10 11:39:48 2021 +0000

description:
Move PF mailbox initialization from ixgbe_attach() to ixgbe_init_iov().

  From FreeBSD ix-3.3.18. No functional change.

diffstat:

 sys/dev/pci/ixgbe/if_sriov.c |  5 +++--
 sys/dev/pci/ixgbe/ixgbe.c    |  7 ++-----
 2 files changed, 5 insertions(+), 7 deletions(-)

diffs (54 lines):

diff -r 20457683da77 -r 369a1e50b433 sys/dev/pci/ixgbe/if_sriov.c
--- a/sys/dev/pci/ixgbe/if_sriov.c      Fri Dec 10 11:33:11 2021 +0000
+++ b/sys/dev/pci/ixgbe/if_sriov.c      Fri Dec 10 11:39:48 2021 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: if_sriov.c,v 1.13 2021/12/10 11:21:44 msaitoh Exp $ */
+/* $NetBSD: if_sriov.c,v 1.14 2021/12/10 11:39:48 msaitoh Exp $ */
 /******************************************************************************
 
   Copyright (c) 2001-2017, Intel Corporation
@@ -34,7 +34,7 @@
 /*$FreeBSD: head/sys/dev/ixgbe/if_sriov.c 327031 2017-12-20 18:15:06Z erj $*/
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_sriov.c,v 1.13 2021/12/10 11:21:44 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_sriov.c,v 1.14 2021/12/10 11:39:48 msaitoh Exp $");
 
 #include "ixgbe.h"
 #include "ixgbe_sriov.h"
@@ -714,6 +714,7 @@
        }
 
        adapter->num_vfs = num_vfs;
+       ixgbe_init_mbx_params_pf(&adapter->hw);
 
        /* set the SRIOV flag now as it's needed
         * by ixgbe_init_locked() */
diff -r 20457683da77 -r 369a1e50b433 sys/dev/pci/ixgbe/ixgbe.c
--- a/sys/dev/pci/ixgbe/ixgbe.c Fri Dec 10 11:33:11 2021 +0000
+++ b/sys/dev/pci/ixgbe/ixgbe.c Fri Dec 10 11:39:48 2021 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ixgbe.c,v 1.296 2021/12/10 11:33:11 msaitoh Exp $ */
+/* $NetBSD: ixgbe.c,v 1.297 2021/12/10 11:39:48 msaitoh Exp $ */
 
 /******************************************************************************
 
@@ -64,7 +64,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ixgbe.c,v 1.296 2021/12/10 11:33:11 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ixgbe.c,v 1.297 2021/12/10 11:39:48 msaitoh Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -920,9 +920,6 @@
        }
        aprint_normal_dev(dev, "device %s\n", str);
 
-       if (hw->mbx.ops.init_params)
-               hw->mbx.ops.init_params(hw);
-
        hw->allow_unsupported_sfp = allow_unsupported_sfp;
 
        /* Pick up the 82599 settings */



Home | Main Index | Thread Index | Old Index