Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/dev/ic Add support for Broadcom GENET v5 ethernet contro...



details:   https://anonhg.NetBSD.org/src/rev/6a20cbf10606
branches:  trunk
changeset: 1007497:6a20cbf10606
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Sat Feb 22 00:28:35 2020 +0000

description:
Add support for Broadcom GENET v5 ethernet controller as found on the
Raspberry Pi 4 (BCM2711).

diffstat:

 sys/arch/arm/broadcom/bcm283x_platform.c |    8 +-
 sys/arch/evbarm/conf/GENERIC64           |    3 +-
 sys/conf/files                           |    6 +-
 sys/dev/fdt/files.fdt                    |    5 +-
 sys/dev/fdt/genet_fdt.c                  |  134 ++++
 sys/dev/ic/bcmgenet.c                    |  955 +++++++++++++++++++++++++++++++
 sys/dev/ic/bcmgenetreg.h                 |  165 +++++
 sys/dev/ic/bcmgenetvar.h                 |   76 ++
 8 files changed, 1346 insertions(+), 6 deletions(-)

diffs (truncated from 1429 to 300 lines):

diff -r edb52aa7b36c -r 6a20cbf10606 sys/arch/arm/broadcom/bcm283x_platform.c
--- a/sys/arch/arm/broadcom/bcm283x_platform.c  Sat Feb 22 00:24:15 2020 +0000
+++ b/sys/arch/arm/broadcom/bcm283x_platform.c  Sat Feb 22 00:28:35 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: bcm283x_platform.c,v 1.36 2020/02/22 00:17:54 jmcneill Exp $   */
+/*     $NetBSD: bcm283x_platform.c,v 1.37 2020/02/22 00:28:35 jmcneill Exp $   */
 
 /*-
  * Copyright (c) 2017 Jared D. McNeill <jmcneill%invisible.ca@localhost>
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bcm283x_platform.c,v 1.36 2020/02/22 00:17:54 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bcm283x_platform.c,v 1.37 2020/02/22 00:28:35 jmcneill Exp $");
 
 #include "opt_arm_debug.h"
 #include "opt_bcm283x.h"
@@ -1415,7 +1415,9 @@
                booted_device = dev;
        }
 #endif
-       if ((device_is_a(dev, "usmsc") || device_is_a(dev, "mue")) &&
+       if ((device_is_a(dev, "usmsc") ||
+            device_is_a(dev, "mue") ||
+            device_is_a(dev, "genet")) &&
            vcprop_tag_success_p(&vb.vbt_macaddr.tag)) {
                const uint8_t enaddr[ETHER_ADDR_LEN] = {
                     (vb.vbt_macaddr.addr >> 0) & 0xff,
diff -r edb52aa7b36c -r 6a20cbf10606 sys/arch/evbarm/conf/GENERIC64
--- a/sys/arch/evbarm/conf/GENERIC64    Sat Feb 22 00:24:15 2020 +0000
+++ b/sys/arch/evbarm/conf/GENERIC64    Sat Feb 22 00:28:35 2020 +0000
@@ -1,5 +1,5 @@
 #
-#      $NetBSD: GENERIC64,v 1.137 2020/02/20 01:36:37 jmcneill Exp $
+#      $NetBSD: GENERIC64,v 1.138 2020/02/22 00:28:35 jmcneill Exp $
 #
 #      GENERIC ARM (aarch64) kernel
 #
@@ -327,6 +327,7 @@
 enet*          at fdt?                         # IMX FEC
 aq*            at pci? dev ? function ?        # Aquantia AQC 10 gigabit
 ena*           at pci? dev ? function ?        # Amazon.com Elastic Network Adapter
+genet*         at fdt?                         # Broadcom GENET v5
 mcx*           at pci? dev ? function ?        # Mellanox 5th generation Ethernet
 mskc*          at pci? dev ? function ?        # Marvell Yukon 2 Gigabit Ethernet
 msk*           at mskc?
diff -r edb52aa7b36c -r 6a20cbf10606 sys/conf/files
--- a/sys/conf/files    Sat Feb 22 00:24:15 2020 +0000
+++ b/sys/conf/files    Sat Feb 22 00:28:35 2020 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: files,v 1.1255 2020/02/08 07:07:07 maxv Exp $
+#      $NetBSD: files,v 1.1256 2020/02/22 00:28:35 jmcneill Exp $
 #      @(#)files.newconf       7.5 (Berkeley) 5/10/93
 
 version        20171118
@@ -1470,6 +1470,10 @@
 device anxdp: edid, videomode, drmkms, drmkms_i2c
 file   dev/ic/anx_dp.c                 anxdp
 
+# Broadcom GENET v5 ethernet
+device genet: arp, ether, ifnet, mii
+file   dev/ic/bcmgenet.c               genet
+
 #
 # File systems
 #
diff -r edb52aa7b36c -r 6a20cbf10606 sys/dev/fdt/files.fdt
--- a/sys/dev/fdt/files.fdt     Sat Feb 22 00:24:15 2020 +0000
+++ b/sys/dev/fdt/files.fdt     Sat Feb 22 00:28:35 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: files.fdt,v 1.50 2020/01/02 00:57:10 jmcneill Exp $
+# $NetBSD: files.fdt,v 1.51 2020/02/22 00:28:35 jmcneill Exp $
 
 include        "external/bsd/libfdt/conf/files.libfdt"
 
@@ -171,3 +171,6 @@
 attach simpleamp at fdt
 file   dev/fdt/simple_amplifier.c              simpleamp
 
+# Broadcom GENET v5
+attach genet at fdt with genet_fdt
+file   dev/fdt/genet_fdt.c                     genet_fdt
diff -r edb52aa7b36c -r 6a20cbf10606 sys/dev/fdt/genet_fdt.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/dev/fdt/genet_fdt.c   Sat Feb 22 00:28:35 2020 +0000
@@ -0,0 +1,134 @@
+/* $NetBSD: genet_fdt.c,v 1.1 2020/02/22 00:28:35 jmcneill Exp $ */
+
+/*-
+ * Copyright (c) 2020 Jared McNeill <jmcneill%invisible.ca@localhost>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include "opt_net_mpsafe.h"
+
+#include <sys/cdefs.h>
+__KERNEL_RCSID(0, "$NetBSD: genet_fdt.c,v 1.1 2020/02/22 00:28:35 jmcneill Exp $");
+
+#include <sys/param.h>
+#include <sys/bus.h>
+#include <sys/device.h>
+#include <sys/intr.h>
+#include <sys/systm.h>
+#include <sys/kernel.h>
+
+#include <net/if.h>
+#include <net/if_dl.h>
+#include <net/if_ether.h>
+#include <net/if_media.h>
+
+#include <dev/mii/miivar.h>
+
+#include <dev/ic/bcmgenetvar.h>
+
+#include <dev/fdt/fdtvar.h>
+
+#ifdef NET_MPSAFE
+#define        FDT_INTR_FLAGS  FDT_INTR_MPSAFE
+#else
+#define        FDT_INTR_FLAGS  0
+#endif
+
+static int     genet_fdt_match(device_t, cfdata_t, void *);
+static void    genet_fdt_attach(device_t, device_t, void *);
+
+CFATTACH_DECL_NEW(genet_fdt, sizeof(struct genet_softc),
+       genet_fdt_match, genet_fdt_attach, NULL, NULL);
+
+static int
+genet_fdt_match(device_t parent, cfdata_t cf, void *aux)
+{
+       const char * const compatible[] = {
+               "brcm,bcm2711-genet-v5",
+               NULL
+       };
+       struct fdt_attach_args * const faa = aux;
+
+       return of_match_compatible(faa->faa_phandle, compatible);
+}
+
+static void
+genet_fdt_attach(device_t parent, device_t self, void *aux)
+{
+       struct genet_softc * const sc = device_private(self);
+       struct fdt_attach_args * const faa = aux;
+       const int phandle = faa->faa_phandle;
+       char intrstr[128];
+       bus_addr_t addr;
+       bus_size_t size;
+       void *ih;
+
+       if (fdtbus_get_reg(phandle, 0, &addr, &size) != 0) {
+               aprint_error(": couldn't get registers\n");
+               return;
+       }
+
+       sc->sc_dev = self;
+       sc->sc_bst = faa->faa_bst;
+       if (bus_space_map(sc->sc_bst, addr, size, 0, &sc->sc_bsh) != 0) {
+               aprint_error(": couldn't map registers\n");
+               return;
+       }
+       sc->sc_dmat = faa->faa_dmat;
+       sc->sc_phy_id = MII_PHY_ANY;
+
+       const char *phy_mode = fdtbus_get_string(phandle, "phy-mode");
+       if (phy_mode == NULL) {
+               aprint_error(": missing 'phy-mode' property\n");
+               return;
+       }
+
+       if (strcmp(phy_mode, "rgmii-rxid") == 0)
+               sc->sc_phy_mode = GENET_PHY_MODE_RGMII_RXID;
+       else if (strcmp(phy_mode, "rgmii-txid") == 0)
+               sc->sc_phy_mode = GENET_PHY_MODE_RGMII_TXID;
+       else if (strcmp(phy_mode, "rgmii") == 0)
+               sc->sc_phy_mode = GENET_PHY_MODE_RGMII;
+       else {
+               aprint_error(": unsupported phy-mode '%s'\n", phy_mode);
+               return;
+       }
+
+       if (!fdtbus_intr_str(phandle, 0, intrstr, sizeof(intrstr))) {
+               aprint_error(": failed to decode interrupt\n");
+               return;
+       }
+
+       if (genet_attach(sc) != 0)
+               return;
+
+       ih = fdtbus_intr_establish(phandle, 0, IPL_NET, FDT_INTR_FLAGS,
+           genet_intr, sc);
+       if (ih == NULL) {
+               aprint_error_dev(self, "couldn't establish interrupt on %s\n",
+                   intrstr);
+               return;
+       }
+       aprint_normal_dev(self, "interrupting on %s\n", intrstr);
+}
diff -r edb52aa7b36c -r 6a20cbf10606 sys/dev/ic/bcmgenet.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/dev/ic/bcmgenet.c     Sat Feb 22 00:28:35 2020 +0000
@@ -0,0 +1,955 @@
+/* $NetBSD: bcmgenet.c,v 1.1 2020/02/22 00:28:35 jmcneill Exp $ */
+
+/*-
+ * Copyright (c) 2020 Jared McNeill <jmcneill%invisible.ca@localhost>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+/*
+ * Broadcom GENETv5
+ */
+
+#include "opt_net_mpsafe.h"
+#include "opt_ddb.h"
+
+#include <sys/cdefs.h>
+__KERNEL_RCSID(0, "$NetBSD: bcmgenet.c,v 1.1 2020/02/22 00:28:35 jmcneill Exp $");
+
+#include <sys/param.h>
+#include <sys/bus.h>
+#include <sys/device.h>
+#include <sys/intr.h>
+#include <sys/systm.h>
+#include <sys/kernel.h>
+#include <sys/mutex.h>
+#include <sys/callout.h>
+#include <sys/cprng.h>
+
+#include <net/if.h>
+#include <net/if_dl.h>
+#include <net/if_ether.h>
+#include <net/if_media.h>
+#include <net/bpf.h>
+
+#include <dev/mii/miivar.h>
+
+#include <dev/ic/bcmgenetreg.h>
+#include <dev/ic/bcmgenetvar.h>
+
+CTASSERT(MCLBYTES == 2048);
+
+#ifdef GENET_DEBUG
+#define        DPRINTF(...)    printf(##__VA_ARGS__)
+#else
+#define        DPRINTF(...)    ((void)0)
+#endif
+
+#ifdef NET_MPSAFE
+#define        GENET_MPSAFE            1
+#define        CALLOUT_FLAGS           CALLOUT_MPSAFE
+#else
+#define        CALLOUT_FLAGS           0
+#endif
+
+#define        TX_SKIP(n, o)           (((n) + (o)) & (GENET_DMA_DESC_COUNT - 1))



Home | Main Index | Thread Index | Old Index