Module Name: src
Committed By: msaitoh
Date: Fri Dec 24 04:56:35 UTC 2021
Modified Files:
src/sys/dev/pci/ixgbe: ixgbe_mbx.h ixgbe_type.h
Log Message:
Move some definitions. No functional change. Part of FreeBSD ix-3.3.18.
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/dev/pci/ixgbe/ixgbe_mbx.h
cvs rdiff -u -r1.52 -r1.53 src/sys/dev/pci/ixgbe/ixgbe_type.h
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_mbx.h
diff -u src/sys/dev/pci/ixgbe/ixgbe_mbx.h:1.14 src/sys/dev/pci/ixgbe/ixgbe_mbx.h:1.15
--- src/sys/dev/pci/ixgbe/ixgbe_mbx.h:1.14 Thu Jun 27 05:55:40 2019
+++ src/sys/dev/pci/ixgbe/ixgbe_mbx.h Fri Dec 24 04:56:34 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: ixgbe_mbx.h,v 1.14 2019/06/27 05:55:40 msaitoh Exp $ */
+/* $NetBSD: ixgbe_mbx.h,v 1.15 2021/12/24 04:56:34 msaitoh Exp $ */
/******************************************************************************
SPDX-License-Identifier: BSD-3-Clause
@@ -40,8 +40,37 @@
#include "ixgbe_type.h"
+struct ixgbe_mbx_operations {
+ void (*init_params)(struct ixgbe_hw *hw);
+ s32 (*read)(struct ixgbe_hw *, u32 *, u16, u16);
+ s32 (*write)(struct ixgbe_hw *, u32 *, u16, u16);
+ s32 (*read_posted)(struct ixgbe_hw *, u32 *, u16, u16);
+ s32 (*write_posted)(struct ixgbe_hw *, u32 *, u16, u16);
+ s32 (*check_for_msg)(struct ixgbe_hw *, u16);
+ s32 (*check_for_ack)(struct ixgbe_hw *, u16);
+ s32 (*check_for_rst)(struct ixgbe_hw *, u16);
+ s32 (*clear)(struct ixgbe_hw *hw, u16 vf_number);
+};
+
+struct ixgbe_mbx_stats {
+ struct evcnt msgs_tx;
+ struct evcnt msgs_rx;
+
+ struct evcnt acks;
+ struct evcnt reqs;
+ struct evcnt rsts;
+};
+
+struct ixgbe_mbx_info {
+ struct ixgbe_mbx_operations ops;
+ struct ixgbe_mbx_stats stats;
+ u32 timeout;
+ u32 usec_delay;
+ u32 v2p_mailbox;
+ u16 size;
+};
+
#define IXGBE_VFMAILBOX_SIZE 16 /* 16 32 bit words - 64 bytes */
-#define IXGBE_ERR_MBX -100
#define IXGBE_VFMAILBOX 0x002FC
#define IXGBE_VFMBMEM 0x00200
Index: src/sys/dev/pci/ixgbe/ixgbe_type.h
diff -u src/sys/dev/pci/ixgbe/ixgbe_type.h:1.52 src/sys/dev/pci/ixgbe/ixgbe_type.h:1.53
--- src/sys/dev/pci/ixgbe/ixgbe_type.h:1.52 Wed Dec 15 09:19:34 2021
+++ src/sys/dev/pci/ixgbe/ixgbe_type.h Fri Dec 24 04:56:34 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: ixgbe_type.h,v 1.52 2021/12/15 09:19:34 msaitoh Exp $ */
+/* $NetBSD: ixgbe_type.h,v 1.53 2021/12/24 04:56:34 msaitoh Exp $ */
/******************************************************************************
SPDX-License-Identifier: BSD-3-Clause
@@ -4234,36 +4234,6 @@ struct ixgbe_phy_info {
#include "ixgbe_mbx.h"
-struct ixgbe_mbx_operations {
- void (*init_params)(struct ixgbe_hw *hw);
- s32 (*read)(struct ixgbe_hw *, u32 *, u16, u16);
- s32 (*write)(struct ixgbe_hw *, u32 *, u16, u16);
- s32 (*read_posted)(struct ixgbe_hw *, u32 *, u16, u16);
- s32 (*write_posted)(struct ixgbe_hw *, u32 *, u16, u16);
- s32 (*check_for_msg)(struct ixgbe_hw *, u16);
- s32 (*check_for_ack)(struct ixgbe_hw *, u16);
- s32 (*check_for_rst)(struct ixgbe_hw *, u16);
- s32 (*clear)(struct ixgbe_hw *hw, u16 vf_number);
-};
-
-struct ixgbe_mbx_stats {
- struct evcnt msgs_tx;
- struct evcnt msgs_rx;
-
- struct evcnt acks;
- struct evcnt reqs;
- struct evcnt rsts;
-};
-
-struct ixgbe_mbx_info {
- struct ixgbe_mbx_operations ops;
- struct ixgbe_mbx_stats stats;
- u32 timeout;
- u32 usec_delay;
- u32 v2p_mailbox;
- u16 size;
-};
-
struct ixgbe_hw {
struct adapter *back;
struct ixgbe_mac_info mac;
@@ -4335,6 +4305,7 @@ struct ixgbe_hw {
#define IXGBE_ERR_FDIR_CMD_INCOMPLETE -38
#define IXGBE_ERR_FW_RESP_INVALID -39
#define IXGBE_ERR_TOKEN_RETRY -40
+#define IXGBE_ERR_MBX -100
#define IXGBE_ERR_NOT_TRUSTED -50 /* XXX NetBSD */
#define IXGBE_ERR_NOT_IN_PROMISC -51 /* XXX NetBSD */
