Module Name: src
Committed By: mrg
Date: Sun Jul 21 08:24:32 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:
move DWCGMAC_MPSAFE into dwc_gmac_var.h and introduce an
additional define that is 0 or FDT_INTR_MPSAFE that the
frontends can use when passing to fdtbus_intr_establish().
with NET_MPSAFE enabled, this avoids hangs seen on rock64,
as well as finishing the MPSAFE port for this driver.
XXX: still don't know why the existing hangs occur.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/altera/cycv_gmac.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/arm/amlogic/meson_dwmac.c
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/arm/rockchip/rk_gmac.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/arm/sunxi/sunxi_gmac.c
cvs rdiff -u -r1.63 -r1.64 src/sys/dev/ic/dwc_gmac.c
cvs rdiff -u -r1.14 -r1.15 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.3 src/sys/arch/arm/altera/cycv_gmac.c:1.4
--- src/sys/arch/arm/altera/cycv_gmac.c:1.3 Mon Jul 8 03:22:38 2019
+++ src/sys/arch/arm/altera/cycv_gmac.c Sun Jul 21 08:24:32 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: cycv_gmac.c,v 1.3 2019/07/08 03:22:38 msaitoh Exp $ */
+/* $NetBSD: cycv_gmac.c,v 1.4 2019/07/21 08:24:32 mrg Exp $ */
/*-
* Copyright (c) 2017 Jared McNeill <jmcne...@invisible.ca>
@@ -30,7 +30,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cycv_gmac.c,v 1.3 2019/07/08 03:22:38 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cycv_gmac.c,v 1.4 2019/07/21 08:24:32 mrg Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -129,7 +129,7 @@ cycv_gmac_attach(device_t parent, device
aprint_naive("\n");
aprint_normal(": GMAC\n");
- if (fdtbus_intr_establish(phandle, 0, IPL_NET, 0,
+ if (fdtbus_intr_establish(phandle, 0, IPL_NET, DWCGMAC_FDT_INTR_MPSAFE,
cycv_gmac_intr, sc) == NULL) {
aprint_error_dev(self, "failed to establish interrupt on %s\n",
intrstr);
Index: src/sys/arch/arm/amlogic/meson_dwmac.c
diff -u src/sys/arch/arm/amlogic/meson_dwmac.c:1.6 src/sys/arch/arm/amlogic/meson_dwmac.c:1.7
--- src/sys/arch/arm/amlogic/meson_dwmac.c:1.6 Mon Jul 8 03:22:38 2019
+++ src/sys/arch/arm/amlogic/meson_dwmac.c Sun Jul 21 08:24:32 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: meson_dwmac.c,v 1.6 2019/07/08 03:22:38 msaitoh Exp $ */
+/* $NetBSD: meson_dwmac.c,v 1.7 2019/07/21 08:24:32 mrg Exp $ */
/*-
* Copyright (c) 2017 Jared McNeill <jmcne...@invisible.ca>
@@ -28,7 +28,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: meson_dwmac.c,v 1.6 2019/07/08 03:22:38 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: meson_dwmac.c,v 1.7 2019/07/21 08:24:32 mrg Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -218,7 +218,8 @@ meson_dwmac_attach(device_t parent, devi
aprint_naive("\n");
aprint_normal(": Gigabit Ethernet Controller\n");
- if (fdtbus_intr_establish(phandle, 0, IPL_NET, 0, meson_dwmac_intr, sc) == NULL) {
+ if (fdtbus_intr_establish(phandle, 0, IPL_NET, DWCGMAC_FDT_INTR_MPSAFE,
+ meson_dwmac_intr, sc) == NULL) {
aprint_error_dev(self, "failed to establish interrupt on %s\n", intrstr);
return;
}
Index: src/sys/arch/arm/rockchip/rk_gmac.c
diff -u src/sys/arch/arm/rockchip/rk_gmac.c:1.13 src/sys/arch/arm/rockchip/rk_gmac.c:1.14
--- src/sys/arch/arm/rockchip/rk_gmac.c:1.13 Mon Jul 8 03:22:38 2019
+++ src/sys/arch/arm/rockchip/rk_gmac.c Sun Jul 21 08:24:32 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: rk_gmac.c,v 1.13 2019/07/08 03:22:38 msaitoh Exp $ */
+/* $NetBSD: rk_gmac.c,v 1.14 2019/07/21 08:24:32 mrg Exp $ */
/*-
* Copyright (c) 2018 Jared McNeill <jmcne...@invisible.ca>
@@ -28,7 +28,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rk_gmac.c,v 1.13 2019/07/08 03:22:38 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rk_gmac.c,v 1.14 2019/07/21 08:24:32 mrg Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -421,7 +421,8 @@ rk_gmac_attach(device_t parent, device_t
if (dwc_gmac_attach(sc, MII_PHY_ANY, GMAC_MII_CLK_150_250M_DIV102) != 0)
return;
- if (fdtbus_intr_establish(phandle, 0, IPL_NET, 0, rk_gmac_intr, sc) == NULL) {
+ if (fdtbus_intr_establish(phandle, 0, IPL_NET, DWCGMAC_FDT_INTR_MPSAFE,
+ rk_gmac_intr, sc) == NULL) {
aprint_error_dev(self, "failed to establish interrupt on %s\n", intrstr);
return;
}
Index: src/sys/arch/arm/sunxi/sunxi_gmac.c
diff -u src/sys/arch/arm/sunxi/sunxi_gmac.c:1.5 src/sys/arch/arm/sunxi/sunxi_gmac.c:1.6
--- src/sys/arch/arm/sunxi/sunxi_gmac.c:1.5 Mon Jul 8 03:22:38 2019
+++ src/sys/arch/arm/sunxi/sunxi_gmac.c Sun Jul 21 08:24:32 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: sunxi_gmac.c,v 1.5 2019/07/08 03:22:38 msaitoh Exp $ */
+/* $NetBSD: sunxi_gmac.c,v 1.6 2019/07/21 08:24:32 mrg Exp $ */
/*-
* Copyright (c) 2017 Jared McNeill <jmcne...@invisible.ca>
@@ -28,7 +28,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sunxi_gmac.c,v 1.5 2019/07/08 03:22:38 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunxi_gmac.c,v 1.6 2019/07/21 08:24:32 mrg Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -182,7 +182,8 @@ sunxi_gmac_attach(device_t parent, devic
aprint_naive("\n");
aprint_normal(": GMAC\n");
- if (fdtbus_intr_establish(phandle, 0, IPL_NET, 0, sunxi_gmac_intr, sc) == NULL) {
+ if (fdtbus_intr_establish(phandle, 0, IPL_NET, DWCGMAC_FDT_INTR_MPSAFE,
+ sunxi_gmac_intr, sc) == NULL) {
aprint_error_dev(self, "failed to establish interrupt on %s\n", intrstr);
return;
}
Index: src/sys/dev/ic/dwc_gmac.c
diff -u src/sys/dev/ic/dwc_gmac.c:1.63 src/sys/dev/ic/dwc_gmac.c:1.64
--- src/sys/dev/ic/dwc_gmac.c:1.63 Mon Jul 8 03:22:38 2019
+++ src/sys/dev/ic/dwc_gmac.c Sun Jul 21 08:24:32 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: dwc_gmac.c,v 1.63 2019/07/08 03:22:38 msaitoh Exp $ */
+/* $NetBSD: dwc_gmac.c,v 1.64 2019/07/21 08:24:32 mrg 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.63 2019/07/08 03:22:38 msaitoh Exp $");
+__KERNEL_RCSID(1, "$NetBSD: dwc_gmac.c,v 1.64 2019/07/21 08:24:32 mrg Exp $");
/* #define DWC_GMAC_DEBUG 1 */
@@ -180,10 +180,6 @@ static void dwc_dump_status(struct dwc_g
static void dwc_gmac_dump_ffilt(struct dwc_gmac_softc *, uint32_t);
#endif
-#ifdef NET_MPSAFE
-#define DWCGMAC_MPSAFE 1
-#endif
-
int
dwc_gmac_attach(struct dwc_gmac_softc *sc, int phy_id, uint32_t mii_clk)
{
@@ -698,7 +694,7 @@ fail:
static void
dwc_gmac_txdesc_sync(struct dwc_gmac_softc *sc, int start, int end, int ops)
{
- /* 'end' is pointing one descriptor beyound the last we want to sync */
+ /* 'end' is pointing one descriptor beyond the last we want to sync */
if (end > start) {
bus_dmamap_sync(sc->sc_dmat, sc->sc_dma_ring_map,
TX_DESC_OFFSET(start),
Index: src/sys/dev/ic/dwc_gmac_var.h
diff -u src/sys/dev/ic/dwc_gmac_var.h:1.14 src/sys/dev/ic/dwc_gmac_var.h:1.15
--- src/sys/dev/ic/dwc_gmac_var.h:1.14 Mon Jul 8 03:22:38 2019
+++ src/sys/dev/ic/dwc_gmac_var.h Sun Jul 21 08:24:32 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: dwc_gmac_var.h,v 1.14 2019/07/08 03:22:38 msaitoh Exp $ */
+/* $NetBSD: dwc_gmac_var.h,v 1.15 2019/07/21 08:24:32 mrg Exp $ */
/*-
* Copyright (c) 2013, 2014 The NetBSD Foundation, Inc.
@@ -29,6 +29,20 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
+#ifdef _KERNEL_OPT
+#include "opt_net_mpsafe.h"
+#endif
+
+/* Use DWCGMAC_MPSAFE inside the front-ends for interrupt handlers. */
+#ifdef NET_MPSAFE
+#define DWCGMAC_MPSAFE 1
+#endif
+
+#ifdef DWCGMAC_MPSAFE
+#define DWCGMAC_FDT_INTR_MPSAFE FDT_INTR_MPSAFE
+#else
+#define DWCGMAC_FDT_INTR_MPSAFE 0
+#endif
/*
* We could use 1024 DMA descriptors to fill up an 8k page (each is 16 byte).
