Module Name: src
Committed By: martin
Date: Sat Jan 29 16:36:07 UTC 2022
Modified Files:
src/sys/dev/pci/ixgbe [netbsd-8]: ixgbe.c
Log Message:
Pull up the following revisions, requested by msaitoh in ticket #1724:
sys/dev/pci/ixgbe/ixgbe.c 1.298, 1.303 via patch
Add some missing error counters to ierror.
To generate a diff of this commit:
cvs rdiff -u -r1.88.2.45 -r1.88.2.46 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/ixgbe.c
diff -u src/sys/dev/pci/ixgbe/ixgbe.c:1.88.2.45 src/sys/dev/pci/ixgbe/ixgbe.c:1.88.2.46
--- src/sys/dev/pci/ixgbe/ixgbe.c:1.88.2.45 Sat Nov 20 15:21:31 2021
+++ src/sys/dev/pci/ixgbe/ixgbe.c Sat Jan 29 16:36:07 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: ixgbe.c,v 1.88.2.45 2021/11/20 15:21:31 martin Exp $ */
+/* $NetBSD: ixgbe.c,v 1.88.2.46 2022/01/29 16:36:07 martin Exp $ */
/******************************************************************************
@@ -64,7 +64,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ixgbe.c,v 1.88.2.45 2021/11/20 15:21:31 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ixgbe.c,v 1.88.2.46 2022/01/29 16:36:07 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -1579,13 +1579,19 @@ ixgbe_update_stats_counters(struct adapt
struct ixgbe_hw_stats *stats = &adapter->stats.pf;
u32 missed_rx = 0, bprc, lxon, lxoff, total;
u64 total_missed_rx = 0;
- uint64_t crcerrs, rlec;
+ uint64_t crcerrs, illerrc, rlec, ruc, rfc, roc, rjc;
unsigned int queue_counters;
int i;
- crcerrs = IXGBE_READ_REG(hw, IXGBE_CRCERRS);
- stats->crcerrs.ev_count += crcerrs;
- stats->illerrc.ev_count += IXGBE_READ_REG(hw, IXGBE_ILLERRC);
+#define READ_COPY_SET(hw, stats, regname, evname) \
+ do { \
+ (evname) = IXGBE_READ_REG((hw), regname); \
+ (stats)->evname.ev_count += (evname); \
+ } while (/*CONSTCOND*/0)
+
+ READ_COPY_SET(hw, stats, IXGBE_CRCERRS, crcerrs);
+ READ_COPY_SET(hw, stats, IXGBE_ILLERRC, illerrc);
+
stats->errbc.ev_count += IXGBE_READ_REG(hw, IXGBE_ERRBC);
stats->mspdc.ev_count += IXGBE_READ_REG(hw, IXGBE_MSPDC);
if (hw->mac.type >= ixgbe_mac_X550)
@@ -1643,8 +1649,7 @@ ixgbe_update_stats_counters(struct adapt
stats->mlfc.ev_count += IXGBE_READ_REG(hw, IXGBE_MLFC);
stats->mrfc.ev_count += IXGBE_READ_REG(hw, IXGBE_MRFC);
}
- rlec = IXGBE_READ_REG(hw, IXGBE_RLEC);
- stats->rlec.ev_count += rlec;
+ READ_COPY_SET(hw, stats, IXGBE_RLEC, rlec);
/* Hardware workaround, gprc counts missed packets */
stats->gprc.ev_count += IXGBE_READ_REG(hw, IXGBE_GPRC) - missed_rx;
@@ -1696,10 +1701,13 @@ ixgbe_update_stats_counters(struct adapt
stats->mptc.ev_count += IXGBE_READ_REG(hw, IXGBE_MPTC) - total;
stats->ptc64.ev_count += IXGBE_READ_REG(hw, IXGBE_PTC64) - total;
- stats->ruc.ev_count += IXGBE_READ_REG(hw, IXGBE_RUC);
- stats->rfc.ev_count += IXGBE_READ_REG(hw, IXGBE_RFC);
- stats->roc.ev_count += IXGBE_READ_REG(hw, IXGBE_ROC);
- stats->rjc.ev_count += IXGBE_READ_REG(hw, IXGBE_RJC);
+ READ_COPY_SET(hw, stats, IXGBE_RUC, ruc);
+ READ_COPY_SET(hw, stats, IXGBE_RFC, rfc);
+ READ_COPY_SET(hw, stats, IXGBE_ROC, roc);
+ READ_COPY_SET(hw, stats, IXGBE_RJC, rjc);
+
+#undef READ_COPY_SET
+
stats->mngprc.ev_count += IXGBE_READ_REG(hw, IXGBE_MNGPRC);
stats->mngpdc.ev_count += IXGBE_READ_REG(hw, IXGBE_MNGPDC);
stats->mngptc.ev_count += IXGBE_READ_REG(hw, IXGBE_MNGPTC);
@@ -1733,7 +1741,19 @@ ixgbe_update_stats_counters(struct adapt
/* Rx Errors */
ifp->if_iqdrops += total_missed_rx;
- ifp->if_ierrors += crcerrs + rlec;
+
+ /*
+ * Aggregate following types of errors as RX errors:
+ * - CRC error count,
+ * - illegal byte error count,
+ * - length error count,
+ * - undersized packets count,
+ * - fragmented packets count,
+ * - oversized packets count,
+ * - jabber count.
+ */
+ ifp->if_ierrors +=
+ crcerrs + illerrc + rlec + ruc + rfc + roc + rjc;
} /* ixgbe_update_stats_counters */
/************************************************************************
