From 16587514ba2bbc31637113b03e9b22f79de87813 Mon Sep 17 00:00:00 2001 From: Wade Fife Date: Wed, 22 Jun 2022 14:47:44 -0500 Subject: [PATCH] fpga: x400: Fix transport adapter PROTOVER Original-commit: 7b93c4a37abc91b6607a3401e39605bc23cae69f --- top/x400/x4xx.v | 38 ++++++++++++++++-------------- top/x400/x4xx_qsfp_wrapper_temp.sv | 32 +++++++++++++------------ 2 files changed, 37 insertions(+), 33 deletions(-) diff --git a/top/x400/x4xx.v b/top/x400/x4xx.v index 222babf..7e00dc9 100644 --- a/top/x400/x4xx.v +++ b/top/x400/x4xx.v @@ -1628,22 +1628,23 @@ module x4xx ( x4xx_qsfp_wrapper_temp #( `ifdef QSFP0_0 - .PROTOCOL0 (`QSFP0_0), + .PROTOCOL0 (`QSFP0_0), `endif `ifdef QSFP0_1 - .PROTOCOL1 (`QSFP0_1), + .PROTOCOL1 (`QSFP0_1), `endif `ifdef QSFP0_2 - .PROTOCOL2 (`QSFP0_2), + .PROTOCOL2 (`QSFP0_2), `endif `ifdef QSFP0_3 - .PROTOCOL3 (`QSFP0_3), + .PROTOCOL3 (`QSFP0_3), `endif - .CPU_W (CPU_W), - .CHDR_W (CHDR_W), - .BYTE_MTU (BYTE_MTU), - .PORTNUM (0), - .NODE_INST (0) + .CPU_W (CPU_W), + .CHDR_W (CHDR_W), + .BYTE_MTU (BYTE_MTU), + .PORTNUM (0), + .NODE_INST (0), + .RFNOC_PROTOVER (RFNOC_PROTOVER) ) x4xx_qsfp_wrapper_0 ( .areset (areset), .refclk_p (MGT_REFCLK_LMK0_P), @@ -1737,22 +1738,23 @@ module x4xx ( x4xx_qsfp_wrapper_temp #( `ifdef QSFP1_0 - .PROTOCOL0 (`QSFP1_0), + .PROTOCOL0 (`QSFP1_0), `endif `ifdef QSFP1_1 - .PROTOCOL1 (`QSFP1_1), + .PROTOCOL1 (`QSFP1_1), `endif `ifdef QSFP1_2 - .PROTOCOL2 (`QSFP1_2), + .PROTOCOL2 (`QSFP1_2), `endif `ifdef QSFP1_3 - .PROTOCOL3 (`QSFP1_3), + .PROTOCOL3 (`QSFP1_3), `endif - .CPU_W (CPU_W), - .CHDR_W (CHDR_W), - .BYTE_MTU (BYTE_MTU), - .PORTNUM (1), - .NODE_INST (4) + .CPU_W (CPU_W), + .CHDR_W (CHDR_W), + .BYTE_MTU (BYTE_MTU), + .PORTNUM (1), + .NODE_INST (4), + .RFNOC_PROTOVER (RFNOC_PROTOVER) ) x4xx_qsfp_wrapper_1 ( .areset (areset), .refclk_p (MGT_REFCLK_LMK3_P), diff --git a/top/x400/x4xx_qsfp_wrapper_temp.sv b/top/x400/x4xx_qsfp_wrapper_temp.sv index 19133de..e503ead 100644 --- a/top/x400/x4xx_qsfp_wrapper_temp.sv +++ b/top/x400/x4xx_qsfp_wrapper_temp.sv @@ -25,15 +25,16 @@ module x4xx_qsfp_wrapper_temp #( - parameter PROTOCOL0 = `MGT_Disabled, - parameter PROTOCOL1 = `MGT_Disabled, - parameter PROTOCOL2 = `MGT_Disabled, - parameter PROTOCOL3 = `MGT_Disabled, - parameter CPU_W = 64, - parameter CHDR_W = 64, - parameter BYTE_MTU = $clog2(8*1024), - parameter [7:0] PORTNUM = 8'd0, - parameter NODE_INST = 0 + parameter PROTOCOL0 = `MGT_Disabled, + parameter PROTOCOL1 = `MGT_Disabled, + parameter PROTOCOL2 = `MGT_Disabled, + parameter PROTOCOL3 = `MGT_Disabled, + parameter CPU_W = 64, + parameter CHDR_W = 64, + parameter BYTE_MTU = $clog2(8*1024), + parameter [ 7:0] PORTNUM = 8'd0, + parameter NODE_INST = 0, + parameter [15:0] RFNOC_PROTOVER = {8'd1, 8'd0} ) ( // Resets input logic areset, @@ -298,12 +299,13 @@ module x4xx_qsfp_wrapper_temp #( end x4xx_qsfp_wrapper #( - .PROTOCOL ({ PROTOCOL3, PROTOCOL2, PROTOCOL1, PROTOCOL0 }), - .CPU_W (CPU_W), - .CHDR_W (CHDR_W), - .BYTE_MTU (BYTE_MTU), - .PORTNUM (PORTNUM), - .NODE_INST (NODE_INST) + .PROTOCOL ({ PROTOCOL3, PROTOCOL2, PROTOCOL1, PROTOCOL0 }), + .CPU_W (CPU_W), + .CHDR_W (CHDR_W), + .BYTE_MTU (BYTE_MTU), + .PORTNUM (PORTNUM), + .NODE_INST (NODE_INST), + .RFNOC_PROTOVER (RFNOC_PROTOVER) ) x4xx_qsfp_wrapper_i ( .areset (areset), .refclk_p (refclk_p),