summaryrefslogtreecommitdiffstats
path: root/sys/mips
diff options
context:
space:
mode:
authorbz <bz@FreeBSD.org>2014-08-16 14:30:46 +0000
committerbz <bz@FreeBSD.org>2014-08-16 14:30:46 +0000
commitfe69d82910f112704db79bb351d48aa316c11807 (patch)
tree2e9e4d8baaaca117b28843cb22304f8d0646dea9 /sys/mips
parent919a83705802c08fe80c350615ad98cee21c3fc6 (diff)
downloadFreeBSD-src-fe69d82910f112704db79bb351d48aa316c11807.zip
FreeBSD-src-fe69d82910f112704db79bb351d48aa316c11807.tar.gz
MFC r264601,264646,265766,267918,267919,267920:
Merge if_nf10bmac(4), a driver to support an NetFPGA-10G Embedded CPU Ethernet Core. The current version operates on a simple PIO based interface connected to a NetFPGA-10G port. To avoid confusion: this driver operates on a CPU running on the FPGA, e.g. BERI/mips, and is not suited for the PCI host interface. Adjust the register layout to allow for 64bit registers in the future for nf10bmac(4). Also, add support for and enable RX interrupts. Allow switching between 32bit and 64bit bus width data access at compile time by setting NF10BMAC_64BIT and using a REGWTYPE #define to set correct variable and return value widths. Adjust comments to indicate the 32 or 64bit register widths. Relnotes: yes Sponsored by: DARPA/AFRL
Diffstat (limited to 'sys/mips')
-rw-r--r--sys/mips/beri/files.beri2
-rw-r--r--sys/mips/conf/BERI_NETFPGA_MDROOT5
2 files changed, 7 insertions, 0 deletions
diff --git a/sys/mips/beri/files.beri b/sys/mips/beri/files.beri
index de7ccc3..ffd70fe 100644
--- a/sys/mips/beri/files.beri
+++ b/sys/mips/beri/files.beri
@@ -6,6 +6,8 @@ dev/altera/jtag_uart/altera_jtag_uart_cons.c optional altera_jtag_uart
dev/altera/jtag_uart/altera_jtag_uart_tty.c optional altera_jtag_uart
dev/altera/jtag_uart/altera_jtag_uart_fdt.c optional altera_jtag_uart fdt
dev/altera/jtag_uart/altera_jtag_uart_nexus.c optional altera_jtag_uart
+dev/netfpga10g/nf10bmac/if_nf10bmac_fdt.c optional netfpga10g_nf10bmac fdt
+dev/netfpga10g/nf10bmac/if_nf10bmac.c optional netfpga10g_nf10bmac
dev/terasic/de4led/terasic_de4led.c optional terasic_de4led
dev/terasic/de4led/terasic_de4led_fdt.c optional terasic_de4led fdt
dev/terasic/de4led/terasic_de4led_nexus.c optional terasic_de4led
diff --git a/sys/mips/conf/BERI_NETFPGA_MDROOT b/sys/mips/conf/BERI_NETFPGA_MDROOT
index bd7b3a4..2ba4917 100644
--- a/sys/mips/conf/BERI_NETFPGA_MDROOT
+++ b/sys/mips/conf/BERI_NETFPGA_MDROOT
@@ -19,6 +19,11 @@ makeoptions FDT_DTS_FILE=beri-netfpga.dts
#device uart
device altera_jtag_uart
+device bpf
+
+options DEVICE_POLLING
+device netfpga10g_nf10bmac
+
#
# This kernel configuration uses an embedded memory root file system.
# Adjust the following path and size based on local requirements.
OpenPOWER on IntegriCloud