Skip to content

Commit 08353c9

Browse files
authored
Merge pull request #2523 from openXC7/gtx-support-contrib
fix attrs.json for GTX_COMMON and GTX_CHANNEL
2 parents faf9c77 + e5b8927 commit 08353c9

2 files changed

Lines changed: 53 additions & 56 deletions

File tree

fuzzers/063-gtx-common-conf/attrs.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"QPLL_CFG": {
33
"type": "BIN",
4-
"values": [134150145],
4+
"values": [134217727],
55
"digits": 27
66
},
77
"QPLL_CP": {
@@ -27,7 +27,7 @@
2727
},
2828
"QPLL_FBDIV": {
2929
"type": "BIN",
30-
"values": [496],
30+
"values": [1023],
3131
"digits": 10
3232
},
3333
"QPLL_FBDIV_MONITOR_EN": {
@@ -57,7 +57,7 @@
5757
},
5858
"COMMON_CFG": {
5959
"type": "BIN",
60-
"values": [4294836225],
60+
"values": [4294967295],
6161
"digits": 32
6262
},
6363
"QPLL_CLKOUT_CFG": {
@@ -68,7 +68,7 @@
6868
"QPLL_COARSE_FREQ_OVRD": {
6969
"type": "BIN",
7070
"values": [63],
71-
"digits": 5
71+
"digits": 6
7272
},
7373
"QPLL_COARSE_FREQ_OVRD_EN": {
7474
"type": "BIN",
@@ -77,7 +77,7 @@
7777
},
7878
"BIAS_CFG": {
7979
"type": "BIN",
80-
"values": [18445618199572250625],
80+
"values": [18446744073709551615],
8181
"digits": 64
8282
}
83-
}
83+
}

fuzzers/064-gtx-channel-conf/attrs.json

Lines changed: 47 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
},
2222
"RXDFELPMRESET_TIME": {
2323
"type": "BIN",
24-
"values": [1],
25-
"digits": 1
24+
"values": [127],
25+
"digits": 7
2626
},
2727
"RXPMARESET_TIME": {
2828
"type": "BIN",
@@ -49,11 +49,6 @@
4949
"values": [31],
5050
"digits": 5
5151
},
52-
"RX_XCLK_SEL": {
53-
"type": "STR",
54-
"values": ["RXREC", "RXUSR"],
55-
"digits": 1
56-
},
5752
"CPLL_INIT_CFG": {
5853
"type": "BIN",
5954
"values": [16777215],
@@ -67,6 +62,7 @@
6762
"SATA_CPLL_CFG": {
6863
"type": "STR",
6964
"values": ["VCO_3000MHZ", "VCO_1500MHZ", "VCO_750MHZ"],
65+
"encoding": [0, 1, 2],
7066
"digits": 2
7167
},
7268
"CPLL_REFCLK_DIV": {
@@ -314,8 +310,8 @@
314310
},
315311
"RXLPM_LF_CFG": {
316312
"type": "BIN",
317-
"values": [8191],
318-
"digits": 13
313+
"values": [16383],
314+
"digits": 14
319315
},
320316
"RXLPM_HF_CFG": {
321317
"type": "BIN",
@@ -324,17 +320,17 @@
324320
},
325321
"ES_QUALIFIER": {
326322
"type": "BIN",
327-
"values": [1208833588708967444709375],
323+
"values": [1208925819614629174706175],
328324
"digits": 80
329325
},
330326
"ES_QUAL_MASK": {
331327
"type": "BIN",
332-
"values": [1208833588708967444709375],
328+
"values": [1208925819614629174706175],
333329
"digits": 80
334330
},
335331
"ES_SDATA_MASK": {
336332
"type": "BIN",
337-
"values": [1208833588708967444709375],
333+
"values": [1208925819614629174706175],
338334
"digits": 80
339335
},
340336
"ES_PRESCALE": {
@@ -440,9 +436,8 @@
440436
"digits": 1
441437
},
442438
"RXSLIDE_AUTO_WAIT": {
443-
"type": "INT",
444-
"values": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15],
445-
"encoding": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15],
439+
"type": "BIN",
440+
"values": [15],
446441
"digits": 4
447442
},
448443
"CLK_CORRECT_USE": {
@@ -462,8 +457,8 @@
462457
},
463458
"CLK_COR_MAX_LAT": {
464459
"type": "INT",
465-
"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],
466-
"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],
460+
"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],
461+
"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],
467462
"digits": 6
468463
},
469464
"CLK_COR_SEQ_1_2": {
@@ -473,8 +468,8 @@
473468
},
474469
"CLK_COR_MIN_LAT": {
475470
"type": "INT",
476-
"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],
477-
"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],
471+
"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],
472+
"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],
478473
"digits": 6
479474
},
480475
"CLK_COR_SEQ_1_3": {
@@ -483,9 +478,8 @@
483478
"digits": 10
484479
},
485480
"CLK_COR_REPEAT_WAIT": {
486-
"type": "INT",
487-
"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],
488-
"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],
481+
"type": "BIN",
482+
"values": [31],
489483
"digits": 5
490484
},
491485
"CLK_COR_SEQ_1_4": {
@@ -661,14 +655,19 @@
661655
"values": ["TXOUT", "TXUSR"],
662656
"digits": 1
663657
},
658+
"RX_XCLK_SEL": {
659+
"type": "STR",
660+
"values": ["RXREC", "RXUSR"],
661+
"digits": 1
662+
},
664663
"RXBUF_EN": {
665664
"type": "BOOL",
666665
"values": ["FALSE", "TRUE"],
667666
"digits": 1
668667
},
669668
"TXPHDLY_CFG": {
670669
"type": "BIN",
671-
"values": [16711425],
670+
"values": [16777215],
672671
"digits": 24
673672
},
674673
"TXDLY_CFG": {
@@ -734,8 +733,8 @@
734733
},
735734
"PMA_RSV4": {
736735
"type": "BIN",
737-
"values": [15],
738-
"digits": 4
736+
"values": [4294967295],
737+
"digits": 32
739738
},
740739
"TX_DATA_WIDTH": {
741740
"type": "INT",
@@ -755,13 +754,13 @@
755754
},
756755
"PCS_RSVD_ATTR": {
757756
"type": "BIN",
758-
"values": [281462092005375],
757+
"values": [281474976710655],
759758
"digits": 48
760759
},
761760
"RX_DFE_KL_CFG2": {
762761
"type": "BIN",
763-
"values": [511],
764-
"digits": 9
762+
"values": [2147483647],
763+
"digits": 31
765764
},
766765
"TX_MARGIN_FULL_1": {
767766
"type": "BIN",
@@ -855,7 +854,7 @@
855854
},
856855
"DMONITOR_CFG": {
857856
"type": "BIN",
858-
"values": [16711425],
857+
"values": [16777215],
859858
"digits": 24
860859
},
861860
"TXOUT_DIV": {
@@ -872,24 +871,19 @@
872871
},
873872
"TST_RSV": {
874873
"type": "BIN",
875-
"values": [4294836225],
874+
"values": [4294967295],
876875
"digits": 32
877876
},
878877
"PMA_RSV": {
879878
"type": "BIN",
880-
"values": [4294836225],
879+
"values": [4294967295],
881880
"digits": 32
882881
},
883882
"RX_BUFFER_CFG": {
884883
"type": "BIN",
885884
"values": [63],
886885
"digits": 6
887886
},
888-
"RXBUF_THRESH_OVRD": {
889-
"type": "BOOL",
890-
"values": ["FALSE", "TRUE"],
891-
"digits": 1
892-
},
893887
"RXBUF_RESET_ON_EIDLE": {
894888
"type": "BOOL",
895889
"values": ["FALSE", "TRUE"],
@@ -910,10 +904,19 @@
910904
"values": ["FALSE", "TRUE"],
911905
"digits": 1
912906
},
907+
"RXBUF_THRESH_OVRD": {
908+
"type": "BOOL",
909+
"values": ["FALSE", "TRUE"],
910+
"digits": 1
911+
},
913912
"RXBUF_THRESH_UNDFLW": {
914-
"type": "INT",
915-
"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],
916-
"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],
913+
"type": "BIN",
914+
"values": [63],
915+
"digits": 6
916+
},
917+
"RXBUF_THRESH_OVFLW": {
918+
"type": "BIN",
919+
"values": [63],
917920
"digits": 6
918921
},
919922
"RXBUF_EIDLE_HI_CNT": {
@@ -931,12 +934,6 @@
931934
"values": ["FULL", "FAST"],
932935
"digits": 1
933936
},
934-
"RXBUF_THRESH_OVFLW": {
935-
"type": "INT",
936-
"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],
937-
"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],
938-
"digits": 6
939-
},
940937
"RX_DEFER_RESET_BUF_EN": {
941938
"type": "BOOL",
942939
"values": ["FALSE", "TRUE"],
@@ -954,18 +951,18 @@
954951
},
955952
"RXPH_CFG": {
956953
"type": "BIN",
957-
"values": [16711425],
954+
"values": [16777215],
958955
"digits": 24
959956
},
960957
"RXPHDLY_CFG": {
961958
"type": "BIN",
962-
"values": [16711425],
959+
"values": [16777215],
963960
"digits": 24
964961
},
965962
"RX_DEBUG_CFG": {
966963
"type": "BIN",
967964
"values": [2047],
968-
"digits": 11
965+
"digits": 12
969966
},
970967
"ES_PMA_CFG": {
971968
"type": "BIN",
@@ -994,7 +991,7 @@
994991
},
995992
"RXCDR_CFG": {
996993
"type": "BIN",
997-
"values": [2361183241434822606847],
998-
"digits": 71
994+
"values": [4722366482869645213695],
995+
"digits": 72
999996
}
1000997
}

0 commit comments

Comments
 (0)