Merge pull request #2523 from openXC7/gtx-support-contrib
fix attrs.json for GTX_COMMON and GTX_CHANNEL
diff --git a/fuzzers/063-gtx-common-conf/attrs.json b/fuzzers/063-gtx-common-conf/attrs.json
index bcb25e6..aedf24d 100644
--- a/fuzzers/063-gtx-common-conf/attrs.json
+++ b/fuzzers/063-gtx-common-conf/attrs.json
@@ -1,7 +1,7 @@
{
"QPLL_CFG": {
"type": "BIN",
- "values": [134150145],
+ "values": [134217727],
"digits": 27
},
"QPLL_CP": {
@@ -27,7 +27,7 @@
},
"QPLL_FBDIV": {
"type": "BIN",
- "values": [496],
+ "values": [1023],
"digits": 10
},
"QPLL_FBDIV_MONITOR_EN": {
@@ -57,7 +57,7 @@
},
"COMMON_CFG": {
"type": "BIN",
- "values": [4294836225],
+ "values": [4294967295],
"digits": 32
},
"QPLL_CLKOUT_CFG": {
@@ -68,7 +68,7 @@
"QPLL_COARSE_FREQ_OVRD": {
"type": "BIN",
"values": [63],
- "digits": 5
+ "digits": 6
},
"QPLL_COARSE_FREQ_OVRD_EN": {
"type": "BIN",
@@ -77,7 +77,7 @@
},
"BIAS_CFG": {
"type": "BIN",
- "values": [18445618199572250625],
+ "values": [18446744073709551615],
"digits": 64
}
-}
\ No newline at end of file
+}
diff --git a/fuzzers/064-gtx-channel-conf/attrs.json b/fuzzers/064-gtx-channel-conf/attrs.json
index 7d5952c..bdd77a4 100644
--- a/fuzzers/064-gtx-channel-conf/attrs.json
+++ b/fuzzers/064-gtx-channel-conf/attrs.json
@@ -21,8 +21,8 @@
},
"RXDFELPMRESET_TIME": {
"type": "BIN",
- "values": [1],
- "digits": 1
+ "values": [127],
+ "digits": 7
},
"RXPMARESET_TIME": {
"type": "BIN",
@@ -49,11 +49,6 @@
"values": [31],
"digits": 5
},
- "RX_XCLK_SEL": {
- "type": "STR",
- "values": ["RXREC", "RXUSR"],
- "digits": 1
- },
"CPLL_INIT_CFG": {
"type": "BIN",
"values": [16777215],
@@ -67,6 +62,7 @@
"SATA_CPLL_CFG": {
"type": "STR",
"values": ["VCO_3000MHZ", "VCO_1500MHZ", "VCO_750MHZ"],
+ "encoding": [0, 1, 2],
"digits": 2
},
"CPLL_REFCLK_DIV": {
@@ -314,8 +310,8 @@
},
"RXLPM_LF_CFG": {
"type": "BIN",
- "values": [8191],
- "digits": 13
+ "values": [16383],
+ "digits": 14
},
"RXLPM_HF_CFG": {
"type": "BIN",
@@ -324,17 +320,17 @@
},
"ES_QUALIFIER": {
"type": "BIN",
- "values": [1208833588708967444709375],
+ "values": [1208925819614629174706175],
"digits": 80
},
"ES_QUAL_MASK": {
"type": "BIN",
- "values": [1208833588708967444709375],
+ "values": [1208925819614629174706175],
"digits": 80
},
"ES_SDATA_MASK": {
"type": "BIN",
- "values": [1208833588708967444709375],
+ "values": [1208925819614629174706175],
"digits": 80
},
"ES_PRESCALE": {
@@ -440,9 +436,8 @@
"digits": 1
},
"RXSLIDE_AUTO_WAIT": {
- "type": "INT",
- "values": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15],
- "encoding": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15],
+ "type": "BIN",
+ "values": [15],
"digits": 4
},
"CLK_CORRECT_USE": {
@@ -462,8 +457,8 @@
},
"CLK_COR_MAX_LAT": {
"type": "INT",
- "values": [6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60],
- "encoding": [6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60],
+ "values": [3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60],
+ "encoding": [3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60],
"digits": 6
},
"CLK_COR_SEQ_1_2": {
@@ -473,8 +468,8 @@
},
"CLK_COR_MIN_LAT": {
"type": "INT",
- "values": [4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60],
- "encoding": [4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60],
+ "values": [3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60],
+ "encoding": [3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60],
"digits": 6
},
"CLK_COR_SEQ_1_3": {
@@ -483,9 +478,8 @@
"digits": 10
},
"CLK_COR_REPEAT_WAIT": {
- "type": "INT",
- "values": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31],
- "encoding": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31],
+ "type": "BIN",
+ "values": [31],
"digits": 5
},
"CLK_COR_SEQ_1_4": {
@@ -661,6 +655,11 @@
"values": ["TXOUT", "TXUSR"],
"digits": 1
},
+ "RX_XCLK_SEL": {
+ "type": "STR",
+ "values": ["RXREC", "RXUSR"],
+ "digits": 1
+ },
"RXBUF_EN": {
"type": "BOOL",
"values": ["FALSE", "TRUE"],
@@ -668,7 +667,7 @@
},
"TXPHDLY_CFG": {
"type": "BIN",
- "values": [16711425],
+ "values": [16777215],
"digits": 24
},
"TXDLY_CFG": {
@@ -734,8 +733,8 @@
},
"PMA_RSV4": {
"type": "BIN",
- "values": [15],
- "digits": 4
+ "values": [4294967295],
+ "digits": 32
},
"TX_DATA_WIDTH": {
"type": "INT",
@@ -755,13 +754,13 @@
},
"PCS_RSVD_ATTR": {
"type": "BIN",
- "values": [281462092005375],
+ "values": [281474976710655],
"digits": 48
},
"RX_DFE_KL_CFG2": {
"type": "BIN",
- "values": [511],
- "digits": 9
+ "values": [2147483647],
+ "digits": 31
},
"TX_MARGIN_FULL_1": {
"type": "BIN",
@@ -855,7 +854,7 @@
},
"DMONITOR_CFG": {
"type": "BIN",
- "values": [16711425],
+ "values": [16777215],
"digits": 24
},
"TXOUT_DIV": {
@@ -872,12 +871,12 @@
},
"TST_RSV": {
"type": "BIN",
- "values": [4294836225],
+ "values": [4294967295],
"digits": 32
},
"PMA_RSV": {
"type": "BIN",
- "values": [4294836225],
+ "values": [4294967295],
"digits": 32
},
"RX_BUFFER_CFG": {
@@ -885,11 +884,6 @@
"values": [63],
"digits": 6
},
- "RXBUF_THRESH_OVRD": {
- "type": "BOOL",
- "values": ["FALSE", "TRUE"],
- "digits": 1
- },
"RXBUF_RESET_ON_EIDLE": {
"type": "BOOL",
"values": ["FALSE", "TRUE"],
@@ -910,10 +904,19 @@
"values": ["FALSE", "TRUE"],
"digits": 1
},
+ "RXBUF_THRESH_OVRD": {
+ "type": "BOOL",
+ "values": ["FALSE", "TRUE"],
+ "digits": 1
+ },
"RXBUF_THRESH_UNDFLW": {
- "type": "INT",
- "values": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63],
- "encoding": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63],
+ "type": "BIN",
+ "values": [63],
+ "digits": 6
+ },
+ "RXBUF_THRESH_OVFLW": {
+ "type": "BIN",
+ "values": [63],
"digits": 6
},
"RXBUF_EIDLE_HI_CNT": {
@@ -931,12 +934,6 @@
"values": ["FULL", "FAST"],
"digits": 1
},
- "RXBUF_THRESH_OVFLW": {
- "type": "INT",
- "values": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63],
- "encoding": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63],
- "digits": 6
- },
"RX_DEFER_RESET_BUF_EN": {
"type": "BOOL",
"values": ["FALSE", "TRUE"],
@@ -954,18 +951,18 @@
},
"RXPH_CFG": {
"type": "BIN",
- "values": [16711425],
+ "values": [16777215],
"digits": 24
},
"RXPHDLY_CFG": {
"type": "BIN",
- "values": [16711425],
+ "values": [16777215],
"digits": 24
},
"RX_DEBUG_CFG": {
"type": "BIN",
"values": [2047],
- "digits": 11
+ "digits": 12
},
"ES_PMA_CFG": {
"type": "BIN",
@@ -994,7 +991,7 @@
},
"RXCDR_CFG": {
"type": "BIN",
- "values": [2361183241434822606847],
- "digits": 71
+ "values": [4722366482869645213695],
+ "digits": 72
}
}
