From 434f31887ebc250db67048ed30ccde3a8585d8ab Mon Sep 17 00:00:00 2001 From: Alex Forencich Date: Thu, 6 Nov 2025 09:35:26 -0800 Subject: [PATCH] eth: Use tie and null_src modules Signed-off-by: Alex Forencich --- src/eth/rtl/taxi_eth_mac_10g.f | 2 + src/eth/rtl/taxi_eth_mac_10g.sv | 36 ++++++------- src/eth/rtl/taxi_eth_mac_1g.f | 2 + src/eth/rtl/taxi_eth_mac_1g.sv | 36 ++++++------- src/eth/rtl/taxi_eth_mac_phy_10g.f | 2 + src/eth/rtl/taxi_eth_mac_phy_10g.sv | 78 +++++++++++++---------------- 6 files changed, 69 insertions(+), 87 deletions(-) diff --git a/src/eth/rtl/taxi_eth_mac_10g.f b/src/eth/rtl/taxi_eth_mac_10g.f index 7e84572..b89e559 100644 --- a/src/eth/rtl/taxi_eth_mac_10g.f +++ b/src/eth/rtl/taxi_eth_mac_10g.f @@ -10,4 +10,6 @@ taxi_mac_pause_ctrl_tx.sv taxi_mac_pause_ctrl_rx.sv ../lib/taxi/src/lfsr/rtl/taxi_lfsr.sv ../lib/taxi/src/axis/rtl/taxi_axis_if.sv +../lib/taxi/src/axis/rtl/taxi_axis_null_src.sv +../lib/taxi/src/axis/rtl/taxi_axis_tie.sv ../lib/taxi/src/sync/rtl/taxi_sync_signal.sv diff --git a/src/eth/rtl/taxi_eth_mac_10g.sv b/src/eth/rtl/taxi_eth_mac_10g.sv index af7404a..6ea976f 100644 --- a/src/eth/rtl/taxi_eth_mac_10g.sv +++ b/src/eth/rtl/taxi_eth_mac_10g.sv @@ -544,13 +544,10 @@ if (STAT_EN) begin : stats end else begin - assign m_axis_stat.tdata = '0; - assign m_axis_stat.tkeep = '0; - assign m_axis_stat.tlast = '0; - assign m_axis_stat.tvalid = '0; - assign m_axis_stat.tid = '0; - assign m_axis_stat.tdest = '0; - assign m_axis_stat.tuser = '0; + taxi_axis_null_src + null_src_inst ( + .m_axis(m_axis_stat) + ); end @@ -827,22 +824,17 @@ if (MAC_CTRL_EN) begin : mac_ctrl end else begin - assign axis_tx_int.tdata = s_axis_tx.tdata; - assign axis_tx_int.tkeep = s_axis_tx.tkeep; - assign axis_tx_int.tvalid = s_axis_tx.tvalid; - assign s_axis_tx.tready = axis_tx_int.tready; - assign axis_tx_int.tlast = s_axis_tx.tlast; - assign axis_tx_int.tid = s_axis_tx.tid; - assign axis_tx_int.tdest = s_axis_tx.tdest; - assign axis_tx_int.tuser = s_axis_tx.tuser; + taxi_axis_tie + tx_tie_inst ( + .s_axis(s_axis_tx), + .m_axis(axis_tx_int) + ); - assign m_axis_rx.tdata = axis_rx_int.tdata; - assign m_axis_rx.tkeep = axis_rx_int.tkeep; - assign m_axis_rx.tvalid = axis_rx_int.tvalid; - assign m_axis_rx.tlast = axis_rx_int.tlast; - assign m_axis_rx.tid = axis_rx_int.tid; - assign m_axis_rx.tdest = axis_rx_int.tdest; - assign m_axis_rx.tuser = axis_rx_int.tuser; + taxi_axis_tie + rx_tie_inst ( + .s_axis(axis_rx_int), + .m_axis(m_axis_rx) + ); assign rx_lfc_req = '0; assign rx_pfc_req = '0; diff --git a/src/eth/rtl/taxi_eth_mac_1g.f b/src/eth/rtl/taxi_eth_mac_1g.f index 8c6ce1d..87a723e 100644 --- a/src/eth/rtl/taxi_eth_mac_1g.f +++ b/src/eth/rtl/taxi_eth_mac_1g.f @@ -8,4 +8,6 @@ taxi_mac_pause_ctrl_tx.sv taxi_mac_pause_ctrl_rx.sv ../lib/taxi/src/lfsr/rtl/taxi_lfsr.sv ../lib/taxi/src/axis/rtl/taxi_axis_if.sv +../lib/taxi/src/axis/rtl/taxi_axis_null_src.sv +../lib/taxi/src/axis/rtl/taxi_axis_tie.sv ../lib/taxi/src/sync/rtl/taxi_sync_signal.sv diff --git a/src/eth/rtl/taxi_eth_mac_1g.sv b/src/eth/rtl/taxi_eth_mac_1g.sv index 5fbce3a..629d120 100644 --- a/src/eth/rtl/taxi_eth_mac_1g.sv +++ b/src/eth/rtl/taxi_eth_mac_1g.sv @@ -404,13 +404,10 @@ if (STAT_EN) begin : stats end else begin - assign m_axis_stat.tdata = '0; - assign m_axis_stat.tkeep = '0; - assign m_axis_stat.tlast = '0; - assign m_axis_stat.tvalid = '0; - assign m_axis_stat.tid = '0; - assign m_axis_stat.tdest = '0; - assign m_axis_stat.tuser = '0; + taxi_axis_null_src + null_src_inst ( + .m_axis(m_axis_stat) + ); end @@ -687,22 +684,17 @@ if (MAC_CTRL_EN) begin : mac_ctrl end else begin - assign axis_tx_int.tdata = s_axis_tx.tdata; - assign axis_tx_int.tkeep = s_axis_tx.tkeep; - assign axis_tx_int.tvalid = s_axis_tx.tvalid; - assign s_axis_tx.tready = axis_tx_int.tready; - assign axis_tx_int.tlast = s_axis_tx.tlast; - assign axis_tx_int.tid = s_axis_tx.tid; - assign axis_tx_int.tdest = s_axis_tx.tdest; - assign axis_tx_int.tuser = s_axis_tx.tuser; + taxi_axis_tie + tx_tie_inst ( + .s_axis(s_axis_tx), + .m_axis(axis_tx_int) + ); - assign m_axis_rx.tdata = axis_rx_int.tdata; - assign m_axis_rx.tkeep = axis_rx_int.tkeep; - assign m_axis_rx.tvalid = axis_rx_int.tvalid; - assign m_axis_rx.tlast = axis_rx_int.tlast; - assign m_axis_rx.tid = axis_rx_int.tid; - assign m_axis_rx.tdest = axis_rx_int.tdest; - assign m_axis_rx.tuser = axis_rx_int.tuser; + taxi_axis_tie + rx_tie_inst ( + .s_axis(axis_rx_int), + .m_axis(m_axis_rx) + ); assign rx_lfc_req = '0; assign rx_pfc_req = '0; diff --git a/src/eth/rtl/taxi_eth_mac_phy_10g.f b/src/eth/rtl/taxi_eth_mac_phy_10g.f index e07e525..ff0beab 100644 --- a/src/eth/rtl/taxi_eth_mac_phy_10g.f +++ b/src/eth/rtl/taxi_eth_mac_phy_10g.f @@ -6,4 +6,6 @@ taxi_mac_ctrl_tx.sv taxi_mac_ctrl_rx.sv taxi_mac_pause_ctrl_tx.sv taxi_mac_pause_ctrl_rx.sv +../lib/taxi/src/axis/rtl/taxi_axis_null_src.sv +../lib/taxi/src/axis/rtl/taxi_axis_tie.sv ../lib/taxi/src/sync/rtl/taxi_sync_signal.sv diff --git a/src/eth/rtl/taxi_eth_mac_phy_10g.sv b/src/eth/rtl/taxi_eth_mac_phy_10g.sv index 8a159c3..a2bc207 100644 --- a/src/eth/rtl/taxi_eth_mac_phy_10g.sv +++ b/src/eth/rtl/taxi_eth_mac_phy_10g.sv @@ -442,13 +442,10 @@ if (STAT_EN) begin : stats end else begin - assign m_axis_stat.tdata = '0; - assign m_axis_stat.tkeep = '0; - assign m_axis_stat.tlast = '0; - assign m_axis_stat.tvalid = '0; - assign m_axis_stat.tid = '0; - assign m_axis_stat.tdest = '0; - assign m_axis_stat.tuser = '0; + taxi_axis_null_src + null_src_inst ( + .m_axis(m_axis_stat) + ); end @@ -725,45 +722,40 @@ if (MAC_CTRL_EN) begin : mac_ctrl end else begin - assign axis_tx_int.tdata = s_axis_tx.tdata; - assign axis_tx_int.tkeep = s_axis_tx.tkeep; - assign axis_tx_int.tvalid = s_axis_tx.tvalid; - assign s_axis_tx.tready = axis_tx_int.tready; - assign axis_tx_int.tlast = s_axis_tx.tlast; - assign axis_tx_int.tid = s_axis_tx.tid; - assign axis_tx_int.tdest = s_axis_tx.tdest; - assign axis_tx_int.tuser = s_axis_tx.tuser; + taxi_axis_tie + tx_tie_inst ( + .s_axis(s_axis_tx), + .m_axis(axis_tx_int) + ); - assign m_axis_rx.tdata = axis_rx_int.tdata; - assign m_axis_rx.tkeep = axis_rx_int.tkeep; - assign m_axis_rx.tvalid = axis_rx_int.tvalid; - assign m_axis_rx.tlast = axis_rx_int.tlast; - assign m_axis_rx.tid = axis_rx_int.tid; - assign m_axis_rx.tdest = axis_rx_int.tdest; - assign m_axis_rx.tuser = axis_rx_int.tuser; + taxi_axis_tie + rx_tie_inst ( + .s_axis(axis_rx_int), + .m_axis(m_axis_rx) + ); - assign rx_lfc_req = 0; - assign rx_pfc_req = 0; - assign tx_pause_ack = 0; + assign rx_lfc_req = '0; + assign rx_pfc_req = '0; + assign tx_pause_ack = '0; - assign stat_tx_mcf = 0; - assign stat_rx_mcf = 0; - assign stat_tx_lfc_pkt = 0; - assign stat_tx_lfc_xon = 0; - assign stat_tx_lfc_xoff = 0; - assign stat_tx_lfc_paused = 0; - assign stat_tx_pfc_pkt = 0; - assign stat_tx_pfc_xon = 0; - assign stat_tx_pfc_xoff = 0; - assign stat_tx_pfc_paused = 0; - assign stat_rx_lfc_pkt = 0; - assign stat_rx_lfc_xon = 0; - assign stat_rx_lfc_xoff = 0; - assign stat_rx_lfc_paused = 0; - assign stat_rx_pfc_pkt = 0; - assign stat_rx_pfc_xon = 0; - assign stat_rx_pfc_xoff = 0; - assign stat_rx_pfc_paused = 0; + assign stat_tx_mcf = '0; + assign stat_rx_mcf = '0; + assign stat_tx_lfc_pkt = '0; + assign stat_tx_lfc_xon = '0; + assign stat_tx_lfc_xoff = '0; + assign stat_tx_lfc_paused = '0; + assign stat_tx_pfc_pkt = '0; + assign stat_tx_pfc_xon = '0; + assign stat_tx_pfc_xoff = '0; + assign stat_tx_pfc_paused = '0; + assign stat_rx_lfc_pkt = '0; + assign stat_rx_lfc_xon = '0; + assign stat_rx_lfc_xoff = '0; + assign stat_rx_lfc_paused = '0; + assign stat_rx_pfc_pkt = '0; + assign stat_rx_pfc_xon = '0; + assign stat_rx_pfc_xoff = '0; + assign stat_rx_pfc_paused = '0; end