重命名 AX88772C_eeprom/asix.c 为 asix_mac.c

hc

2024-09-20 a36159eec6ca17402b0e146b86efaf76568dc353

 kernel/arch/mips/include/asm/octeon/cvmx-ipd-defs.h
..
..
@@ -108,24 +108,6 @@
108
108
 		uint64_t reserved_6_63:58;
109
109
 #endif
110
110
 	} s;
111
-	struct cvmx_ipd_1st_mbuff_skip_s cn30xx;
112
-	struct cvmx_ipd_1st_mbuff_skip_s cn31xx;
113
-	struct cvmx_ipd_1st_mbuff_skip_s cn38xx;
114
-	struct cvmx_ipd_1st_mbuff_skip_s cn38xxp2;
115
-	struct cvmx_ipd_1st_mbuff_skip_s cn50xx;
116
-	struct cvmx_ipd_1st_mbuff_skip_s cn52xx;
117
-	struct cvmx_ipd_1st_mbuff_skip_s cn52xxp1;
118
-	struct cvmx_ipd_1st_mbuff_skip_s cn56xx;
119
-	struct cvmx_ipd_1st_mbuff_skip_s cn56xxp1;
120
-	struct cvmx_ipd_1st_mbuff_skip_s cn58xx;
121
-	struct cvmx_ipd_1st_mbuff_skip_s cn58xxp1;
122
-	struct cvmx_ipd_1st_mbuff_skip_s cn61xx;
123
-	struct cvmx_ipd_1st_mbuff_skip_s cn63xx;
124
-	struct cvmx_ipd_1st_mbuff_skip_s cn63xxp1;
125
-	struct cvmx_ipd_1st_mbuff_skip_s cn66xx;
126
-	struct cvmx_ipd_1st_mbuff_skip_s cn68xx;
127
-	struct cvmx_ipd_1st_mbuff_skip_s cn68xxp1;
128
-	struct cvmx_ipd_1st_mbuff_skip_s cnf71xx;
129
111
 };
130
112
 
131
113
 union cvmx_ipd_1st_next_ptr_back {
..
..
@@ -139,24 +121,6 @@
139
121
 		uint64_t reserved_4_63:60;
140
122
 #endif
141
123
 	} s;
142
-	struct cvmx_ipd_1st_next_ptr_back_s cn30xx;
143
-	struct cvmx_ipd_1st_next_ptr_back_s cn31xx;
144
-	struct cvmx_ipd_1st_next_ptr_back_s cn38xx;
145
-	struct cvmx_ipd_1st_next_ptr_back_s cn38xxp2;
146
-	struct cvmx_ipd_1st_next_ptr_back_s cn50xx;
147
-	struct cvmx_ipd_1st_next_ptr_back_s cn52xx;
148
-	struct cvmx_ipd_1st_next_ptr_back_s cn52xxp1;
149
-	struct cvmx_ipd_1st_next_ptr_back_s cn56xx;
150
-	struct cvmx_ipd_1st_next_ptr_back_s cn56xxp1;
151
-	struct cvmx_ipd_1st_next_ptr_back_s cn58xx;
152
-	struct cvmx_ipd_1st_next_ptr_back_s cn58xxp1;
153
-	struct cvmx_ipd_1st_next_ptr_back_s cn61xx;
154
-	struct cvmx_ipd_1st_next_ptr_back_s cn63xx;
155
-	struct cvmx_ipd_1st_next_ptr_back_s cn63xxp1;
156
-	struct cvmx_ipd_1st_next_ptr_back_s cn66xx;
157
-	struct cvmx_ipd_1st_next_ptr_back_s cn68xx;
158
-	struct cvmx_ipd_1st_next_ptr_back_s cn68xxp1;
159
-	struct cvmx_ipd_1st_next_ptr_back_s cnf71xx;
160
124
 };
161
125
 
162
126
 union cvmx_ipd_2nd_next_ptr_back {
..
..
@@ -170,24 +134,6 @@
170
134
 		uint64_t reserved_4_63:60;
171
135
 #endif
172
136
 	} s;
173
-	struct cvmx_ipd_2nd_next_ptr_back_s cn30xx;
174
-	struct cvmx_ipd_2nd_next_ptr_back_s cn31xx;
175
-	struct cvmx_ipd_2nd_next_ptr_back_s cn38xx;
176
-	struct cvmx_ipd_2nd_next_ptr_back_s cn38xxp2;
177
-	struct cvmx_ipd_2nd_next_ptr_back_s cn50xx;
178
-	struct cvmx_ipd_2nd_next_ptr_back_s cn52xx;
179
-	struct cvmx_ipd_2nd_next_ptr_back_s cn52xxp1;
180
-	struct cvmx_ipd_2nd_next_ptr_back_s cn56xx;
181
-	struct cvmx_ipd_2nd_next_ptr_back_s cn56xxp1;
182
-	struct cvmx_ipd_2nd_next_ptr_back_s cn58xx;
183
-	struct cvmx_ipd_2nd_next_ptr_back_s cn58xxp1;
184
-	struct cvmx_ipd_2nd_next_ptr_back_s cn61xx;
185
-	struct cvmx_ipd_2nd_next_ptr_back_s cn63xx;
186
-	struct cvmx_ipd_2nd_next_ptr_back_s cn63xxp1;
187
-	struct cvmx_ipd_2nd_next_ptr_back_s cn66xx;
188
-	struct cvmx_ipd_2nd_next_ptr_back_s cn68xx;
189
-	struct cvmx_ipd_2nd_next_ptr_back_s cn68xxp1;
190
-	struct cvmx_ipd_2nd_next_ptr_back_s cnf71xx;
191
137
 };
192
138
 
193
139
 union cvmx_ipd_bist_status {
..
..
@@ -284,10 +230,6 @@
284
230
 		uint64_t reserved_16_63:48;
285
231
 #endif
286
232
 	} cn30xx;
287
-	struct cvmx_ipd_bist_status_cn30xx cn31xx;
288
-	struct cvmx_ipd_bist_status_cn30xx cn38xx;
289
-	struct cvmx_ipd_bist_status_cn30xx cn38xxp2;
290
-	struct cvmx_ipd_bist_status_cn30xx cn50xx;
291
233
 	struct cvmx_ipd_bist_status_cn52xx {
292
234
 #ifdef __BIG_ENDIAN_BITFIELD
293
235
 		uint64_t reserved_18_63:46;
..
..
@@ -331,18 +273,6 @@
331
273
 		uint64_t reserved_18_63:46;
332
274
 #endif
333
275
 	} cn52xx;
334
-	struct cvmx_ipd_bist_status_cn52xx cn52xxp1;
335
-	struct cvmx_ipd_bist_status_cn52xx cn56xx;
336
-	struct cvmx_ipd_bist_status_cn52xx cn56xxp1;
337
-	struct cvmx_ipd_bist_status_cn30xx cn58xx;
338
-	struct cvmx_ipd_bist_status_cn30xx cn58xxp1;
339
-	struct cvmx_ipd_bist_status_cn52xx cn61xx;
340
-	struct cvmx_ipd_bist_status_cn52xx cn63xx;
341
-	struct cvmx_ipd_bist_status_cn52xx cn63xxp1;
342
-	struct cvmx_ipd_bist_status_cn52xx cn66xx;
343
-	struct cvmx_ipd_bist_status_s cn68xx;
344
-	struct cvmx_ipd_bist_status_s cn68xxp1;
345
-	struct cvmx_ipd_bist_status_cn52xx cnf71xx;
346
276
 };
347
277
 
348
278
 union cvmx_ipd_bp_prt_red_end {
..
..
@@ -365,10 +295,6 @@
365
295
 		uint64_t reserved_36_63:28;
366
296
 #endif
367
297
 	} cn30xx;
368
-	struct cvmx_ipd_bp_prt_red_end_cn30xx cn31xx;
369
-	struct cvmx_ipd_bp_prt_red_end_cn30xx cn38xx;
370
-	struct cvmx_ipd_bp_prt_red_end_cn30xx cn38xxp2;
371
-	struct cvmx_ipd_bp_prt_red_end_cn30xx cn50xx;
372
298
 	struct cvmx_ipd_bp_prt_red_end_cn52xx {
373
299
 #ifdef __BIG_ENDIAN_BITFIELD
374
300
 		uint64_t reserved_40_63:24;
..
..
@@ -378,12 +304,6 @@
378
304
 		uint64_t reserved_40_63:24;
379
305
 #endif
380
306
 	} cn52xx;
381
-	struct cvmx_ipd_bp_prt_red_end_cn52xx cn52xxp1;
382
-	struct cvmx_ipd_bp_prt_red_end_cn52xx cn56xx;
383
-	struct cvmx_ipd_bp_prt_red_end_cn52xx cn56xxp1;
384
-	struct cvmx_ipd_bp_prt_red_end_cn30xx cn58xx;
385
-	struct cvmx_ipd_bp_prt_red_end_cn30xx cn58xxp1;
386
-	struct cvmx_ipd_bp_prt_red_end_s cn61xx;
387
307
 	struct cvmx_ipd_bp_prt_red_end_cn63xx {
388
308
 #ifdef __BIG_ENDIAN_BITFIELD
389
309
 		uint64_t reserved_44_63:20;
..
..
@@ -393,9 +313,6 @@
393
313
 		uint64_t reserved_44_63:20;
394
314
 #endif
395
315
 	} cn63xx;
396
-	struct cvmx_ipd_bp_prt_red_end_cn63xx cn63xxp1;
397
-	struct cvmx_ipd_bp_prt_red_end_s cn66xx;
398
-	struct cvmx_ipd_bp_prt_red_end_s cnf71xx;
399
316
 };
400
317
 
401
318
 union cvmx_ipd_bpidx_mbuf_th {
..
..
@@ -411,8 +328,6 @@
411
328
 		uint64_t reserved_18_63:46;
412
329
 #endif
413
330
 	} s;
414
-	struct cvmx_ipd_bpidx_mbuf_th_s cn68xx;
415
-	struct cvmx_ipd_bpidx_mbuf_th_s cn68xxp1;
416
331
 };
417
332
 
418
333
 union cvmx_ipd_bpid_bp_counterx {
..
..
@@ -426,8 +341,6 @@
426
341
 		uint64_t reserved_25_63:39;
427
342
 #endif
428
343
 	} s;
429
-	struct cvmx_ipd_bpid_bp_counterx_s cn68xx;
430
-	struct cvmx_ipd_bpid_bp_counterx_s cn68xxp1;
431
344
 };
432
345
 
433
346
 union cvmx_ipd_clk_count {
..
..
@@ -439,24 +352,6 @@
439
352
 		uint64_t clk_cnt:64;
440
353
 #endif
441
354
 	} s;
442
-	struct cvmx_ipd_clk_count_s cn30xx;
443
-	struct cvmx_ipd_clk_count_s cn31xx;
444
-	struct cvmx_ipd_clk_count_s cn38xx;
445
-	struct cvmx_ipd_clk_count_s cn38xxp2;
446
-	struct cvmx_ipd_clk_count_s cn50xx;
447
-	struct cvmx_ipd_clk_count_s cn52xx;
448
-	struct cvmx_ipd_clk_count_s cn52xxp1;
449
-	struct cvmx_ipd_clk_count_s cn56xx;
450
-	struct cvmx_ipd_clk_count_s cn56xxp1;
451
-	struct cvmx_ipd_clk_count_s cn58xx;
452
-	struct cvmx_ipd_clk_count_s cn58xxp1;
453
-	struct cvmx_ipd_clk_count_s cn61xx;
454
-	struct cvmx_ipd_clk_count_s cn63xx;
455
-	struct cvmx_ipd_clk_count_s cn63xxp1;
456
-	struct cvmx_ipd_clk_count_s cn66xx;
457
-	struct cvmx_ipd_clk_count_s cn68xx;
458
-	struct cvmx_ipd_clk_count_s cn68xxp1;
459
-	struct cvmx_ipd_clk_count_s cnf71xx;
460
355
 };
461
356
 
462
357
 union cvmx_ipd_credits {
..
..
@@ -472,8 +367,6 @@
472
367
 		uint64_t reserved_16_63:48;
473
368
 #endif
474
369
 	} s;
475
-	struct cvmx_ipd_credits_s cn68xx;
476
-	struct cvmx_ipd_credits_s cn68xxp1;
477
370
 };
478
371
 
479
372
 union cvmx_ipd_ctl_status {
..
..
@@ -544,8 +437,6 @@
544
437
 		uint64_t reserved_10_63:54;
545
438
 #endif
546
439
 	} cn30xx;
547
-	struct cvmx_ipd_ctl_status_cn30xx cn31xx;
548
-	struct cvmx_ipd_ctl_status_cn30xx cn38xx;
549
440
 	struct cvmx_ipd_ctl_status_cn38xxp2 {
550
441
 #ifdef __BIG_ENDIAN_BITFIELD
551
442
 		uint64_t reserved_9_63:55;
..
..
@@ -604,10 +495,6 @@
604
495
 		uint64_t reserved_15_63:49;
605
496
 #endif
606
497
 	} cn50xx;
607
-	struct cvmx_ipd_ctl_status_cn50xx cn52xx;
608
-	struct cvmx_ipd_ctl_status_cn50xx cn52xxp1;
609
-	struct cvmx_ipd_ctl_status_cn50xx cn56xx;
610
-	struct cvmx_ipd_ctl_status_cn50xx cn56xxp1;
611
498
 	struct cvmx_ipd_ctl_status_cn58xx {
612
499
 #ifdef __BIG_ENDIAN_BITFIELD
613
500
 		uint64_t reserved_12_63:52;
..
..
@@ -637,9 +524,6 @@
637
524
 		uint64_t reserved_12_63:52;
638
525
 #endif
639
526
 	} cn58xx;
640
-	struct cvmx_ipd_ctl_status_cn58xx cn58xxp1;
641
-	struct cvmx_ipd_ctl_status_s cn61xx;
642
-	struct cvmx_ipd_ctl_status_s cn63xx;
643
527
 	struct cvmx_ipd_ctl_status_cn63xxp1 {
644
528
 #ifdef __BIG_ENDIAN_BITFIELD
645
529
 		uint64_t reserved_16_63:48;
..
..
@@ -677,10 +561,6 @@
677
561
 		uint64_t reserved_16_63:48;
678
562
 #endif
679
563
 	} cn63xxp1;
680
-	struct cvmx_ipd_ctl_status_s cn66xx;
681
-	struct cvmx_ipd_ctl_status_s cn68xx;
682
-	struct cvmx_ipd_ctl_status_s cn68xxp1;
683
-	struct cvmx_ipd_ctl_status_s cnf71xx;
684
564
 };
685
565
 
686
566
 union cvmx_ipd_ecc_ctl {
..
..
@@ -700,8 +580,6 @@
700
580
 		uint64_t reserved_8_63:56;
701
581
 #endif
702
582
 	} s;
703
-	struct cvmx_ipd_ecc_ctl_s cn68xx;
704
-	struct cvmx_ipd_ecc_ctl_s cn68xxp1;
705
583
 };
706
584
 
707
585
 union cvmx_ipd_free_ptr_fifo_ctl {
..
..
@@ -723,8 +601,6 @@
723
601
 		uint64_t reserved_32_63:32;
724
602
 #endif
725
603
 	} s;
726
-	struct cvmx_ipd_free_ptr_fifo_ctl_s cn68xx;
727
-	struct cvmx_ipd_free_ptr_fifo_ctl_s cn68xxp1;
728
604
 };
729
605
 
730
606
 union cvmx_ipd_free_ptr_value {
..
..
@@ -738,8 +614,6 @@
738
614
 		uint64_t reserved_33_63:31;
739
615
 #endif
740
616
 	} s;
741
-	struct cvmx_ipd_free_ptr_value_s cn68xx;
742
-	struct cvmx_ipd_free_ptr_value_s cn68xxp1;
743
617
 };
744
618
 
745
619
 union cvmx_ipd_hold_ptr_fifo_ctl {
..
..
@@ -761,8 +635,6 @@
761
635
 		uint64_t reserved_43_63:21;
762
636
 #endif
763
637
 	} s;
764
-	struct cvmx_ipd_hold_ptr_fifo_ctl_s cn68xx;
765
-	struct cvmx_ipd_hold_ptr_fifo_ctl_s cn68xxp1;
766
638
 };
767
639
 
768
640
 union cvmx_ipd_int_enb {
..
..
@@ -837,7 +709,6 @@
837
709
 		uint64_t reserved_5_63:59;
838
710
 #endif
839
711
 	} cn30xx;
840
-	struct cvmx_ipd_int_enb_cn30xx cn31xx;
841
712
 	struct cvmx_ipd_int_enb_cn38xx {
842
713
 #ifdef __BIG_ENDIAN_BITFIELD
843
714
 		uint64_t reserved_10_63:54;
..
..
@@ -865,8 +736,6 @@
865
736
 		uint64_t reserved_10_63:54;
866
737
 #endif
867
738
 	} cn38xx;
868
-	struct cvmx_ipd_int_enb_cn30xx cn38xxp2;
869
-	struct cvmx_ipd_int_enb_cn38xx cn50xx;
870
739
 	struct cvmx_ipd_int_enb_cn52xx {
871
740
 #ifdef __BIG_ENDIAN_BITFIELD
872
741
 		uint64_t reserved_12_63:52;
..
..
@@ -898,18 +767,6 @@
898
767
 		uint64_t reserved_12_63:52;
899
768
 #endif
900
769
 	} cn52xx;
901
-	struct cvmx_ipd_int_enb_cn52xx cn52xxp1;
902
-	struct cvmx_ipd_int_enb_cn52xx cn56xx;
903
-	struct cvmx_ipd_int_enb_cn52xx cn56xxp1;
904
-	struct cvmx_ipd_int_enb_cn38xx cn58xx;
905
-	struct cvmx_ipd_int_enb_cn38xx cn58xxp1;
906
-	struct cvmx_ipd_int_enb_cn52xx cn61xx;
907
-	struct cvmx_ipd_int_enb_cn52xx cn63xx;
908
-	struct cvmx_ipd_int_enb_cn52xx cn63xxp1;
909
-	struct cvmx_ipd_int_enb_cn52xx cn66xx;
910
-	struct cvmx_ipd_int_enb_s cn68xx;
911
-	struct cvmx_ipd_int_enb_s cn68xxp1;
912
-	struct cvmx_ipd_int_enb_cn52xx cnf71xx;
913
770
 };
914
771
 
915
772
 union cvmx_ipd_int_sum {
..
..
@@ -984,7 +841,6 @@
984
841
 		uint64_t reserved_5_63:59;
985
842
 #endif
986
843
 	} cn30xx;
987
-	struct cvmx_ipd_int_sum_cn30xx cn31xx;
988
844
 	struct cvmx_ipd_int_sum_cn38xx {
989
845
 #ifdef __BIG_ENDIAN_BITFIELD
990
846
 		uint64_t reserved_10_63:54;
..
..
@@ -1012,8 +868,6 @@
1012
868
 		uint64_t reserved_10_63:54;
1013
869
 #endif
1014
870
 	} cn38xx;
1015
-	struct cvmx_ipd_int_sum_cn30xx cn38xxp2;
1016
-	struct cvmx_ipd_int_sum_cn38xx cn50xx;
1017
871
 	struct cvmx_ipd_int_sum_cn52xx {
1018
872
 #ifdef __BIG_ENDIAN_BITFIELD
1019
873
 		uint64_t reserved_12_63:52;
..
..
@@ -1045,18 +899,6 @@
1045
899
 		uint64_t reserved_12_63:52;
1046
900
 #endif
1047
901
 	} cn52xx;
1048
-	struct cvmx_ipd_int_sum_cn52xx cn52xxp1;
1049
-	struct cvmx_ipd_int_sum_cn52xx cn56xx;
1050
-	struct cvmx_ipd_int_sum_cn52xx cn56xxp1;
1051
-	struct cvmx_ipd_int_sum_cn38xx cn58xx;
1052
-	struct cvmx_ipd_int_sum_cn38xx cn58xxp1;
1053
-	struct cvmx_ipd_int_sum_cn52xx cn61xx;
1054
-	struct cvmx_ipd_int_sum_cn52xx cn63xx;
1055
-	struct cvmx_ipd_int_sum_cn52xx cn63xxp1;
1056
-	struct cvmx_ipd_int_sum_cn52xx cn66xx;
1057
-	struct cvmx_ipd_int_sum_s cn68xx;
1058
-	struct cvmx_ipd_int_sum_s cn68xxp1;
1059
-	struct cvmx_ipd_int_sum_cn52xx cnf71xx;
1060
902
 };
1061
903
 
1062
904
 union cvmx_ipd_next_pkt_ptr {
..
..
@@ -1070,8 +912,6 @@
1070
912
 		uint64_t reserved_33_63:31;
1071
913
 #endif
1072
914
 	} s;
1073
-	struct cvmx_ipd_next_pkt_ptr_s cn68xx;
1074
-	struct cvmx_ipd_next_pkt_ptr_s cn68xxp1;
1075
915
 };
1076
916
 
1077
917
 union cvmx_ipd_next_wqe_ptr {
..
..
@@ -1085,8 +925,6 @@
1085
925
 		uint64_t reserved_33_63:31;
1086
926
 #endif
1087
927
 	} s;
1088
-	struct cvmx_ipd_next_wqe_ptr_s cn68xx;
1089
-	struct cvmx_ipd_next_wqe_ptr_s cn68xxp1;
1090
928
 };
1091
929
 
1092
930
 union cvmx_ipd_not_1st_mbuff_skip {
..
..
@@ -1100,24 +938,6 @@
1100
938
 		uint64_t reserved_6_63:58;
1101
939
 #endif
1102
940
 	} s;
1103
-	struct cvmx_ipd_not_1st_mbuff_skip_s cn30xx;
1104
-	struct cvmx_ipd_not_1st_mbuff_skip_s cn31xx;
1105
-	struct cvmx_ipd_not_1st_mbuff_skip_s cn38xx;
1106
-	struct cvmx_ipd_not_1st_mbuff_skip_s cn38xxp2;
1107
-	struct cvmx_ipd_not_1st_mbuff_skip_s cn50xx;
1108
-	struct cvmx_ipd_not_1st_mbuff_skip_s cn52xx;
1109
-	struct cvmx_ipd_not_1st_mbuff_skip_s cn52xxp1;
1110
-	struct cvmx_ipd_not_1st_mbuff_skip_s cn56xx;
1111
-	struct cvmx_ipd_not_1st_mbuff_skip_s cn56xxp1;
1112
-	struct cvmx_ipd_not_1st_mbuff_skip_s cn58xx;
1113
-	struct cvmx_ipd_not_1st_mbuff_skip_s cn58xxp1;
1114
-	struct cvmx_ipd_not_1st_mbuff_skip_s cn61xx;
1115
-	struct cvmx_ipd_not_1st_mbuff_skip_s cn63xx;
1116
-	struct cvmx_ipd_not_1st_mbuff_skip_s cn63xxp1;
1117
-	struct cvmx_ipd_not_1st_mbuff_skip_s cn66xx;
1118
-	struct cvmx_ipd_not_1st_mbuff_skip_s cn68xx;
1119
-	struct cvmx_ipd_not_1st_mbuff_skip_s cn68xxp1;
1120
-	struct cvmx_ipd_not_1st_mbuff_skip_s cnf71xx;
1121
941
 };
1122
942
 
1123
943
 union cvmx_ipd_on_bp_drop_pktx {
..
..
@@ -1129,8 +949,6 @@
1129
949
 		uint64_t prt_enb:64;
1130
950
 #endif
1131
951
 	} s;
1132
-	struct cvmx_ipd_on_bp_drop_pktx_s cn68xx;
1133
-	struct cvmx_ipd_on_bp_drop_pktx_s cn68xxp1;
1134
952
 };
1135
953
 
1136
954
 union cvmx_ipd_packet_mbuff_size {
..
..
@@ -1144,24 +962,6 @@
1144
962
 		uint64_t reserved_12_63:52;
1145
963
 #endif
1146
964
 	} s;
1147
-	struct cvmx_ipd_packet_mbuff_size_s cn30xx;
1148
-	struct cvmx_ipd_packet_mbuff_size_s cn31xx;
1149
-	struct cvmx_ipd_packet_mbuff_size_s cn38xx;
1150
-	struct cvmx_ipd_packet_mbuff_size_s cn38xxp2;
1151
-	struct cvmx_ipd_packet_mbuff_size_s cn50xx;
1152
-	struct cvmx_ipd_packet_mbuff_size_s cn52xx;
1153
-	struct cvmx_ipd_packet_mbuff_size_s cn52xxp1;
1154
-	struct cvmx_ipd_packet_mbuff_size_s cn56xx;
1155
-	struct cvmx_ipd_packet_mbuff_size_s cn56xxp1;
1156
-	struct cvmx_ipd_packet_mbuff_size_s cn58xx;
1157
-	struct cvmx_ipd_packet_mbuff_size_s cn58xxp1;
1158
-	struct cvmx_ipd_packet_mbuff_size_s cn61xx;
1159
-	struct cvmx_ipd_packet_mbuff_size_s cn63xx;
1160
-	struct cvmx_ipd_packet_mbuff_size_s cn63xxp1;
1161
-	struct cvmx_ipd_packet_mbuff_size_s cn66xx;
1162
-	struct cvmx_ipd_packet_mbuff_size_s cn68xx;
1163
-	struct cvmx_ipd_packet_mbuff_size_s cn68xxp1;
1164
-	struct cvmx_ipd_packet_mbuff_size_s cnf71xx;
1165
965
 };
1166
966
 
1167
967
 union cvmx_ipd_pkt_err {
..
..
@@ -1175,8 +975,6 @@
1175
975
 		uint64_t reserved_6_63:58;
1176
976
 #endif
1177
977
 	} s;
1178
-	struct cvmx_ipd_pkt_err_s cn68xx;
1179
-	struct cvmx_ipd_pkt_err_s cn68xxp1;
1180
978
 };
1181
979
 
1182
980
 union cvmx_ipd_pkt_ptr_valid {
..
..
@@ -1190,21 +988,6 @@
1190
988
 		uint64_t reserved_29_63:35;
1191
989
 #endif
1192
990
 	} s;
1193
-	struct cvmx_ipd_pkt_ptr_valid_s cn30xx;
1194
-	struct cvmx_ipd_pkt_ptr_valid_s cn31xx;
1195
-	struct cvmx_ipd_pkt_ptr_valid_s cn38xx;
1196
-	struct cvmx_ipd_pkt_ptr_valid_s cn50xx;
1197
-	struct cvmx_ipd_pkt_ptr_valid_s cn52xx;
1198
-	struct cvmx_ipd_pkt_ptr_valid_s cn52xxp1;
1199
-	struct cvmx_ipd_pkt_ptr_valid_s cn56xx;
1200
-	struct cvmx_ipd_pkt_ptr_valid_s cn56xxp1;
1201
-	struct cvmx_ipd_pkt_ptr_valid_s cn58xx;
1202
-	struct cvmx_ipd_pkt_ptr_valid_s cn58xxp1;
1203
-	struct cvmx_ipd_pkt_ptr_valid_s cn61xx;
1204
-	struct cvmx_ipd_pkt_ptr_valid_s cn63xx;
1205
-	struct cvmx_ipd_pkt_ptr_valid_s cn63xxp1;
1206
-	struct cvmx_ipd_pkt_ptr_valid_s cn66xx;
1207
-	struct cvmx_ipd_pkt_ptr_valid_s cnf71xx;
1208
991
 };
1209
992
 
1210
993
 union cvmx_ipd_portx_bp_page_cnt {
..
..
@@ -1220,22 +1003,6 @@
1220
1003
 		uint64_t reserved_18_63:46;
1221
1004
 #endif
1222
1005
 	} s;
1223
-	struct cvmx_ipd_portx_bp_page_cnt_s cn30xx;
1224
-	struct cvmx_ipd_portx_bp_page_cnt_s cn31xx;
1225
-	struct cvmx_ipd_portx_bp_page_cnt_s cn38xx;
1226
-	struct cvmx_ipd_portx_bp_page_cnt_s cn38xxp2;
1227
-	struct cvmx_ipd_portx_bp_page_cnt_s cn50xx;
1228
-	struct cvmx_ipd_portx_bp_page_cnt_s cn52xx;
1229
-	struct cvmx_ipd_portx_bp_page_cnt_s cn52xxp1;
1230
-	struct cvmx_ipd_portx_bp_page_cnt_s cn56xx;
1231
-	struct cvmx_ipd_portx_bp_page_cnt_s cn56xxp1;
1232
-	struct cvmx_ipd_portx_bp_page_cnt_s cn58xx;
1233
-	struct cvmx_ipd_portx_bp_page_cnt_s cn58xxp1;
1234
-	struct cvmx_ipd_portx_bp_page_cnt_s cn61xx;
1235
-	struct cvmx_ipd_portx_bp_page_cnt_s cn63xx;
1236
-	struct cvmx_ipd_portx_bp_page_cnt_s cn63xxp1;
1237
-	struct cvmx_ipd_portx_bp_page_cnt_s cn66xx;
1238
-	struct cvmx_ipd_portx_bp_page_cnt_s cnf71xx;
1239
1006
 };
1240
1007
 
1241
1008
 union cvmx_ipd_portx_bp_page_cnt2 {
..
..
@@ -1251,15 +1018,6 @@
1251
1018
 		uint64_t reserved_18_63:46;
1252
1019
 #endif
1253
1020
 	} s;
1254
-	struct cvmx_ipd_portx_bp_page_cnt2_s cn52xx;
1255
-	struct cvmx_ipd_portx_bp_page_cnt2_s cn52xxp1;
1256
-	struct cvmx_ipd_portx_bp_page_cnt2_s cn56xx;
1257
-	struct cvmx_ipd_portx_bp_page_cnt2_s cn56xxp1;
1258
-	struct cvmx_ipd_portx_bp_page_cnt2_s cn61xx;
1259
-	struct cvmx_ipd_portx_bp_page_cnt2_s cn63xx;
1260
-	struct cvmx_ipd_portx_bp_page_cnt2_s cn63xxp1;
1261
-	struct cvmx_ipd_portx_bp_page_cnt2_s cn66xx;
1262
-	struct cvmx_ipd_portx_bp_page_cnt2_s cnf71xx;
1263
1021
 };
1264
1022
 
1265
1023
 union cvmx_ipd_portx_bp_page_cnt3 {
..
..
@@ -1275,11 +1033,6 @@
1275
1033
 		uint64_t reserved_18_63:46;
1276
1034
 #endif
1277
1035
 	} s;
1278
-	struct cvmx_ipd_portx_bp_page_cnt3_s cn61xx;
1279
-	struct cvmx_ipd_portx_bp_page_cnt3_s cn63xx;
1280
-	struct cvmx_ipd_portx_bp_page_cnt3_s cn63xxp1;
1281
-	struct cvmx_ipd_portx_bp_page_cnt3_s cn66xx;
1282
-	struct cvmx_ipd_portx_bp_page_cnt3_s cnf71xx;
1283
1036
 };
1284
1037
 
1285
1038
 union cvmx_ipd_port_bp_counters2_pairx {
..
..
@@ -1293,15 +1046,6 @@
1293
1046
 		uint64_t reserved_25_63:39;
1294
1047
 #endif
1295
1048
 	} s;
1296
-	struct cvmx_ipd_port_bp_counters2_pairx_s cn52xx;
1297
-	struct cvmx_ipd_port_bp_counters2_pairx_s cn52xxp1;
1298
-	struct cvmx_ipd_port_bp_counters2_pairx_s cn56xx;
1299
-	struct cvmx_ipd_port_bp_counters2_pairx_s cn56xxp1;
1300
-	struct cvmx_ipd_port_bp_counters2_pairx_s cn61xx;
1301
-	struct cvmx_ipd_port_bp_counters2_pairx_s cn63xx;
1302
-	struct cvmx_ipd_port_bp_counters2_pairx_s cn63xxp1;
1303
-	struct cvmx_ipd_port_bp_counters2_pairx_s cn66xx;
1304
-	struct cvmx_ipd_port_bp_counters2_pairx_s cnf71xx;
1305
1049
 };
1306
1050
 
1307
1051
 union cvmx_ipd_port_bp_counters3_pairx {
..
..
@@ -1315,11 +1059,6 @@
1315
1059
 		uint64_t reserved_25_63:39;
1316
1060
 #endif
1317
1061
 	} s;
1318
-	struct cvmx_ipd_port_bp_counters3_pairx_s cn61xx;
1319
-	struct cvmx_ipd_port_bp_counters3_pairx_s cn63xx;
1320
-	struct cvmx_ipd_port_bp_counters3_pairx_s cn63xxp1;
1321
-	struct cvmx_ipd_port_bp_counters3_pairx_s cn66xx;
1322
-	struct cvmx_ipd_port_bp_counters3_pairx_s cnf71xx;
1323
1062
 };
1324
1063
 
1325
1064
 union cvmx_ipd_port_bp_counters4_pairx {
..
..
@@ -1333,9 +1072,6 @@
1333
1072
 		uint64_t reserved_25_63:39;
1334
1073
 #endif
1335
1074
 	} s;
1336
-	struct cvmx_ipd_port_bp_counters4_pairx_s cn61xx;
1337
-	struct cvmx_ipd_port_bp_counters4_pairx_s cn66xx;
1338
-	struct cvmx_ipd_port_bp_counters4_pairx_s cnf71xx;
1339
1075
 };
1340
1076
 
1341
1077
 union cvmx_ipd_port_bp_counters_pairx {
..
..
@@ -1349,22 +1085,6 @@
1349
1085
 		uint64_t reserved_25_63:39;
1350
1086
 #endif
1351
1087
 	} s;
1352
-	struct cvmx_ipd_port_bp_counters_pairx_s cn30xx;
1353
-	struct cvmx_ipd_port_bp_counters_pairx_s cn31xx;
1354
-	struct cvmx_ipd_port_bp_counters_pairx_s cn38xx;
1355
-	struct cvmx_ipd_port_bp_counters_pairx_s cn38xxp2;
1356
-	struct cvmx_ipd_port_bp_counters_pairx_s cn50xx;
1357
-	struct cvmx_ipd_port_bp_counters_pairx_s cn52xx;
1358
-	struct cvmx_ipd_port_bp_counters_pairx_s cn52xxp1;
1359
-	struct cvmx_ipd_port_bp_counters_pairx_s cn56xx;
1360
-	struct cvmx_ipd_port_bp_counters_pairx_s cn56xxp1;
1361
-	struct cvmx_ipd_port_bp_counters_pairx_s cn58xx;
1362
-	struct cvmx_ipd_port_bp_counters_pairx_s cn58xxp1;
1363
-	struct cvmx_ipd_port_bp_counters_pairx_s cn61xx;
1364
-	struct cvmx_ipd_port_bp_counters_pairx_s cn63xx;
1365
-	struct cvmx_ipd_port_bp_counters_pairx_s cn63xxp1;
1366
-	struct cvmx_ipd_port_bp_counters_pairx_s cn66xx;
1367
-	struct cvmx_ipd_port_bp_counters_pairx_s cnf71xx;
1368
1088
 };
1369
1089
 
1370
1090
 union cvmx_ipd_port_ptr_fifo_ctl {
..
..
@@ -1384,8 +1104,6 @@
1384
1104
 		uint64_t reserved_48_63:16;
1385
1105
 #endif
1386
1106
 	} s;
1387
-	struct cvmx_ipd_port_ptr_fifo_ctl_s cn68xx;
1388
-	struct cvmx_ipd_port_ptr_fifo_ctl_s cn68xxp1;
1389
1107
 };
1390
1108
 
1391
1109
 union cvmx_ipd_port_qos_x_cnt {
..
..
@@ -1399,17 +1117,6 @@
1399
1117
 		uint64_t wmark:32;
1400
1118
 #endif
1401
1119
 	} s;
1402
-	struct cvmx_ipd_port_qos_x_cnt_s cn52xx;
1403
-	struct cvmx_ipd_port_qos_x_cnt_s cn52xxp1;
1404
-	struct cvmx_ipd_port_qos_x_cnt_s cn56xx;
1405
-	struct cvmx_ipd_port_qos_x_cnt_s cn56xxp1;
1406
-	struct cvmx_ipd_port_qos_x_cnt_s cn61xx;
1407
-	struct cvmx_ipd_port_qos_x_cnt_s cn63xx;
1408
-	struct cvmx_ipd_port_qos_x_cnt_s cn63xxp1;
1409
-	struct cvmx_ipd_port_qos_x_cnt_s cn66xx;
1410
-	struct cvmx_ipd_port_qos_x_cnt_s cn68xx;
1411
-	struct cvmx_ipd_port_qos_x_cnt_s cn68xxp1;
1412
-	struct cvmx_ipd_port_qos_x_cnt_s cnf71xx;
1413
1120
 };
1414
1121
 
1415
1122
 union cvmx_ipd_port_qos_intx {
..
..
@@ -1421,17 +1128,6 @@
1421
1128
 		uint64_t intr:64;
1422
1129
 #endif
1423
1130
 	} s;
1424
-	struct cvmx_ipd_port_qos_intx_s cn52xx;
1425
-	struct cvmx_ipd_port_qos_intx_s cn52xxp1;
1426
-	struct cvmx_ipd_port_qos_intx_s cn56xx;
1427
-	struct cvmx_ipd_port_qos_intx_s cn56xxp1;
1428
-	struct cvmx_ipd_port_qos_intx_s cn61xx;
1429
-	struct cvmx_ipd_port_qos_intx_s cn63xx;
1430
-	struct cvmx_ipd_port_qos_intx_s cn63xxp1;
1431
-	struct cvmx_ipd_port_qos_intx_s cn66xx;
1432
-	struct cvmx_ipd_port_qos_intx_s cn68xx;
1433
-	struct cvmx_ipd_port_qos_intx_s cn68xxp1;
1434
-	struct cvmx_ipd_port_qos_intx_s cnf71xx;
1435
1131
 };
1436
1132
 
1437
1133
 union cvmx_ipd_port_qos_int_enbx {
..
..
@@ -1443,17 +1139,6 @@
1443
1139
 		uint64_t enb:64;
1444
1140
 #endif
1445
1141
 	} s;
1446
-	struct cvmx_ipd_port_qos_int_enbx_s cn52xx;
1447
-	struct cvmx_ipd_port_qos_int_enbx_s cn52xxp1;
1448
-	struct cvmx_ipd_port_qos_int_enbx_s cn56xx;
1449
-	struct cvmx_ipd_port_qos_int_enbx_s cn56xxp1;
1450
-	struct cvmx_ipd_port_qos_int_enbx_s cn61xx;
1451
-	struct cvmx_ipd_port_qos_int_enbx_s cn63xx;
1452
-	struct cvmx_ipd_port_qos_int_enbx_s cn63xxp1;
1453
-	struct cvmx_ipd_port_qos_int_enbx_s cn66xx;
1454
-	struct cvmx_ipd_port_qos_int_enbx_s cn68xx;
1455
-	struct cvmx_ipd_port_qos_int_enbx_s cn68xxp1;
1456
-	struct cvmx_ipd_port_qos_int_enbx_s cnf71xx;
1457
1142
 };
1458
1143
 
1459
1144
 union cvmx_ipd_port_sopx {
..
..
@@ -1465,8 +1150,6 @@
1465
1150
 		uint64_t sop:64;
1466
1151
 #endif
1467
1152
 	} s;
1468
-	struct cvmx_ipd_port_sopx_s cn68xx;
1469
-	struct cvmx_ipd_port_sopx_s cn68xxp1;
1470
1153
 };
1471
1154
 
1472
1155
 union cvmx_ipd_prc_hold_ptr_fifo_ctl {
..
..
@@ -1488,21 +1171,6 @@
1488
1171
 		uint64_t reserved_39_63:25;
1489
1172
 #endif
1490
1173
 	} s;
1491
-	struct cvmx_ipd_prc_hold_ptr_fifo_ctl_s cn30xx;
1492
-	struct cvmx_ipd_prc_hold_ptr_fifo_ctl_s cn31xx;
1493
-	struct cvmx_ipd_prc_hold_ptr_fifo_ctl_s cn38xx;
1494
-	struct cvmx_ipd_prc_hold_ptr_fifo_ctl_s cn50xx;
1495
-	struct cvmx_ipd_prc_hold_ptr_fifo_ctl_s cn52xx;
1496
-	struct cvmx_ipd_prc_hold_ptr_fifo_ctl_s cn52xxp1;
1497
-	struct cvmx_ipd_prc_hold_ptr_fifo_ctl_s cn56xx;
1498
-	struct cvmx_ipd_prc_hold_ptr_fifo_ctl_s cn56xxp1;
1499
-	struct cvmx_ipd_prc_hold_ptr_fifo_ctl_s cn58xx;
1500
-	struct cvmx_ipd_prc_hold_ptr_fifo_ctl_s cn58xxp1;
1501
-	struct cvmx_ipd_prc_hold_ptr_fifo_ctl_s cn61xx;
1502
-	struct cvmx_ipd_prc_hold_ptr_fifo_ctl_s cn63xx;
1503
-	struct cvmx_ipd_prc_hold_ptr_fifo_ctl_s cn63xxp1;
1504
-	struct cvmx_ipd_prc_hold_ptr_fifo_ctl_s cn66xx;
1505
-	struct cvmx_ipd_prc_hold_ptr_fifo_ctl_s cnf71xx;
1506
1174
 };
1507
1175
 
1508
1176
 union cvmx_ipd_prc_port_ptr_fifo_ctl {
..
..
@@ -1522,21 +1190,6 @@
1522
1190
 		uint64_t reserved_44_63:20;
1523
1191
 #endif
1524
1192
 	} s;
1525
-	struct cvmx_ipd_prc_port_ptr_fifo_ctl_s cn30xx;
1526
-	struct cvmx_ipd_prc_port_ptr_fifo_ctl_s cn31xx;
1527
-	struct cvmx_ipd_prc_port_ptr_fifo_ctl_s cn38xx;
1528
-	struct cvmx_ipd_prc_port_ptr_fifo_ctl_s cn50xx;
1529
-	struct cvmx_ipd_prc_port_ptr_fifo_ctl_s cn52xx;
1530
-	struct cvmx_ipd_prc_port_ptr_fifo_ctl_s cn52xxp1;
1531
-	struct cvmx_ipd_prc_port_ptr_fifo_ctl_s cn56xx;
1532
-	struct cvmx_ipd_prc_port_ptr_fifo_ctl_s cn56xxp1;
1533
-	struct cvmx_ipd_prc_port_ptr_fifo_ctl_s cn58xx;
1534
-	struct cvmx_ipd_prc_port_ptr_fifo_ctl_s cn58xxp1;
1535
-	struct cvmx_ipd_prc_port_ptr_fifo_ctl_s cn61xx;
1536
-	struct cvmx_ipd_prc_port_ptr_fifo_ctl_s cn63xx;
1537
-	struct cvmx_ipd_prc_port_ptr_fifo_ctl_s cn63xxp1;
1538
-	struct cvmx_ipd_prc_port_ptr_fifo_ctl_s cn66xx;
1539
-	struct cvmx_ipd_prc_port_ptr_fifo_ctl_s cnf71xx;
1540
1193
 };
1541
1194
 
1542
1195
 union cvmx_ipd_ptr_count {
..
..
@@ -1558,24 +1211,6 @@
1558
1211
 		uint64_t reserved_19_63:45;
1559
1212
 #endif
1560
1213
 	} s;
1561
-	struct cvmx_ipd_ptr_count_s cn30xx;
1562
-	struct cvmx_ipd_ptr_count_s cn31xx;
1563
-	struct cvmx_ipd_ptr_count_s cn38xx;
1564
-	struct cvmx_ipd_ptr_count_s cn38xxp2;
1565
-	struct cvmx_ipd_ptr_count_s cn50xx;
1566
-	struct cvmx_ipd_ptr_count_s cn52xx;
1567
-	struct cvmx_ipd_ptr_count_s cn52xxp1;
1568
-	struct cvmx_ipd_ptr_count_s cn56xx;
1569
-	struct cvmx_ipd_ptr_count_s cn56xxp1;
1570
-	struct cvmx_ipd_ptr_count_s cn58xx;
1571
-	struct cvmx_ipd_ptr_count_s cn58xxp1;
1572
-	struct cvmx_ipd_ptr_count_s cn61xx;
1573
-	struct cvmx_ipd_ptr_count_s cn63xx;
1574
-	struct cvmx_ipd_ptr_count_s cn63xxp1;
1575
-	struct cvmx_ipd_ptr_count_s cn66xx;
1576
-	struct cvmx_ipd_ptr_count_s cn68xx;
1577
-	struct cvmx_ipd_ptr_count_s cn68xxp1;
1578
-	struct cvmx_ipd_ptr_count_s cnf71xx;
1579
1214
 };
1580
1215
 
1581
1216
 union cvmx_ipd_pwp_ptr_fifo_ctl {
..
..
@@ -1599,21 +1234,6 @@
1599
1234
 		uint64_t reserved_61_63:3;
1600
1235
 #endif
1601
1236
 	} s;
1602
-	struct cvmx_ipd_pwp_ptr_fifo_ctl_s cn30xx;
1603
-	struct cvmx_ipd_pwp_ptr_fifo_ctl_s cn31xx;
1604
-	struct cvmx_ipd_pwp_ptr_fifo_ctl_s cn38xx;
1605
-	struct cvmx_ipd_pwp_ptr_fifo_ctl_s cn50xx;
1606
-	struct cvmx_ipd_pwp_ptr_fifo_ctl_s cn52xx;
1607
-	struct cvmx_ipd_pwp_ptr_fifo_ctl_s cn52xxp1;
1608
-	struct cvmx_ipd_pwp_ptr_fifo_ctl_s cn56xx;
1609
-	struct cvmx_ipd_pwp_ptr_fifo_ctl_s cn56xxp1;
1610
-	struct cvmx_ipd_pwp_ptr_fifo_ctl_s cn58xx;
1611
-	struct cvmx_ipd_pwp_ptr_fifo_ctl_s cn58xxp1;
1612
-	struct cvmx_ipd_pwp_ptr_fifo_ctl_s cn61xx;
1613
-	struct cvmx_ipd_pwp_ptr_fifo_ctl_s cn63xx;
1614
-	struct cvmx_ipd_pwp_ptr_fifo_ctl_s cn63xxp1;
1615
-	struct cvmx_ipd_pwp_ptr_fifo_ctl_s cn66xx;
1616
-	struct cvmx_ipd_pwp_ptr_fifo_ctl_s cnf71xx;
1617
1237
 };
1618
1238
 
1619
1239
 union cvmx_ipd_qosx_red_marks {
..
..
@@ -1627,24 +1247,6 @@
1627
1247
 		uint64_t drop:32;
1628
1248
 #endif
1629
1249
 	} s;
1630
-	struct cvmx_ipd_qosx_red_marks_s cn30xx;
1631
-	struct cvmx_ipd_qosx_red_marks_s cn31xx;
1632
-	struct cvmx_ipd_qosx_red_marks_s cn38xx;
1633
-	struct cvmx_ipd_qosx_red_marks_s cn38xxp2;
1634
-	struct cvmx_ipd_qosx_red_marks_s cn50xx;
1635
-	struct cvmx_ipd_qosx_red_marks_s cn52xx;
1636
-	struct cvmx_ipd_qosx_red_marks_s cn52xxp1;
1637
-	struct cvmx_ipd_qosx_red_marks_s cn56xx;
1638
-	struct cvmx_ipd_qosx_red_marks_s cn56xxp1;
1639
-	struct cvmx_ipd_qosx_red_marks_s cn58xx;
1640
-	struct cvmx_ipd_qosx_red_marks_s cn58xxp1;
1641
-	struct cvmx_ipd_qosx_red_marks_s cn61xx;
1642
-	struct cvmx_ipd_qosx_red_marks_s cn63xx;
1643
-	struct cvmx_ipd_qosx_red_marks_s cn63xxp1;
1644
-	struct cvmx_ipd_qosx_red_marks_s cn66xx;
1645
-	struct cvmx_ipd_qosx_red_marks_s cn68xx;
1646
-	struct cvmx_ipd_qosx_red_marks_s cn68xxp1;
1647
-	struct cvmx_ipd_qosx_red_marks_s cnf71xx;
1648
1250
 };
1649
1251
 
1650
1252
 union cvmx_ipd_que0_free_page_cnt {
..
..
@@ -1658,24 +1260,6 @@
1658
1260
 		uint64_t reserved_32_63:32;
1659
1261
 #endif
1660
1262
 	} s;
1661
-	struct cvmx_ipd_que0_free_page_cnt_s cn30xx;
1662
-	struct cvmx_ipd_que0_free_page_cnt_s cn31xx;
1663
-	struct cvmx_ipd_que0_free_page_cnt_s cn38xx;
1664
-	struct cvmx_ipd_que0_free_page_cnt_s cn38xxp2;
1665
-	struct cvmx_ipd_que0_free_page_cnt_s cn50xx;
1666
-	struct cvmx_ipd_que0_free_page_cnt_s cn52xx;
1667
-	struct cvmx_ipd_que0_free_page_cnt_s cn52xxp1;
1668
-	struct cvmx_ipd_que0_free_page_cnt_s cn56xx;
1669
-	struct cvmx_ipd_que0_free_page_cnt_s cn56xxp1;
1670
-	struct cvmx_ipd_que0_free_page_cnt_s cn58xx;
1671
-	struct cvmx_ipd_que0_free_page_cnt_s cn58xxp1;
1672
-	struct cvmx_ipd_que0_free_page_cnt_s cn61xx;
1673
-	struct cvmx_ipd_que0_free_page_cnt_s cn63xx;
1674
-	struct cvmx_ipd_que0_free_page_cnt_s cn63xxp1;
1675
-	struct cvmx_ipd_que0_free_page_cnt_s cn66xx;
1676
-	struct cvmx_ipd_que0_free_page_cnt_s cn68xx;
1677
-	struct cvmx_ipd_que0_free_page_cnt_s cn68xxp1;
1678
-	struct cvmx_ipd_que0_free_page_cnt_s cnf71xx;
1679
1263
 };
1680
1264
 
1681
1265
 union cvmx_ipd_red_bpid_enablex {
..
..
@@ -1687,8 +1271,6 @@
1687
1271
 		uint64_t prt_enb:64;
1688
1272
 #endif
1689
1273
 	} s;
1690
-	struct cvmx_ipd_red_bpid_enablex_s cn68xx;
1691
-	struct cvmx_ipd_red_bpid_enablex_s cn68xxp1;
1692
1274
 };
1693
1275
 
1694
1276
 union cvmx_ipd_red_delay {
..
..
@@ -1704,8 +1286,6 @@
1704
1286
 		uint64_t reserved_28_63:36;
1705
1287
 #endif
1706
1288
 	} s;
1707
-	struct cvmx_ipd_red_delay_s cn68xx;
1708
-	struct cvmx_ipd_red_delay_s cn68xxp1;
1709
1289
 };
1710
1290
 
1711
1291
 union cvmx_ipd_red_port_enable {
..
..
@@ -1721,22 +1301,6 @@
1721
1301
 		uint64_t prb_dly:14;
1722
1302
 #endif
1723
1303
 	} s;
1724
-	struct cvmx_ipd_red_port_enable_s cn30xx;
1725
-	struct cvmx_ipd_red_port_enable_s cn31xx;
1726
-	struct cvmx_ipd_red_port_enable_s cn38xx;
1727
-	struct cvmx_ipd_red_port_enable_s cn38xxp2;
1728
-	struct cvmx_ipd_red_port_enable_s cn50xx;
1729
-	struct cvmx_ipd_red_port_enable_s cn52xx;
1730
-	struct cvmx_ipd_red_port_enable_s cn52xxp1;
1731
-	struct cvmx_ipd_red_port_enable_s cn56xx;
1732
-	struct cvmx_ipd_red_port_enable_s cn56xxp1;
1733
-	struct cvmx_ipd_red_port_enable_s cn58xx;
1734
-	struct cvmx_ipd_red_port_enable_s cn58xxp1;
1735
-	struct cvmx_ipd_red_port_enable_s cn61xx;
1736
-	struct cvmx_ipd_red_port_enable_s cn63xx;
1737
-	struct cvmx_ipd_red_port_enable_s cn63xxp1;
1738
-	struct cvmx_ipd_red_port_enable_s cn66xx;
1739
-	struct cvmx_ipd_red_port_enable_s cnf71xx;
1740
1304
 };
1741
1305
 
1742
1306
 union cvmx_ipd_red_port_enable2 {
..
..
@@ -1759,10 +1323,6 @@
1759
1323
 		uint64_t reserved_4_63:60;
1760
1324
 #endif
1761
1325
 	} cn52xx;
1762
-	struct cvmx_ipd_red_port_enable2_cn52xx cn52xxp1;
1763
-	struct cvmx_ipd_red_port_enable2_cn52xx cn56xx;
1764
-	struct cvmx_ipd_red_port_enable2_cn52xx cn56xxp1;
1765
-	struct cvmx_ipd_red_port_enable2_s cn61xx;
1766
1326
 	struct cvmx_ipd_red_port_enable2_cn63xx {
1767
1327
 #ifdef __BIG_ENDIAN_BITFIELD
1768
1328
 		uint64_t reserved_8_63:56;
..
..
@@ -1772,9 +1332,6 @@
1772
1332
 		uint64_t reserved_8_63:56;
1773
1333
 #endif
1774
1334
 	} cn63xx;
1775
-	struct cvmx_ipd_red_port_enable2_cn63xx cn63xxp1;
1776
-	struct cvmx_ipd_red_port_enable2_s cn66xx;
1777
-	struct cvmx_ipd_red_port_enable2_s cnf71xx;
1778
1335
 };
1779
1336
 
1780
1337
 union cvmx_ipd_red_quex_param {
..
..
@@ -1794,24 +1351,6 @@
1794
1351
 		uint64_t reserved_49_63:15;
1795
1352
 #endif
1796
1353
 	} s;
1797
-	struct cvmx_ipd_red_quex_param_s cn30xx;
1798
-	struct cvmx_ipd_red_quex_param_s cn31xx;
1799
-	struct cvmx_ipd_red_quex_param_s cn38xx;
1800
-	struct cvmx_ipd_red_quex_param_s cn38xxp2;
1801
-	struct cvmx_ipd_red_quex_param_s cn50xx;
1802
-	struct cvmx_ipd_red_quex_param_s cn52xx;
1803
-	struct cvmx_ipd_red_quex_param_s cn52xxp1;
1804
-	struct cvmx_ipd_red_quex_param_s cn56xx;
1805
-	struct cvmx_ipd_red_quex_param_s cn56xxp1;
1806
-	struct cvmx_ipd_red_quex_param_s cn58xx;
1807
-	struct cvmx_ipd_red_quex_param_s cn58xxp1;
1808
-	struct cvmx_ipd_red_quex_param_s cn61xx;
1809
-	struct cvmx_ipd_red_quex_param_s cn63xx;
1810
-	struct cvmx_ipd_red_quex_param_s cn63xxp1;
1811
-	struct cvmx_ipd_red_quex_param_s cn66xx;
1812
-	struct cvmx_ipd_red_quex_param_s cn68xx;
1813
-	struct cvmx_ipd_red_quex_param_s cn68xxp1;
1814
-	struct cvmx_ipd_red_quex_param_s cnf71xx;
1815
1354
 };
1816
1355
 
1817
1356
 union cvmx_ipd_req_wgt {
..
..
@@ -1837,7 +1376,6 @@
1837
1376
 		uint64_t wgt7:8;
1838
1377
 #endif
1839
1378
 	} s;
1840
-	struct cvmx_ipd_req_wgt_s cn68xx;
1841
1379
 };
1842
1380
 
1843
1381
 union cvmx_ipd_sub_port_bp_page_cnt {
..
..
@@ -1853,24 +1391,6 @@
1853
1391
 		uint64_t reserved_31_63:33;
1854
1392
 #endif
1855
1393
 	} s;
1856
-	struct cvmx_ipd_sub_port_bp_page_cnt_s cn30xx;
1857
-	struct cvmx_ipd_sub_port_bp_page_cnt_s cn31xx;
1858
-	struct cvmx_ipd_sub_port_bp_page_cnt_s cn38xx;
1859
-	struct cvmx_ipd_sub_port_bp_page_cnt_s cn38xxp2;
1860
-	struct cvmx_ipd_sub_port_bp_page_cnt_s cn50xx;
1861
-	struct cvmx_ipd_sub_port_bp_page_cnt_s cn52xx;
1862
-	struct cvmx_ipd_sub_port_bp_page_cnt_s cn52xxp1;
1863
-	struct cvmx_ipd_sub_port_bp_page_cnt_s cn56xx;
1864
-	struct cvmx_ipd_sub_port_bp_page_cnt_s cn56xxp1;
1865
-	struct cvmx_ipd_sub_port_bp_page_cnt_s cn58xx;
1866
-	struct cvmx_ipd_sub_port_bp_page_cnt_s cn58xxp1;
1867
-	struct cvmx_ipd_sub_port_bp_page_cnt_s cn61xx;
1868
-	struct cvmx_ipd_sub_port_bp_page_cnt_s cn63xx;
1869
-	struct cvmx_ipd_sub_port_bp_page_cnt_s cn63xxp1;
1870
-	struct cvmx_ipd_sub_port_bp_page_cnt_s cn66xx;
1871
-	struct cvmx_ipd_sub_port_bp_page_cnt_s cn68xx;
1872
-	struct cvmx_ipd_sub_port_bp_page_cnt_s cn68xxp1;
1873
-	struct cvmx_ipd_sub_port_bp_page_cnt_s cnf71xx;
1874
1394
 };
1875
1395
 
1876
1396
 union cvmx_ipd_sub_port_fcs {
..
..
@@ -1897,7 +1417,6 @@
1897
1417
 		uint64_t reserved_3_63:61;
1898
1418
 #endif
1899
1419
 	} cn30xx;
1900
-	struct cvmx_ipd_sub_port_fcs_cn30xx cn31xx;
1901
1420
 	struct cvmx_ipd_sub_port_fcs_cn38xx {
1902
1421
 #ifdef __BIG_ENDIAN_BITFIELD
1903
1422
 		uint64_t reserved_32_63:32;
..
..
@@ -1907,19 +1426,6 @@
1907
1426
 		uint64_t reserved_32_63:32;
1908
1427
 #endif
1909
1428
 	} cn38xx;
1910
-	struct cvmx_ipd_sub_port_fcs_cn38xx cn38xxp2;
1911
-	struct cvmx_ipd_sub_port_fcs_cn30xx cn50xx;
1912
-	struct cvmx_ipd_sub_port_fcs_s cn52xx;
1913
-	struct cvmx_ipd_sub_port_fcs_s cn52xxp1;
1914
-	struct cvmx_ipd_sub_port_fcs_s cn56xx;
1915
-	struct cvmx_ipd_sub_port_fcs_s cn56xxp1;
1916
-	struct cvmx_ipd_sub_port_fcs_cn38xx cn58xx;
1917
-	struct cvmx_ipd_sub_port_fcs_cn38xx cn58xxp1;
1918
-	struct cvmx_ipd_sub_port_fcs_s cn61xx;
1919
-	struct cvmx_ipd_sub_port_fcs_s cn63xx;
1920
-	struct cvmx_ipd_sub_port_fcs_s cn63xxp1;
1921
-	struct cvmx_ipd_sub_port_fcs_s cn66xx;
1922
-	struct cvmx_ipd_sub_port_fcs_s cnf71xx;
1923
1429
 };
1924
1430
 
1925
1431
 union cvmx_ipd_sub_port_qos_cnt {
..
..
@@ -1935,17 +1441,6 @@
1935
1441
 		uint64_t reserved_41_63:23;
1936
1442
 #endif
1937
1443
 	} s;
1938
-	struct cvmx_ipd_sub_port_qos_cnt_s cn52xx;
1939
-	struct cvmx_ipd_sub_port_qos_cnt_s cn52xxp1;
1940
-	struct cvmx_ipd_sub_port_qos_cnt_s cn56xx;
1941
-	struct cvmx_ipd_sub_port_qos_cnt_s cn56xxp1;
1942
-	struct cvmx_ipd_sub_port_qos_cnt_s cn61xx;
1943
-	struct cvmx_ipd_sub_port_qos_cnt_s cn63xx;
1944
-	struct cvmx_ipd_sub_port_qos_cnt_s cn63xxp1;
1945
-	struct cvmx_ipd_sub_port_qos_cnt_s cn66xx;
1946
-	struct cvmx_ipd_sub_port_qos_cnt_s cn68xx;
1947
-	struct cvmx_ipd_sub_port_qos_cnt_s cn68xxp1;
1948
-	struct cvmx_ipd_sub_port_qos_cnt_s cnf71xx;
1949
1444
 };
1950
1445
 
1951
1446
 union cvmx_ipd_wqe_fpa_queue {
..
..
@@ -1959,24 +1454,6 @@
1959
1454
 		uint64_t reserved_3_63:61;
1960
1455
 #endif
1961
1456
 	} s;
1962
-	struct cvmx_ipd_wqe_fpa_queue_s cn30xx;
1963
-	struct cvmx_ipd_wqe_fpa_queue_s cn31xx;
1964
-	struct cvmx_ipd_wqe_fpa_queue_s cn38xx;
1965
-	struct cvmx_ipd_wqe_fpa_queue_s cn38xxp2;
1966
-	struct cvmx_ipd_wqe_fpa_queue_s cn50xx;
1967
-	struct cvmx_ipd_wqe_fpa_queue_s cn52xx;
1968
-	struct cvmx_ipd_wqe_fpa_queue_s cn52xxp1;
1969
-	struct cvmx_ipd_wqe_fpa_queue_s cn56xx;
1970
-	struct cvmx_ipd_wqe_fpa_queue_s cn56xxp1;
1971
-	struct cvmx_ipd_wqe_fpa_queue_s cn58xx;
1972
-	struct cvmx_ipd_wqe_fpa_queue_s cn58xxp1;
1973
-	struct cvmx_ipd_wqe_fpa_queue_s cn61xx;
1974
-	struct cvmx_ipd_wqe_fpa_queue_s cn63xx;
1975
-	struct cvmx_ipd_wqe_fpa_queue_s cn63xxp1;
1976
-	struct cvmx_ipd_wqe_fpa_queue_s cn66xx;
1977
-	struct cvmx_ipd_wqe_fpa_queue_s cn68xx;
1978
-	struct cvmx_ipd_wqe_fpa_queue_s cn68xxp1;
1979
-	struct cvmx_ipd_wqe_fpa_queue_s cnf71xx;
1980
1457
 };
1981
1458
 
1982
1459
 union cvmx_ipd_wqe_ptr_valid {
..
..
@@ -1990,21 +1467,6 @@
1990
1467
 		uint64_t reserved_29_63:35;
1991
1468
 #endif
1992
1469
 	} s;
1993
-	struct cvmx_ipd_wqe_ptr_valid_s cn30xx;
1994
-	struct cvmx_ipd_wqe_ptr_valid_s cn31xx;
1995
-	struct cvmx_ipd_wqe_ptr_valid_s cn38xx;
1996
-	struct cvmx_ipd_wqe_ptr_valid_s cn50xx;
1997
-	struct cvmx_ipd_wqe_ptr_valid_s cn52xx;
1998
-	struct cvmx_ipd_wqe_ptr_valid_s cn52xxp1;
1999
-	struct cvmx_ipd_wqe_ptr_valid_s cn56xx;
2000
-	struct cvmx_ipd_wqe_ptr_valid_s cn56xxp1;
2001
-	struct cvmx_ipd_wqe_ptr_valid_s cn58xx;
2002
-	struct cvmx_ipd_wqe_ptr_valid_s cn58xxp1;
2003
-	struct cvmx_ipd_wqe_ptr_valid_s cn61xx;
2004
-	struct cvmx_ipd_wqe_ptr_valid_s cn63xx;
2005
-	struct cvmx_ipd_wqe_ptr_valid_s cn63xxp1;
2006
-	struct cvmx_ipd_wqe_ptr_valid_s cn66xx;
2007
-	struct cvmx_ipd_wqe_ptr_valid_s cnf71xx;
2008
1470
 };
2009
1471
 
2010
1472
 #endif