change wifi driver to cypress

hc

2024-01-05 071106ecf68c401173c58808b1cf5f68cc50d390

 kernel/arch/mips/include/asm/octeon/cvmx-pip-defs.h
..
..
@@ -160,10 +160,6 @@
160
160
 		uint64_t reserved_57_63:7;
161
161
 #endif
162
162
 	} s;
163
-	struct cvmx_pip_alt_skip_cfgx_s cn61xx;
164
-	struct cvmx_pip_alt_skip_cfgx_s cn66xx;
165
-	struct cvmx_pip_alt_skip_cfgx_s cn68xx;
166
-	struct cvmx_pip_alt_skip_cfgx_s cnf71xx;
167
163
 };
168
164
 
169
165
 union cvmx_pip_bck_prs {
..
..
@@ -183,19 +179,6 @@
183
179
 		uint64_t bckprs:1;
184
180
 #endif
185
181
 	} s;
186
-	struct cvmx_pip_bck_prs_s cn38xx;
187
-	struct cvmx_pip_bck_prs_s cn38xxp2;
188
-	struct cvmx_pip_bck_prs_s cn56xx;
189
-	struct cvmx_pip_bck_prs_s cn56xxp1;
190
-	struct cvmx_pip_bck_prs_s cn58xx;
191
-	struct cvmx_pip_bck_prs_s cn58xxp1;
192
-	struct cvmx_pip_bck_prs_s cn61xx;
193
-	struct cvmx_pip_bck_prs_s cn63xx;
194
-	struct cvmx_pip_bck_prs_s cn63xxp1;
195
-	struct cvmx_pip_bck_prs_s cn66xx;
196
-	struct cvmx_pip_bck_prs_s cn68xx;
197
-	struct cvmx_pip_bck_prs_s cn68xxp1;
198
-	struct cvmx_pip_bck_prs_s cnf71xx;
199
182
 };
200
183
 
201
184
 union cvmx_pip_bist_status {
..
..
@@ -218,9 +201,6 @@
218
201
 		uint64_t reserved_18_63:46;
219
202
 #endif
220
203
 	} cn30xx;
221
-	struct cvmx_pip_bist_status_cn30xx cn31xx;
222
-	struct cvmx_pip_bist_status_cn30xx cn38xx;
223
-	struct cvmx_pip_bist_status_cn30xx cn38xxp2;
224
204
 	struct cvmx_pip_bist_status_cn50xx {
225
205
 #ifdef __BIG_ENDIAN_BITFIELD
226
206
 		uint64_t reserved_17_63:47;
..
..
@@ -230,12 +210,6 @@
230
210
 		uint64_t reserved_17_63:47;
231
211
 #endif
232
212
 	} cn50xx;
233
-	struct cvmx_pip_bist_status_cn30xx cn52xx;
234
-	struct cvmx_pip_bist_status_cn30xx cn52xxp1;
235
-	struct cvmx_pip_bist_status_cn30xx cn56xx;
236
-	struct cvmx_pip_bist_status_cn30xx cn56xxp1;
237
-	struct cvmx_pip_bist_status_cn30xx cn58xx;
238
-	struct cvmx_pip_bist_status_cn30xx cn58xxp1;
239
213
 	struct cvmx_pip_bist_status_cn61xx {
240
214
 #ifdef __BIG_ENDIAN_BITFIELD
241
215
 		uint64_t reserved_20_63:44;
..
..
@@ -245,12 +219,6 @@
245
219
 		uint64_t reserved_20_63:44;
246
220
 #endif
247
221
 	} cn61xx;
248
-	struct cvmx_pip_bist_status_cn30xx cn63xx;
249
-	struct cvmx_pip_bist_status_cn30xx cn63xxp1;
250
-	struct cvmx_pip_bist_status_cn61xx cn66xx;
251
-	struct cvmx_pip_bist_status_s cn68xx;
252
-	struct cvmx_pip_bist_status_cn61xx cn68xxp1;
253
-	struct cvmx_pip_bist_status_cn61xx cnf71xx;
254
222
 };
255
223
 
256
224
 union cvmx_pip_bsel_ext_cfgx {
..
..
@@ -274,9 +242,6 @@
274
242
 		uint64_t reserved_56_63:8;
275
243
 #endif
276
244
 	} s;
277
-	struct cvmx_pip_bsel_ext_cfgx_s cn61xx;
278
-	struct cvmx_pip_bsel_ext_cfgx_s cn68xx;
279
-	struct cvmx_pip_bsel_ext_cfgx_s cnf71xx;
280
245
 };
281
246
 
282
247
 union cvmx_pip_bsel_ext_posx {
..
..
@@ -318,9 +283,6 @@
318
283
 		uint64_t pos7_val:1;
319
284
 #endif
320
285
 	} s;
321
-	struct cvmx_pip_bsel_ext_posx_s cn61xx;
322
-	struct cvmx_pip_bsel_ext_posx_s cn68xx;
323
-	struct cvmx_pip_bsel_ext_posx_s cnf71xx;
324
286
 };
325
287
 
326
288
 union cvmx_pip_bsel_tbl_entx {
..
..
@@ -383,8 +345,6 @@
383
345
 		uint64_t tag_en:1;
384
346
 #endif
385
347
 	} cn61xx;
386
-	struct cvmx_pip_bsel_tbl_entx_s cn68xx;
387
-	struct cvmx_pip_bsel_tbl_entx_cn61xx cnf71xx;
388
348
 };
389
349
 
390
350
 union cvmx_pip_clken {
..
..
@@ -398,13 +358,6 @@
398
358
 		uint64_t reserved_1_63:63;
399
359
 #endif
400
360
 	} s;
401
-	struct cvmx_pip_clken_s cn61xx;
402
-	struct cvmx_pip_clken_s cn63xx;
403
-	struct cvmx_pip_clken_s cn63xxp1;
404
-	struct cvmx_pip_clken_s cn66xx;
405
-	struct cvmx_pip_clken_s cn68xx;
406
-	struct cvmx_pip_clken_s cn68xxp1;
407
-	struct cvmx_pip_clken_s cnf71xx;
408
361
 };
409
362
 
410
363
 union cvmx_pip_crc_ctlx {
..
..
@@ -420,10 +373,6 @@
420
373
 		uint64_t reserved_2_63:62;
421
374
 #endif
422
375
 	} s;
423
-	struct cvmx_pip_crc_ctlx_s cn38xx;
424
-	struct cvmx_pip_crc_ctlx_s cn38xxp2;
425
-	struct cvmx_pip_crc_ctlx_s cn58xx;
426
-	struct cvmx_pip_crc_ctlx_s cn58xxp1;
427
376
 };
428
377
 
429
378
 union cvmx_pip_crc_ivx {
..
..
@@ -437,10 +386,6 @@
437
386
 		uint64_t reserved_32_63:32;
438
387
 #endif
439
388
 	} s;
440
-	struct cvmx_pip_crc_ivx_s cn38xx;
441
-	struct cvmx_pip_crc_ivx_s cn38xxp2;
442
-	struct cvmx_pip_crc_ivx_s cn58xx;
443
-	struct cvmx_pip_crc_ivx_s cn58xxp1;
444
389
 };
445
390
 
446
391
 union cvmx_pip_dec_ipsecx {
..
..
@@ -458,24 +403,6 @@
458
403
 		uint64_t reserved_18_63:46;
459
404
 #endif
460
405
 	} s;
461
-	struct cvmx_pip_dec_ipsecx_s cn30xx;
462
-	struct cvmx_pip_dec_ipsecx_s cn31xx;
463
-	struct cvmx_pip_dec_ipsecx_s cn38xx;
464
-	struct cvmx_pip_dec_ipsecx_s cn38xxp2;
465
-	struct cvmx_pip_dec_ipsecx_s cn50xx;
466
-	struct cvmx_pip_dec_ipsecx_s cn52xx;
467
-	struct cvmx_pip_dec_ipsecx_s cn52xxp1;
468
-	struct cvmx_pip_dec_ipsecx_s cn56xx;
469
-	struct cvmx_pip_dec_ipsecx_s cn56xxp1;
470
-	struct cvmx_pip_dec_ipsecx_s cn58xx;
471
-	struct cvmx_pip_dec_ipsecx_s cn58xxp1;
472
-	struct cvmx_pip_dec_ipsecx_s cn61xx;
473
-	struct cvmx_pip_dec_ipsecx_s cn63xx;
474
-	struct cvmx_pip_dec_ipsecx_s cn63xxp1;
475
-	struct cvmx_pip_dec_ipsecx_s cn66xx;
476
-	struct cvmx_pip_dec_ipsecx_s cn68xx;
477
-	struct cvmx_pip_dec_ipsecx_s cn68xxp1;
478
-	struct cvmx_pip_dec_ipsecx_s cnf71xx;
479
406
 };
480
407
 
481
408
 union cvmx_pip_dsa_src_grp {
..
..
@@ -517,16 +444,6 @@
517
444
 		uint64_t map15:4;
518
445
 #endif
519
446
 	} s;
520
-	struct cvmx_pip_dsa_src_grp_s cn52xx;
521
-	struct cvmx_pip_dsa_src_grp_s cn52xxp1;
522
-	struct cvmx_pip_dsa_src_grp_s cn56xx;
523
-	struct cvmx_pip_dsa_src_grp_s cn61xx;
524
-	struct cvmx_pip_dsa_src_grp_s cn63xx;
525
-	struct cvmx_pip_dsa_src_grp_s cn63xxp1;
526
-	struct cvmx_pip_dsa_src_grp_s cn66xx;
527
-	struct cvmx_pip_dsa_src_grp_s cn68xx;
528
-	struct cvmx_pip_dsa_src_grp_s cn68xxp1;
529
-	struct cvmx_pip_dsa_src_grp_s cnf71xx;
530
447
 };
531
448
 
532
449
 union cvmx_pip_dsa_vid_grp {
..
..
@@ -568,16 +485,6 @@
568
485
 		uint64_t map15:4;
569
486
 #endif
570
487
 	} s;
571
-	struct cvmx_pip_dsa_vid_grp_s cn52xx;
572
-	struct cvmx_pip_dsa_vid_grp_s cn52xxp1;
573
-	struct cvmx_pip_dsa_vid_grp_s cn56xx;
574
-	struct cvmx_pip_dsa_vid_grp_s cn61xx;
575
-	struct cvmx_pip_dsa_vid_grp_s cn63xx;
576
-	struct cvmx_pip_dsa_vid_grp_s cn63xxp1;
577
-	struct cvmx_pip_dsa_vid_grp_s cn66xx;
578
-	struct cvmx_pip_dsa_vid_grp_s cn68xx;
579
-	struct cvmx_pip_dsa_vid_grp_s cn68xxp1;
580
-	struct cvmx_pip_dsa_vid_grp_s cnf71xx;
581
488
 };
582
489
 
583
490
 union cvmx_pip_frm_len_chkx {
..
..
@@ -593,18 +500,6 @@
593
500
 		uint64_t reserved_32_63:32;
594
501
 #endif
595
502
 	} s;
596
-	struct cvmx_pip_frm_len_chkx_s cn50xx;
597
-	struct cvmx_pip_frm_len_chkx_s cn52xx;
598
-	struct cvmx_pip_frm_len_chkx_s cn52xxp1;
599
-	struct cvmx_pip_frm_len_chkx_s cn56xx;
600
-	struct cvmx_pip_frm_len_chkx_s cn56xxp1;
601
-	struct cvmx_pip_frm_len_chkx_s cn61xx;
602
-	struct cvmx_pip_frm_len_chkx_s cn63xx;
603
-	struct cvmx_pip_frm_len_chkx_s cn63xxp1;
604
-	struct cvmx_pip_frm_len_chkx_s cn66xx;
605
-	struct cvmx_pip_frm_len_chkx_s cn68xx;
606
-	struct cvmx_pip_frm_len_chkx_s cn68xxp1;
607
-	struct cvmx_pip_frm_len_chkx_s cnf71xx;
608
503
 };
609
504
 
610
505
 union cvmx_pip_gbl_cfg {
..
..
@@ -630,24 +525,6 @@
630
525
 		uint64_t reserved_19_63:45;
631
526
 #endif
632
527
 	} s;
633
-	struct cvmx_pip_gbl_cfg_s cn30xx;
634
-	struct cvmx_pip_gbl_cfg_s cn31xx;
635
-	struct cvmx_pip_gbl_cfg_s cn38xx;
636
-	struct cvmx_pip_gbl_cfg_s cn38xxp2;
637
-	struct cvmx_pip_gbl_cfg_s cn50xx;
638
-	struct cvmx_pip_gbl_cfg_s cn52xx;
639
-	struct cvmx_pip_gbl_cfg_s cn52xxp1;
640
-	struct cvmx_pip_gbl_cfg_s cn56xx;
641
-	struct cvmx_pip_gbl_cfg_s cn56xxp1;
642
-	struct cvmx_pip_gbl_cfg_s cn58xx;
643
-	struct cvmx_pip_gbl_cfg_s cn58xxp1;
644
-	struct cvmx_pip_gbl_cfg_s cn61xx;
645
-	struct cvmx_pip_gbl_cfg_s cn63xx;
646
-	struct cvmx_pip_gbl_cfg_s cn63xxp1;
647
-	struct cvmx_pip_gbl_cfg_s cn66xx;
648
-	struct cvmx_pip_gbl_cfg_s cn68xx;
649
-	struct cvmx_pip_gbl_cfg_s cn68xxp1;
650
-	struct cvmx_pip_gbl_cfg_s cnf71xx;
651
528
 };
652
529
 
653
530
 union cvmx_pip_gbl_ctl {
..
..
@@ -742,10 +619,6 @@
742
619
 		uint64_t reserved_17_63:47;
743
620
 #endif
744
621
 	} cn30xx;
745
-	struct cvmx_pip_gbl_ctl_cn30xx cn31xx;
746
-	struct cvmx_pip_gbl_ctl_cn30xx cn38xx;
747
-	struct cvmx_pip_gbl_ctl_cn30xx cn38xxp2;
748
-	struct cvmx_pip_gbl_ctl_cn30xx cn50xx;
749
622
 	struct cvmx_pip_gbl_ctl_cn52xx {
750
623
 #ifdef __BIG_ENDIAN_BITFIELD
751
624
 		uint64_t reserved_27_63:37;
..
..
@@ -795,8 +668,6 @@
795
668
 		uint64_t reserved_27_63:37;
796
669
 #endif
797
670
 	} cn52xx;
798
-	struct cvmx_pip_gbl_ctl_cn52xx cn52xxp1;
799
-	struct cvmx_pip_gbl_ctl_cn52xx cn56xx;
800
671
 	struct cvmx_pip_gbl_ctl_cn56xxp1 {
801
672
 #ifdef __BIG_ENDIAN_BITFIELD
802
673
 		uint64_t reserved_21_63:43;
..
..
@@ -838,8 +709,6 @@
838
709
 		uint64_t reserved_21_63:43;
839
710
 #endif
840
711
 	} cn56xxp1;
841
-	struct cvmx_pip_gbl_ctl_cn30xx cn58xx;
842
-	struct cvmx_pip_gbl_ctl_cn30xx cn58xxp1;
843
712
 	struct cvmx_pip_gbl_ctl_cn61xx {
844
713
 #ifdef __BIG_ENDIAN_BITFIELD
845
714
 		uint64_t reserved_28_63:36;
..
..
@@ -891,9 +760,6 @@
891
760
 		uint64_t reserved_28_63:36;
892
761
 #endif
893
762
 	} cn61xx;
894
-	struct cvmx_pip_gbl_ctl_cn61xx cn63xx;
895
-	struct cvmx_pip_gbl_ctl_cn61xx cn63xxp1;
896
-	struct cvmx_pip_gbl_ctl_cn61xx cn66xx;
897
763
 	struct cvmx_pip_gbl_ctl_cn68xx {
898
764
 #ifdef __BIG_ENDIAN_BITFIELD
899
765
 		uint64_t reserved_29_63:35;
..
..
@@ -990,7 +856,6 @@
990
856
 		uint64_t reserved_28_63:36;
991
857
 #endif
992
858
 	} cn68xxp1;
993
-	struct cvmx_pip_gbl_ctl_cn61xx cnf71xx;
994
859
 };
995
860
 
996
861
 union cvmx_pip_hg_pri_qos {
..
..
@@ -1012,14 +877,6 @@
1012
877
 		uint64_t reserved_13_63:51;
1013
878
 #endif
1014
879
 	} s;
1015
-	struct cvmx_pip_hg_pri_qos_s cn52xx;
1016
-	struct cvmx_pip_hg_pri_qos_s cn52xxp1;
1017
-	struct cvmx_pip_hg_pri_qos_s cn56xx;
1018
-	struct cvmx_pip_hg_pri_qos_s cn61xx;
1019
-	struct cvmx_pip_hg_pri_qos_s cn63xx;
1020
-	struct cvmx_pip_hg_pri_qos_s cn63xxp1;
1021
-	struct cvmx_pip_hg_pri_qos_s cn66xx;
1022
-	struct cvmx_pip_hg_pri_qos_s cnf71xx;
1023
880
 };
1024
881
 
1025
882
 union cvmx_pip_int_en {
..
..
@@ -1082,9 +939,6 @@
1082
939
 		uint64_t reserved_9_63:55;
1083
940
 #endif
1084
941
 	} cn30xx;
1085
-	struct cvmx_pip_int_en_cn30xx cn31xx;
1086
-	struct cvmx_pip_int_en_cn30xx cn38xx;
1087
-	struct cvmx_pip_int_en_cn30xx cn38xxp2;
1088
942
 	struct cvmx_pip_int_en_cn50xx {
1089
943
 #ifdef __BIG_ENDIAN_BITFIELD
1090
944
 		uint64_t reserved_12_63:52;
..
..
@@ -1149,8 +1003,6 @@
1149
1003
 		uint64_t reserved_13_63:51;
1150
1004
 #endif
1151
1005
 	} cn52xx;
1152
-	struct cvmx_pip_int_en_cn52xx cn52xxp1;
1153
-	struct cvmx_pip_int_en_s cn56xx;
1154
1006
 	struct cvmx_pip_int_en_cn56xxp1 {
1155
1007
 #ifdef __BIG_ENDIAN_BITFIELD
1156
1008
 		uint64_t reserved_12_63:52;
..
..
@@ -1211,14 +1063,6 @@
1211
1063
 		uint64_t reserved_13_63:51;
1212
1064
 #endif
1213
1065
 	} cn58xx;
1214
-	struct cvmx_pip_int_en_cn30xx cn58xxp1;
1215
-	struct cvmx_pip_int_en_s cn61xx;
1216
-	struct cvmx_pip_int_en_s cn63xx;
1217
-	struct cvmx_pip_int_en_s cn63xxp1;
1218
-	struct cvmx_pip_int_en_s cn66xx;
1219
-	struct cvmx_pip_int_en_s cn68xx;
1220
-	struct cvmx_pip_int_en_s cn68xxp1;
1221
-	struct cvmx_pip_int_en_s cnf71xx;
1222
1066
 };
1223
1067
 
1224
1068
 union cvmx_pip_int_reg {
..
..
@@ -1281,9 +1125,6 @@
1281
1125
 		uint64_t reserved_9_63:55;
1282
1126
 #endif
1283
1127
 	} cn30xx;
1284
-	struct cvmx_pip_int_reg_cn30xx cn31xx;
1285
-	struct cvmx_pip_int_reg_cn30xx cn38xx;
1286
-	struct cvmx_pip_int_reg_cn30xx cn38xxp2;
1287
1128
 	struct cvmx_pip_int_reg_cn50xx {
1288
1129
 #ifdef __BIG_ENDIAN_BITFIELD
1289
1130
 		uint64_t reserved_12_63:52;
..
..
@@ -1348,8 +1189,6 @@
1348
1189
 		uint64_t reserved_13_63:51;
1349
1190
 #endif
1350
1191
 	} cn52xx;
1351
-	struct cvmx_pip_int_reg_cn52xx cn52xxp1;
1352
-	struct cvmx_pip_int_reg_s cn56xx;
1353
1192
 	struct cvmx_pip_int_reg_cn56xxp1 {
1354
1193
 #ifdef __BIG_ENDIAN_BITFIELD
1355
1194
 		uint64_t reserved_12_63:52;
..
..
@@ -1410,14 +1249,6 @@
1410
1249
 		uint64_t reserved_13_63:51;
1411
1250
 #endif
1412
1251
 	} cn58xx;
1413
-	struct cvmx_pip_int_reg_cn30xx cn58xxp1;
1414
-	struct cvmx_pip_int_reg_s cn61xx;
1415
-	struct cvmx_pip_int_reg_s cn63xx;
1416
-	struct cvmx_pip_int_reg_s cn63xxp1;
1417
-	struct cvmx_pip_int_reg_s cn66xx;
1418
-	struct cvmx_pip_int_reg_s cn68xx;
1419
-	struct cvmx_pip_int_reg_s cn68xxp1;
1420
-	struct cvmx_pip_int_reg_s cnf71xx;
1421
1252
 };
1422
1253
 
1423
1254
 union cvmx_pip_ip_offset {
..
..
@@ -1431,24 +1262,6 @@
1431
1262
 		uint64_t reserved_3_63:61;
1432
1263
 #endif
1433
1264
 	} s;
1434
-	struct cvmx_pip_ip_offset_s cn30xx;
1435
-	struct cvmx_pip_ip_offset_s cn31xx;
1436
-	struct cvmx_pip_ip_offset_s cn38xx;
1437
-	struct cvmx_pip_ip_offset_s cn38xxp2;
1438
-	struct cvmx_pip_ip_offset_s cn50xx;
1439
-	struct cvmx_pip_ip_offset_s cn52xx;
1440
-	struct cvmx_pip_ip_offset_s cn52xxp1;
1441
-	struct cvmx_pip_ip_offset_s cn56xx;
1442
-	struct cvmx_pip_ip_offset_s cn56xxp1;
1443
-	struct cvmx_pip_ip_offset_s cn58xx;
1444
-	struct cvmx_pip_ip_offset_s cn58xxp1;
1445
-	struct cvmx_pip_ip_offset_s cn61xx;
1446
-	struct cvmx_pip_ip_offset_s cn63xx;
1447
-	struct cvmx_pip_ip_offset_s cn63xxp1;
1448
-	struct cvmx_pip_ip_offset_s cn66xx;
1449
-	struct cvmx_pip_ip_offset_s cn68xx;
1450
-	struct cvmx_pip_ip_offset_s cn68xxp1;
1451
-	struct cvmx_pip_ip_offset_s cnf71xx;
1452
1265
 };
1453
1266
 
1454
1267
 union cvmx_pip_pri_tblx {
..
..
@@ -1488,8 +1301,6 @@
1488
1301
 		uint64_t diff2_padd:8;
1489
1302
 #endif
1490
1303
 	} s;
1491
-	struct cvmx_pip_pri_tblx_s cn68xx;
1492
-	struct cvmx_pip_pri_tblx_s cn68xxp1;
1493
1304
 };
1494
1305
 
1495
1306
 union cvmx_pip_prt_cfgx {
..
..
@@ -1596,7 +1407,6 @@
1596
1407
 		uint64_t reserved_37_63:27;
1597
1408
 #endif
1598
1409
 	} cn30xx;
1599
-	struct cvmx_pip_prt_cfgx_cn30xx cn31xx;
1600
1410
 	struct cvmx_pip_prt_cfgx_cn38xx {
1601
1411
 #ifdef __BIG_ENDIAN_BITFIELD
1602
1412
 		uint64_t reserved_37_63:27;
..
..
@@ -1638,7 +1448,6 @@
1638
1448
 		uint64_t reserved_37_63:27;
1639
1449
 #endif
1640
1450
 	} cn38xx;
1641
-	struct cvmx_pip_prt_cfgx_cn38xx cn38xxp2;
1642
1451
 	struct cvmx_pip_prt_cfgx_cn50xx {
1643
1452
 #ifdef __BIG_ENDIAN_BITFIELD
1644
1453
 		uint64_t reserved_53_63:11;
..
..
@@ -1759,9 +1568,6 @@
1759
1568
 		uint64_t reserved_53_63:11;
1760
1569
 #endif
1761
1570
 	} cn52xx;
1762
-	struct cvmx_pip_prt_cfgx_cn52xx cn52xxp1;
1763
-	struct cvmx_pip_prt_cfgx_cn52xx cn56xx;
1764
-	struct cvmx_pip_prt_cfgx_cn50xx cn56xxp1;
1765
1571
 	struct cvmx_pip_prt_cfgx_cn58xx {
1766
1572
 #ifdef __BIG_ENDIAN_BITFIELD
1767
1573
 		uint64_t reserved_37_63:27;
..
..
@@ -1805,11 +1611,6 @@
1805
1611
 		uint64_t reserved_37_63:27;
1806
1612
 #endif
1807
1613
 	} cn58xx;
1808
-	struct cvmx_pip_prt_cfgx_cn58xx cn58xxp1;
1809
-	struct cvmx_pip_prt_cfgx_cn52xx cn61xx;
1810
-	struct cvmx_pip_prt_cfgx_cn52xx cn63xx;
1811
-	struct cvmx_pip_prt_cfgx_cn52xx cn63xxp1;
1812
-	struct cvmx_pip_prt_cfgx_cn52xx cn66xx;
1813
1614
 	struct cvmx_pip_prt_cfgx_cn68xx {
1814
1615
 #ifdef __BIG_ENDIAN_BITFIELD
1815
1616
 		uint64_t reserved_55_63:9;
..
..
@@ -1875,8 +1676,6 @@
1875
1676
 		uint64_t reserved_55_63:9;
1876
1677
 #endif
1877
1678
 	} cn68xx;
1878
-	struct cvmx_pip_prt_cfgx_cn68xx cn68xxp1;
1879
-	struct cvmx_pip_prt_cfgx_cn52xx cnf71xx;
1880
1679
 };
1881
1680
 
1882
1681
 union cvmx_pip_prt_cfgbx {
..
..
@@ -1938,7 +1737,6 @@
1938
1737
 		uint64_t reserved_39_63:25;
1939
1738
 #endif
1940
1739
 	} cn66xx;
1941
-	struct cvmx_pip_prt_cfgbx_s cn68xx;
1942
1740
 	struct cvmx_pip_prt_cfgbx_cn68xxp1 {
1943
1741
 #ifdef __BIG_ENDIAN_BITFIELD
1944
1742
 		uint64_t reserved_24_63:40;
..
..
@@ -1952,7 +1750,6 @@
1952
1750
 		uint64_t reserved_24_63:40;
1953
1751
 #endif
1954
1752
 	} cn68xxp1;
1955
-	struct cvmx_pip_prt_cfgbx_cn61xx cnf71xx;
1956
1753
 };
1957
1754
 
1958
1755
 union cvmx_pip_prt_tagx {
..
..
@@ -2083,9 +1880,6 @@
2083
1880
 		uint64_t reserved_40_63:24;
2084
1881
 #endif
2085
1882
 	} cn30xx;
2086
-	struct cvmx_pip_prt_tagx_cn30xx cn31xx;
2087
-	struct cvmx_pip_prt_tagx_cn30xx cn38xx;
2088
-	struct cvmx_pip_prt_tagx_cn30xx cn38xxp2;
2089
1883
 	struct cvmx_pip_prt_tagx_cn50xx {
2090
1884
 #ifdef __BIG_ENDIAN_BITFIELD
2091
1885
 		uint64_t reserved_40_63:24;
..
..
@@ -2141,19 +1935,6 @@
2141
1935
 		uint64_t reserved_40_63:24;
2142
1936
 #endif
2143
1937
 	} cn50xx;
2144
-	struct cvmx_pip_prt_tagx_cn50xx cn52xx;
2145
-	struct cvmx_pip_prt_tagx_cn50xx cn52xxp1;
2146
-	struct cvmx_pip_prt_tagx_cn50xx cn56xx;
2147
-	struct cvmx_pip_prt_tagx_cn50xx cn56xxp1;
2148
-	struct cvmx_pip_prt_tagx_cn30xx cn58xx;
2149
-	struct cvmx_pip_prt_tagx_cn30xx cn58xxp1;
2150
-	struct cvmx_pip_prt_tagx_cn50xx cn61xx;
2151
-	struct cvmx_pip_prt_tagx_cn50xx cn63xx;
2152
-	struct cvmx_pip_prt_tagx_cn50xx cn63xxp1;
2153
-	struct cvmx_pip_prt_tagx_cn50xx cn66xx;
2154
-	struct cvmx_pip_prt_tagx_s cn68xx;
2155
-	struct cvmx_pip_prt_tagx_s cn68xxp1;
2156
-	struct cvmx_pip_prt_tagx_cn50xx cnf71xx;
2157
1938
 };
2158
1939
 
2159
1940
 union cvmx_pip_qos_diffx {
..
..
@@ -2167,22 +1948,6 @@
2167
1948
 		uint64_t reserved_3_63:61;
2168
1949
 #endif
2169
1950
 	} s;
2170
-	struct cvmx_pip_qos_diffx_s cn30xx;
2171
-	struct cvmx_pip_qos_diffx_s cn31xx;
2172
-	struct cvmx_pip_qos_diffx_s cn38xx;
2173
-	struct cvmx_pip_qos_diffx_s cn38xxp2;
2174
-	struct cvmx_pip_qos_diffx_s cn50xx;
2175
-	struct cvmx_pip_qos_diffx_s cn52xx;
2176
-	struct cvmx_pip_qos_diffx_s cn52xxp1;
2177
-	struct cvmx_pip_qos_diffx_s cn56xx;
2178
-	struct cvmx_pip_qos_diffx_s cn56xxp1;
2179
-	struct cvmx_pip_qos_diffx_s cn58xx;
2180
-	struct cvmx_pip_qos_diffx_s cn58xxp1;
2181
-	struct cvmx_pip_qos_diffx_s cn61xx;
2182
-	struct cvmx_pip_qos_diffx_s cn63xx;
2183
-	struct cvmx_pip_qos_diffx_s cn63xxp1;
2184
-	struct cvmx_pip_qos_diffx_s cn66xx;
2185
-	struct cvmx_pip_qos_diffx_s cnf71xx;
2186
1951
 };
2187
1952
 
2188
1953
 union cvmx_pip_qos_vlanx {
..
..
@@ -2209,21 +1974,6 @@
2209
1974
 		uint64_t reserved_3_63:61;
2210
1975
 #endif
2211
1976
 	} cn30xx;
2212
-	struct cvmx_pip_qos_vlanx_cn30xx cn31xx;
2213
-	struct cvmx_pip_qos_vlanx_cn30xx cn38xx;
2214
-	struct cvmx_pip_qos_vlanx_cn30xx cn38xxp2;
2215
-	struct cvmx_pip_qos_vlanx_cn30xx cn50xx;
2216
-	struct cvmx_pip_qos_vlanx_s cn52xx;
2217
-	struct cvmx_pip_qos_vlanx_s cn52xxp1;
2218
-	struct cvmx_pip_qos_vlanx_s cn56xx;
2219
-	struct cvmx_pip_qos_vlanx_cn30xx cn56xxp1;
2220
-	struct cvmx_pip_qos_vlanx_cn30xx cn58xx;
2221
-	struct cvmx_pip_qos_vlanx_cn30xx cn58xxp1;
2222
-	struct cvmx_pip_qos_vlanx_s cn61xx;
2223
-	struct cvmx_pip_qos_vlanx_s cn63xx;
2224
-	struct cvmx_pip_qos_vlanx_s cn63xxp1;
2225
-	struct cvmx_pip_qos_vlanx_s cn66xx;
2226
-	struct cvmx_pip_qos_vlanx_s cnf71xx;
2227
1977
 };
2228
1978
 
2229
1979
 union cvmx_pip_qos_watchx {
..
..
@@ -2274,9 +2024,6 @@
2274
2024
 		uint64_t reserved_48_63:16;
2275
2025
 #endif
2276
2026
 	} cn30xx;
2277
-	struct cvmx_pip_qos_watchx_cn30xx cn31xx;
2278
-	struct cvmx_pip_qos_watchx_cn30xx cn38xx;
2279
-	struct cvmx_pip_qos_watchx_cn30xx cn38xxp2;
2280
2027
 	struct cvmx_pip_qos_watchx_cn50xx {
2281
2028
 #ifdef __BIG_ENDIAN_BITFIELD
2282
2029
 		uint64_t reserved_48_63:16;
..
..
@@ -2300,19 +2047,6 @@
2300
2047
 		uint64_t reserved_48_63:16;
2301
2048
 #endif
2302
2049
 	} cn50xx;
2303
-	struct cvmx_pip_qos_watchx_cn50xx cn52xx;
2304
-	struct cvmx_pip_qos_watchx_cn50xx cn52xxp1;
2305
-	struct cvmx_pip_qos_watchx_cn50xx cn56xx;
2306
-	struct cvmx_pip_qos_watchx_cn50xx cn56xxp1;
2307
-	struct cvmx_pip_qos_watchx_cn30xx cn58xx;
2308
-	struct cvmx_pip_qos_watchx_cn30xx cn58xxp1;
2309
-	struct cvmx_pip_qos_watchx_cn50xx cn61xx;
2310
-	struct cvmx_pip_qos_watchx_cn50xx cn63xx;
2311
-	struct cvmx_pip_qos_watchx_cn50xx cn63xxp1;
2312
-	struct cvmx_pip_qos_watchx_cn50xx cn66xx;
2313
-	struct cvmx_pip_qos_watchx_s cn68xx;
2314
-	struct cvmx_pip_qos_watchx_s cn68xxp1;
2315
-	struct cvmx_pip_qos_watchx_cn50xx cnf71xx;
2316
2050
 };
2317
2051
 
2318
2052
 union cvmx_pip_raw_word {
..
..
@@ -2326,24 +2060,6 @@
2326
2060
 		uint64_t reserved_56_63:8;
2327
2061
 #endif
2328
2062
 	} s;
2329
-	struct cvmx_pip_raw_word_s cn30xx;
2330
-	struct cvmx_pip_raw_word_s cn31xx;
2331
-	struct cvmx_pip_raw_word_s cn38xx;
2332
-	struct cvmx_pip_raw_word_s cn38xxp2;
2333
-	struct cvmx_pip_raw_word_s cn50xx;
2334
-	struct cvmx_pip_raw_word_s cn52xx;
2335
-	struct cvmx_pip_raw_word_s cn52xxp1;
2336
-	struct cvmx_pip_raw_word_s cn56xx;
2337
-	struct cvmx_pip_raw_word_s cn56xxp1;
2338
-	struct cvmx_pip_raw_word_s cn58xx;
2339
-	struct cvmx_pip_raw_word_s cn58xxp1;
2340
-	struct cvmx_pip_raw_word_s cn61xx;
2341
-	struct cvmx_pip_raw_word_s cn63xx;
2342
-	struct cvmx_pip_raw_word_s cn63xxp1;
2343
-	struct cvmx_pip_raw_word_s cn66xx;
2344
-	struct cvmx_pip_raw_word_s cn68xx;
2345
-	struct cvmx_pip_raw_word_s cn68xxp1;
2346
-	struct cvmx_pip_raw_word_s cnf71xx;
2347
2063
 };
2348
2064
 
2349
2065
 union cvmx_pip_sft_rst {
..
..
@@ -2357,23 +2073,6 @@
2357
2073
 		uint64_t reserved_1_63:63;
2358
2074
 #endif
2359
2075
 	} s;
2360
-	struct cvmx_pip_sft_rst_s cn30xx;
2361
-	struct cvmx_pip_sft_rst_s cn31xx;
2362
-	struct cvmx_pip_sft_rst_s cn38xx;
2363
-	struct cvmx_pip_sft_rst_s cn50xx;
2364
-	struct cvmx_pip_sft_rst_s cn52xx;
2365
-	struct cvmx_pip_sft_rst_s cn52xxp1;
2366
-	struct cvmx_pip_sft_rst_s cn56xx;
2367
-	struct cvmx_pip_sft_rst_s cn56xxp1;
2368
-	struct cvmx_pip_sft_rst_s cn58xx;
2369
-	struct cvmx_pip_sft_rst_s cn58xxp1;
2370
-	struct cvmx_pip_sft_rst_s cn61xx;
2371
-	struct cvmx_pip_sft_rst_s cn63xx;
2372
-	struct cvmx_pip_sft_rst_s cn63xxp1;
2373
-	struct cvmx_pip_sft_rst_s cn66xx;
2374
-	struct cvmx_pip_sft_rst_s cn68xx;
2375
-	struct cvmx_pip_sft_rst_s cn68xxp1;
2376
-	struct cvmx_pip_sft_rst_s cnf71xx;
2377
2076
 };
2378
2077
 
2379
2078
 union cvmx_pip_stat0_x {
..
..
@@ -2387,8 +2086,6 @@
2387
2086
 		uint64_t drp_pkts:32;
2388
2087
 #endif
2389
2088
 	} s;
2390
-	struct cvmx_pip_stat0_x_s cn68xx;
2391
-	struct cvmx_pip_stat0_x_s cn68xxp1;
2392
2089
 };
2393
2090
 
2394
2091
 union cvmx_pip_stat0_prtx {
..
..
@@ -2402,22 +2099,6 @@
2402
2099
 		uint64_t drp_pkts:32;
2403
2100
 #endif
2404
2101
 	} s;
2405
-	struct cvmx_pip_stat0_prtx_s cn30xx;
2406
-	struct cvmx_pip_stat0_prtx_s cn31xx;
2407
-	struct cvmx_pip_stat0_prtx_s cn38xx;
2408
-	struct cvmx_pip_stat0_prtx_s cn38xxp2;
2409
-	struct cvmx_pip_stat0_prtx_s cn50xx;
2410
-	struct cvmx_pip_stat0_prtx_s cn52xx;
2411
-	struct cvmx_pip_stat0_prtx_s cn52xxp1;
2412
-	struct cvmx_pip_stat0_prtx_s cn56xx;
2413
-	struct cvmx_pip_stat0_prtx_s cn56xxp1;
2414
-	struct cvmx_pip_stat0_prtx_s cn58xx;
2415
-	struct cvmx_pip_stat0_prtx_s cn58xxp1;
2416
-	struct cvmx_pip_stat0_prtx_s cn61xx;
2417
-	struct cvmx_pip_stat0_prtx_s cn63xx;
2418
-	struct cvmx_pip_stat0_prtx_s cn63xxp1;
2419
-	struct cvmx_pip_stat0_prtx_s cn66xx;
2420
-	struct cvmx_pip_stat0_prtx_s cnf71xx;
2421
2102
 };
2422
2103
 
2423
2104
 union cvmx_pip_stat10_x {
..
..
@@ -2431,8 +2112,6 @@
2431
2112
 		uint64_t bcast:32;
2432
2113
 #endif
2433
2114
 	} s;
2434
-	struct cvmx_pip_stat10_x_s cn68xx;
2435
-	struct cvmx_pip_stat10_x_s cn68xxp1;
2436
2115
 };
2437
2116
 
2438
2117
 union cvmx_pip_stat10_prtx {
..
..
@@ -2446,15 +2125,6 @@
2446
2125
 		uint64_t bcast:32;
2447
2126
 #endif
2448
2127
 	} s;
2449
-	struct cvmx_pip_stat10_prtx_s cn52xx;
2450
-	struct cvmx_pip_stat10_prtx_s cn52xxp1;
2451
-	struct cvmx_pip_stat10_prtx_s cn56xx;
2452
-	struct cvmx_pip_stat10_prtx_s cn56xxp1;
2453
-	struct cvmx_pip_stat10_prtx_s cn61xx;
2454
-	struct cvmx_pip_stat10_prtx_s cn63xx;
2455
-	struct cvmx_pip_stat10_prtx_s cn63xxp1;
2456
-	struct cvmx_pip_stat10_prtx_s cn66xx;
2457
-	struct cvmx_pip_stat10_prtx_s cnf71xx;
2458
2128
 };
2459
2129
 
2460
2130
 union cvmx_pip_stat11_x {
..
..
@@ -2468,8 +2138,6 @@
2468
2138
 		uint64_t bcast:32;
2469
2139
 #endif
2470
2140
 	} s;
2471
-	struct cvmx_pip_stat11_x_s cn68xx;
2472
-	struct cvmx_pip_stat11_x_s cn68xxp1;
2473
2141
 };
2474
2142
 
2475
2143
 union cvmx_pip_stat11_prtx {
..
..
@@ -2483,15 +2151,6 @@
2483
2151
 		uint64_t bcast:32;
2484
2152
 #endif
2485
2153
 	} s;
2486
-	struct cvmx_pip_stat11_prtx_s cn52xx;
2487
-	struct cvmx_pip_stat11_prtx_s cn52xxp1;
2488
-	struct cvmx_pip_stat11_prtx_s cn56xx;
2489
-	struct cvmx_pip_stat11_prtx_s cn56xxp1;
2490
-	struct cvmx_pip_stat11_prtx_s cn61xx;
2491
-	struct cvmx_pip_stat11_prtx_s cn63xx;
2492
-	struct cvmx_pip_stat11_prtx_s cn63xxp1;
2493
-	struct cvmx_pip_stat11_prtx_s cn66xx;
2494
-	struct cvmx_pip_stat11_prtx_s cnf71xx;
2495
2154
 };
2496
2155
 
2497
2156
 union cvmx_pip_stat1_x {
..
..
@@ -2505,8 +2164,6 @@
2505
2164
 		uint64_t reserved_48_63:16;
2506
2165
 #endif
2507
2166
 	} s;
2508
-	struct cvmx_pip_stat1_x_s cn68xx;
2509
-	struct cvmx_pip_stat1_x_s cn68xxp1;
2510
2167
 };
2511
2168
 
2512
2169
 union cvmx_pip_stat1_prtx {
..
..
@@ -2520,22 +2177,6 @@
2520
2177
 		uint64_t reserved_48_63:16;
2521
2178
 #endif
2522
2179
 	} s;
2523
-	struct cvmx_pip_stat1_prtx_s cn30xx;
2524
-	struct cvmx_pip_stat1_prtx_s cn31xx;
2525
-	struct cvmx_pip_stat1_prtx_s cn38xx;
2526
-	struct cvmx_pip_stat1_prtx_s cn38xxp2;
2527
-	struct cvmx_pip_stat1_prtx_s cn50xx;
2528
-	struct cvmx_pip_stat1_prtx_s cn52xx;
2529
-	struct cvmx_pip_stat1_prtx_s cn52xxp1;
2530
-	struct cvmx_pip_stat1_prtx_s cn56xx;
2531
-	struct cvmx_pip_stat1_prtx_s cn56xxp1;
2532
-	struct cvmx_pip_stat1_prtx_s cn58xx;
2533
-	struct cvmx_pip_stat1_prtx_s cn58xxp1;
2534
-	struct cvmx_pip_stat1_prtx_s cn61xx;
2535
-	struct cvmx_pip_stat1_prtx_s cn63xx;
2536
-	struct cvmx_pip_stat1_prtx_s cn63xxp1;
2537
-	struct cvmx_pip_stat1_prtx_s cn66xx;
2538
-	struct cvmx_pip_stat1_prtx_s cnf71xx;
2539
2180
 };
2540
2181
 
2541
2182
 union cvmx_pip_stat2_x {
..
..
@@ -2549,8 +2190,6 @@
2549
2190
 		uint64_t pkts:32;
2550
2191
 #endif
2551
2192
 	} s;
2552
-	struct cvmx_pip_stat2_x_s cn68xx;
2553
-	struct cvmx_pip_stat2_x_s cn68xxp1;
2554
2193
 };
2555
2194
 
2556
2195
 union cvmx_pip_stat2_prtx {
..
..
@@ -2564,22 +2203,6 @@
2564
2203
 		uint64_t pkts:32;
2565
2204
 #endif
2566
2205
 	} s;
2567
-	struct cvmx_pip_stat2_prtx_s cn30xx;
2568
-	struct cvmx_pip_stat2_prtx_s cn31xx;
2569
-	struct cvmx_pip_stat2_prtx_s cn38xx;
2570
-	struct cvmx_pip_stat2_prtx_s cn38xxp2;
2571
-	struct cvmx_pip_stat2_prtx_s cn50xx;
2572
-	struct cvmx_pip_stat2_prtx_s cn52xx;
2573
-	struct cvmx_pip_stat2_prtx_s cn52xxp1;
2574
-	struct cvmx_pip_stat2_prtx_s cn56xx;
2575
-	struct cvmx_pip_stat2_prtx_s cn56xxp1;
2576
-	struct cvmx_pip_stat2_prtx_s cn58xx;
2577
-	struct cvmx_pip_stat2_prtx_s cn58xxp1;
2578
-	struct cvmx_pip_stat2_prtx_s cn61xx;
2579
-	struct cvmx_pip_stat2_prtx_s cn63xx;
2580
-	struct cvmx_pip_stat2_prtx_s cn63xxp1;
2581
-	struct cvmx_pip_stat2_prtx_s cn66xx;
2582
-	struct cvmx_pip_stat2_prtx_s cnf71xx;
2583
2206
 };
2584
2207
 
2585
2208
 union cvmx_pip_stat3_x {
..
..
@@ -2593,8 +2216,6 @@
2593
2216
 		uint64_t bcst:32;
2594
2217
 #endif
2595
2218
 	} s;
2596
-	struct cvmx_pip_stat3_x_s cn68xx;
2597
-	struct cvmx_pip_stat3_x_s cn68xxp1;
2598
2219
 };
2599
2220
 
2600
2221
 union cvmx_pip_stat3_prtx {
..
..
@@ -2608,22 +2229,6 @@
2608
2229
 		uint64_t bcst:32;
2609
2230
 #endif
2610
2231
 	} s;
2611
-	struct cvmx_pip_stat3_prtx_s cn30xx;
2612
-	struct cvmx_pip_stat3_prtx_s cn31xx;
2613
-	struct cvmx_pip_stat3_prtx_s cn38xx;
2614
-	struct cvmx_pip_stat3_prtx_s cn38xxp2;
2615
-	struct cvmx_pip_stat3_prtx_s cn50xx;
2616
-	struct cvmx_pip_stat3_prtx_s cn52xx;
2617
-	struct cvmx_pip_stat3_prtx_s cn52xxp1;
2618
-	struct cvmx_pip_stat3_prtx_s cn56xx;
2619
-	struct cvmx_pip_stat3_prtx_s cn56xxp1;
2620
-	struct cvmx_pip_stat3_prtx_s cn58xx;
2621
-	struct cvmx_pip_stat3_prtx_s cn58xxp1;
2622
-	struct cvmx_pip_stat3_prtx_s cn61xx;
2623
-	struct cvmx_pip_stat3_prtx_s cn63xx;
2624
-	struct cvmx_pip_stat3_prtx_s cn63xxp1;
2625
-	struct cvmx_pip_stat3_prtx_s cn66xx;
2626
-	struct cvmx_pip_stat3_prtx_s cnf71xx;
2627
2232
 };
2628
2233
 
2629
2234
 union cvmx_pip_stat4_x {
..
..
@@ -2637,8 +2242,6 @@
2637
2242
 		uint64_t h65to127:32;
2638
2243
 #endif
2639
2244
 	} s;
2640
-	struct cvmx_pip_stat4_x_s cn68xx;
2641
-	struct cvmx_pip_stat4_x_s cn68xxp1;
2642
2245
 };
2643
2246
 
2644
2247
 union cvmx_pip_stat4_prtx {
..
..
@@ -2652,22 +2255,6 @@
2652
2255
 		uint64_t h65to127:32;
2653
2256
 #endif
2654
2257
 	} s;
2655
-	struct cvmx_pip_stat4_prtx_s cn30xx;
2656
-	struct cvmx_pip_stat4_prtx_s cn31xx;
2657
-	struct cvmx_pip_stat4_prtx_s cn38xx;
2658
-	struct cvmx_pip_stat4_prtx_s cn38xxp2;
2659
-	struct cvmx_pip_stat4_prtx_s cn50xx;
2660
-	struct cvmx_pip_stat4_prtx_s cn52xx;
2661
-	struct cvmx_pip_stat4_prtx_s cn52xxp1;
2662
-	struct cvmx_pip_stat4_prtx_s cn56xx;
2663
-	struct cvmx_pip_stat4_prtx_s cn56xxp1;
2664
-	struct cvmx_pip_stat4_prtx_s cn58xx;
2665
-	struct cvmx_pip_stat4_prtx_s cn58xxp1;
2666
-	struct cvmx_pip_stat4_prtx_s cn61xx;
2667
-	struct cvmx_pip_stat4_prtx_s cn63xx;
2668
-	struct cvmx_pip_stat4_prtx_s cn63xxp1;
2669
-	struct cvmx_pip_stat4_prtx_s cn66xx;
2670
-	struct cvmx_pip_stat4_prtx_s cnf71xx;
2671
2258
 };
2672
2259
 
2673
2260
 union cvmx_pip_stat5_x {
..
..
@@ -2681,8 +2268,6 @@
2681
2268
 		uint64_t h256to511:32;
2682
2269
 #endif
2683
2270
 	} s;
2684
-	struct cvmx_pip_stat5_x_s cn68xx;
2685
-	struct cvmx_pip_stat5_x_s cn68xxp1;
2686
2271
 };
2687
2272
 
2688
2273
 union cvmx_pip_stat5_prtx {
..
..
@@ -2696,22 +2281,6 @@
2696
2281
 		uint64_t h256to511:32;
2697
2282
 #endif
2698
2283
 	} s;
2699
-	struct cvmx_pip_stat5_prtx_s cn30xx;
2700
-	struct cvmx_pip_stat5_prtx_s cn31xx;
2701
-	struct cvmx_pip_stat5_prtx_s cn38xx;
2702
-	struct cvmx_pip_stat5_prtx_s cn38xxp2;
2703
-	struct cvmx_pip_stat5_prtx_s cn50xx;
2704
-	struct cvmx_pip_stat5_prtx_s cn52xx;
2705
-	struct cvmx_pip_stat5_prtx_s cn52xxp1;
2706
-	struct cvmx_pip_stat5_prtx_s cn56xx;
2707
-	struct cvmx_pip_stat5_prtx_s cn56xxp1;
2708
-	struct cvmx_pip_stat5_prtx_s cn58xx;
2709
-	struct cvmx_pip_stat5_prtx_s cn58xxp1;
2710
-	struct cvmx_pip_stat5_prtx_s cn61xx;
2711
-	struct cvmx_pip_stat5_prtx_s cn63xx;
2712
-	struct cvmx_pip_stat5_prtx_s cn63xxp1;
2713
-	struct cvmx_pip_stat5_prtx_s cn66xx;
2714
-	struct cvmx_pip_stat5_prtx_s cnf71xx;
2715
2284
 };
2716
2285
 
2717
2286
 union cvmx_pip_stat6_x {
..
..
@@ -2725,8 +2294,6 @@
2725
2294
 		uint64_t h1024to1518:32;
2726
2295
 #endif
2727
2296
 	} s;
2728
-	struct cvmx_pip_stat6_x_s cn68xx;
2729
-	struct cvmx_pip_stat6_x_s cn68xxp1;
2730
2297
 };
2731
2298
 
2732
2299
 union cvmx_pip_stat6_prtx {
..
..
@@ -2740,22 +2307,6 @@
2740
2307
 		uint64_t h1024to1518:32;
2741
2308
 #endif
2742
2309
 	} s;
2743
-	struct cvmx_pip_stat6_prtx_s cn30xx;
2744
-	struct cvmx_pip_stat6_prtx_s cn31xx;
2745
-	struct cvmx_pip_stat6_prtx_s cn38xx;
2746
-	struct cvmx_pip_stat6_prtx_s cn38xxp2;
2747
-	struct cvmx_pip_stat6_prtx_s cn50xx;
2748
-	struct cvmx_pip_stat6_prtx_s cn52xx;
2749
-	struct cvmx_pip_stat6_prtx_s cn52xxp1;
2750
-	struct cvmx_pip_stat6_prtx_s cn56xx;
2751
-	struct cvmx_pip_stat6_prtx_s cn56xxp1;
2752
-	struct cvmx_pip_stat6_prtx_s cn58xx;
2753
-	struct cvmx_pip_stat6_prtx_s cn58xxp1;
2754
-	struct cvmx_pip_stat6_prtx_s cn61xx;
2755
-	struct cvmx_pip_stat6_prtx_s cn63xx;
2756
-	struct cvmx_pip_stat6_prtx_s cn63xxp1;
2757
-	struct cvmx_pip_stat6_prtx_s cn66xx;
2758
-	struct cvmx_pip_stat6_prtx_s cnf71xx;
2759
2310
 };
2760
2311
 
2761
2312
 union cvmx_pip_stat7_x {
..
..
@@ -2769,8 +2320,6 @@
2769
2320
 		uint64_t fcs:32;
2770
2321
 #endif
2771
2322
 	} s;
2772
-	struct cvmx_pip_stat7_x_s cn68xx;
2773
-	struct cvmx_pip_stat7_x_s cn68xxp1;
2774
2323
 };
2775
2324
 
2776
2325
 union cvmx_pip_stat7_prtx {
..
..
@@ -2784,22 +2333,6 @@
2784
2333
 		uint64_t fcs:32;
2785
2334
 #endif
2786
2335
 	} s;
2787
-	struct cvmx_pip_stat7_prtx_s cn30xx;
2788
-	struct cvmx_pip_stat7_prtx_s cn31xx;
2789
-	struct cvmx_pip_stat7_prtx_s cn38xx;
2790
-	struct cvmx_pip_stat7_prtx_s cn38xxp2;
2791
-	struct cvmx_pip_stat7_prtx_s cn50xx;
2792
-	struct cvmx_pip_stat7_prtx_s cn52xx;
2793
-	struct cvmx_pip_stat7_prtx_s cn52xxp1;
2794
-	struct cvmx_pip_stat7_prtx_s cn56xx;
2795
-	struct cvmx_pip_stat7_prtx_s cn56xxp1;
2796
-	struct cvmx_pip_stat7_prtx_s cn58xx;
2797
-	struct cvmx_pip_stat7_prtx_s cn58xxp1;
2798
-	struct cvmx_pip_stat7_prtx_s cn61xx;
2799
-	struct cvmx_pip_stat7_prtx_s cn63xx;
2800
-	struct cvmx_pip_stat7_prtx_s cn63xxp1;
2801
-	struct cvmx_pip_stat7_prtx_s cn66xx;
2802
-	struct cvmx_pip_stat7_prtx_s cnf71xx;
2803
2336
 };
2804
2337
 
2805
2338
 union cvmx_pip_stat8_x {
..
..
@@ -2813,8 +2346,6 @@
2813
2346
 		uint64_t frag:32;
2814
2347
 #endif
2815
2348
 	} s;
2816
-	struct cvmx_pip_stat8_x_s cn68xx;
2817
-	struct cvmx_pip_stat8_x_s cn68xxp1;
2818
2349
 };
2819
2350
 
2820
2351
 union cvmx_pip_stat8_prtx {
..
..
@@ -2828,22 +2359,6 @@
2828
2359
 		uint64_t frag:32;
2829
2360
 #endif
2830
2361
 	} s;
2831
-	struct cvmx_pip_stat8_prtx_s cn30xx;
2832
-	struct cvmx_pip_stat8_prtx_s cn31xx;
2833
-	struct cvmx_pip_stat8_prtx_s cn38xx;
2834
-	struct cvmx_pip_stat8_prtx_s cn38xxp2;
2835
-	struct cvmx_pip_stat8_prtx_s cn50xx;
2836
-	struct cvmx_pip_stat8_prtx_s cn52xx;
2837
-	struct cvmx_pip_stat8_prtx_s cn52xxp1;
2838
-	struct cvmx_pip_stat8_prtx_s cn56xx;
2839
-	struct cvmx_pip_stat8_prtx_s cn56xxp1;
2840
-	struct cvmx_pip_stat8_prtx_s cn58xx;
2841
-	struct cvmx_pip_stat8_prtx_s cn58xxp1;
2842
-	struct cvmx_pip_stat8_prtx_s cn61xx;
2843
-	struct cvmx_pip_stat8_prtx_s cn63xx;
2844
-	struct cvmx_pip_stat8_prtx_s cn63xxp1;
2845
-	struct cvmx_pip_stat8_prtx_s cn66xx;
2846
-	struct cvmx_pip_stat8_prtx_s cnf71xx;
2847
2362
 };
2848
2363
 
2849
2364
 union cvmx_pip_stat9_x {
..
..
@@ -2857,8 +2372,6 @@
2857
2372
 		uint64_t jabber:32;
2858
2373
 #endif
2859
2374
 	} s;
2860
-	struct cvmx_pip_stat9_x_s cn68xx;
2861
-	struct cvmx_pip_stat9_x_s cn68xxp1;
2862
2375
 };
2863
2376
 
2864
2377
 union cvmx_pip_stat9_prtx {
..
..
@@ -2872,22 +2385,6 @@
2872
2385
 		uint64_t jabber:32;
2873
2386
 #endif
2874
2387
 	} s;
2875
-	struct cvmx_pip_stat9_prtx_s cn30xx;
2876
-	struct cvmx_pip_stat9_prtx_s cn31xx;
2877
-	struct cvmx_pip_stat9_prtx_s cn38xx;
2878
-	struct cvmx_pip_stat9_prtx_s cn38xxp2;
2879
-	struct cvmx_pip_stat9_prtx_s cn50xx;
2880
-	struct cvmx_pip_stat9_prtx_s cn52xx;
2881
-	struct cvmx_pip_stat9_prtx_s cn52xxp1;
2882
-	struct cvmx_pip_stat9_prtx_s cn56xx;
2883
-	struct cvmx_pip_stat9_prtx_s cn56xxp1;
2884
-	struct cvmx_pip_stat9_prtx_s cn58xx;
2885
-	struct cvmx_pip_stat9_prtx_s cn58xxp1;
2886
-	struct cvmx_pip_stat9_prtx_s cn61xx;
2887
-	struct cvmx_pip_stat9_prtx_s cn63xx;
2888
-	struct cvmx_pip_stat9_prtx_s cn63xxp1;
2889
-	struct cvmx_pip_stat9_prtx_s cn66xx;
2890
-	struct cvmx_pip_stat9_prtx_s cnf71xx;
2891
2388
 };
2892
2389
 
2893
2390
 union cvmx_pip_stat_ctl {
..
..
@@ -2914,23 +2411,6 @@
2914
2411
 		uint64_t reserved_1_63:63;
2915
2412
 #endif
2916
2413
 	} cn30xx;
2917
-	struct cvmx_pip_stat_ctl_cn30xx cn31xx;
2918
-	struct cvmx_pip_stat_ctl_cn30xx cn38xx;
2919
-	struct cvmx_pip_stat_ctl_cn30xx cn38xxp2;
2920
-	struct cvmx_pip_stat_ctl_cn30xx cn50xx;
2921
-	struct cvmx_pip_stat_ctl_cn30xx cn52xx;
2922
-	struct cvmx_pip_stat_ctl_cn30xx cn52xxp1;
2923
-	struct cvmx_pip_stat_ctl_cn30xx cn56xx;
2924
-	struct cvmx_pip_stat_ctl_cn30xx cn56xxp1;
2925
-	struct cvmx_pip_stat_ctl_cn30xx cn58xx;
2926
-	struct cvmx_pip_stat_ctl_cn30xx cn58xxp1;
2927
-	struct cvmx_pip_stat_ctl_cn30xx cn61xx;
2928
-	struct cvmx_pip_stat_ctl_cn30xx cn63xx;
2929
-	struct cvmx_pip_stat_ctl_cn30xx cn63xxp1;
2930
-	struct cvmx_pip_stat_ctl_cn30xx cn66xx;
2931
-	struct cvmx_pip_stat_ctl_s cn68xx;
2932
-	struct cvmx_pip_stat_ctl_s cn68xxp1;
2933
-	struct cvmx_pip_stat_ctl_cn30xx cnf71xx;
2934
2414
 };
2935
2415
 
2936
2416
 union cvmx_pip_stat_inb_errsx {
..
..
@@ -2944,22 +2424,6 @@
2944
2424
 		uint64_t reserved_16_63:48;
2945
2425
 #endif
2946
2426
 	} s;
2947
-	struct cvmx_pip_stat_inb_errsx_s cn30xx;
2948
-	struct cvmx_pip_stat_inb_errsx_s cn31xx;
2949
-	struct cvmx_pip_stat_inb_errsx_s cn38xx;
2950
-	struct cvmx_pip_stat_inb_errsx_s cn38xxp2;
2951
-	struct cvmx_pip_stat_inb_errsx_s cn50xx;
2952
-	struct cvmx_pip_stat_inb_errsx_s cn52xx;
2953
-	struct cvmx_pip_stat_inb_errsx_s cn52xxp1;
2954
-	struct cvmx_pip_stat_inb_errsx_s cn56xx;
2955
-	struct cvmx_pip_stat_inb_errsx_s cn56xxp1;
2956
-	struct cvmx_pip_stat_inb_errsx_s cn58xx;
2957
-	struct cvmx_pip_stat_inb_errsx_s cn58xxp1;
2958
-	struct cvmx_pip_stat_inb_errsx_s cn61xx;
2959
-	struct cvmx_pip_stat_inb_errsx_s cn63xx;
2960
-	struct cvmx_pip_stat_inb_errsx_s cn63xxp1;
2961
-	struct cvmx_pip_stat_inb_errsx_s cn66xx;
2962
-	struct cvmx_pip_stat_inb_errsx_s cnf71xx;
2963
2427
 };
2964
2428
 
2965
2429
 union cvmx_pip_stat_inb_errs_pkndx {
..
..
@@ -2973,8 +2437,6 @@
2973
2437
 		uint64_t reserved_16_63:48;
2974
2438
 #endif
2975
2439
 	} s;
2976
-	struct cvmx_pip_stat_inb_errs_pkndx_s cn68xx;
2977
-	struct cvmx_pip_stat_inb_errs_pkndx_s cn68xxp1;
2978
2440
 };
2979
2441
 
2980
2442
 union cvmx_pip_stat_inb_octsx {
..
..
@@ -2988,22 +2450,6 @@
2988
2450
 		uint64_t reserved_48_63:16;
2989
2451
 #endif
2990
2452
 	} s;
2991
-	struct cvmx_pip_stat_inb_octsx_s cn30xx;
2992
-	struct cvmx_pip_stat_inb_octsx_s cn31xx;
2993
-	struct cvmx_pip_stat_inb_octsx_s cn38xx;
2994
-	struct cvmx_pip_stat_inb_octsx_s cn38xxp2;
2995
-	struct cvmx_pip_stat_inb_octsx_s cn50xx;
2996
-	struct cvmx_pip_stat_inb_octsx_s cn52xx;
2997
-	struct cvmx_pip_stat_inb_octsx_s cn52xxp1;
2998
-	struct cvmx_pip_stat_inb_octsx_s cn56xx;
2999
-	struct cvmx_pip_stat_inb_octsx_s cn56xxp1;
3000
-	struct cvmx_pip_stat_inb_octsx_s cn58xx;
3001
-	struct cvmx_pip_stat_inb_octsx_s cn58xxp1;
3002
-	struct cvmx_pip_stat_inb_octsx_s cn61xx;
3003
-	struct cvmx_pip_stat_inb_octsx_s cn63xx;
3004
-	struct cvmx_pip_stat_inb_octsx_s cn63xxp1;
3005
-	struct cvmx_pip_stat_inb_octsx_s cn66xx;
3006
-	struct cvmx_pip_stat_inb_octsx_s cnf71xx;
3007
2453
 };
3008
2454
 
3009
2455
 union cvmx_pip_stat_inb_octs_pkndx {
..
..
@@ -3017,8 +2463,6 @@
3017
2463
 		uint64_t reserved_48_63:16;
3018
2464
 #endif
3019
2465
 	} s;
3020
-	struct cvmx_pip_stat_inb_octs_pkndx_s cn68xx;
3021
-	struct cvmx_pip_stat_inb_octs_pkndx_s cn68xxp1;
3022
2466
 };
3023
2467
 
3024
2468
 union cvmx_pip_stat_inb_pktsx {
..
..
@@ -3032,22 +2476,6 @@
3032
2476
 		uint64_t reserved_32_63:32;
3033
2477
 #endif
3034
2478
 	} s;
3035
-	struct cvmx_pip_stat_inb_pktsx_s cn30xx;
3036
-	struct cvmx_pip_stat_inb_pktsx_s cn31xx;
3037
-	struct cvmx_pip_stat_inb_pktsx_s cn38xx;
3038
-	struct cvmx_pip_stat_inb_pktsx_s cn38xxp2;
3039
-	struct cvmx_pip_stat_inb_pktsx_s cn50xx;
3040
-	struct cvmx_pip_stat_inb_pktsx_s cn52xx;
3041
-	struct cvmx_pip_stat_inb_pktsx_s cn52xxp1;
3042
-	struct cvmx_pip_stat_inb_pktsx_s cn56xx;
3043
-	struct cvmx_pip_stat_inb_pktsx_s cn56xxp1;
3044
-	struct cvmx_pip_stat_inb_pktsx_s cn58xx;
3045
-	struct cvmx_pip_stat_inb_pktsx_s cn58xxp1;
3046
-	struct cvmx_pip_stat_inb_pktsx_s cn61xx;
3047
-	struct cvmx_pip_stat_inb_pktsx_s cn63xx;
3048
-	struct cvmx_pip_stat_inb_pktsx_s cn63xxp1;
3049
-	struct cvmx_pip_stat_inb_pktsx_s cn66xx;
3050
-	struct cvmx_pip_stat_inb_pktsx_s cnf71xx;
3051
2479
 };
3052
2480
 
3053
2481
 union cvmx_pip_stat_inb_pkts_pkndx {
..
..
@@ -3061,8 +2489,6 @@
3061
2489
 		uint64_t reserved_32_63:32;
3062
2490
 #endif
3063
2491
 	} s;
3064
-	struct cvmx_pip_stat_inb_pkts_pkndx_s cn68xx;
3065
-	struct cvmx_pip_stat_inb_pkts_pkndx_s cn68xxp1;
3066
2492
 };
3067
2493
 
3068
2494
 union cvmx_pip_sub_pkind_fcsx {
..
..
@@ -3074,8 +2500,6 @@
3074
2500
 		uint64_t port_bit:64;
3075
2501
 #endif
3076
2502
 	} s;
3077
-	struct cvmx_pip_sub_pkind_fcsx_s cn68xx;
3078
-	struct cvmx_pip_sub_pkind_fcsx_s cn68xxp1;
3079
2503
 };
3080
2504
 
3081
2505
 union cvmx_pip_tag_incx {
..
..
@@ -3089,24 +2513,6 @@
3089
2513
 		uint64_t reserved_8_63:56;
3090
2514
 #endif
3091
2515
 	} s;
3092
-	struct cvmx_pip_tag_incx_s cn30xx;
3093
-	struct cvmx_pip_tag_incx_s cn31xx;
3094
-	struct cvmx_pip_tag_incx_s cn38xx;
3095
-	struct cvmx_pip_tag_incx_s cn38xxp2;
3096
-	struct cvmx_pip_tag_incx_s cn50xx;
3097
-	struct cvmx_pip_tag_incx_s cn52xx;
3098
-	struct cvmx_pip_tag_incx_s cn52xxp1;
3099
-	struct cvmx_pip_tag_incx_s cn56xx;
3100
-	struct cvmx_pip_tag_incx_s cn56xxp1;
3101
-	struct cvmx_pip_tag_incx_s cn58xx;
3102
-	struct cvmx_pip_tag_incx_s cn58xxp1;
3103
-	struct cvmx_pip_tag_incx_s cn61xx;
3104
-	struct cvmx_pip_tag_incx_s cn63xx;
3105
-	struct cvmx_pip_tag_incx_s cn63xxp1;
3106
-	struct cvmx_pip_tag_incx_s cn66xx;
3107
-	struct cvmx_pip_tag_incx_s cn68xx;
3108
-	struct cvmx_pip_tag_incx_s cn68xxp1;
3109
-	struct cvmx_pip_tag_incx_s cnf71xx;
3110
2516
 };
3111
2517
 
3112
2518
 union cvmx_pip_tag_mask {
..
..
@@ -3120,24 +2526,6 @@
3120
2526
 		uint64_t reserved_16_63:48;
3121
2527
 #endif
3122
2528
 	} s;
3123
-	struct cvmx_pip_tag_mask_s cn30xx;
3124
-	struct cvmx_pip_tag_mask_s cn31xx;
3125
-	struct cvmx_pip_tag_mask_s cn38xx;
3126
-	struct cvmx_pip_tag_mask_s cn38xxp2;
3127
-	struct cvmx_pip_tag_mask_s cn50xx;
3128
-	struct cvmx_pip_tag_mask_s cn52xx;
3129
-	struct cvmx_pip_tag_mask_s cn52xxp1;
3130
-	struct cvmx_pip_tag_mask_s cn56xx;
3131
-	struct cvmx_pip_tag_mask_s cn56xxp1;
3132
-	struct cvmx_pip_tag_mask_s cn58xx;
3133
-	struct cvmx_pip_tag_mask_s cn58xxp1;
3134
-	struct cvmx_pip_tag_mask_s cn61xx;
3135
-	struct cvmx_pip_tag_mask_s cn63xx;
3136
-	struct cvmx_pip_tag_mask_s cn63xxp1;
3137
-	struct cvmx_pip_tag_mask_s cn66xx;
3138
-	struct cvmx_pip_tag_mask_s cn68xx;
3139
-	struct cvmx_pip_tag_mask_s cn68xxp1;
3140
-	struct cvmx_pip_tag_mask_s cnf71xx;
3141
2529
 };
3142
2530
 
3143
2531
 union cvmx_pip_tag_secret {
..
..
@@ -3153,24 +2541,6 @@
3153
2541
 		uint64_t reserved_32_63:32;
3154
2542
 #endif
3155
2543
 	} s;
3156
-	struct cvmx_pip_tag_secret_s cn30xx;
3157
-	struct cvmx_pip_tag_secret_s cn31xx;
3158
-	struct cvmx_pip_tag_secret_s cn38xx;
3159
-	struct cvmx_pip_tag_secret_s cn38xxp2;
3160
-	struct cvmx_pip_tag_secret_s cn50xx;
3161
-	struct cvmx_pip_tag_secret_s cn52xx;
3162
-	struct cvmx_pip_tag_secret_s cn52xxp1;
3163
-	struct cvmx_pip_tag_secret_s cn56xx;
3164
-	struct cvmx_pip_tag_secret_s cn56xxp1;
3165
-	struct cvmx_pip_tag_secret_s cn58xx;
3166
-	struct cvmx_pip_tag_secret_s cn58xxp1;
3167
-	struct cvmx_pip_tag_secret_s cn61xx;
3168
-	struct cvmx_pip_tag_secret_s cn63xx;
3169
-	struct cvmx_pip_tag_secret_s cn63xxp1;
3170
-	struct cvmx_pip_tag_secret_s cn66xx;
3171
-	struct cvmx_pip_tag_secret_s cn68xx;
3172
-	struct cvmx_pip_tag_secret_s cn68xxp1;
3173
-	struct cvmx_pip_tag_secret_s cnf71xx;
3174
2544
 };
3175
2545
 
3176
2546
 union cvmx_pip_todo_entry {
..
..
@@ -3186,24 +2556,6 @@
3186
2556
 		uint64_t val:1;
3187
2557
 #endif
3188
2558
 	} s;
3189
-	struct cvmx_pip_todo_entry_s cn30xx;
3190
-	struct cvmx_pip_todo_entry_s cn31xx;
3191
-	struct cvmx_pip_todo_entry_s cn38xx;
3192
-	struct cvmx_pip_todo_entry_s cn38xxp2;
3193
-	struct cvmx_pip_todo_entry_s cn50xx;
3194
-	struct cvmx_pip_todo_entry_s cn52xx;
3195
-	struct cvmx_pip_todo_entry_s cn52xxp1;
3196
-	struct cvmx_pip_todo_entry_s cn56xx;
3197
-	struct cvmx_pip_todo_entry_s cn56xxp1;
3198
-	struct cvmx_pip_todo_entry_s cn58xx;
3199
-	struct cvmx_pip_todo_entry_s cn58xxp1;
3200
-	struct cvmx_pip_todo_entry_s cn61xx;
3201
-	struct cvmx_pip_todo_entry_s cn63xx;
3202
-	struct cvmx_pip_todo_entry_s cn63xxp1;
3203
-	struct cvmx_pip_todo_entry_s cn66xx;
3204
-	struct cvmx_pip_todo_entry_s cn68xx;
3205
-	struct cvmx_pip_todo_entry_s cn68xxp1;
3206
-	struct cvmx_pip_todo_entry_s cnf71xx;
3207
2559
 };
3208
2560
 
3209
2561
 union cvmx_pip_vlan_etypesx {
..
..
@@ -3221,10 +2573,6 @@
3221
2573
 		uint64_t type3:16;
3222
2574
 #endif
3223
2575
 	} s;
3224
-	struct cvmx_pip_vlan_etypesx_s cn61xx;
3225
-	struct cvmx_pip_vlan_etypesx_s cn66xx;
3226
-	struct cvmx_pip_vlan_etypesx_s cn68xx;
3227
-	struct cvmx_pip_vlan_etypesx_s cnf71xx;
3228
2576
 };
3229
2577
 
3230
2578
 union cvmx_pip_xstat0_prtx {
..
..
@@ -3238,9 +2586,6 @@
3238
2586
 		uint64_t drp_pkts:32;
3239
2587
 #endif
3240
2588
 	} s;
3241
-	struct cvmx_pip_xstat0_prtx_s cn63xx;
3242
-	struct cvmx_pip_xstat0_prtx_s cn63xxp1;
3243
-	struct cvmx_pip_xstat0_prtx_s cn66xx;
3244
2589
 };
3245
2590
 
3246
2591
 union cvmx_pip_xstat10_prtx {
..
..
@@ -3254,9 +2599,6 @@
3254
2599
 		uint64_t bcast:32;
3255
2600
 #endif
3256
2601
 	} s;
3257
-	struct cvmx_pip_xstat10_prtx_s cn63xx;
3258
-	struct cvmx_pip_xstat10_prtx_s cn63xxp1;
3259
-	struct cvmx_pip_xstat10_prtx_s cn66xx;
3260
2602
 };
3261
2603
 
3262
2604
 union cvmx_pip_xstat11_prtx {
..
..
@@ -3270,9 +2612,6 @@
3270
2612
 		uint64_t bcast:32;
3271
2613
 #endif
3272
2614
 	} s;
3273
-	struct cvmx_pip_xstat11_prtx_s cn63xx;
3274
-	struct cvmx_pip_xstat11_prtx_s cn63xxp1;
3275
-	struct cvmx_pip_xstat11_prtx_s cn66xx;
3276
2615
 };
3277
2616
 
3278
2617
 union cvmx_pip_xstat1_prtx {
..
..
@@ -3286,9 +2625,6 @@
3286
2625
 		uint64_t reserved_48_63:16;
3287
2626
 #endif
3288
2627
 	} s;
3289
-	struct cvmx_pip_xstat1_prtx_s cn63xx;
3290
-	struct cvmx_pip_xstat1_prtx_s cn63xxp1;
3291
-	struct cvmx_pip_xstat1_prtx_s cn66xx;
3292
2628
 };
3293
2629
 
3294
2630
 union cvmx_pip_xstat2_prtx {
..
..
@@ -3302,9 +2638,6 @@
3302
2638
 		uint64_t pkts:32;
3303
2639
 #endif
3304
2640
 	} s;
3305
-	struct cvmx_pip_xstat2_prtx_s cn63xx;
3306
-	struct cvmx_pip_xstat2_prtx_s cn63xxp1;
3307
-	struct cvmx_pip_xstat2_prtx_s cn66xx;
3308
2641
 };
3309
2642
 
3310
2643
 union cvmx_pip_xstat3_prtx {
..
..
@@ -3318,9 +2651,6 @@
3318
2651
 		uint64_t bcst:32;
3319
2652
 #endif
3320
2653
 	} s;
3321
-	struct cvmx_pip_xstat3_prtx_s cn63xx;
3322
-	struct cvmx_pip_xstat3_prtx_s cn63xxp1;
3323
-	struct cvmx_pip_xstat3_prtx_s cn66xx;
3324
2654
 };
3325
2655
 
3326
2656
 union cvmx_pip_xstat4_prtx {
..
..
@@ -3334,9 +2664,6 @@
3334
2664
 		uint64_t h65to127:32;
3335
2665
 #endif
3336
2666
 	} s;
3337
-	struct cvmx_pip_xstat4_prtx_s cn63xx;
3338
-	struct cvmx_pip_xstat4_prtx_s cn63xxp1;
3339
-	struct cvmx_pip_xstat4_prtx_s cn66xx;
3340
2667
 };
3341
2668
 
3342
2669
 union cvmx_pip_xstat5_prtx {
..
..
@@ -3350,9 +2677,6 @@
3350
2677
 		uint64_t h256to511:32;
3351
2678
 #endif
3352
2679
 	} s;
3353
-	struct cvmx_pip_xstat5_prtx_s cn63xx;
3354
-	struct cvmx_pip_xstat5_prtx_s cn63xxp1;
3355
-	struct cvmx_pip_xstat5_prtx_s cn66xx;
3356
2680
 };
3357
2681
 
3358
2682
 union cvmx_pip_xstat6_prtx {
..
..
@@ -3366,9 +2690,6 @@
3366
2690
 		uint64_t h1024to1518:32;
3367
2691
 #endif
3368
2692
 	} s;
3369
-	struct cvmx_pip_xstat6_prtx_s cn63xx;
3370
-	struct cvmx_pip_xstat6_prtx_s cn63xxp1;
3371
-	struct cvmx_pip_xstat6_prtx_s cn66xx;
3372
2693
 };
3373
2694
 
3374
2695
 union cvmx_pip_xstat7_prtx {
..
..
@@ -3382,9 +2703,6 @@
3382
2703
 		uint64_t fcs:32;
3383
2704
 #endif
3384
2705
 	} s;
3385
-	struct cvmx_pip_xstat7_prtx_s cn63xx;
3386
-	struct cvmx_pip_xstat7_prtx_s cn63xxp1;
3387
-	struct cvmx_pip_xstat7_prtx_s cn66xx;
3388
2706
 };
3389
2707
 
3390
2708
 union cvmx_pip_xstat8_prtx {
..
..
@@ -3398,9 +2716,6 @@
3398
2716
 		uint64_t frag:32;
3399
2717
 #endif
3400
2718
 	} s;
3401
-	struct cvmx_pip_xstat8_prtx_s cn63xx;
3402
-	struct cvmx_pip_xstat8_prtx_s cn63xxp1;
3403
-	struct cvmx_pip_xstat8_prtx_s cn66xx;
3404
2719
 };
3405
2720
 
3406
2721
 union cvmx_pip_xstat9_prtx {
..
..
@@ -3414,9 +2729,6 @@
3414
2729
 		uint64_t jabber:32;
3415
2730
 #endif
3416
2731
 	} s;
3417
-	struct cvmx_pip_xstat9_prtx_s cn63xx;
3418
-	struct cvmx_pip_xstat9_prtx_s cn63xxp1;
3419
-	struct cvmx_pip_xstat9_prtx_s cn66xx;
3420
2732
 };
3421
2733
 
3422
2734
 #endif