bslathi19/taxi
1
0
Fork 0
mirror of https://github.com/fpganinja/taxi.git synced 2025-12-10 17:28:40 -08:00
Code Issues Packages Projects Releases Wiki Activity

eth: Add gearbox support to 64-bit 10G MAC

Browse Source 
Signed-off-by: Alex Forencich <alex@alexforencich.com>
This commit is contained in:
Alex Forencich
2025-06-13 16:39:55 -07:00
parent 28195390a2
commit e846e7f0cd
18 changed files with 641 additions and 536 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/eth/rtl/taxi_axis_xgmii_rx_64.sv
View File

@@ -19,6 +19,7 @@ module taxi_axis_xgmii_rx_64 #
( (
parameter DATA_W = 64, parameter DATA_W = 64,
parameter CTRL_W = (DATA_W/8), parameter CTRL_W = (DATA_W/8),
parameter logic GBX_IF_EN = 1'b0,
parameter logic PTP_TS_EN = 1'b0, parameter logic PTP_TS_EN = 1'b0,
parameter logic PTP_TS_FMT_TOD = 1'b1, parameter logic PTP_TS_FMT_TOD = 1'b1,
parameter PTP_TS_W = PTP_TS_FMT_TOD ? 96 : 64 parameter PTP_TS_W = PTP_TS_FMT_TOD ? 96 : 64
@@ -32,6 +33,7 @@ module taxi_axis_xgmii_rx_64 #
*/ */
input wire logic [DATA_W-1:0] xgmii_rxd, input wire logic [DATA_W-1:0] xgmii_rxd,
input wire logic [CTRL_W-1:0] xgmii_rxc, input wire logic [CTRL_W-1:0] xgmii_rxc,
input wire logic xgmii_rx_valid,
/* /*
* Receive interface (AXI stream) * Receive interface (AXI stream)
@@ -276,6 +278,10 @@ always_comb begin
stat_rx_err_framing_next = 1'b0; stat_rx_err_framing_next = 1'b0;
stat_rx_err_preamble_next = 1'b0; stat_rx_err_preamble_next = 1'b0;
if (GBX_IF_EN && !xgmii_rx_valid) begin
// XGMII data not valid - hold state
state_next = state_reg;
end else begin
// counter to measure frame length // counter to measure frame length
if (&frame_len_reg[15:3] == 0) begin if (&frame_len_reg[15:3] == 0) begin
if (term_present_reg) begin if (term_present_reg) begin
@@ -465,6 +471,7 @@ always_comb begin
state_next = STATE_IDLE; state_next = STATE_IDLE;
end end
endcase endcase
end
end end
always_ff @(posedge clk) begin always_ff @(posedge clk) begin
@@ -505,6 +512,7 @@ always_ff @(posedge clk) begin
stat_rx_err_framing_reg <= stat_rx_err_framing_next; stat_rx_err_framing_reg <= stat_rx_err_framing_next;
stat_rx_err_preamble_reg <= stat_rx_err_preamble_next; stat_rx_err_preamble_reg <= stat_rx_err_preamble_next;
if (!GBX_IF_EN || xgmii_rx_valid) begin
swap_rxd <= xgmii_rxd_masked[63:32]; swap_rxd <= xgmii_rxd_masked[63:32];
swap_rxc <= xgmii_rxc[7:4]; swap_rxc <= xgmii_rxc[7:4];
swap_rxc_term <= xgmii_term[7:4]; swap_rxc_term <= xgmii_term[7:4];
@@ -600,6 +608,7 @@ always_ff @(posedge clk) begin
xgmii_rxd_d1 <= xgmii_rxd_d0; xgmii_rxd_d1 <= xgmii_rxd_d0;
xgmii_start_d1 <= xgmii_start_d0; xgmii_start_d1 <= xgmii_start_d0;
end
last_ts_reg <= (4+16)'(ptp_ts); last_ts_reg <= (4+16)'(ptp_ts);
ts_inc_reg <= (4+16)'(ptp_ts) - last_ts_reg; ts_inc_reg <= (4+16)'(ptp_ts) - last_ts_reg;

30
src/eth/rtl/taxi_axis_xgmii_tx_64.sv
View File

@@ -19,6 +19,8 @@ module taxi_axis_xgmii_tx_64 #
( (
parameter DATA_W = 64, parameter DATA_W = 64,
parameter CTRL_W = (DATA_W/8), parameter CTRL_W = (DATA_W/8),
parameter logic GBX_IF_EN = 1'b0,
parameter GBX_CNT = 1,
parameter logic PADDING_EN = 1'b1, parameter logic PADDING_EN = 1'b1,
parameter logic DIC_EN = 1'b1, parameter logic DIC_EN = 1'b1,
parameter MIN_FRAME_LEN = 64, parameter MIN_FRAME_LEN = 64,
@@ -42,6 +44,10 @@ module taxi_axis_xgmii_tx_64 #
*/ */
output wire logic [DATA_W-1:0] xgmii_txd, output wire logic [DATA_W-1:0] xgmii_txd,
output wire logic [CTRL_W-1:0] xgmii_txc, output wire logic [CTRL_W-1:0] xgmii_txc,
output wire logic xgmii_tx_valid,
input wire logic [GBX_CNT-1:0] tx_gbx_req_sync = '0,
input wire logic tx_gbx_req_stall = '0,
output wire logic [GBX_CNT-1:0] tx_gbx_sync,
/* /*
* PTP * PTP
@@ -165,6 +171,8 @@ logic [4+16-1:0] ts_inc_reg = '0;
logic [DATA_W-1:0] xgmii_txd_reg = {CTRL_W{XGMII_IDLE}}, xgmii_txd_next; logic [DATA_W-1:0] xgmii_txd_reg = {CTRL_W{XGMII_IDLE}}, xgmii_txd_next;
logic [CTRL_W-1:0] xgmii_txc_reg = {CTRL_W{1'b1}}, xgmii_txc_next; logic [CTRL_W-1:0] xgmii_txc_reg = {CTRL_W{1'b1}}, xgmii_txc_next;
logic xgmii_tx_valid_reg = 1'b0;
logic [GBX_CNT-1:0] tx_gbx_sync_reg = '0;
logic [1:0] start_packet_reg = 2'b00; logic [1:0] start_packet_reg = 2'b00;
@@ -180,10 +188,12 @@ logic stat_tx_err_oversize_reg = 1'b0, stat_tx_err_oversize_next;
logic stat_tx_err_user_reg = 1'b0, stat_tx_err_user_next; logic stat_tx_err_user_reg = 1'b0, stat_tx_err_user_next;
logic stat_tx_err_underflow_reg = 1'b0, stat_tx_err_underflow_next; logic stat_tx_err_underflow_reg = 1'b0, stat_tx_err_underflow_next;
assign s_axis_tx.tready = s_axis_tx_tready_reg; assign s_axis_tx.tready = s_axis_tx_tready_reg && (!GBX_IF_EN || !tx_gbx_req_stall);
assign xgmii_txd = xgmii_txd_reg; assign xgmii_txd = xgmii_txd_reg;
assign xgmii_txc = xgmii_txc_reg; assign xgmii_txc = xgmii_txc_reg;
assign xgmii_tx_valid = GBX_IF_EN ? xgmii_tx_valid_reg : 1'b1;
assign tx_gbx_sync = GBX_IF_EN ? tx_gbx_sync_reg : '0;
assign m_axis_tx_cpl.tdata = PTP_TS_EN ? ((!PTP_TS_FMT_TOD || m_axis_tx_cpl_ts_borrow_reg) ? m_axis_tx_cpl_ts_reg : m_axis_tx_cpl_ts_adj_reg) : '0; assign m_axis_tx_cpl.tdata = PTP_TS_EN ? ((!PTP_TS_FMT_TOD || m_axis_tx_cpl_ts_borrow_reg) ? m_axis_tx_cpl_ts_reg : m_axis_tx_cpl_ts_adj_reg) : '0;
assign m_axis_tx_cpl.tkeep = 1'b1; assign m_axis_tx_cpl.tkeep = 1'b1;
@@ -361,6 +371,12 @@ always_comb begin
frame_next = !s_axis_tx.tlast; frame_next = !s_axis_tx.tlast;
end end
if (GBX_IF_EN && tx_gbx_req_stall) begin
// gearbox stall - hold state
state_next = state_reg;
frame_start_next = frame_start_reg;
s_axis_tx_tready_next = s_axis_tx_tready_reg;
end else begin
// counter for min frame length enforcement // counter for min frame length enforcement
if (frame_min_count_reg > MIN_LEN_W'(CTRL_W)) begin if (frame_min_count_reg > MIN_LEN_W'(CTRL_W)) begin
frame_min_count_next = MIN_LEN_W'(frame_min_count_reg - CTRL_W); frame_min_count_next = MIN_LEN_W'(frame_min_count_reg - CTRL_W);
@@ -648,6 +664,7 @@ always_comb begin
state_next = STATE_IDLE; state_next = STATE_IDLE;
end end
endcase endcase
end
end end
always_ff @(posedge clk) begin always_ff @(posedge clk) begin
@@ -701,6 +718,10 @@ always_ff @(posedge clk) begin
m_axis_tx_cpl_ts_adj_reg[95:48] <= m_axis_tx_cpl_ts_reg[95:48] + 1; m_axis_tx_cpl_ts_adj_reg[95:48] <= m_axis_tx_cpl_ts_reg[95:48] + 1;
end end
if (GBX_IF_EN && tx_gbx_req_stall) begin
// gearbox stall
xgmii_tx_valid_reg <= 1'b0;
end else begin
if (frame_start_reg) begin if (frame_start_reg) begin
if (swap_lanes_reg) begin if (swap_lanes_reg) begin
if (PTP_TS_EN) begin if (PTP_TS_EN) begin
@@ -757,6 +778,11 @@ always_ff @(posedge clk) begin
xgmii_txc_reg <= xgmii_txc_next; xgmii_txc_reg <= xgmii_txc_next;
end end
xgmii_tx_valid_reg <= 1'b1;
end
tx_gbx_sync_reg <= tx_gbx_req_sync;
last_ts_reg <= (4+16)'(ptp_ts); last_ts_reg <= (4+16)'(ptp_ts);
ts_inc_reg <= (4+16)'(ptp_ts) - last_ts_reg; ts_inc_reg <= (4+16)'(ptp_ts) - last_ts_reg;
@@ -778,6 +804,8 @@ always_ff @(posedge clk) begin
xgmii_txd_reg <= {CTRL_W{XGMII_IDLE}}; xgmii_txd_reg <= {CTRL_W{XGMII_IDLE}};
xgmii_txc_reg <= {CTRL_W{1'b1}}; xgmii_txc_reg <= {CTRL_W{1'b1}};
xgmii_tx_valid_reg <= 1'b0;
tx_gbx_sync_reg <= '0;
start_packet_reg <= 2'b00; start_packet_reg <= 2'b00;

20
src/eth/rtl/taxi_eth_mac_10g.sv
View File

@@ -19,6 +19,9 @@ module taxi_eth_mac_10g #
( (
parameter DATA_W = 64, parameter DATA_W = 64,
parameter CTRL_W = (DATA_W/8), parameter CTRL_W = (DATA_W/8),
parameter logic TX_GBX_IF_EN = 1'b0,
parameter logic RX_GBX_IF_EN = TX_GBX_IF_EN,
parameter GBX_CNT = 1,
parameter logic PADDING_EN = 1'b1, parameter logic PADDING_EN = 1'b1,
parameter logic DIC_EN = 1'b1, parameter logic DIC_EN = 1'b1,
parameter MIN_FRAME_LEN = 64, parameter MIN_FRAME_LEN = 64,
@@ -57,8 +60,13 @@ module taxi_eth_mac_10g #
*/ */
input wire logic [DATA_W-1:0] xgmii_rxd, input wire logic [DATA_W-1:0] xgmii_rxd,
input wire logic [CTRL_W-1:0] xgmii_rxc, input wire logic [CTRL_W-1:0] xgmii_rxc,
input wire logic xgmii_rx_valid = 1'b1,
output wire logic [DATA_W-1:0] xgmii_txd, output wire logic [DATA_W-1:0] xgmii_txd,
output wire logic [CTRL_W-1:0] xgmii_txc, output wire logic [CTRL_W-1:0] xgmii_txc,
output wire logic xgmii_tx_valid = 1'b1,
input wire logic [GBX_CNT-1:0] tx_gbx_req_sync = '0,
input wire logic tx_gbx_req_stall = 1'b0,
output wire logic [GBX_CNT-1:0] tx_gbx_sync,
/* /*
* PTP * PTP
@@ -213,6 +221,7 @@ if (DATA_W == 64) begin
taxi_axis_xgmii_rx_64 #( taxi_axis_xgmii_rx_64 #(
.DATA_W(DATA_W), .DATA_W(DATA_W),
.CTRL_W(CTRL_W), .CTRL_W(CTRL_W),
.GBX_IF_EN(RX_GBX_IF_EN),
.PTP_TS_EN(PTP_TS_EN), .PTP_TS_EN(PTP_TS_EN),
.PTP_TS_FMT_TOD(PTP_TS_FMT_TOD), .PTP_TS_FMT_TOD(PTP_TS_FMT_TOD),
.PTP_TS_W(PTP_TS_W) .PTP_TS_W(PTP_TS_W)
@@ -226,6 +235,7 @@ if (DATA_W == 64) begin
*/ */
.xgmii_rxd(xgmii_rxd), .xgmii_rxd(xgmii_rxd),
.xgmii_rxc(xgmii_rxc), .xgmii_rxc(xgmii_rxc),
.xgmii_rx_valid(xgmii_rx_valid),
/* /*
* Receive interface (AXI stream) * Receive interface (AXI stream)
@@ -267,6 +277,8 @@ if (DATA_W == 64) begin
taxi_axis_xgmii_tx_64 #( taxi_axis_xgmii_tx_64 #(
.DATA_W(DATA_W), .DATA_W(DATA_W),
.CTRL_W(CTRL_W), .CTRL_W(CTRL_W),
.GBX_IF_EN(TX_GBX_IF_EN),
.GBX_CNT(GBX_CNT),
.PADDING_EN(PADDING_EN), .PADDING_EN(PADDING_EN),
.DIC_EN(DIC_EN), .DIC_EN(DIC_EN),
.MIN_FRAME_LEN(MIN_FRAME_LEN), .MIN_FRAME_LEN(MIN_FRAME_LEN),
@@ -290,6 +302,10 @@ if (DATA_W == 64) begin
*/ */
.xgmii_txd(xgmii_txd), .xgmii_txd(xgmii_txd),
.xgmii_txc(xgmii_txc), .xgmii_txc(xgmii_txc),
.xgmii_tx_valid(xgmii_tx_valid),
.tx_gbx_req_sync(tx_gbx_req_sync),
.tx_gbx_req_stall(tx_gbx_req_stall),
.tx_gbx_sync(tx_gbx_sync),
/* /*
* PTP * PTP
@@ -731,7 +747,7 @@ if (MAC_CTRL_EN) begin : mac_ctrl
.cfg_tx_pfc_quanta(cfg_tx_pfc_quanta), .cfg_tx_pfc_quanta(cfg_tx_pfc_quanta),
.cfg_tx_pfc_refresh(cfg_tx_pfc_refresh), .cfg_tx_pfc_refresh(cfg_tx_pfc_refresh),
.cfg_quanta_step(10'((DATA_W*256)/512)), .cfg_quanta_step(10'((DATA_W*256)/512)),
.cfg_quanta_clk_en(1'b1), .cfg_quanta_clk_en(!TX_GBX_IF_EN || xgmii_tx_valid),
/* /*
* Status * Status
@@ -786,7 +802,7 @@ if (MAC_CTRL_EN) begin : mac_ctrl
.cfg_rx_pfc_opcode(cfg_rx_pfc_opcode), .cfg_rx_pfc_opcode(cfg_rx_pfc_opcode),
.cfg_rx_pfc_en(cfg_rx_pfc_en), .cfg_rx_pfc_en(cfg_rx_pfc_en),
.cfg_quanta_step(10'((DATA_W*256)/512)), .cfg_quanta_step(10'((DATA_W*256)/512)),
.cfg_quanta_clk_en(1'b1), .cfg_quanta_clk_en(!RX_GBX_IF_EN || xgmii_rx_valid),
/* /*
* Status * Status

16
src/eth/rtl/taxi_eth_mac_10g_fifo.sv
View File

@@ -19,6 +19,9 @@ module taxi_eth_mac_10g_fifo #
( (
parameter DATA_W = 64, parameter DATA_W = 64,
parameter CTRL_W = (DATA_W/8), parameter CTRL_W = (DATA_W/8),
parameter logic TX_GBX_IF_EN = 1'b0,
parameter logic RX_GBX_IF_EN = TX_GBX_IF_EN,
parameter GBX_CNT = 1,
parameter logic PADDING_EN = 1'b1, parameter logic PADDING_EN = 1'b1,
parameter logic DIC_EN = 1'b1, parameter logic DIC_EN = 1'b1,
parameter MIN_FRAME_LEN = 64, parameter MIN_FRAME_LEN = 64,
@@ -71,8 +74,13 @@ module taxi_eth_mac_10g_fifo #
*/ */
input wire logic [DATA_W-1:0] xgmii_rxd, input wire logic [DATA_W-1:0] xgmii_rxd,
input wire logic [CTRL_W-1:0] xgmii_rxc, input wire logic [CTRL_W-1:0] xgmii_rxc,
input wire logic xgmii_rx_valid = 1'b1,
output wire logic [DATA_W-1:0] xgmii_txd, output wire logic [DATA_W-1:0] xgmii_txd,
output wire logic [CTRL_W-1:0] xgmii_txc, output wire logic [CTRL_W-1:0] xgmii_txc,
output wire logic xgmii_tx_valid = 1'b1,
input wire logic [GBX_CNT-1:0] tx_gbx_req_sync = '0,
input wire logic tx_gbx_req_stall = 1'b0,
output wire logic [GBX_CNT-1:0] tx_gbx_sync,
/* /*
* PTP clock * PTP clock
@@ -242,6 +250,9 @@ wire stat_rx_fifo_drop;
taxi_eth_mac_10g #( taxi_eth_mac_10g #(
.DATA_W(DATA_W), .DATA_W(DATA_W),
.CTRL_W(CTRL_W), .CTRL_W(CTRL_W),
.TX_GBX_IF_EN(TX_GBX_IF_EN),
.RX_GBX_IF_EN(RX_GBX_IF_EN),
.GBX_CNT(GBX_CNT),
.PADDING_EN(PADDING_EN), .PADDING_EN(PADDING_EN),
.DIC_EN(DIC_EN), .DIC_EN(DIC_EN),
.MIN_FRAME_LEN(MIN_FRAME_LEN), .MIN_FRAME_LEN(MIN_FRAME_LEN),
@@ -280,8 +291,13 @@ eth_mac_10g_inst (
*/ */
.xgmii_rxd(xgmii_rxd), .xgmii_rxd(xgmii_rxd),
.xgmii_rxc(xgmii_rxc), .xgmii_rxc(xgmii_rxc),
.xgmii_rx_valid(xgmii_rx_valid),
.xgmii_txd(xgmii_txd), .xgmii_txd(xgmii_txd),
.xgmii_txc(xgmii_txc), .xgmii_txc(xgmii_txc),
.xgmii_tx_valid(xgmii_tx_valid),
.tx_gbx_req_sync(tx_gbx_req_sync),
.tx_gbx_req_stall(tx_gbx_req_stall),
.tx_gbx_sync(tx_gbx_sync),
/* /*
* PTP * PTP

17
src/eth/rtl/us/taxi_eth_mac_25g_us_ch.sv
View File

@@ -720,9 +720,6 @@ if (COMBINED_MAC_PCS) begin : mac
end else begin : mac end else begin : mac
if (CFG_LOW_LATENCY)
$fatal(0, "Split MAC/PCS does not currently support low latency mode");
localparam CTRL_W = DATA_W / 8; localparam CTRL_W = DATA_W / 8;
wire [DATA_W-1:0] xgmii_txd; wire [DATA_W-1:0] xgmii_txd;
@@ -807,8 +804,8 @@ end else begin : mac
taxi_eth_mac_10g #( taxi_eth_mac_10g #(
.DATA_W(DATA_W), .DATA_W(DATA_W),
.CTRL_W(CTRL_W), .CTRL_W(CTRL_W),
// .TX_GBX_IF_EN(CFG_LOW_LATENCY), .TX_GBX_IF_EN(CFG_LOW_LATENCY),
// .RX_GBX_IF_EN(CFG_LOW_LATENCY), .RX_GBX_IF_EN(CFG_LOW_LATENCY),
.PADDING_EN(PADDING_EN), .PADDING_EN(PADDING_EN),
.DIC_EN(DIC_EN), .DIC_EN(DIC_EN),
.MIN_FRAME_LEN(MIN_FRAME_LEN), .MIN_FRAME_LEN(MIN_FRAME_LEN),
@@ -847,13 +844,13 @@ end else begin : mac
*/ */
.xgmii_txd(xgmii_txd), .xgmii_txd(xgmii_txd),
.xgmii_txc(xgmii_txc), .xgmii_txc(xgmii_txc),
// .xgmii_tx_valid(xgmii_tx_valid), .xgmii_tx_valid(xgmii_tx_valid),
.xgmii_rxd(xgmii_rxd), .xgmii_rxd(xgmii_rxd),
.xgmii_rxc(xgmii_rxc), .xgmii_rxc(xgmii_rxc),
// .xgmii_rx_valid(xgmii_rx_valid), .xgmii_rx_valid(xgmii_rx_valid),
// .tx_gbx_req_sync(tx_gbx_req_sync), .tx_gbx_req_sync(tx_gbx_req_sync),
// .tx_gbx_req_stall(tx_gbx_req_stall), .tx_gbx_req_stall(tx_gbx_req_stall),
// .tx_gbx_sync(tx_gbx_sync), .tx_gbx_sync(tx_gbx_sync),
/* /*
* PTP * PTP

1
src/eth/tb/taxi_axis_xgmii_rx_64/Makefile
View File

@@ -35,6 +35,7 @@ VERILOG_SOURCES := $(call uniq_base,$(call process_f_files,$(VERILOG_SOURCES)))
# module parameters # module parameters
export PARAM_DATA_W := 64 export PARAM_DATA_W := 64
export PARAM_GBX_IF_EN := 0
export PARAM_PTP_TS_EN := 1 export PARAM_PTP_TS_EN := 1
export PARAM_PTP_TS_FMT_TOD := 1 export PARAM_PTP_TS_FMT_TOD := 1
export PARAM_PTP_TS_W := $(if $(filter-out 1,$(PARAM_PTP_TS_FMT_TOD)),64,96) export PARAM_PTP_TS_W := $(if $(filter-out 1,$(PARAM_PTP_TS_FMT_TOD)),64,96)

3
src/eth/tb/taxi_axis_xgmii_rx_64/test_taxi_axis_xgmii_rx_64.py
View File

@@ -39,6 +39,8 @@ class TB:
self.ptp_clock = PtpClockSimTime(ts_tod=dut.ptp_ts, clock=dut.clk) self.ptp_clock = PtpClockSimTime(ts_tod=dut.ptp_ts, clock=dut.clk)
dut.xgmii_rx_valid.setimmediatevalue(1)
dut.cfg_rx_max_pkt_len.setimmediatevalue(0) dut.cfg_rx_max_pkt_len.setimmediatevalue(0)
dut.cfg_rx_enable.setimmediatevalue(0) dut.cfg_rx_enable.setimmediatevalue(0)
@@ -306,6 +308,7 @@ def test_taxi_axis_xgmii_rx_64(request):
parameters = {} parameters = {}
parameters['DATA_W'] = 64 parameters['DATA_W'] = 64
parameters['GBX_IF_EN'] = 0
parameters['PTP_TS_EN'] = 1 parameters['PTP_TS_EN'] = 1
parameters['PTP_TS_FMT_TOD'] = 1 parameters['PTP_TS_FMT_TOD'] = 1
parameters['PTP_TS_W'] = 96 if parameters['PTP_TS_FMT_TOD'] else 64 parameters['PTP_TS_W'] = 96 if parameters['PTP_TS_FMT_TOD'] else 64

4
src/eth/tb/taxi_axis_xgmii_rx_64/test_taxi_axis_xgmii_rx_64.sv
View File

@@ -19,6 +19,7 @@ module test_taxi_axis_xgmii_rx_64 #
( (
/* verilator lint_off WIDTHTRUNC */ /* verilator lint_off WIDTHTRUNC */
parameter DATA_W = 64, parameter DATA_W = 64,
parameter logic GBX_IF_EN = 1'b0,
parameter logic PTP_TS_EN = 1'b0, parameter logic PTP_TS_EN = 1'b0,
parameter logic PTP_TS_FMT_TOD = 1'b1, parameter logic PTP_TS_FMT_TOD = 1'b1,
parameter PTP_TS_W = PTP_TS_FMT_TOD ? 96 : 64 parameter PTP_TS_W = PTP_TS_FMT_TOD ? 96 : 64
@@ -34,6 +35,7 @@ logic rst;
logic [DATA_W-1:0] xgmii_rxd; logic [DATA_W-1:0] xgmii_rxd;
logic [CTRL_W-1:0] xgmii_rxc; logic [CTRL_W-1:0] xgmii_rxc;
logic xgmii_rx_valid;
taxi_axis_if #(.DATA_W(DATA_W), .USER_EN(1), .USER_W(USER_W)) m_axis_rx(); taxi_axis_if #(.DATA_W(DATA_W), .USER_EN(1), .USER_W(USER_W)) m_axis_rx();
@@ -62,6 +64,7 @@ logic stat_rx_err_preamble;
taxi_axis_xgmii_rx_64 #( taxi_axis_xgmii_rx_64 #(
.DATA_W(DATA_W), .DATA_W(DATA_W),
.CTRL_W(CTRL_W), .CTRL_W(CTRL_W),
.GBX_IF_EN(GBX_IF_EN),
.PTP_TS_EN(PTP_TS_EN), .PTP_TS_EN(PTP_TS_EN),
.PTP_TS_FMT_TOD(PTP_TS_FMT_TOD), .PTP_TS_FMT_TOD(PTP_TS_FMT_TOD),
.PTP_TS_W(PTP_TS_W) .PTP_TS_W(PTP_TS_W)
@@ -75,6 +78,7 @@ uut (
*/ */
.xgmii_rxd(xgmii_rxd), .xgmii_rxd(xgmii_rxd),
.xgmii_rxc(xgmii_rxc), .xgmii_rxc(xgmii_rxc),
.xgmii_rx_valid(xgmii_rx_valid),
/* /*
* AXI4-Stream output (source) * AXI4-Stream output (source)

2
src/eth/tb/taxi_axis_xgmii_tx_64/Makefile
View File

@@ -35,6 +35,8 @@ VERILOG_SOURCES := $(call uniq_base,$(call process_f_files,$(VERILOG_SOURCES)))
# module parameters # module parameters
export PARAM_DATA_W := 64 export PARAM_DATA_W := 64
export PARAM_GBX_IF_EN := 0
export PARAM_GBX_CNT := 1
export PARAM_PADDING_EN := 1 export PARAM_PADDING_EN := 1
export PARAM_DIC_EN := 1 export PARAM_DIC_EN := 1
export PARAM_MIN_FRAME_LEN := 64 export PARAM_MIN_FRAME_LEN := 64

2
src/eth/tb/taxi_axis_xgmii_tx_64/test_taxi_axis_xgmii_tx_64.py
View File

@@ -522,6 +522,8 @@ def test_taxi_axis_xgmii_tx_64(request, enable_dic):
parameters = {} parameters = {}
parameters['DATA_W'] = 64 parameters['DATA_W'] = 64
parameters['GBX_IF_EN'] = 0
parameters['GBX_CNT'] = 1
parameters['PADDING_EN'] = 1 parameters['PADDING_EN'] = 1
parameters['DIC_EN'] = enable_dic parameters['DIC_EN'] = enable_dic
parameters['MIN_FRAME_LEN'] = 64 parameters['MIN_FRAME_LEN'] = 64

2
src/eth/tb/taxi_axis_xgmii_tx_64/test_taxi_axis_xgmii_tx_64.sv
View File

@@ -19,6 +19,7 @@ module test_taxi_axis_xgmii_tx_64 #
( (
/* verilator lint_off WIDTHTRUNC */ /* verilator lint_off WIDTHTRUNC */
parameter DATA_W = 64, parameter DATA_W = 64,
parameter logic GBX_IF_EN = 1'b0,
parameter logic PADDING_EN = 1'b1, parameter logic PADDING_EN = 1'b1,
parameter logic DIC_EN = 1'b1, parameter logic DIC_EN = 1'b1,
parameter MIN_FRAME_LEN = 64, parameter MIN_FRAME_LEN = 64,
@@ -65,6 +66,7 @@ logic stat_tx_err_underflow;
taxi_axis_xgmii_tx_64 #( taxi_axis_xgmii_tx_64 #(
.DATA_W(DATA_W), .DATA_W(DATA_W),
.CTRL_W(CTRL_W), .CTRL_W(CTRL_W),
.GBX_IF_EN(GBX_IF_EN),
.PADDING_EN(PADDING_EN), .PADDING_EN(PADDING_EN),
.DIC_EN(DIC_EN), .DIC_EN(DIC_EN),
.MIN_FRAME_LEN(MIN_FRAME_LEN), .MIN_FRAME_LEN(MIN_FRAME_LEN),

3
src/eth/tb/taxi_eth_mac_10g/Makefile
View File

@@ -33,6 +33,9 @@ VERILOG_SOURCES := $(call uniq_base,$(call process_f_files,$(VERILOG_SOURCES)))
# module parameters # module parameters
export PARAM_DATA_W := 64 export PARAM_DATA_W := 64
export PARAM_TX_GBX_IF_EN := 1
export PARAM_RX_GBX_IF_EN := $(PARAM_TX_GBX_IF_EN)
export PARAM_GBX_CNT := 1
export PARAM_PADDING_EN := 1 export PARAM_PADDING_EN := 1
export PARAM_DIC_EN := 1 export PARAM_DIC_EN := 1
export PARAM_MIN_FRAME_LEN := 64 export PARAM_MIN_FRAME_LEN := 64

3
src/eth/tb/taxi_eth_mac_10g/test_taxi_eth_mac_10g.py
View File

@@ -747,6 +747,9 @@ def test_taxi_eth_mac_10g(request, data_w, dic_en, pfc_en):
parameters = {} parameters = {}
parameters['DATA_W'] = data_w parameters['DATA_W'] = data_w
parameters['TX_GBX_IF_EN'] = 0
parameters['RX_GBX_IF_EN'] = parameters['TX_GBX_IF_EN']
parameters['GBX_CNT'] = 1
parameters['PADDING_EN'] = 1 parameters['PADDING_EN'] = 1
parameters['DIC_EN'] = dic_en parameters['DIC_EN'] = dic_en
parameters['MIN_FRAME_LEN'] = 64 parameters['MIN_FRAME_LEN'] = 64

6
src/eth/tb/taxi_eth_mac_10g/test_taxi_eth_mac_10g.sv
View File

@@ -19,6 +19,9 @@ module test_taxi_eth_mac_10g #
( (
/* verilator lint_off WIDTHTRUNC */ /* verilator lint_off WIDTHTRUNC */
parameter DATA_W = 64, parameter DATA_W = 64,
parameter logic TX_GBX_IF_EN = 1'b0,
parameter logic RX_GBX_IF_EN = TX_GBX_IF_EN,
parameter GBX_CNT = 1,
parameter logic PADDING_EN = 1'b1, parameter logic PADDING_EN = 1'b1,
parameter logic DIC_EN = 1'b1, parameter logic DIC_EN = 1'b1,
parameter MIN_FRAME_LEN = 64, parameter MIN_FRAME_LEN = 64,
@@ -168,6 +171,9 @@ logic cfg_rx_pfc_en;
taxi_eth_mac_10g #( taxi_eth_mac_10g #(
.DATA_W(DATA_W), .DATA_W(DATA_W),
.CTRL_W(CTRL_W), .CTRL_W(CTRL_W),
.TX_GBX_IF_EN(TX_GBX_IF_EN),
.RX_GBX_IF_EN(RX_GBX_IF_EN),
.GBX_CNT(GBX_CNT),
.PADDING_EN(PADDING_EN), .PADDING_EN(PADDING_EN),
.DIC_EN(DIC_EN), .DIC_EN(DIC_EN),
.MIN_FRAME_LEN(MIN_FRAME_LEN), .MIN_FRAME_LEN(MIN_FRAME_LEN),

3
src/eth/tb/taxi_eth_mac_10g_fifo/Makefile
View File

@@ -33,6 +33,9 @@ VERILOG_SOURCES := $(call uniq_base,$(call process_f_files,$(VERILOG_SOURCES)))
# module parameters # module parameters
export PARAM_DATA_W := 64 export PARAM_DATA_W := 64
export PARAM_TX_GBX_IF_EN := 1
export PARAM_RX_GBX_IF_EN := $(PARAM_TX_GBX_IF_EN)
export PARAM_GBX_CNT := 1
export PARAM_AXIS_DATA_W := $(PARAM_DATA_W) export PARAM_AXIS_DATA_W := $(PARAM_DATA_W)
export PARAM_PADDING_EN := 1 export PARAM_PADDING_EN := 1
export PARAM_DIC_EN := 1 export PARAM_DIC_EN := 1

3
src/eth/tb/taxi_eth_mac_10g_fifo/test_taxi_eth_mac_10g_fifo.py
View File

@@ -347,6 +347,9 @@ def test_taxi_eth_mac_10g_fifo(request, data_w, dic_en):
parameters['DATA_W'] = data_w parameters['DATA_W'] = data_w
parameters['AXIS_DATA_W'] = parameters['DATA_W'] parameters['AXIS_DATA_W'] = parameters['DATA_W']
parameters['TX_GBX_IF_EN'] = 0
parameters['RX_GBX_IF_EN'] = parameters['TX_GBX_IF_EN']
parameters['GBX_CNT'] = 1
parameters['PADDING_EN'] = 1 parameters['PADDING_EN'] = 1
parameters['DIC_EN'] = dic_en parameters['DIC_EN'] = dic_en
parameters['MIN_FRAME_LEN'] = 64 parameters['MIN_FRAME_LEN'] = 64

6
src/eth/tb/taxi_eth_mac_10g_fifo/test_taxi_eth_mac_10g_fifo.sv
View File

@@ -19,6 +19,9 @@ module test_taxi_eth_mac_10g_fifo #
( (
/* verilator lint_off WIDTHTRUNC */ /* verilator lint_off WIDTHTRUNC */
parameter DATA_W = 8, parameter DATA_W = 8,
parameter logic TX_GBX_IF_EN = 1'b0,
parameter logic RX_GBX_IF_EN = TX_GBX_IF_EN,
parameter GBX_CNT = 1,
parameter AXIS_DATA_W = 8, parameter AXIS_DATA_W = 8,
parameter logic PADDING_EN = 1'b1, parameter logic PADDING_EN = 1'b1,
parameter logic DIC_EN = 1'b1, parameter logic DIC_EN = 1'b1,
@@ -98,6 +101,9 @@ logic cfg_rx_enable;
taxi_eth_mac_10g_fifo #( taxi_eth_mac_10g_fifo #(
.DATA_W(DATA_W), .DATA_W(DATA_W),
.CTRL_W(CTRL_W), .CTRL_W(CTRL_W),
.TX_GBX_IF_EN(TX_GBX_IF_EN),
.RX_GBX_IF_EN(RX_GBX_IF_EN),
.GBX_CNT(GBX_CNT),
.PADDING_EN(PADDING_EN), .PADDING_EN(PADDING_EN),
.DIC_EN(DIC_EN), .DIC_EN(DIC_EN),
.MIN_FRAME_LEN(MIN_FRAME_LEN), .MIN_FRAME_LEN(MIN_FRAME_LEN),

3
src/eth/tb/taxi_eth_mac_25g_us/test_taxi_eth_mac_25g_us.py
View File

@@ -911,7 +911,8 @@ def process_f_files(files):
@pytest.mark.parametrize(("dic_en", "pfc_en"), [(1, 1), (1, 0), (0, 0)]) @pytest.mark.parametrize(("dic_en", "pfc_en"), [(1, 1), (1, 0), (0, 0)])
@pytest.mark.parametrize(("low_latency", "combined_mac_pcs"), [(1, 1), (0, 1), (0, 0)]) @pytest.mark.parametrize("low_latency", [1, 0])
@pytest.mark.parametrize("combined_mac_pcs", [1, 0])
def test_taxi_eth_mac_25g_us(request, combined_mac_pcs, low_latency, dic_en, pfc_en): def test_taxi_eth_mac_25g_us(request, combined_mac_pcs, low_latency, dic_en, pfc_en):
dut = "taxi_eth_mac_25g_us" dut = "taxi_eth_mac_25g_us"
module = os.path.splitext(os.path.basename(__file__))[0] module = os.path.splitext(os.path.basename(__file__))[0]