summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authormsaitoh <msaitoh@NetBSD.org>2021-12-10 11:39:48 +0000
committermsaitoh <msaitoh@NetBSD.org>2021-12-10 11:39:48 +0000
commite13ed3c790e207a2bef38540875040aed6a56eb2 (patch)
treef23b5e35da8ba5fabb403a5d3b50829252895273 /sys/dev
parentfedba09a5138ea4a5714126e3bf4b91397b6b5e3 (diff)
Move PF mailbox initialization from ixgbe_attach() to ixgbe_init_iov().
From FreeBSD ix-3.3.18. No functional change.
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/pci/ixgbe/if_sriov.c5
-rw-r--r--sys/dev/pci/ixgbe/ixgbe.c7
2 files changed, 5 insertions, 7 deletions
diff --git a/sys/dev/pci/ixgbe/if_sriov.c b/sys/dev/pci/ixgbe/if_sriov.c
index 3f032a96278..34acc67dcc7 100644
--- a/sys/dev/pci/ixgbe/if_sriov.c
+++ b/sys/dev/pci/ixgbe/if_sriov.c
@@ -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 @@ ixgbe_init_iov(device_t dev, u16 num_vfs, const nvlist_t *config)
}
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 --git a/sys/dev/pci/ixgbe/ixgbe.c b/sys/dev/pci/ixgbe/ixgbe.c
index 73bebc45559..480d419803f 100644
--- a/sys/dev/pci/ixgbe/ixgbe.c
+++ b/sys/dev/pci/ixgbe/ixgbe.c
@@ -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 @@ ixgbe_attach(device_t parent, device_t dev, void *aux)
}
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 */