Module Name: src
Committed By: msaitoh
Date: Fri Dec 10 11:39:49 UTC 2021
Modified Files:
src/sys/dev/pci/ixgbe: if_sriov.c ixgbe.c
Log Message:
Move PF mailbox initialization from ixgbe_attach() to ixgbe_init_iov().
From FreeBSD ix-3.3.18. No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/dev/pci/ixgbe/if_sriov.c
cvs rdiff -u -r1.296 -r1.297 src/sys/dev/pci/ixgbe/ixgbe.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/if_sriov.c
diff -u src/sys/dev/pci/ixgbe/if_sriov.c:1.13 src/sys/dev/pci/ixgbe/if_sriov.c:1.14
--- src/sys/dev/pci/ixgbe/if_sriov.c:1.13 Fri Dec 10 11:21:44 2021
+++ src/sys/dev/pci/ixgbe/if_sriov.c Fri Dec 10 11:39:48 2021
@@ -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
}
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() */
Index: src/sys/dev/pci/ixgbe/ixgbe.c
diff -u src/sys/dev/pci/ixgbe/ixgbe.c:1.296 src/sys/dev/pci/ixgbe/ixgbe.c:1.297
--- src/sys/dev/pci/ixgbe/ixgbe.c:1.296 Fri Dec 10 11:33:11 2021
+++ src/sys/dev/pci/ixgbe/ixgbe.c Fri Dec 10 11:39:48 2021
@@ -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 d
}
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 */
