From ec3c6a3d06bb60c3cbfba50b9cf55a3753b53ec7 Mon Sep 17 00:00:00 2001 From: d-kor Date: Wed, 21 Sep 2022 23:12:01 +0200 Subject: [PATCH] sync up. --- hw/hdl/network/rdma/roce_stack.sv | 9 +++++++++ hw/scripts/wr_hdl/templates/dynamic_wrapper.txt | 12 ++++++------ 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/hw/hdl/network/rdma/roce_stack.sv b/hw/hdl/network/rdma/roce_stack.sv index b20b839..30e3b43 100644 --- a/hw/hdl/network/rdma/roce_stack.sv +++ b/hw/hdl/network/rdma/roce_stack.sv @@ -315,6 +315,15 @@ rocev2_ip rocev2_inst( .local_ip_address_V({local_ip_address,local_ip_address,local_ip_address,local_ip_address}), //Use IPv4 addr // Debug +`ifdef DBG_IBV + .m_axis_dbg_0_V_TVALID(m_axis_dbg_0.valid), + .m_axis_dbg_0_V_TREADY(m_axis_dbg_0.ready), + .m_axis_dbg_0_V_TDATA(m_axis_dbg_0.data), + .m_axis_dbg_1_V_TVALID(m_axis_dbg_1.valid), + .m_axis_dbg_1_V_TREADY(m_axis_dbg_1.ready), + .m_axis_dbg_1_V_TDATA(m_axis_dbg_1.data), +`endif + .regCrcDropPkgCount_V(crc_drop_pkg_count_data), .regCrcDropPkgCount_V_ap_vld(crc_drop_pkg_count_valid), .regInvalidPsnDropCount_V(psn_drop_pkg_count_data), diff --git a/hw/scripts/wr_hdl/templates/dynamic_wrapper.txt b/hw/scripts/wr_hdl/templates/dynamic_wrapper.txt index a6fb229..50446b3 100644 --- a/hw/scripts/wr_hdl/templates/dynamic_wrapper.txt +++ b/hw/scripts/wr_hdl/templates/dynamic_wrapper.txt @@ -532,7 +532,7 @@ module design_dynamic_wrapper #( {% if cnfg.en_rpc %} meta_decoupler (.decouple(decouple_uclk), .s_meta(rdma_0_sq_user_ul), .m_meta(rdma_0_sq_user_s3)); - meta_decoupler (.decouple(decouple_uclk), .s_meta(rdma_0_sq_ack_s3), .m_meta(rdma_0_sq_ack_ul)); + meta_decoupler (.decouple(decouple_uclk), .s_meta(rdma_0_ack_user_s3), .m_meta(rdma_0_ack_user_ul)); {% endif %} meta_decoupler (.decouple(decouple_uclk), .s_meta(rdma_0_rd_req_s3), .m_meta(rdma_0_rd_req_ul)); meta_decoupler (.decouple(decouple_uclk), .s_meta(rdma_0_wr_req_s3), .m_meta(rdma_0_wr_req_ul)); @@ -708,7 +708,7 @@ module design_dynamic_wrapper #( {% if cnfg.en_rpc %} meta_decoupler (.decouple(decouple_uclk), .s_meta(rdma_1_sq_user_ul), .m_meta(rdma_1_sq_user_s3)); - meta_decoupler (.decouple(decouple_uclk), .s_meta(rdma_1_sq_ack_s3), .m_meta(rdma_1_sq_ack_ul)); + meta_decoupler (.decouple(decouple_uclk), .s_meta(rdma_1_ack_user_s3), .m_meta(rdma_1_ack_user_ul)); {% endif %} meta_decoupler (.decouple(decouple_uclk), .s_meta(rdma_1_rd_req_s3), .m_meta(rdma_1_rd_req_ul)); meta_decoupler (.decouple(decouple_uclk), .s_meta(rdma_1_wr_req_s3), .m_meta(rdma_1_wr_req_ul)); @@ -1399,16 +1399,16 @@ module design_dynamic_wrapper #( .m_rdma_0_sq(rdma_0_sq_host_s1), .s_rdma_0_ack(rdma_0_ack_host_s1), {% if cnfg.en_rpc %} - .s_rdma_0_sq(rdma_0_sq_user_s1), - .m_rdma_0_ack(rdma_0_ack_user_s1), + .s_rdma_0_sq(rdma_0_sq_user_s2), + .m_rdma_0_ack(rdma_0_ack_user_s2), {% endif %} {% endif %} {% if cnfg.en_rdma_1 %} .m_rdma_1_sq(rdma_1_sq_host_s1), .s_rdma_1_ack(rdma_1_ack_host_s1), {% if cnfg.en_rpc %} - .s_rdma_1_sq(rdma_1_sq_user_s1), - .m_rdma_1_ack(rdma_1_ack_user_s1), + .s_rdma_1_sq(rdma_1_sq_user_s2), + .m_rdma_1_ack(rdma_1_ack_user_s2), {% endif %} {% endif %} {% if cnfg.en_strm %}