diff --git a/example/HTG940/fpga/README.md b/example/HTG940/fpga/README.md index 634b7ba..0ff9aa3 100644 --- a/example/HTG940/fpga/README.md +++ b/example/HTG940/fpga/README.md @@ -4,10 +4,10 @@ This example design targets the HiTech Global HTG-940 FPGA board. -The design places a looped-back MAC on the BASE-T port, as well as a looped-back UART on on the USB UART connection. +The design places a looped-back MAC on the BASE-T port, as well as XFCP on the USB UART for monitoring and control. * USB UART - * Looped-back UART + * XFCP (921600 baud) * RJ-45 Ethernet ports with TI DP83867IRPAP PHY * Looped-back MAC via RGMII @@ -32,6 +32,4 @@ Run `make` in the appropriate `fpga*` subdirectory to build the bitstream. Ensu Run `make program` to program the board with Vivado. -To test the looped-back UART, use any serial terminal software like minicom, screen, etc. The looped-back UART will echo typed text back without modification. - To test the looped-back MAC, it is recommended to use a network tester like the Viavi T-BERD 5800 that supports basic layer 2 tests with a loopback. Do not connect the looped-back MAC to a network as the reflected packets may cause problems. diff --git a/example/HTG940/fpga/fpga_vu13p/Makefile b/example/HTG940/fpga/fpga_vu13p/Makefile index cedfee2..6be0e1c 100644 --- a/example/HTG940/fpga/fpga_vu13p/Makefile +++ b/example/HTG940/fpga/fpga_vu13p/Makefile @@ -15,7 +15,9 @@ FPGA_ARCH = virtexuplus SYN_FILES = ../rtl/fpga.sv SYN_FILES += ../rtl/fpga_core.sv SYN_FILES += ../lib/taxi/rtl/eth/taxi_eth_mac_1g_rgmii_fifo.f -SYN_FILES += ../lib/taxi/rtl/lss/taxi_uart.f +SYN_FILES += ../lib/taxi/rtl/xfcp/taxi_xfcp_if_uart.f +SYN_FILES += ../lib/taxi/rtl/xfcp/taxi_xfcp_switch.sv +SYN_FILES += ../lib/taxi/rtl/xfcp/taxi_xfcp_mod_stats.f SYN_FILES += ../lib/taxi/rtl/io/taxi_debounce_switch.sv SYN_FILES += ../lib/taxi/rtl/sync/taxi_sync_reset.sv SYN_FILES += ../lib/taxi/rtl/sync/taxi_sync_signal.sv diff --git a/example/HTG940/fpga/fpga_vu9p/Makefile b/example/HTG940/fpga/fpga_vu9p/Makefile index 4de5c60..454d6ee 100644 --- a/example/HTG940/fpga/fpga_vu9p/Makefile +++ b/example/HTG940/fpga/fpga_vu9p/Makefile @@ -15,7 +15,9 @@ FPGA_ARCH = virtexuplus SYN_FILES = ../rtl/fpga.sv SYN_FILES += ../rtl/fpga_core.sv SYN_FILES += ../lib/taxi/rtl/eth/taxi_eth_mac_1g_rgmii_fifo.f -SYN_FILES += ../lib/taxi/rtl/lss/taxi_uart.f +SYN_FILES += ../lib/taxi/rtl/xfcp/taxi_xfcp_if_uart.f +SYN_FILES += ../lib/taxi/rtl/xfcp/taxi_xfcp_switch.sv +SYN_FILES += ../lib/taxi/rtl/xfcp/taxi_xfcp_mod_stats.f SYN_FILES += ../lib/taxi/rtl/io/taxi_debounce_switch.sv SYN_FILES += ../lib/taxi/rtl/sync/taxi_sync_reset.sv SYN_FILES += ../lib/taxi/rtl/sync/taxi_sync_signal.sv diff --git a/example/HTG940/fpga/rtl/fpga_core.sv b/example/HTG940/fpga/rtl/fpga_core.sv index 8659e38..024f2f2 100644 --- a/example/HTG940/fpga/rtl/fpga_core.sv +++ b/example/HTG940/fpga/rtl/fpga_core.sv @@ -64,51 +64,91 @@ module fpga_core # assign led = sw; -// UART +// XFCP assign uart_cts = 1'b1; assign uart_rst_n = 1'b1; -taxi_axis_if #(.DATA_W(8)) axis_uart(); +taxi_axis_if #(.DATA_W(8), .USER_EN(1), .USER_W(1)) xfcp_ds(), xfcp_us(); -taxi_uart -uart_inst ( +taxi_xfcp_if_uart #( + .TX_FIFO_DEPTH(512), + .RX_FIFO_DEPTH(512) +) +xfcp_if_uart_inst ( .clk(clk), .rst(rst), - /* - * AXI4-Stream input (sink) - */ - .s_axis_tx(axis_uart), - - /* - * AXI4-Stream output (source) - */ - .m_axis_rx(axis_uart), - /* * UART interface */ - .rxd(uart_txd), - .txd(uart_rxd), + .uart_rxd(uart_txd), + .uart_txd(uart_rxd), /* - * Status + * XFCP downstream interface */ - .tx_busy(), - .rx_busy(), - .rx_overrun_error(), - .rx_frame_error(), + .xfcp_dsp_ds(xfcp_ds), + .xfcp_dsp_us(xfcp_us), /* * Configuration */ - .prescale(16'(125000000/115200)) + .prescale(16'(125000000/921600)) +); + +taxi_axis_if #(.DATA_W(8), .USER_EN(1), .USER_W(1)) xfcp_sw_ds[1](), xfcp_sw_us[1](); + +taxi_xfcp_switch #( + .XFCP_ID_STR("HTG940"), + .XFCP_EXT_ID(0), + .XFCP_EXT_ID_STR("Taxi example"), + .PORTS($size(xfcp_sw_us)) +) +xfcp_sw_inst ( + .clk(clk), + .rst(rst), + + /* + * XFCP upstream port + */ + .xfcp_usp_ds(xfcp_ds), + .xfcp_usp_us(xfcp_us), + + /* + * XFCP downstream ports + */ + .xfcp_dsp_ds(xfcp_sw_ds), + .xfcp_dsp_us(xfcp_sw_us) +); + +taxi_axis_if #(.DATA_W(16), .KEEP_W(1), .KEEP_EN(0), .LAST_EN(0), .USER_EN(1), .USER_W(1), .ID_EN(1), .ID_W(10)) axis_mac_stat(); + +taxi_xfcp_mod_stats #( + .XFCP_ID_STR("Statistics"), + .XFCP_EXT_ID(0), + .XFCP_EXT_ID_STR(""), + .STAT_COUNT_W(64), + .STAT_PIPELINE(2) +) +xfcp_stats_inst ( + .clk(clk), + .rst(rst), + + /* + * XFCP upstream port + */ + .xfcp_usp_ds(xfcp_sw_ds[0]), + .xfcp_usp_us(xfcp_sw_us[0]), + + /* + * Statistics increment input + */ + .s_axis_stat(axis_mac_stat) ); // BASE-T PHY taxi_axis_if #(.DATA_W(8), .ID_W(8)) axis_eth(); taxi_axis_if #(.DATA_W(96), .KEEP_W(1), .ID_W(8)) axis_tx_cpl(); -taxi_axis_if #(.DATA_W(16), .KEEP_W(1), .KEEP_EN(0), .LAST_EN(0), .USER_EN(1), .USER_W(1), .ID_EN(1), .ID_W(8)) axis_stat(); taxi_eth_mac_1g_rgmii_fifo #( .SIM(SIM), @@ -117,7 +157,11 @@ taxi_eth_mac_1g_rgmii_fifo #( .USE_CLK90(USE_CLK90), .PADDING_EN(1), .MIN_FRAME_LEN(64), - .STAT_EN(1'b0), + .STAT_EN(1), + .STAT_TX_LEVEL(1), + .STAT_RX_LEVEL(1), + .STAT_ID_BASE(0), + .STAT_UPDATE_PERIOD(1024), .TX_FIFO_DEPTH(16384), .TX_FRAME_FIFO(1), .RX_FIFO_DEPTH(16384), @@ -156,7 +200,7 @@ eth_mac_inst ( */ .stat_clk(clk), .stat_rst(rst), - .m_axis_stat(axis_stat), + .m_axis_stat(axis_mac_stat), /* * Status diff --git a/example/HTG940/fpga/tb/fpga_core/Makefile b/example/HTG940/fpga/tb/fpga_core/Makefile index 982464c..ee5d89e 100644 --- a/example/HTG940/fpga/tb/fpga_core/Makefile +++ b/example/HTG940/fpga/tb/fpga_core/Makefile @@ -20,7 +20,9 @@ MODULE = $(COCOTB_TEST_MODULES) TOPLEVEL = $(COCOTB_TOPLEVEL) VERILOG_SOURCES += ../../rtl/$(DUT).sv VERILOG_SOURCES += ../../lib/taxi/rtl/eth/taxi_eth_mac_1g_rgmii_fifo.f -VERILOG_SOURCES += ../../lib/taxi/rtl/lss/taxi_uart.f +VERILOG_SOURCES += ../../lib/taxi/rtl/xfcp/taxi_xfcp_if_uart.f +VERILOG_SOURCES += ../../lib/taxi/rtl/xfcp/taxi_xfcp_switch.sv +VERILOG_SOURCES += ../../lib/taxi/rtl/xfcp/taxi_xfcp_mod_stats.f VERILOG_SOURCES += ../../lib/taxi/rtl/sync/taxi_sync_reset.sv VERILOG_SOURCES += ../../lib/taxi/rtl/sync/taxi_sync_signal.sv diff --git a/example/HTG940/fpga/tb/fpga_core/test_fpga_core.py b/example/HTG940/fpga/tb/fpga_core/test_fpga_core.py index e2f135e..3f3687c 100644 --- a/example/HTG940/fpga/tb/fpga_core/test_fpga_core.py +++ b/example/HTG940/fpga/tb/fpga_core/test_fpga_core.py @@ -33,8 +33,8 @@ class TB: self.baset_phy = RgmiiPhy(dut.phy_rgmii_txd, dut.phy_rgmii_tx_ctl, dut.phy_rgmii_tx_clk, dut.phy_rgmii_rxd, dut.phy_rgmii_rx_ctl, dut.phy_rgmii_rx_clk, speed=speed) - self.uart_source = UartSource(dut.uart_txd, baud=115200, bits=8, stop_bits=1) - self.uart_sink = UartSink(dut.uart_rxd, baud=115200, bits=8, stop_bits=1) + self.uart_source = UartSource(dut.uart_txd, baud=921600, bits=8, stop_bits=1) + self.uart_sink = UartSink(dut.uart_rxd, baud=921600, bits=8, stop_bits=1) cocotb.start_soon(self._run_clk()) @@ -65,25 +65,6 @@ class TB: await t -async def uart_test(tb, source, sink): - tb.log.info("Test UART") - - tx_data = b"FPGA Ninja" - - tb.log.info("UART TX: %s", tx_data) - - await source.write(tx_data) - - rx_data = bytearray() - - while len(rx_data) < len(tx_data): - rx_data.extend(await sink.read()) - - tb.log.info("UART RX: %s", rx_data) - - tb.log.info("UART test done") - - async def mac_test(tb, source, sink): tb.log.info("Test MAC") @@ -133,15 +114,11 @@ async def run_test(dut): await tb.init() - tb.log.info("Start UART test") - - uart_test_cr = cocotb.start_soon(uart_test(tb, tb.uart_source, tb.uart_sink)) - tb.log.info("Start BASE-T MAC loopback test") phy_test_cr = cocotb.start_soon(mac_test(tb, tb.baset_phy.rx, tb.baset_phy.tx)) - await Combine(uart_test_cr, phy_test_cr) + await Combine(phy_test_cr) await RisingEdge(dut.clk) await RisingEdge(dut.clk) @@ -175,7 +152,9 @@ def test_fpga_core(request): verilog_sources = [ os.path.join(rtl_dir, f"{dut}.sv"), os.path.join(lib_dir, "taxi", "rtl", "eth", "taxi_eth_mac_1g_rgmii_fifo.f"), - os.path.join(lib_dir, "taxi", "rtl", "lss", "taxi_uart.f"), + os.path.join(lib_dir, "taxi", "rtl", "xfcp", "taxi_xfcp_if_uart.f"), + os.path.join(lib_dir, "taxi", "rtl", "xfcp", "taxi_xfcp_switch.sv"), + os.path.join(lib_dir, "taxi", "rtl", "xfcp", "taxi_xfcp_mod_stats.f"), os.path.join(lib_dir, "taxi", "rtl", "sync", "taxi_sync_reset.sv"), os.path.join(lib_dir, "taxi", "rtl", "sync", "taxi_sync_signal.sv"), ]