From 0a7f1ccbbe8753b986d8ce99cd94e607f015d134 Mon Sep 17 00:00:00 2001 From: Alex Forencich Date: Wed, 2 Jun 2021 18:18:23 -0700 Subject: [PATCH] Remove string parameters --- fpga/common/rtl/cpl_op_mux.v | 15 ++++++++------- fpga/common/rtl/cpl_write.v | 2 +- fpga/common/rtl/desc_fetch.v | 2 +- fpga/common/rtl/desc_op_mux.v | 15 ++++++++------- fpga/common/rtl/event_mux.v | 15 ++++++++------- fpga/common/rtl/mqnic_interface.v | 16 ++++++++-------- fpga/common/rtl/mqnic_port.v | 8 ++++---- fpga/common/rtl/tx_scheduler_rr.v | 2 +- .../mqnic/ADM_PCIE_9V3/fpga_100g/rtl/fpga_core.v | 12 ++++++------ fpga/mqnic/ADM_PCIE_9V3/fpga_10g/rtl/fpga_core.v | 12 ++++++------ fpga/mqnic/ADM_PCIE_9V3/fpga_25g/rtl/fpga_core.v | 12 ++++++------ fpga/mqnic/AU200/fpga_100g/rtl/fpga_core.v | 12 ++++++------ fpga/mqnic/AU200/fpga_10g/rtl/fpga_core.v | 12 ++++++------ fpga/mqnic/AU250/fpga_100g/rtl/fpga_core.v | 12 ++++++------ fpga/mqnic/AU250/fpga_10g/rtl/fpga_core.v | 12 ++++++------ fpga/mqnic/AU280/fpga_100g/rtl/fpga_core.v | 12 ++++++------ fpga/mqnic/AU280/fpga_10g/rtl/fpga_core.v | 12 ++++++------ fpga/mqnic/AU50/fpga_100g/rtl/fpga_core.v | 12 ++++++------ fpga/mqnic/AU50/fpga_10g/rtl/fpga_core.v | 12 ++++++------ fpga/mqnic/ExaNIC_X10/fpga/rtl/fpga_core.v | 12 ++++++------ fpga/mqnic/ExaNIC_X25/fpga_10g/rtl/fpga_core.v | 12 ++++++------ fpga/mqnic/NetFPGA_SUME/fpga/rtl/fpga_core.v | 12 ++++++------ fpga/mqnic/VCU108/fpga_10g/rtl/fpga_core.v | 12 ++++++------ fpga/mqnic/VCU118/fpga_100g/rtl/fpga_core.v | 12 ++++++------ fpga/mqnic/VCU118/fpga_10g/rtl/fpga_core.v | 12 ++++++------ fpga/mqnic/VCU1525/fpga_100g/rtl/fpga_core.v | 12 ++++++------ fpga/mqnic/VCU1525/fpga_10g/rtl/fpga_core.v | 12 ++++++------ fpga/mqnic/ZCU106/fpga_pcie/rtl/fpga_core.v | 12 ++++++------ fpga/mqnic/fb2CG/fpga_100g/rtl/fpga_core.v | 12 ++++++------ fpga/mqnic/fb2CG/fpga_10g/rtl/fpga_core.v | 12 ++++++------ fpga/mqnic/fb2CG/fpga_25g/rtl/fpga_core.v | 12 ++++++------ .../ADM_PCIE_9V3/fpga_10g/rtl/fpga_core.v | 12 ++++++------ fpga/mqnic_tdma/ExaNIC_X10/fpga/rtl/fpga_core.v | 12 ++++++------ fpga/mqnic_tdma/VCU108/fpga_10g/rtl/fpga_core.v | 12 ++++++------ fpga/mqnic_tdma/VCU118/fpga_10g/rtl/fpga_core.v | 12 ++++++------ 35 files changed, 201 insertions(+), 198 deletions(-) diff --git a/fpga/common/rtl/cpl_op_mux.v b/fpga/common/rtl/cpl_op_mux.v index d1a430848..d73e7de96 100644 --- a/fpga/common/rtl/cpl_op_mux.v +++ b/fpga/common/rtl/cpl_op_mux.v @@ -53,10 +53,10 @@ module cpl_op_mux # parameter M_REQ_TAG_WIDTH = S_REQ_TAG_WIDTH+$clog2(PORTS), // Completion size (bytes) parameter CPL_SIZE = 32, - // arbitration type: "PRIORITY" or "ROUND_ROBIN" - parameter ARB_TYPE = "PRIORITY", - // LSB priority: "LOW", "HIGH" - parameter LSB_PRIORITY = "HIGH" + // select round robin arbitration + parameter ARB_TYPE_ROUND_ROBIN = 0, + // LSB priority selection + parameter ARB_LSB_HIGH_PRIORITY = 1 ) ( input wire clk, @@ -138,9 +138,10 @@ wire current_s_desc_ready = s_axis_req_ready[grant_encod // arbiter instance arbiter #( .PORTS(PORTS), - .TYPE(ARB_TYPE), - .BLOCK("ACKNOWLEDGE"), - .LSB_PRIORITY(LSB_PRIORITY) + .ARB_TYPE_ROUND_ROBIN(ARB_TYPE_ROUND_ROBIN), + .ARB_BLOCK(1), + .ARB_BLOCK_ACK(1), + .ARB_LSB_HIGH_PRIORITY(ARB_LSB_HIGH_PRIORITY) ) arb_inst ( .clk(clk), diff --git a/fpga/common/rtl/cpl_write.v b/fpga/common/rtl/cpl_write.v index c202c3eea..e2cd5cc99 100644 --- a/fpga/common/rtl/cpl_write.v +++ b/fpga/common/rtl/cpl_write.v @@ -258,7 +258,7 @@ wire enqueue_resp_enc_valid; priority_encoder #( .WIDTH(PORTS), - .LSB_PRIORITY("HIGH") + .LSB_HIGH_PRIORITY(1) ) op_table_start_enc_inst ( .input_unencoded(s_axis_cpl_enqueue_resp_valid & ~s_axis_cpl_enqueue_resp_ready), diff --git a/fpga/common/rtl/desc_fetch.v b/fpga/common/rtl/desc_fetch.v index 0d2028498..a0d2939af 100644 --- a/fpga/common/rtl/desc_fetch.v +++ b/fpga/common/rtl/desc_fetch.v @@ -311,7 +311,7 @@ wire dequeue_resp_enc_valid; priority_encoder #( .WIDTH(PORTS), - .LSB_PRIORITY("HIGH") + .LSB_HIGH_PRIORITY(1) ) op_table_start_enc_inst ( .input_unencoded(s_axis_desc_dequeue_resp_valid & ~s_axis_desc_dequeue_resp_ready), diff --git a/fpga/common/rtl/desc_op_mux.v b/fpga/common/rtl/desc_op_mux.v index f8948995c..9e7a0a1ff 100644 --- a/fpga/common/rtl/desc_op_mux.v +++ b/fpga/common/rtl/desc_op_mux.v @@ -59,10 +59,10 @@ module desc_op_mux # parameter AXIS_DATA_WIDTH = 256, // AXI stream tkeep signal width (words per cycle) parameter AXIS_KEEP_WIDTH = AXIS_DATA_WIDTH/8, - // arbitration type: "PRIORITY" or "ROUND_ROBIN" - parameter ARB_TYPE = "PRIORITY", - // LSB priority: "LOW", "HIGH" - parameter LSB_PRIORITY = "HIGH" + // select round robin arbitration + parameter ARB_TYPE_ROUND_ROBIN = 0, + // LSB priority selection + parameter ARB_LSB_HIGH_PRIORITY = 1 ) ( input wire clk, @@ -168,9 +168,10 @@ wire current_s_desc_ready = s_axis_req_ready[grant_encod // arbiter instance arbiter #( .PORTS(PORTS), - .TYPE(ARB_TYPE), - .BLOCK("ACKNOWLEDGE"), - .LSB_PRIORITY(LSB_PRIORITY) + .ARB_TYPE_ROUND_ROBIN(ARB_TYPE_ROUND_ROBIN), + .ARB_BLOCK(1), + .ARB_BLOCK_ACK(1), + .ARB_LSB_HIGH_PRIORITY(ARB_LSB_HIGH_PRIORITY) ) arb_inst ( .clk(clk), diff --git a/fpga/common/rtl/event_mux.v b/fpga/common/rtl/event_mux.v index 0bdcc48a9..b421003e3 100644 --- a/fpga/common/rtl/event_mux.v +++ b/fpga/common/rtl/event_mux.v @@ -48,10 +48,10 @@ module event_mux # parameter EVENT_TYPE_WIDTH = 16, // Event source field width parameter EVENT_SOURCE_WIDTH = 16, - // arbitration type: "PRIORITY" or "ROUND_ROBIN" - parameter ARB_TYPE = "PRIORITY", - // LSB priority: "LOW", "HIGH" - parameter LSB_PRIORITY = "HIGH" + // select round robin arbitration + parameter ARB_TYPE_ROUND_ROBIN = 0, + // LSB priority selection + parameter ARB_LSB_HIGH_PRIORITY = 1 ) ( input wire clk, @@ -105,9 +105,10 @@ wire current_s_event_ready = s_axis_event_ready[grant // arbiter instance arbiter #( .PORTS(PORTS), - .TYPE(ARB_TYPE), - .BLOCK("ACKNOWLEDGE"), - .LSB_PRIORITY(LSB_PRIORITY) + .ARB_TYPE_ROUND_ROBIN(ARB_TYPE_ROUND_ROBIN), + .ARB_BLOCK(1), + .ARB_BLOCK_ACK(1), + .ARB_LSB_HIGH_PRIORITY(ARB_LSB_HIGH_PRIORITY) ) arb_inst ( .clk(clk), diff --git a/fpga/common/rtl/mqnic_interface.v b/fpga/common/rtl/mqnic_interface.v index f38781e9b..7a87abd3f 100644 --- a/fpga/common/rtl/mqnic_interface.v +++ b/fpga/common/rtl/mqnic_interface.v @@ -1362,8 +1362,8 @@ if (PORTS > 1) begin .M_REQ_TAG_WIDTH(DESC_REQ_TAG_WIDTH), .AXIS_DATA_WIDTH(AXIS_DESC_DATA_WIDTH), .AXIS_KEEP_WIDTH(AXIS_DESC_KEEP_WIDTH), - .ARB_TYPE("ROUND_ROBIN"), - .LSB_PRIORITY("HIGH") + .ARB_TYPE_ROUND_ROBIN(1), + .ARB_LSB_HIGH_PRIORITY(1) ) desc_op_mux_inst ( .clk(clk), @@ -1588,8 +1588,8 @@ cpl_op_mux #( .S_REQ_TAG_WIDTH(PORT_DESC_REQ_TAG_WIDTH), .M_REQ_TAG_WIDTH(DESC_REQ_TAG_WIDTH), .CPL_SIZE(CPL_SIZE), - .ARB_TYPE("ROUND_ROBIN"), - .LSB_PRIORITY("HIGH") + .ARB_TYPE_ROUND_ROBIN(1), + .ARB_LSB_HIGH_PRIORITY(1) ) cpl_op_mux_inst ( .clk(clk), @@ -1749,8 +1749,8 @@ if (PORTS > 1) begin .LEN_WIDTH(DMA_LEN_WIDTH), .S_TAG_WIDTH(DMA_TAG_WIDTH_INT), .M_TAG_WIDTH(DMA_TAG_WIDTH), - .ARB_TYPE("ROUND_ROBIN"), - .LSB_PRIORITY("HIGH") + .ARB_TYPE_ROUND_ROBIN(1), + .ARB_LSB_HIGH_PRIORITY(1) ) dma_if_mux_inst ( .clk(clk), @@ -1905,8 +1905,8 @@ event_mux #( .QUEUE_INDEX_WIDTH(EVENT_QUEUE_INDEX_WIDTH), .EVENT_TYPE_WIDTH(EVENT_TYPE_WIDTH), .EVENT_SOURCE_WIDTH(EVENT_SOURCE_WIDTH), - .ARB_TYPE("ROUND_ROBIN"), - .LSB_PRIORITY("HIGH") + .ARB_TYPE_ROUND_ROBIN(1), + .ARB_LSB_HIGH_PRIORITY(1) ) event_mux_inst ( .clk(clk), diff --git a/fpga/common/rtl/mqnic_port.v b/fpga/common/rtl/mqnic_port.v index 1896e4abc..f6dc5a032 100644 --- a/fpga/common/rtl/mqnic_port.v +++ b/fpga/common/rtl/mqnic_port.v @@ -801,8 +801,8 @@ desc_op_mux #( .M_REQ_TAG_WIDTH(DESC_REQ_TAG_WIDTH), .AXIS_DATA_WIDTH(AXIS_DESC_DATA_WIDTH), .AXIS_KEEP_WIDTH(AXIS_DESC_KEEP_WIDTH), - .ARB_TYPE("ROUND_ROBIN"), - .LSB_PRIORITY("HIGH") + .ARB_TYPE_ROUND_ROBIN(1), + .ARB_LSB_HIGH_PRIORITY(1) ) desc_op_mux_inst ( .clk(clk), @@ -878,8 +878,8 @@ cpl_op_mux #( .S_REQ_TAG_WIDTH(DESC_REQ_TAG_WIDTH_INT), .M_REQ_TAG_WIDTH(DESC_REQ_TAG_WIDTH), .CPL_SIZE(CPL_SIZE), - .ARB_TYPE("ROUND_ROBIN"), - .LSB_PRIORITY("HIGH") + .ARB_TYPE_ROUND_ROBIN(1), + .ARB_LSB_HIGH_PRIORITY(1) ) cpl_op_mux_inst ( .clk(clk), diff --git a/fpga/common/rtl/tx_scheduler_rr.v b/fpga/common/rtl/tx_scheduler_rr.v index 22f3830ea..d89aab474 100644 --- a/fpga/common/rtl/tx_scheduler_rr.v +++ b/fpga/common/rtl/tx_scheduler_rr.v @@ -366,7 +366,7 @@ rr_fifo ( priority_encoder #( .WIDTH(OP_TABLE_SIZE), - .LSB_PRIORITY("HIGH") + .LSB_HIGH_PRIORITY(1) ) op_table_start_enc_inst ( .input_unencoded(~op_table_active), diff --git a/fpga/mqnic/ADM_PCIE_9V3/fpga_100g/rtl/fpga_core.v b/fpga/mqnic/ADM_PCIE_9V3/fpga_100g/rtl/fpga_core.v index ce89d07fe..a6a94b42c 100644 --- a/fpga/mqnic/ADM_PCIE_9V3/fpga_100g/rtl/fpga_core.v +++ b/fpga/mqnic/ADM_PCIE_9V3/fpga_100g/rtl/fpga_core.v @@ -1383,8 +1383,8 @@ dma_if_mux # .LEN_WIDTH(PCIE_DMA_LEN_WIDTH), .S_TAG_WIDTH(PCIE_DMA_TAG_WIDTH-1), .M_TAG_WIDTH(PCIE_DMA_TAG_WIDTH), - .ARB_TYPE("PRIORITY"), - .LSB_PRIORITY("HIGH") + .ARB_TYPE_ROUND_ROBIN(0), + .ARB_LSB_HIGH_PRIORITY(1) ) dma_if_mux_inst ( .clk(clk_250mhz), @@ -1585,8 +1585,8 @@ if (IF_COUNT > 1) begin .LEN_WIDTH(PCIE_DMA_LEN_WIDTH), .S_TAG_WIDTH(IF_PCIE_DMA_TAG_WIDTH), .M_TAG_WIDTH(PCIE_DMA_TAG_WIDTH-1), - .ARB_TYPE("ROUND_ROBIN"), - .LSB_PRIORITY("HIGH") + .ARB_TYPE_ROUND_ROBIN(1), + .ARB_LSB_HIGH_PRIORITY(1) ) dma_if_mux_ctrl_inst ( .clk(clk_250mhz), @@ -1711,8 +1711,8 @@ if (IF_COUNT > 1) begin .LEN_WIDTH(PCIE_DMA_LEN_WIDTH), .S_TAG_WIDTH(IF_PCIE_DMA_TAG_WIDTH), .M_TAG_WIDTH(PCIE_DMA_TAG_WIDTH-1), - .ARB_TYPE("ROUND_ROBIN"), - .LSB_PRIORITY("HIGH") + .ARB_TYPE_ROUND_ROBIN(1), + .ARB_LSB_HIGH_PRIORITY(1) ) dma_if_mux_data_inst ( .clk(clk_250mhz), diff --git a/fpga/mqnic/ADM_PCIE_9V3/fpga_10g/rtl/fpga_core.v b/fpga/mqnic/ADM_PCIE_9V3/fpga_10g/rtl/fpga_core.v index 62f6ebca1..11143f8d0 100644 --- a/fpga/mqnic/ADM_PCIE_9V3/fpga_10g/rtl/fpga_core.v +++ b/fpga/mqnic/ADM_PCIE_9V3/fpga_10g/rtl/fpga_core.v @@ -1446,8 +1446,8 @@ dma_if_mux # .LEN_WIDTH(PCIE_DMA_LEN_WIDTH), .S_TAG_WIDTH(PCIE_DMA_TAG_WIDTH-1), .M_TAG_WIDTH(PCIE_DMA_TAG_WIDTH), - .ARB_TYPE("PRIORITY"), - .LSB_PRIORITY("HIGH") + .ARB_TYPE_ROUND_ROBIN(0), + .ARB_LSB_HIGH_PRIORITY(1) ) dma_if_mux_inst ( .clk(clk_250mhz), @@ -1648,8 +1648,8 @@ if (IF_COUNT > 1) begin .LEN_WIDTH(PCIE_DMA_LEN_WIDTH), .S_TAG_WIDTH(IF_PCIE_DMA_TAG_WIDTH), .M_TAG_WIDTH(PCIE_DMA_TAG_WIDTH-1), - .ARB_TYPE("ROUND_ROBIN"), - .LSB_PRIORITY("HIGH") + .ARB_TYPE_ROUND_ROBIN(1), + .ARB_LSB_HIGH_PRIORITY(1) ) dma_if_mux_ctrl_inst ( .clk(clk_250mhz), @@ -1774,8 +1774,8 @@ if (IF_COUNT > 1) begin .LEN_WIDTH(PCIE_DMA_LEN_WIDTH), .S_TAG_WIDTH(IF_PCIE_DMA_TAG_WIDTH), .M_TAG_WIDTH(PCIE_DMA_TAG_WIDTH-1), - .ARB_TYPE("ROUND_ROBIN"), - .LSB_PRIORITY("HIGH") + .ARB_TYPE_ROUND_ROBIN(1), + .ARB_LSB_HIGH_PRIORITY(1) ) dma_if_mux_data_inst ( .clk(clk_250mhz), diff --git a/fpga/mqnic/ADM_PCIE_9V3/fpga_25g/rtl/fpga_core.v b/fpga/mqnic/ADM_PCIE_9V3/fpga_25g/rtl/fpga_core.v index da8a9d402..fe740e15a 100644 --- a/fpga/mqnic/ADM_PCIE_9V3/fpga_25g/rtl/fpga_core.v +++ b/fpga/mqnic/ADM_PCIE_9V3/fpga_25g/rtl/fpga_core.v @@ -1446,8 +1446,8 @@ dma_if_mux # .LEN_WIDTH(PCIE_DMA_LEN_WIDTH), .S_TAG_WIDTH(PCIE_DMA_TAG_WIDTH-1), .M_TAG_WIDTH(PCIE_DMA_TAG_WIDTH), - .ARB_TYPE("PRIORITY"), - .LSB_PRIORITY("HIGH") + .ARB_TYPE_ROUND_ROBIN(0), + .ARB_LSB_HIGH_PRIORITY(1) ) dma_if_mux_inst ( .clk(clk_250mhz), @@ -1648,8 +1648,8 @@ if (IF_COUNT > 1) begin .LEN_WIDTH(PCIE_DMA_LEN_WIDTH), .S_TAG_WIDTH(IF_PCIE_DMA_TAG_WIDTH), .M_TAG_WIDTH(PCIE_DMA_TAG_WIDTH-1), - .ARB_TYPE("ROUND_ROBIN"), - .LSB_PRIORITY("HIGH") + .ARB_TYPE_ROUND_ROBIN(1), + .ARB_LSB_HIGH_PRIORITY(1) ) dma_if_mux_ctrl_inst ( .clk(clk_250mhz), @@ -1774,8 +1774,8 @@ if (IF_COUNT > 1) begin .LEN_WIDTH(PCIE_DMA_LEN_WIDTH), .S_TAG_WIDTH(IF_PCIE_DMA_TAG_WIDTH), .M_TAG_WIDTH(PCIE_DMA_TAG_WIDTH-1), - .ARB_TYPE("ROUND_ROBIN"), - .LSB_PRIORITY("HIGH") + .ARB_TYPE_ROUND_ROBIN(1), + .ARB_LSB_HIGH_PRIORITY(1) ) dma_if_mux_data_inst ( .clk(clk_250mhz), diff --git a/fpga/mqnic/AU200/fpga_100g/rtl/fpga_core.v b/fpga/mqnic/AU200/fpga_100g/rtl/fpga_core.v index e93437eed..fc4a0ef34 100644 --- a/fpga/mqnic/AU200/fpga_100g/rtl/fpga_core.v +++ b/fpga/mqnic/AU200/fpga_100g/rtl/fpga_core.v @@ -1373,8 +1373,8 @@ dma_if_mux # .LEN_WIDTH(PCIE_DMA_LEN_WIDTH), .S_TAG_WIDTH(PCIE_DMA_TAG_WIDTH-1), .M_TAG_WIDTH(PCIE_DMA_TAG_WIDTH), - .ARB_TYPE("PRIORITY"), - .LSB_PRIORITY("HIGH") + .ARB_TYPE_ROUND_ROBIN(0), + .ARB_LSB_HIGH_PRIORITY(1) ) dma_if_mux_inst ( .clk(clk_250mhz), @@ -1575,8 +1575,8 @@ if (IF_COUNT > 1) begin .LEN_WIDTH(PCIE_DMA_LEN_WIDTH), .S_TAG_WIDTH(IF_PCIE_DMA_TAG_WIDTH), .M_TAG_WIDTH(PCIE_DMA_TAG_WIDTH-1), - .ARB_TYPE("ROUND_ROBIN"), - .LSB_PRIORITY("HIGH") + .ARB_TYPE_ROUND_ROBIN(1), + .ARB_LSB_HIGH_PRIORITY(1) ) dma_if_mux_ctrl_inst ( .clk(clk_250mhz), @@ -1701,8 +1701,8 @@ if (IF_COUNT > 1) begin .LEN_WIDTH(PCIE_DMA_LEN_WIDTH), .S_TAG_WIDTH(IF_PCIE_DMA_TAG_WIDTH), .M_TAG_WIDTH(PCIE_DMA_TAG_WIDTH-1), - .ARB_TYPE("ROUND_ROBIN"), - .LSB_PRIORITY("HIGH") + .ARB_TYPE_ROUND_ROBIN(1), + .ARB_LSB_HIGH_PRIORITY(1) ) dma_if_mux_data_inst ( .clk(clk_250mhz), diff --git a/fpga/mqnic/AU200/fpga_10g/rtl/fpga_core.v b/fpga/mqnic/AU200/fpga_10g/rtl/fpga_core.v index a0d8668cf..3a74f098d 100644 --- a/fpga/mqnic/AU200/fpga_10g/rtl/fpga_core.v +++ b/fpga/mqnic/AU200/fpga_10g/rtl/fpga_core.v @@ -1387,8 +1387,8 @@ dma_if_mux # .LEN_WIDTH(PCIE_DMA_LEN_WIDTH), .S_TAG_WIDTH(PCIE_DMA_TAG_WIDTH-1), .M_TAG_WIDTH(PCIE_DMA_TAG_WIDTH), - .ARB_TYPE("PRIORITY"), - .LSB_PRIORITY("HIGH") + .ARB_TYPE_ROUND_ROBIN(0), + .ARB_LSB_HIGH_PRIORITY(1) ) dma_if_mux_inst ( .clk(clk_250mhz), @@ -1589,8 +1589,8 @@ if (IF_COUNT > 1) begin .LEN_WIDTH(PCIE_DMA_LEN_WIDTH), .S_TAG_WIDTH(IF_PCIE_DMA_TAG_WIDTH), .M_TAG_WIDTH(PCIE_DMA_TAG_WIDTH-1), - .ARB_TYPE("ROUND_ROBIN"), - .LSB_PRIORITY("HIGH") + .ARB_TYPE_ROUND_ROBIN(1), + .ARB_LSB_HIGH_PRIORITY(1) ) dma_if_mux_ctrl_inst ( .clk(clk_250mhz), @@ -1715,8 +1715,8 @@ if (IF_COUNT > 1) begin .LEN_WIDTH(PCIE_DMA_LEN_WIDTH), .S_TAG_WIDTH(IF_PCIE_DMA_TAG_WIDTH), .M_TAG_WIDTH(PCIE_DMA_TAG_WIDTH-1), - .ARB_TYPE("ROUND_ROBIN"), - .LSB_PRIORITY("HIGH") + .ARB_TYPE_ROUND_ROBIN(1), + .ARB_LSB_HIGH_PRIORITY(1) ) dma_if_mux_data_inst ( .clk(clk_250mhz), diff --git a/fpga/mqnic/AU250/fpga_100g/rtl/fpga_core.v b/fpga/mqnic/AU250/fpga_100g/rtl/fpga_core.v index 95a4271cc..3dc77687d 100644 --- a/fpga/mqnic/AU250/fpga_100g/rtl/fpga_core.v +++ b/fpga/mqnic/AU250/fpga_100g/rtl/fpga_core.v @@ -1373,8 +1373,8 @@ dma_if_mux # .LEN_WIDTH(PCIE_DMA_LEN_WIDTH), .S_TAG_WIDTH(PCIE_DMA_TAG_WIDTH-1), .M_TAG_WIDTH(PCIE_DMA_TAG_WIDTH), - .ARB_TYPE("PRIORITY"), - .LSB_PRIORITY("HIGH") + .ARB_TYPE_ROUND_ROBIN(0), + .ARB_LSB_HIGH_PRIORITY(1) ) dma_if_mux_inst ( .clk(clk_250mhz), @@ -1575,8 +1575,8 @@ if (IF_COUNT > 1) begin .LEN_WIDTH(PCIE_DMA_LEN_WIDTH), .S_TAG_WIDTH(IF_PCIE_DMA_TAG_WIDTH), .M_TAG_WIDTH(PCIE_DMA_TAG_WIDTH-1), - .ARB_TYPE("ROUND_ROBIN"), - .LSB_PRIORITY("HIGH") + .ARB_TYPE_ROUND_ROBIN(1), + .ARB_LSB_HIGH_PRIORITY(1) ) dma_if_mux_ctrl_inst ( .clk(clk_250mhz), @@ -1701,8 +1701,8 @@ if (IF_COUNT > 1) begin .LEN_WIDTH(PCIE_DMA_LEN_WIDTH), .S_TAG_WIDTH(IF_PCIE_DMA_TAG_WIDTH), .M_TAG_WIDTH(PCIE_DMA_TAG_WIDTH-1), - .ARB_TYPE("ROUND_ROBIN"), - .LSB_PRIORITY("HIGH") + .ARB_TYPE_ROUND_ROBIN(1), + .ARB_LSB_HIGH_PRIORITY(1) ) dma_if_mux_data_inst ( .clk(clk_250mhz), diff --git a/fpga/mqnic/AU250/fpga_10g/rtl/fpga_core.v b/fpga/mqnic/AU250/fpga_10g/rtl/fpga_core.v index 4450103cd..d2ea0516e 100644 --- a/fpga/mqnic/AU250/fpga_10g/rtl/fpga_core.v +++ b/fpga/mqnic/AU250/fpga_10g/rtl/fpga_core.v @@ -1387,8 +1387,8 @@ dma_if_mux # .LEN_WIDTH(PCIE_DMA_LEN_WIDTH), .S_TAG_WIDTH(PCIE_DMA_TAG_WIDTH-1), .M_TAG_WIDTH(PCIE_DMA_TAG_WIDTH), - .ARB_TYPE("PRIORITY"), - .LSB_PRIORITY("HIGH") + .ARB_TYPE_ROUND_ROBIN(0), + .ARB_LSB_HIGH_PRIORITY(1) ) dma_if_mux_inst ( .clk(clk_250mhz), @@ -1589,8 +1589,8 @@ if (IF_COUNT > 1) begin .LEN_WIDTH(PCIE_DMA_LEN_WIDTH), .S_TAG_WIDTH(IF_PCIE_DMA_TAG_WIDTH), .M_TAG_WIDTH(PCIE_DMA_TAG_WIDTH-1), - .ARB_TYPE("ROUND_ROBIN"), - .LSB_PRIORITY("HIGH") + .ARB_TYPE_ROUND_ROBIN(1), + .ARB_LSB_HIGH_PRIORITY(1) ) dma_if_mux_ctrl_inst ( .clk(clk_250mhz), @@ -1715,8 +1715,8 @@ if (IF_COUNT > 1) begin .LEN_WIDTH(PCIE_DMA_LEN_WIDTH), .S_TAG_WIDTH(IF_PCIE_DMA_TAG_WIDTH), .M_TAG_WIDTH(PCIE_DMA_TAG_WIDTH-1), - .ARB_TYPE("ROUND_ROBIN"), - .LSB_PRIORITY("HIGH") + .ARB_TYPE_ROUND_ROBIN(1), + .ARB_LSB_HIGH_PRIORITY(1) ) dma_if_mux_data_inst ( .clk(clk_250mhz), diff --git a/fpga/mqnic/AU280/fpga_100g/rtl/fpga_core.v b/fpga/mqnic/AU280/fpga_100g/rtl/fpga_core.v index 4815bbea1..6d14e70b5 100644 --- a/fpga/mqnic/AU280/fpga_100g/rtl/fpga_core.v +++ b/fpga/mqnic/AU280/fpga_100g/rtl/fpga_core.v @@ -1284,8 +1284,8 @@ dma_if_mux # .LEN_WIDTH(PCIE_DMA_LEN_WIDTH), .S_TAG_WIDTH(PCIE_DMA_TAG_WIDTH-1), .M_TAG_WIDTH(PCIE_DMA_TAG_WIDTH), - .ARB_TYPE("PRIORITY"), - .LSB_PRIORITY("HIGH") + .ARB_TYPE_ROUND_ROBIN(0), + .ARB_LSB_HIGH_PRIORITY(1) ) dma_if_mux_inst ( .clk(clk_250mhz), @@ -1486,8 +1486,8 @@ if (IF_COUNT > 1) begin .LEN_WIDTH(PCIE_DMA_LEN_WIDTH), .S_TAG_WIDTH(IF_PCIE_DMA_TAG_WIDTH), .M_TAG_WIDTH(PCIE_DMA_TAG_WIDTH-1), - .ARB_TYPE("ROUND_ROBIN"), - .LSB_PRIORITY("HIGH") + .ARB_TYPE_ROUND_ROBIN(1), + .ARB_LSB_HIGH_PRIORITY(1) ) dma_if_mux_ctrl_inst ( .clk(clk_250mhz), @@ -1612,8 +1612,8 @@ if (IF_COUNT > 1) begin .LEN_WIDTH(PCIE_DMA_LEN_WIDTH), .S_TAG_WIDTH(IF_PCIE_DMA_TAG_WIDTH), .M_TAG_WIDTH(PCIE_DMA_TAG_WIDTH-1), - .ARB_TYPE("ROUND_ROBIN"), - .LSB_PRIORITY("HIGH") + .ARB_TYPE_ROUND_ROBIN(1), + .ARB_LSB_HIGH_PRIORITY(1) ) dma_if_mux_data_inst ( .clk(clk_250mhz), diff --git a/fpga/mqnic/AU280/fpga_10g/rtl/fpga_core.v b/fpga/mqnic/AU280/fpga_10g/rtl/fpga_core.v index 1bbc4d586..217741740 100644 --- a/fpga/mqnic/AU280/fpga_10g/rtl/fpga_core.v +++ b/fpga/mqnic/AU280/fpga_10g/rtl/fpga_core.v @@ -1298,8 +1298,8 @@ dma_if_mux # .LEN_WIDTH(PCIE_DMA_LEN_WIDTH), .S_TAG_WIDTH(PCIE_DMA_TAG_WIDTH-1), .M_TAG_WIDTH(PCIE_DMA_TAG_WIDTH), - .ARB_TYPE("PRIORITY"), - .LSB_PRIORITY("HIGH") + .ARB_TYPE_ROUND_ROBIN(0), + .ARB_LSB_HIGH_PRIORITY(1) ) dma_if_mux_inst ( .clk(clk_250mhz), @@ -1500,8 +1500,8 @@ if (IF_COUNT > 1) begin .LEN_WIDTH(PCIE_DMA_LEN_WIDTH), .S_TAG_WIDTH(IF_PCIE_DMA_TAG_WIDTH), .M_TAG_WIDTH(PCIE_DMA_TAG_WIDTH-1), - .ARB_TYPE("ROUND_ROBIN"), - .LSB_PRIORITY("HIGH") + .ARB_TYPE_ROUND_ROBIN(1), + .ARB_LSB_HIGH_PRIORITY(1) ) dma_if_mux_ctrl_inst ( .clk(clk_250mhz), @@ -1626,8 +1626,8 @@ if (IF_COUNT > 1) begin .LEN_WIDTH(PCIE_DMA_LEN_WIDTH), .S_TAG_WIDTH(IF_PCIE_DMA_TAG_WIDTH), .M_TAG_WIDTH(PCIE_DMA_TAG_WIDTH-1), - .ARB_TYPE("ROUND_ROBIN"), - .LSB_PRIORITY("HIGH") + .ARB_TYPE_ROUND_ROBIN(1), + .ARB_LSB_HIGH_PRIORITY(1) ) dma_if_mux_data_inst ( .clk(clk_250mhz), diff --git a/fpga/mqnic/AU50/fpga_100g/rtl/fpga_core.v b/fpga/mqnic/AU50/fpga_100g/rtl/fpga_core.v index f02e416a7..827e6b4b8 100644 --- a/fpga/mqnic/AU50/fpga_100g/rtl/fpga_core.v +++ b/fpga/mqnic/AU50/fpga_100g/rtl/fpga_core.v @@ -1266,8 +1266,8 @@ dma_if_mux # .LEN_WIDTH(PCIE_DMA_LEN_WIDTH), .S_TAG_WIDTH(PCIE_DMA_TAG_WIDTH-1), .M_TAG_WIDTH(PCIE_DMA_TAG_WIDTH), - .ARB_TYPE("PRIORITY"), - .LSB_PRIORITY("HIGH") + .ARB_TYPE_ROUND_ROBIN(0), + .ARB_LSB_HIGH_PRIORITY(1) ) dma_if_mux_inst ( .clk(clk_250mhz), @@ -1468,8 +1468,8 @@ if (IF_COUNT > 1) begin .LEN_WIDTH(PCIE_DMA_LEN_WIDTH), .S_TAG_WIDTH(IF_PCIE_DMA_TAG_WIDTH), .M_TAG_WIDTH(PCIE_DMA_TAG_WIDTH-1), - .ARB_TYPE("ROUND_ROBIN"), - .LSB_PRIORITY("HIGH") + .ARB_TYPE_ROUND_ROBIN(1), + .ARB_LSB_HIGH_PRIORITY(1) ) dma_if_mux_ctrl_inst ( .clk(clk_250mhz), @@ -1594,8 +1594,8 @@ if (IF_COUNT > 1) begin .LEN_WIDTH(PCIE_DMA_LEN_WIDTH), .S_TAG_WIDTH(IF_PCIE_DMA_TAG_WIDTH), .M_TAG_WIDTH(PCIE_DMA_TAG_WIDTH-1), - .ARB_TYPE("ROUND_ROBIN"), - .LSB_PRIORITY("HIGH") + .ARB_TYPE_ROUND_ROBIN(1), + .ARB_LSB_HIGH_PRIORITY(1) ) dma_if_mux_data_inst ( .clk(clk_250mhz), diff --git a/fpga/mqnic/AU50/fpga_10g/rtl/fpga_core.v b/fpga/mqnic/AU50/fpga_10g/rtl/fpga_core.v index 9134c6c91..d391a9ef0 100644 --- a/fpga/mqnic/AU50/fpga_10g/rtl/fpga_core.v +++ b/fpga/mqnic/AU50/fpga_10g/rtl/fpga_core.v @@ -1260,8 +1260,8 @@ dma_if_mux # .LEN_WIDTH(PCIE_DMA_LEN_WIDTH), .S_TAG_WIDTH(PCIE_DMA_TAG_WIDTH-1), .M_TAG_WIDTH(PCIE_DMA_TAG_WIDTH), - .ARB_TYPE("PRIORITY"), - .LSB_PRIORITY("HIGH") + .ARB_TYPE_ROUND_ROBIN(0), + .ARB_LSB_HIGH_PRIORITY(1) ) dma_if_mux_inst ( .clk(clk_250mhz), @@ -1462,8 +1462,8 @@ if (IF_COUNT > 1) begin .LEN_WIDTH(PCIE_DMA_LEN_WIDTH), .S_TAG_WIDTH(IF_PCIE_DMA_TAG_WIDTH), .M_TAG_WIDTH(PCIE_DMA_TAG_WIDTH-1), - .ARB_TYPE("ROUND_ROBIN"), - .LSB_PRIORITY("HIGH") + .ARB_TYPE_ROUND_ROBIN(1), + .ARB_LSB_HIGH_PRIORITY(1) ) dma_if_mux_ctrl_inst ( .clk(clk_250mhz), @@ -1588,8 +1588,8 @@ if (IF_COUNT > 1) begin .LEN_WIDTH(PCIE_DMA_LEN_WIDTH), .S_TAG_WIDTH(IF_PCIE_DMA_TAG_WIDTH), .M_TAG_WIDTH(PCIE_DMA_TAG_WIDTH-1), - .ARB_TYPE("ROUND_ROBIN"), - .LSB_PRIORITY("HIGH") + .ARB_TYPE_ROUND_ROBIN(1), + .ARB_LSB_HIGH_PRIORITY(1) ) dma_if_mux_data_inst ( .clk(clk_250mhz), diff --git a/fpga/mqnic/ExaNIC_X10/fpga/rtl/fpga_core.v b/fpga/mqnic/ExaNIC_X10/fpga/rtl/fpga_core.v index d21d5c2ec..c29042fb8 100644 --- a/fpga/mqnic/ExaNIC_X10/fpga/rtl/fpga_core.v +++ b/fpga/mqnic/ExaNIC_X10/fpga/rtl/fpga_core.v @@ -1371,8 +1371,8 @@ dma_if_mux # .LEN_WIDTH(PCIE_DMA_LEN_WIDTH), .S_TAG_WIDTH(PCIE_DMA_TAG_WIDTH-1), .M_TAG_WIDTH(PCIE_DMA_TAG_WIDTH), - .ARB_TYPE("PRIORITY"), - .LSB_PRIORITY("HIGH") + .ARB_TYPE_ROUND_ROBIN(0), + .ARB_LSB_HIGH_PRIORITY(1) ) dma_if_mux_inst ( .clk(clk_250mhz), @@ -1573,8 +1573,8 @@ if (IF_COUNT > 1) begin .LEN_WIDTH(PCIE_DMA_LEN_WIDTH), .S_TAG_WIDTH(IF_PCIE_DMA_TAG_WIDTH), .M_TAG_WIDTH(PCIE_DMA_TAG_WIDTH-1), - .ARB_TYPE("ROUND_ROBIN"), - .LSB_PRIORITY("HIGH") + .ARB_TYPE_ROUND_ROBIN(1), + .ARB_LSB_HIGH_PRIORITY(1) ) dma_if_mux_ctrl_inst ( .clk(clk_250mhz), @@ -1699,8 +1699,8 @@ if (IF_COUNT > 1) begin .LEN_WIDTH(PCIE_DMA_LEN_WIDTH), .S_TAG_WIDTH(IF_PCIE_DMA_TAG_WIDTH), .M_TAG_WIDTH(PCIE_DMA_TAG_WIDTH-1), - .ARB_TYPE("ROUND_ROBIN"), - .LSB_PRIORITY("HIGH") + .ARB_TYPE_ROUND_ROBIN(1), + .ARB_LSB_HIGH_PRIORITY(1) ) dma_if_mux_data_inst ( .clk(clk_250mhz), diff --git a/fpga/mqnic/ExaNIC_X25/fpga_10g/rtl/fpga_core.v b/fpga/mqnic/ExaNIC_X25/fpga_10g/rtl/fpga_core.v index 48eda0e10..f9bb26aff 100644 --- a/fpga/mqnic/ExaNIC_X25/fpga_10g/rtl/fpga_core.v +++ b/fpga/mqnic/ExaNIC_X25/fpga_10g/rtl/fpga_core.v @@ -1371,8 +1371,8 @@ dma_if_mux # .LEN_WIDTH(PCIE_DMA_LEN_WIDTH), .S_TAG_WIDTH(PCIE_DMA_TAG_WIDTH-1), .M_TAG_WIDTH(PCIE_DMA_TAG_WIDTH), - .ARB_TYPE("PRIORITY"), - .LSB_PRIORITY("HIGH") + .ARB_TYPE_ROUND_ROBIN(0), + .ARB_LSB_HIGH_PRIORITY(1) ) dma_if_mux_inst ( .clk(clk_250mhz), @@ -1573,8 +1573,8 @@ if (IF_COUNT > 1) begin .LEN_WIDTH(PCIE_DMA_LEN_WIDTH), .S_TAG_WIDTH(IF_PCIE_DMA_TAG_WIDTH), .M_TAG_WIDTH(PCIE_DMA_TAG_WIDTH-1), - .ARB_TYPE("ROUND_ROBIN"), - .LSB_PRIORITY("HIGH") + .ARB_TYPE_ROUND_ROBIN(1), + .ARB_LSB_HIGH_PRIORITY(1) ) dma_if_mux_ctrl_inst ( .clk(clk_250mhz), @@ -1699,8 +1699,8 @@ if (IF_COUNT > 1) begin .LEN_WIDTH(PCIE_DMA_LEN_WIDTH), .S_TAG_WIDTH(IF_PCIE_DMA_TAG_WIDTH), .M_TAG_WIDTH(PCIE_DMA_TAG_WIDTH-1), - .ARB_TYPE("ROUND_ROBIN"), - .LSB_PRIORITY("HIGH") + .ARB_TYPE_ROUND_ROBIN(1), + .ARB_LSB_HIGH_PRIORITY(1) ) dma_if_mux_data_inst ( .clk(clk_250mhz), diff --git a/fpga/mqnic/NetFPGA_SUME/fpga/rtl/fpga_core.v b/fpga/mqnic/NetFPGA_SUME/fpga/rtl/fpga_core.v index 5a95bf88d..0154d3c65 100644 --- a/fpga/mqnic/NetFPGA_SUME/fpga/rtl/fpga_core.v +++ b/fpga/mqnic/NetFPGA_SUME/fpga/rtl/fpga_core.v @@ -1259,8 +1259,8 @@ dma_if_mux # .LEN_WIDTH(PCIE_DMA_LEN_WIDTH), .S_TAG_WIDTH(PCIE_DMA_TAG_WIDTH-1), .M_TAG_WIDTH(PCIE_DMA_TAG_WIDTH), - .ARB_TYPE("PRIORITY"), - .LSB_PRIORITY("HIGH") + .ARB_TYPE_ROUND_ROBIN(0), + .ARB_LSB_HIGH_PRIORITY(1) ) dma_if_mux_inst ( .clk(clk_250mhz), @@ -1461,8 +1461,8 @@ if (IF_COUNT > 1) begin .LEN_WIDTH(PCIE_DMA_LEN_WIDTH), .S_TAG_WIDTH(IF_PCIE_DMA_TAG_WIDTH), .M_TAG_WIDTH(PCIE_DMA_TAG_WIDTH-1), - .ARB_TYPE("ROUND_ROBIN"), - .LSB_PRIORITY("HIGH") + .ARB_TYPE_ROUND_ROBIN(1), + .ARB_LSB_HIGH_PRIORITY(1) ) dma_if_mux_ctrl_inst ( .clk(clk_250mhz), @@ -1587,8 +1587,8 @@ if (IF_COUNT > 1) begin .LEN_WIDTH(PCIE_DMA_LEN_WIDTH), .S_TAG_WIDTH(IF_PCIE_DMA_TAG_WIDTH), .M_TAG_WIDTH(PCIE_DMA_TAG_WIDTH-1), - .ARB_TYPE("ROUND_ROBIN"), - .LSB_PRIORITY("HIGH") + .ARB_TYPE_ROUND_ROBIN(1), + .ARB_LSB_HIGH_PRIORITY(1) ) dma_if_mux_data_inst ( .clk(clk_250mhz), diff --git a/fpga/mqnic/VCU108/fpga_10g/rtl/fpga_core.v b/fpga/mqnic/VCU108/fpga_10g/rtl/fpga_core.v index 1b42607a8..f5feea51e 100644 --- a/fpga/mqnic/VCU108/fpga_10g/rtl/fpga_core.v +++ b/fpga/mqnic/VCU108/fpga_10g/rtl/fpga_core.v @@ -1355,8 +1355,8 @@ dma_if_mux # .LEN_WIDTH(PCIE_DMA_LEN_WIDTH), .S_TAG_WIDTH(PCIE_DMA_TAG_WIDTH-1), .M_TAG_WIDTH(PCIE_DMA_TAG_WIDTH), - .ARB_TYPE("PRIORITY"), - .LSB_PRIORITY("HIGH") + .ARB_TYPE_ROUND_ROBIN(0), + .ARB_LSB_HIGH_PRIORITY(1) ) dma_if_mux_inst ( .clk(clk_250mhz), @@ -1557,8 +1557,8 @@ if (IF_COUNT > 1) begin .LEN_WIDTH(PCIE_DMA_LEN_WIDTH), .S_TAG_WIDTH(IF_PCIE_DMA_TAG_WIDTH), .M_TAG_WIDTH(PCIE_DMA_TAG_WIDTH-1), - .ARB_TYPE("ROUND_ROBIN"), - .LSB_PRIORITY("HIGH") + .ARB_TYPE_ROUND_ROBIN(1), + .ARB_LSB_HIGH_PRIORITY(1) ) dma_if_mux_ctrl_inst ( .clk(clk_250mhz), @@ -1683,8 +1683,8 @@ if (IF_COUNT > 1) begin .LEN_WIDTH(PCIE_DMA_LEN_WIDTH), .S_TAG_WIDTH(IF_PCIE_DMA_TAG_WIDTH), .M_TAG_WIDTH(PCIE_DMA_TAG_WIDTH-1), - .ARB_TYPE("ROUND_ROBIN"), - .LSB_PRIORITY("HIGH") + .ARB_TYPE_ROUND_ROBIN(1), + .ARB_LSB_HIGH_PRIORITY(1) ) dma_if_mux_data_inst ( .clk(clk_250mhz), diff --git a/fpga/mqnic/VCU118/fpga_100g/rtl/fpga_core.v b/fpga/mqnic/VCU118/fpga_100g/rtl/fpga_core.v index 340e3981d..8cd5c81a1 100644 --- a/fpga/mqnic/VCU118/fpga_100g/rtl/fpga_core.v +++ b/fpga/mqnic/VCU118/fpga_100g/rtl/fpga_core.v @@ -1362,8 +1362,8 @@ dma_if_mux # .LEN_WIDTH(PCIE_DMA_LEN_WIDTH), .S_TAG_WIDTH(PCIE_DMA_TAG_WIDTH-1), .M_TAG_WIDTH(PCIE_DMA_TAG_WIDTH), - .ARB_TYPE("PRIORITY"), - .LSB_PRIORITY("HIGH") + .ARB_TYPE_ROUND_ROBIN(0), + .ARB_LSB_HIGH_PRIORITY(1) ) dma_if_mux_inst ( .clk(clk_250mhz), @@ -1564,8 +1564,8 @@ if (IF_COUNT > 1) begin .LEN_WIDTH(PCIE_DMA_LEN_WIDTH), .S_TAG_WIDTH(IF_PCIE_DMA_TAG_WIDTH), .M_TAG_WIDTH(PCIE_DMA_TAG_WIDTH-1), - .ARB_TYPE("ROUND_ROBIN"), - .LSB_PRIORITY("HIGH") + .ARB_TYPE_ROUND_ROBIN(1), + .ARB_LSB_HIGH_PRIORITY(1) ) dma_if_mux_ctrl_inst ( .clk(clk_250mhz), @@ -1690,8 +1690,8 @@ if (IF_COUNT > 1) begin .LEN_WIDTH(PCIE_DMA_LEN_WIDTH), .S_TAG_WIDTH(IF_PCIE_DMA_TAG_WIDTH), .M_TAG_WIDTH(PCIE_DMA_TAG_WIDTH-1), - .ARB_TYPE("ROUND_ROBIN"), - .LSB_PRIORITY("HIGH") + .ARB_TYPE_ROUND_ROBIN(1), + .ARB_LSB_HIGH_PRIORITY(1) ) dma_if_mux_data_inst ( .clk(clk_250mhz), diff --git a/fpga/mqnic/VCU118/fpga_10g/rtl/fpga_core.v b/fpga/mqnic/VCU118/fpga_10g/rtl/fpga_core.v index 6b4ca53d0..a957e40f5 100644 --- a/fpga/mqnic/VCU118/fpga_10g/rtl/fpga_core.v +++ b/fpga/mqnic/VCU118/fpga_10g/rtl/fpga_core.v @@ -1422,8 +1422,8 @@ dma_if_mux # .LEN_WIDTH(PCIE_DMA_LEN_WIDTH), .S_TAG_WIDTH(PCIE_DMA_TAG_WIDTH-1), .M_TAG_WIDTH(PCIE_DMA_TAG_WIDTH), - .ARB_TYPE("PRIORITY"), - .LSB_PRIORITY("HIGH") + .ARB_TYPE_ROUND_ROBIN(0), + .ARB_LSB_HIGH_PRIORITY(1) ) dma_if_mux_inst ( .clk(clk_250mhz), @@ -1624,8 +1624,8 @@ if (IF_COUNT > 1) begin .LEN_WIDTH(PCIE_DMA_LEN_WIDTH), .S_TAG_WIDTH(IF_PCIE_DMA_TAG_WIDTH), .M_TAG_WIDTH(PCIE_DMA_TAG_WIDTH-1), - .ARB_TYPE("ROUND_ROBIN"), - .LSB_PRIORITY("HIGH") + .ARB_TYPE_ROUND_ROBIN(1), + .ARB_LSB_HIGH_PRIORITY(1) ) dma_if_mux_ctrl_inst ( .clk(clk_250mhz), @@ -1750,8 +1750,8 @@ if (IF_COUNT > 1) begin .LEN_WIDTH(PCIE_DMA_LEN_WIDTH), .S_TAG_WIDTH(IF_PCIE_DMA_TAG_WIDTH), .M_TAG_WIDTH(PCIE_DMA_TAG_WIDTH-1), - .ARB_TYPE("ROUND_ROBIN"), - .LSB_PRIORITY("HIGH") + .ARB_TYPE_ROUND_ROBIN(1), + .ARB_LSB_HIGH_PRIORITY(1) ) dma_if_mux_data_inst ( .clk(clk_250mhz), diff --git a/fpga/mqnic/VCU1525/fpga_100g/rtl/fpga_core.v b/fpga/mqnic/VCU1525/fpga_100g/rtl/fpga_core.v index 0ffa5b65b..31619aa58 100644 --- a/fpga/mqnic/VCU1525/fpga_100g/rtl/fpga_core.v +++ b/fpga/mqnic/VCU1525/fpga_100g/rtl/fpga_core.v @@ -1301,8 +1301,8 @@ dma_if_mux # .LEN_WIDTH(PCIE_DMA_LEN_WIDTH), .S_TAG_WIDTH(PCIE_DMA_TAG_WIDTH-1), .M_TAG_WIDTH(PCIE_DMA_TAG_WIDTH), - .ARB_TYPE("PRIORITY"), - .LSB_PRIORITY("HIGH") + .ARB_TYPE_ROUND_ROBIN(0), + .ARB_LSB_HIGH_PRIORITY(1) ) dma_if_mux_inst ( .clk(clk_250mhz), @@ -1503,8 +1503,8 @@ if (IF_COUNT > 1) begin .LEN_WIDTH(PCIE_DMA_LEN_WIDTH), .S_TAG_WIDTH(IF_PCIE_DMA_TAG_WIDTH), .M_TAG_WIDTH(PCIE_DMA_TAG_WIDTH-1), - .ARB_TYPE("ROUND_ROBIN"), - .LSB_PRIORITY("HIGH") + .ARB_TYPE_ROUND_ROBIN(1), + .ARB_LSB_HIGH_PRIORITY(1) ) dma_if_mux_ctrl_inst ( .clk(clk_250mhz), @@ -1629,8 +1629,8 @@ if (IF_COUNT > 1) begin .LEN_WIDTH(PCIE_DMA_LEN_WIDTH), .S_TAG_WIDTH(IF_PCIE_DMA_TAG_WIDTH), .M_TAG_WIDTH(PCIE_DMA_TAG_WIDTH-1), - .ARB_TYPE("ROUND_ROBIN"), - .LSB_PRIORITY("HIGH") + .ARB_TYPE_ROUND_ROBIN(1), + .ARB_LSB_HIGH_PRIORITY(1) ) dma_if_mux_data_inst ( .clk(clk_250mhz), diff --git a/fpga/mqnic/VCU1525/fpga_10g/rtl/fpga_core.v b/fpga/mqnic/VCU1525/fpga_10g/rtl/fpga_core.v index 657096af6..31b9931a5 100644 --- a/fpga/mqnic/VCU1525/fpga_10g/rtl/fpga_core.v +++ b/fpga/mqnic/VCU1525/fpga_10g/rtl/fpga_core.v @@ -1315,8 +1315,8 @@ dma_if_mux # .LEN_WIDTH(PCIE_DMA_LEN_WIDTH), .S_TAG_WIDTH(PCIE_DMA_TAG_WIDTH-1), .M_TAG_WIDTH(PCIE_DMA_TAG_WIDTH), - .ARB_TYPE("PRIORITY"), - .LSB_PRIORITY("HIGH") + .ARB_TYPE_ROUND_ROBIN(0), + .ARB_LSB_HIGH_PRIORITY(1) ) dma_if_mux_inst ( .clk(clk_250mhz), @@ -1517,8 +1517,8 @@ if (IF_COUNT > 1) begin .LEN_WIDTH(PCIE_DMA_LEN_WIDTH), .S_TAG_WIDTH(IF_PCIE_DMA_TAG_WIDTH), .M_TAG_WIDTH(PCIE_DMA_TAG_WIDTH-1), - .ARB_TYPE("ROUND_ROBIN"), - .LSB_PRIORITY("HIGH") + .ARB_TYPE_ROUND_ROBIN(1), + .ARB_LSB_HIGH_PRIORITY(1) ) dma_if_mux_ctrl_inst ( .clk(clk_250mhz), @@ -1643,8 +1643,8 @@ if (IF_COUNT > 1) begin .LEN_WIDTH(PCIE_DMA_LEN_WIDTH), .S_TAG_WIDTH(IF_PCIE_DMA_TAG_WIDTH), .M_TAG_WIDTH(PCIE_DMA_TAG_WIDTH-1), - .ARB_TYPE("ROUND_ROBIN"), - .LSB_PRIORITY("HIGH") + .ARB_TYPE_ROUND_ROBIN(1), + .ARB_LSB_HIGH_PRIORITY(1) ) dma_if_mux_data_inst ( .clk(clk_250mhz), diff --git a/fpga/mqnic/ZCU106/fpga_pcie/rtl/fpga_core.v b/fpga/mqnic/ZCU106/fpga_pcie/rtl/fpga_core.v index 0125f0fad..dc7a96b4e 100644 --- a/fpga/mqnic/ZCU106/fpga_pcie/rtl/fpga_core.v +++ b/fpga/mqnic/ZCU106/fpga_pcie/rtl/fpga_core.v @@ -1147,8 +1147,8 @@ dma_if_mux # .LEN_WIDTH(PCIE_DMA_LEN_WIDTH), .S_TAG_WIDTH(PCIE_DMA_TAG_WIDTH-1), .M_TAG_WIDTH(PCIE_DMA_TAG_WIDTH), - .ARB_TYPE("PRIORITY"), - .LSB_PRIORITY("HIGH") + .ARB_TYPE_ROUND_ROBIN(0), + .ARB_LSB_HIGH_PRIORITY(1) ) dma_if_mux_inst ( .clk(clk_250mhz), @@ -1349,8 +1349,8 @@ if (IF_COUNT > 1) begin .LEN_WIDTH(PCIE_DMA_LEN_WIDTH), .S_TAG_WIDTH(IF_PCIE_DMA_TAG_WIDTH), .M_TAG_WIDTH(PCIE_DMA_TAG_WIDTH-1), - .ARB_TYPE("ROUND_ROBIN"), - .LSB_PRIORITY("HIGH") + .ARB_TYPE_ROUND_ROBIN(1), + .ARB_LSB_HIGH_PRIORITY(1) ) dma_if_mux_ctrl_inst ( .clk(clk_250mhz), @@ -1475,8 +1475,8 @@ if (IF_COUNT > 1) begin .LEN_WIDTH(PCIE_DMA_LEN_WIDTH), .S_TAG_WIDTH(IF_PCIE_DMA_TAG_WIDTH), .M_TAG_WIDTH(PCIE_DMA_TAG_WIDTH-1), - .ARB_TYPE("ROUND_ROBIN"), - .LSB_PRIORITY("HIGH") + .ARB_TYPE_ROUND_ROBIN(1), + .ARB_LSB_HIGH_PRIORITY(1) ) dma_if_mux_data_inst ( .clk(clk_250mhz), diff --git a/fpga/mqnic/fb2CG/fpga_100g/rtl/fpga_core.v b/fpga/mqnic/fb2CG/fpga_100g/rtl/fpga_core.v index df97db422..5035745e8 100644 --- a/fpga/mqnic/fb2CG/fpga_100g/rtl/fpga_core.v +++ b/fpga/mqnic/fb2CG/fpga_100g/rtl/fpga_core.v @@ -1480,8 +1480,8 @@ dma_if_mux # .LEN_WIDTH(PCIE_DMA_LEN_WIDTH), .S_TAG_WIDTH(PCIE_DMA_TAG_WIDTH-1), .M_TAG_WIDTH(PCIE_DMA_TAG_WIDTH), - .ARB_TYPE("PRIORITY"), - .LSB_PRIORITY("HIGH") + .ARB_TYPE_ROUND_ROBIN(0), + .ARB_LSB_HIGH_PRIORITY(1) ) dma_if_mux_inst ( .clk(clk_250mhz), @@ -1682,8 +1682,8 @@ if (IF_COUNT > 1) begin .LEN_WIDTH(PCIE_DMA_LEN_WIDTH), .S_TAG_WIDTH(IF_PCIE_DMA_TAG_WIDTH), .M_TAG_WIDTH(PCIE_DMA_TAG_WIDTH-1), - .ARB_TYPE("ROUND_ROBIN"), - .LSB_PRIORITY("HIGH") + .ARB_TYPE_ROUND_ROBIN(1), + .ARB_LSB_HIGH_PRIORITY(1) ) dma_if_mux_ctrl_inst ( .clk(clk_250mhz), @@ -1808,8 +1808,8 @@ if (IF_COUNT > 1) begin .LEN_WIDTH(PCIE_DMA_LEN_WIDTH), .S_TAG_WIDTH(IF_PCIE_DMA_TAG_WIDTH), .M_TAG_WIDTH(PCIE_DMA_TAG_WIDTH-1), - .ARB_TYPE("ROUND_ROBIN"), - .LSB_PRIORITY("HIGH") + .ARB_TYPE_ROUND_ROBIN(1), + .ARB_LSB_HIGH_PRIORITY(1) ) dma_if_mux_data_inst ( .clk(clk_250mhz), diff --git a/fpga/mqnic/fb2CG/fpga_10g/rtl/fpga_core.v b/fpga/mqnic/fb2CG/fpga_10g/rtl/fpga_core.v index 77f0734e5..ee31e2494 100644 --- a/fpga/mqnic/fb2CG/fpga_10g/rtl/fpga_core.v +++ b/fpga/mqnic/fb2CG/fpga_10g/rtl/fpga_core.v @@ -1543,8 +1543,8 @@ dma_if_mux # .LEN_WIDTH(PCIE_DMA_LEN_WIDTH), .S_TAG_WIDTH(PCIE_DMA_TAG_WIDTH-1), .M_TAG_WIDTH(PCIE_DMA_TAG_WIDTH), - .ARB_TYPE("PRIORITY"), - .LSB_PRIORITY("HIGH") + .ARB_TYPE_ROUND_ROBIN(0), + .ARB_LSB_HIGH_PRIORITY(1) ) dma_if_mux_inst ( .clk(clk_250mhz), @@ -1745,8 +1745,8 @@ if (IF_COUNT > 1) begin .LEN_WIDTH(PCIE_DMA_LEN_WIDTH), .S_TAG_WIDTH(IF_PCIE_DMA_TAG_WIDTH), .M_TAG_WIDTH(PCIE_DMA_TAG_WIDTH-1), - .ARB_TYPE("ROUND_ROBIN"), - .LSB_PRIORITY("HIGH") + .ARB_TYPE_ROUND_ROBIN(1), + .ARB_LSB_HIGH_PRIORITY(1) ) dma_if_mux_ctrl_inst ( .clk(clk_250mhz), @@ -1871,8 +1871,8 @@ if (IF_COUNT > 1) begin .LEN_WIDTH(PCIE_DMA_LEN_WIDTH), .S_TAG_WIDTH(IF_PCIE_DMA_TAG_WIDTH), .M_TAG_WIDTH(PCIE_DMA_TAG_WIDTH-1), - .ARB_TYPE("ROUND_ROBIN"), - .LSB_PRIORITY("HIGH") + .ARB_TYPE_ROUND_ROBIN(1), + .ARB_LSB_HIGH_PRIORITY(1) ) dma_if_mux_data_inst ( .clk(clk_250mhz), diff --git a/fpga/mqnic/fb2CG/fpga_25g/rtl/fpga_core.v b/fpga/mqnic/fb2CG/fpga_25g/rtl/fpga_core.v index b194ec8fe..642d3cc36 100644 --- a/fpga/mqnic/fb2CG/fpga_25g/rtl/fpga_core.v +++ b/fpga/mqnic/fb2CG/fpga_25g/rtl/fpga_core.v @@ -1543,8 +1543,8 @@ dma_if_mux # .LEN_WIDTH(PCIE_DMA_LEN_WIDTH), .S_TAG_WIDTH(PCIE_DMA_TAG_WIDTH-1), .M_TAG_WIDTH(PCIE_DMA_TAG_WIDTH), - .ARB_TYPE("PRIORITY"), - .LSB_PRIORITY("HIGH") + .ARB_TYPE_ROUND_ROBIN(0), + .ARB_LSB_HIGH_PRIORITY(1) ) dma_if_mux_inst ( .clk(clk_250mhz), @@ -1745,8 +1745,8 @@ if (IF_COUNT > 1) begin .LEN_WIDTH(PCIE_DMA_LEN_WIDTH), .S_TAG_WIDTH(IF_PCIE_DMA_TAG_WIDTH), .M_TAG_WIDTH(PCIE_DMA_TAG_WIDTH-1), - .ARB_TYPE("ROUND_ROBIN"), - .LSB_PRIORITY("HIGH") + .ARB_TYPE_ROUND_ROBIN(1), + .ARB_LSB_HIGH_PRIORITY(1) ) dma_if_mux_ctrl_inst ( .clk(clk_250mhz), @@ -1871,8 +1871,8 @@ if (IF_COUNT > 1) begin .LEN_WIDTH(PCIE_DMA_LEN_WIDTH), .S_TAG_WIDTH(IF_PCIE_DMA_TAG_WIDTH), .M_TAG_WIDTH(PCIE_DMA_TAG_WIDTH-1), - .ARB_TYPE("ROUND_ROBIN"), - .LSB_PRIORITY("HIGH") + .ARB_TYPE_ROUND_ROBIN(1), + .ARB_LSB_HIGH_PRIORITY(1) ) dma_if_mux_data_inst ( .clk(clk_250mhz), diff --git a/fpga/mqnic_tdma/ADM_PCIE_9V3/fpga_10g/rtl/fpga_core.v b/fpga/mqnic_tdma/ADM_PCIE_9V3/fpga_10g/rtl/fpga_core.v index 59d2e87e4..b0e184bc5 100644 --- a/fpga/mqnic_tdma/ADM_PCIE_9V3/fpga_10g/rtl/fpga_core.v +++ b/fpga/mqnic_tdma/ADM_PCIE_9V3/fpga_10g/rtl/fpga_core.v @@ -1446,8 +1446,8 @@ dma_if_mux # .LEN_WIDTH(PCIE_DMA_LEN_WIDTH), .S_TAG_WIDTH(PCIE_DMA_TAG_WIDTH-1), .M_TAG_WIDTH(PCIE_DMA_TAG_WIDTH), - .ARB_TYPE("PRIORITY"), - .LSB_PRIORITY("HIGH") + .ARB_TYPE_ROUND_ROBIN(0), + .ARB_LSB_HIGH_PRIORITY(1) ) dma_if_mux_inst ( .clk(clk_250mhz), @@ -1648,8 +1648,8 @@ if (IF_COUNT > 1) begin .LEN_WIDTH(PCIE_DMA_LEN_WIDTH), .S_TAG_WIDTH(IF_PCIE_DMA_TAG_WIDTH), .M_TAG_WIDTH(PCIE_DMA_TAG_WIDTH-1), - .ARB_TYPE("ROUND_ROBIN"), - .LSB_PRIORITY("HIGH") + .ARB_TYPE_ROUND_ROBIN(1), + .ARB_LSB_HIGH_PRIORITY(1) ) dma_if_mux_ctrl_inst ( .clk(clk_250mhz), @@ -1774,8 +1774,8 @@ if (IF_COUNT > 1) begin .LEN_WIDTH(PCIE_DMA_LEN_WIDTH), .S_TAG_WIDTH(IF_PCIE_DMA_TAG_WIDTH), .M_TAG_WIDTH(PCIE_DMA_TAG_WIDTH-1), - .ARB_TYPE("ROUND_ROBIN"), - .LSB_PRIORITY("HIGH") + .ARB_TYPE_ROUND_ROBIN(1), + .ARB_LSB_HIGH_PRIORITY(1) ) dma_if_mux_data_inst ( .clk(clk_250mhz), diff --git a/fpga/mqnic_tdma/ExaNIC_X10/fpga/rtl/fpga_core.v b/fpga/mqnic_tdma/ExaNIC_X10/fpga/rtl/fpga_core.v index b1b02bad1..d50bac2b5 100644 --- a/fpga/mqnic_tdma/ExaNIC_X10/fpga/rtl/fpga_core.v +++ b/fpga/mqnic_tdma/ExaNIC_X10/fpga/rtl/fpga_core.v @@ -1371,8 +1371,8 @@ dma_if_mux # .LEN_WIDTH(PCIE_DMA_LEN_WIDTH), .S_TAG_WIDTH(PCIE_DMA_TAG_WIDTH-1), .M_TAG_WIDTH(PCIE_DMA_TAG_WIDTH), - .ARB_TYPE("PRIORITY"), - .LSB_PRIORITY("HIGH") + .ARB_TYPE_ROUND_ROBIN(0), + .ARB_LSB_HIGH_PRIORITY(1) ) dma_if_mux_inst ( .clk(clk_250mhz), @@ -1573,8 +1573,8 @@ if (IF_COUNT > 1) begin .LEN_WIDTH(PCIE_DMA_LEN_WIDTH), .S_TAG_WIDTH(IF_PCIE_DMA_TAG_WIDTH), .M_TAG_WIDTH(PCIE_DMA_TAG_WIDTH-1), - .ARB_TYPE("ROUND_ROBIN"), - .LSB_PRIORITY("HIGH") + .ARB_TYPE_ROUND_ROBIN(1), + .ARB_LSB_HIGH_PRIORITY(1) ) dma_if_mux_ctrl_inst ( .clk(clk_250mhz), @@ -1699,8 +1699,8 @@ if (IF_COUNT > 1) begin .LEN_WIDTH(PCIE_DMA_LEN_WIDTH), .S_TAG_WIDTH(IF_PCIE_DMA_TAG_WIDTH), .M_TAG_WIDTH(PCIE_DMA_TAG_WIDTH-1), - .ARB_TYPE("ROUND_ROBIN"), - .LSB_PRIORITY("HIGH") + .ARB_TYPE_ROUND_ROBIN(1), + .ARB_LSB_HIGH_PRIORITY(1) ) dma_if_mux_data_inst ( .clk(clk_250mhz), diff --git a/fpga/mqnic_tdma/VCU108/fpga_10g/rtl/fpga_core.v b/fpga/mqnic_tdma/VCU108/fpga_10g/rtl/fpga_core.v index 8917cd87e..263f57f95 100644 --- a/fpga/mqnic_tdma/VCU108/fpga_10g/rtl/fpga_core.v +++ b/fpga/mqnic_tdma/VCU108/fpga_10g/rtl/fpga_core.v @@ -1355,8 +1355,8 @@ dma_if_mux # .LEN_WIDTH(PCIE_DMA_LEN_WIDTH), .S_TAG_WIDTH(PCIE_DMA_TAG_WIDTH-1), .M_TAG_WIDTH(PCIE_DMA_TAG_WIDTH), - .ARB_TYPE("PRIORITY"), - .LSB_PRIORITY("HIGH") + .ARB_TYPE_ROUND_ROBIN(0), + .ARB_LSB_HIGH_PRIORITY(1) ) dma_if_mux_inst ( .clk(clk_250mhz), @@ -1557,8 +1557,8 @@ if (IF_COUNT > 1) begin .LEN_WIDTH(PCIE_DMA_LEN_WIDTH), .S_TAG_WIDTH(IF_PCIE_DMA_TAG_WIDTH), .M_TAG_WIDTH(PCIE_DMA_TAG_WIDTH-1), - .ARB_TYPE("ROUND_ROBIN"), - .LSB_PRIORITY("HIGH") + .ARB_TYPE_ROUND_ROBIN(1), + .ARB_LSB_HIGH_PRIORITY(1) ) dma_if_mux_ctrl_inst ( .clk(clk_250mhz), @@ -1683,8 +1683,8 @@ if (IF_COUNT > 1) begin .LEN_WIDTH(PCIE_DMA_LEN_WIDTH), .S_TAG_WIDTH(IF_PCIE_DMA_TAG_WIDTH), .M_TAG_WIDTH(PCIE_DMA_TAG_WIDTH-1), - .ARB_TYPE("ROUND_ROBIN"), - .LSB_PRIORITY("HIGH") + .ARB_TYPE_ROUND_ROBIN(1), + .ARB_LSB_HIGH_PRIORITY(1) ) dma_if_mux_data_inst ( .clk(clk_250mhz), diff --git a/fpga/mqnic_tdma/VCU118/fpga_10g/rtl/fpga_core.v b/fpga/mqnic_tdma/VCU118/fpga_10g/rtl/fpga_core.v index e22c041b2..215af71ad 100644 --- a/fpga/mqnic_tdma/VCU118/fpga_10g/rtl/fpga_core.v +++ b/fpga/mqnic_tdma/VCU118/fpga_10g/rtl/fpga_core.v @@ -1422,8 +1422,8 @@ dma_if_mux # .LEN_WIDTH(PCIE_DMA_LEN_WIDTH), .S_TAG_WIDTH(PCIE_DMA_TAG_WIDTH-1), .M_TAG_WIDTH(PCIE_DMA_TAG_WIDTH), - .ARB_TYPE("PRIORITY"), - .LSB_PRIORITY("HIGH") + .ARB_TYPE_ROUND_ROBIN(0), + .ARB_LSB_HIGH_PRIORITY(1) ) dma_if_mux_inst ( .clk(clk_250mhz), @@ -1624,8 +1624,8 @@ if (IF_COUNT > 1) begin .LEN_WIDTH(PCIE_DMA_LEN_WIDTH), .S_TAG_WIDTH(IF_PCIE_DMA_TAG_WIDTH), .M_TAG_WIDTH(PCIE_DMA_TAG_WIDTH-1), - .ARB_TYPE("ROUND_ROBIN"), - .LSB_PRIORITY("HIGH") + .ARB_TYPE_ROUND_ROBIN(1), + .ARB_LSB_HIGH_PRIORITY(1) ) dma_if_mux_ctrl_inst ( .clk(clk_250mhz), @@ -1750,8 +1750,8 @@ if (IF_COUNT > 1) begin .LEN_WIDTH(PCIE_DMA_LEN_WIDTH), .S_TAG_WIDTH(IF_PCIE_DMA_TAG_WIDTH), .M_TAG_WIDTH(PCIE_DMA_TAG_WIDTH-1), - .ARB_TYPE("ROUND_ROBIN"), - .LSB_PRIORITY("HIGH") + .ARB_TYPE_ROUND_ROBIN(1), + .ARB_LSB_HIGH_PRIORITY(1) ) dma_if_mux_data_inst ( .clk(clk_250mhz),