Module Name: src
Committed By: rjs
Date: Thu Aug 13 14:51:35 UTC 2015
Modified Files:
src/sys/dev/cadence: cemacreg.h if_cemac.c
Log Message:
Add gem versions of collision counters.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/dev/cadence/cemacreg.h
cvs rdiff -u -r1.2 -r1.3 src/sys/dev/cadence/if_cemac.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/cadence/cemacreg.h
diff -u src/sys/dev/cadence/cemacreg.h:1.1 src/sys/dev/cadence/cemacreg.h:1.2
--- src/sys/dev/cadence/cemacreg.h:1.1 Fri Jan 23 12:34:09 2015
+++ src/sys/dev/cadence/cemacreg.h Thu Aug 13 14:51:35 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: cemacreg.h,v 1.1 2015/01/23 12:34:09 hkenken Exp $ */
+/* $NetBSD: cemacreg.h,v 1.2 2015/08/13 14:51:35 rjs Exp $ */
/*-
* Copyright (c) 2015 Genetec Corporation. All rights reserved.
@@ -109,6 +109,8 @@
#define GEM_SA3H 0x009C
#define GEM_SA4L 0x0090
#define GEM_SA4H 0x0094
+#define GEM_SCOL 0x0138
+#define GEM_MCOL 0x013C
#define GEM_DCFG2 0x0284
#define GEM_DCFG3 0x0288
#define GEM_DCFG4 0x028C
Index: src/sys/dev/cadence/if_cemac.c
diff -u src/sys/dev/cadence/if_cemac.c:1.2 src/sys/dev/cadence/if_cemac.c:1.3
--- src/sys/dev/cadence/if_cemac.c:1.2 Wed May 20 09:17:18 2015
+++ src/sys/dev/cadence/if_cemac.c Thu Aug 13 14:51:35 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: if_cemac.c,v 1.2 2015/05/20 09:17:18 ozaki-r Exp $ */
+/* $NetBSD: if_cemac.c,v 1.3 2015/08/13 14:51:35 rjs Exp $ */
/*
* Copyright (c) 2015 Genetec Corporation. All rights reserved.
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_cemac.c,v 1.2 2015/05/20 09:17:18 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_cemac.c,v 1.3 2015/08/13 14:51:35 rjs Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -689,7 +689,11 @@ cemac_tick(void *arg)
struct ifnet * ifp = &sc->sc_ethercom.ec_if;
int s;
- ifp->if_collisions += CEMAC_READ(ETH_SCOL) + CEMAC_READ(ETH_MCOL);
+ if (ISSET(sc->cemac_flags, CEMAC_FLAG_GEM))
+ ifp->if_collisions += CEMAC_READ(GEM_SCOL) + CEMAC_READ(GEM_MCOL);
+ else
+ ifp->if_collisions += CEMAC_READ(ETH_SCOL) + CEMAC_READ(ETH_MCOL);
+
/* These misses are ok, they will happen if the RAM/CPU can't keep up */
if (!ISSET(sc->cemac_flags, CEMAC_FLAG_GEM)) {
uint32_t misses = CEMAC_READ(ETH_DRFC);
