Module Name: src
Committed By: msaitoh
Date: Mon Jul 8 03:22:38 UTC 2019
Modified Files:
src/sys/arch/arm/altera: cycv_gmac.c
src/sys/arch/arm/amlogic: meson_dwmac.c
src/sys/arch/arm/rockchip: rk_gmac.c
src/sys/arch/arm/sunxi: sunxi_gmac.c
src/sys/dev/ic: dwc_gmac.c dwc_gmac_var.h
Log Message:
Add rnd(9) support.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/altera/cycv_gmac.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/arm/amlogic/meson_dwmac.c
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/arm/rockchip/rk_gmac.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/sunxi/sunxi_gmac.c
cvs rdiff -u -r1.62 -r1.63 src/sys/dev/ic/dwc_gmac.c
cvs rdiff -u -r1.13 -r1.14 src/sys/dev/ic/dwc_gmac_var.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/arch/arm/altera/cycv_gmac.c
diff -u src/sys/arch/arm/altera/cycv_gmac.c:1.2 src/sys/arch/arm/altera/cycv_gmac.c:1.3
--- src/sys/arch/arm/altera/cycv_gmac.c:1.2 Sat Feb 23 17:18:38 2019
+++ src/sys/arch/arm/altera/cycv_gmac.c Mon Jul 8 03:22:38 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: cycv_gmac.c,v 1.2 2019/02/23 17:18:38 martin Exp $ */
+/* $NetBSD: cycv_gmac.c,v 1.3 2019/07/08 03:22:38 msaitoh Exp $ */
/*-
* Copyright (c) 2017 Jared McNeill <[email protected]>
@@ -30,7 +30,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cycv_gmac.c,v 1.2 2019/02/23 17:18:38 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cycv_gmac.c,v 1.3 2019/07/08 03:22:38 msaitoh Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -38,6 +38,7 @@ __KERNEL_RCSID(0, "$NetBSD: cycv_gmac.c,
#include <sys/intr.h>
#include <sys/systm.h>
#include <sys/gpio.h>
+#include <sys/rndsource.h>
#include <net/if.h>
#include <net/if_ether.h>
Index: src/sys/arch/arm/amlogic/meson_dwmac.c
diff -u src/sys/arch/arm/amlogic/meson_dwmac.c:1.5 src/sys/arch/arm/amlogic/meson_dwmac.c:1.6
--- src/sys/arch/arm/amlogic/meson_dwmac.c:1.5 Fri Apr 19 19:07:56 2019
+++ src/sys/arch/arm/amlogic/meson_dwmac.c Mon Jul 8 03:22:38 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: meson_dwmac.c,v 1.5 2019/04/19 19:07:56 jmcneill Exp $ */
+/* $NetBSD: meson_dwmac.c,v 1.6 2019/07/08 03:22:38 msaitoh Exp $ */
/*-
* Copyright (c) 2017 Jared McNeill <[email protected]>
@@ -28,7 +28,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: meson_dwmac.c,v 1.5 2019/04/19 19:07:56 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: meson_dwmac.c,v 1.6 2019/07/08 03:22:38 msaitoh Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -36,6 +36,7 @@ __KERNEL_RCSID(0, "$NetBSD: meson_dwmac.
#include <sys/intr.h>
#include <sys/systm.h>
#include <sys/gpio.h>
+#include <sys/rndsource.h>
#include <net/if.h>
#include <net/if_ether.h>
Index: src/sys/arch/arm/rockchip/rk_gmac.c
diff -u src/sys/arch/arm/rockchip/rk_gmac.c:1.12 src/sys/arch/arm/rockchip/rk_gmac.c:1.13
--- src/sys/arch/arm/rockchip/rk_gmac.c:1.12 Sun May 5 19:10:05 2019
+++ src/sys/arch/arm/rockchip/rk_gmac.c Mon Jul 8 03:22:38 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: rk_gmac.c,v 1.12 2019/05/05 19:10:05 jmcneill Exp $ */
+/* $NetBSD: rk_gmac.c,v 1.13 2019/07/08 03:22:38 msaitoh Exp $ */
/*-
* Copyright (c) 2018 Jared McNeill <[email protected]>
@@ -28,7 +28,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rk_gmac.c,v 1.12 2019/05/05 19:10:05 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rk_gmac.c,v 1.13 2019/07/08 03:22:38 msaitoh Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -36,6 +36,7 @@ __KERNEL_RCSID(0, "$NetBSD: rk_gmac.c,v
#include <sys/intr.h>
#include <sys/systm.h>
#include <sys/gpio.h>
+#include <sys/rndsource.h>
#include <net/if.h>
#include <net/if_ether.h>
Index: src/sys/arch/arm/sunxi/sunxi_gmac.c
diff -u src/sys/arch/arm/sunxi/sunxi_gmac.c:1.4 src/sys/arch/arm/sunxi/sunxi_gmac.c:1.5
--- src/sys/arch/arm/sunxi/sunxi_gmac.c:1.4 Mon May 27 23:27:26 2019
+++ src/sys/arch/arm/sunxi/sunxi_gmac.c Mon Jul 8 03:22:38 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: sunxi_gmac.c,v 1.4 2019/05/27 23:27:26 jmcneill Exp $ */
+/* $NetBSD: sunxi_gmac.c,v 1.5 2019/07/08 03:22:38 msaitoh Exp $ */
/*-
* Copyright (c) 2017 Jared McNeill <[email protected]>
@@ -28,7 +28,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sunxi_gmac.c,v 1.4 2019/05/27 23:27:26 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunxi_gmac.c,v 1.5 2019/07/08 03:22:38 msaitoh Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -36,6 +36,7 @@ __KERNEL_RCSID(0, "$NetBSD: sunxi_gmac.c
#include <sys/intr.h>
#include <sys/systm.h>
#include <sys/gpio.h>
+#include <sys/rndsource.h>
#include <net/if.h>
#include <net/if_ether.h>
Index: src/sys/dev/ic/dwc_gmac.c
diff -u src/sys/dev/ic/dwc_gmac.c:1.62 src/sys/dev/ic/dwc_gmac.c:1.63
--- src/sys/dev/ic/dwc_gmac.c:1.62 Thu May 23 13:10:51 2019
+++ src/sys/dev/ic/dwc_gmac.c Mon Jul 8 03:22:38 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: dwc_gmac.c,v 1.62 2019/05/23 13:10:51 msaitoh Exp $ */
+/* $NetBSD: dwc_gmac.c,v 1.63 2019/07/08 03:22:38 msaitoh Exp $ */
/*-
* Copyright (c) 2013, 2014 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: dwc_gmac.c,v 1.62 2019/05/23 13:10:51 msaitoh Exp $");
+__KERNEL_RCSID(1, "$NetBSD: dwc_gmac.c,v 1.63 2019/07/08 03:22:38 msaitoh Exp $");
/* #define DWC_GMAC_DEBUG 1 */
@@ -57,6 +57,7 @@ __KERNEL_RCSID(1, "$NetBSD: dwc_gmac.c,v
#include <sys/systm.h>
#include <sys/sockio.h>
#include <sys/cprng.h>
+#include <sys/rndsource.h>
#include <net/if.h>
#include <net/if_ether.h>
@@ -333,6 +334,8 @@ dwc_gmac_attach(struct dwc_gmac_softc *s
ether_ifattach(ifp, enaddr);
ether_set_ifflags_cb(&sc->sc_ec, dwc_gmac_ifflags_cb);
if_register(ifp);
+ rnd_attach_source(&sc->rnd_source, device_xname(sc->sc_dev),
+ RND_TYPE_NET, RND_FLAG_DEFAULT);
/*
* Enable interrupts
@@ -1455,6 +1458,8 @@ dwc_gmac_intr(struct dwc_gmac_softc *sc)
#endif
}
+ rnd_add_uint32(&sc->rnd_source, dma_status);
+
/* ack interrupt */
if (dma_status)
bus_space_write_4(sc->sc_bst, sc->sc_bsh,
Index: src/sys/dev/ic/dwc_gmac_var.h
diff -u src/sys/dev/ic/dwc_gmac_var.h:1.13 src/sys/dev/ic/dwc_gmac_var.h:1.14
--- src/sys/dev/ic/dwc_gmac_var.h:1.13 Sat Feb 23 17:18:07 2019
+++ src/sys/dev/ic/dwc_gmac_var.h Mon Jul 8 03:22:38 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: dwc_gmac_var.h,v 1.13 2019/02/23 17:18:07 martin Exp $ */
+/* $NetBSD: dwc_gmac_var.h,v 1.14 2019/07/08 03:22:38 msaitoh Exp $ */
/*-
* Copyright (c) 2013, 2014 The NetBSD Foundation, Inc.
@@ -109,7 +109,7 @@ struct dwc_gmac_softc {
short sc_if_flags; /* shadow of ether flags */
uint16_t sc_mii_clk;
bool sc_stopping;
-
+ krndsource_t rnd_source;
kmutex_t *sc_lock; /* lock for softc operations */
struct if_percpuq *sc_ipq; /* softint-based input queues */
