[Arista] Fix 7060 flex HWSKU SFP ports and Ethernet8/1 (#9173)

* [Arista] Fix 7060 flex HWSKU SFP ports and Ethernet8/1

* [Arista] Fix polarity flips for Arista 7060 on non-leading intfs

Co-authored-by: Zhi Yuan (Carl) Zhao <[email protected]>

device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S/hwsku.json

@@ -96,11 +96,11 @@
         "Ethernet124": {
             "default_brkout_mode": "1x100G[50G,40G,25G,10G]"
         },
-        "Ethernet125": {
+        "Ethernet128": {
             "default_brkout_mode": "1x10G"
         },
-        "Ethernet126": {
+        "Ethernet129": {
             "default_brkout_mode": "1x10G"
         }
     }
-}
+}

device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S/port_config.ini

@@ -31,5 +31,5 @@ Ethernet112     17,18,19,20       Ethernet29/1  29
 Ethernet116     21,22,23,24       Ethernet30/1  30
 Ethernet120     25,26,27,28       Ethernet31/1  31
 Ethernet124     29,30,31,32       Ethernet32/1  32
-Ethernet125     129               Ethernet33    33
-Ethernet126     131               Ethernet34    34
+Ethernet128     129               Ethernet33    33
+Ethernet129     131               Ethernet34    34

device/arista/x86_64-arista_7060_cx32s/platform.json

@@ -802,7 +802,7 @@
                 ]
             }
         },
-        "Ethernet125": {
+        "Ethernet128": {
             "index": "33",
             "lanes": "129",
             "breakout_modes": {
@@ -811,7 +811,7 @@
                 ]
             }
         },
-        "Ethernet126": {
+        "Ethernet129": {
             "index": "34",
             "lanes": "131",
             "breakout_modes": {

device/arista/x86_64-arista_7060_cx32s/th-a7060-cx32s-flex-all.config.bcm

@@ -32,71 +32,263 @@ phy_an_c37_100.0=2
 phy_an_c73=1
 phy_an_fec=1
 phy_xaui_rx_polarity_flip_1.0=0x1
+phy_xaui_rx_polarity_flip_2.0=0x0
+phy_xaui_rx_polarity_flip_3.0=0x0
+phy_xaui_rx_polarity_flip_4.0=0x0
 phy_xaui_rx_polarity_flip_5.0=0x5
+phy_xaui_rx_polarity_flip_6.0=0x2
+phy_xaui_rx_polarity_flip_7.0=0x1
+phy_xaui_rx_polarity_flip_8.0=0x0
 phy_xaui_rx_polarity_flip_9.0=0x1
+phy_xaui_rx_polarity_flip_10.0=0x0
+phy_xaui_rx_polarity_flip_11.0=0x0
+phy_xaui_rx_polarity_flip_12.0=0x0
 phy_xaui_rx_polarity_flip_13.0=0x7
+phy_xaui_rx_polarity_flip_14.0=0x3
+phy_xaui_rx_polarity_flip_15.0=0x1
+phy_xaui_rx_polarity_flip_16.0=0x0
 phy_xaui_rx_polarity_flip_17.0=0xc
+phy_xaui_rx_polarity_flip_18.0=0x6
+phy_xaui_rx_polarity_flip_19.0=0x3
+phy_xaui_rx_polarity_flip_20.0=0x1
 phy_xaui_rx_polarity_flip_21.0=0xf
+phy_xaui_rx_polarity_flip_22.0=0x7
+phy_xaui_rx_polarity_flip_23.0=0x3
+phy_xaui_rx_polarity_flip_24.0=0x1
 phy_xaui_rx_polarity_flip_25.0=0xc
+phy_xaui_rx_polarity_flip_26.0=0x6
+phy_xaui_rx_polarity_flip_27.0=0x3
+phy_xaui_rx_polarity_flip_28.0=0x1
 phy_xaui_rx_polarity_flip_29.0=0xf
+phy_xaui_rx_polarity_flip_30.0=0x7
+phy_xaui_rx_polarity_flip_31.0=0x3
+phy_xaui_rx_polarity_flip_32.0=0x1
 phy_xaui_rx_polarity_flip_34.0=0x0
+phy_xaui_rx_polarity_flip_35.0=0x0
+phy_xaui_rx_polarity_flip_36.0=0x0
+phy_xaui_rx_polarity_flip_37.0=0x0
 phy_xaui_rx_polarity_flip_38.0=0x7
+phy_xaui_rx_polarity_flip_39.0=0x3
+phy_xaui_rx_polarity_flip_40.0=0x1
+phy_xaui_rx_polarity_flip_41.0=0x0
 phy_xaui_rx_polarity_flip_42.0=0x4
+phy_xaui_rx_polarity_flip_43.0=0x2
+phy_xaui_rx_polarity_flip_44.0=0x1
+phy_xaui_rx_polarity_flip_45.0=0x0
 phy_xaui_rx_polarity_flip_46.0=0x7
+phy_xaui_rx_polarity_flip_47.0=0x3
+phy_xaui_rx_polarity_flip_48.0=0x1
+phy_xaui_rx_polarity_flip_49.0=0x0
 phy_xaui_rx_polarity_flip_50.0=0x4
+phy_xaui_rx_polarity_flip_51.0=0x2
+phy_xaui_rx_polarity_flip_52.0=0x1
+phy_xaui_rx_polarity_flip_53.0=0x0
 phy_xaui_rx_polarity_flip_54.0=0x6
+phy_xaui_rx_polarity_flip_55.0=0x3
+phy_xaui_rx_polarity_flip_56.0=0x1
+phy_xaui_rx_polarity_flip_57.0=0x0
 phy_xaui_rx_polarity_flip_58.0=0x1
-phy_xaui_rx_polarity_flip_61.0=0x2
+phy_xaui_rx_polarity_flip_59.0=0x0
+phy_xaui_rx_polarity_flip_60.0=0x0
+phy_xaui_rx_polarity_flip_61.0=0x0
+phy_xaui_rx_polarity_flip_62.0=0x2
+phy_xaui_rx_polarity_flip_63.0=0x1
+phy_xaui_rx_polarity_flip_64.0=0x0
+phy_xaui_rx_polarity_flip_65.0=0x0
 phy_xaui_rx_polarity_flip_68.0=0xd
+phy_xaui_rx_polarity_flip_69.0=0x6
+phy_xaui_rx_polarity_flip_70.0=0x3
+phy_xaui_rx_polarity_flip_71.0=0x1
 phy_xaui_rx_polarity_flip_72.0=0x6
+phy_xaui_rx_polarity_flip_73.0=0x3
+phy_xaui_rx_polarity_flip_74.0=0x1
+phy_xaui_rx_polarity_flip_75.0=0x0
 phy_xaui_rx_polarity_flip_76.0=0x1
+phy_xaui_rx_polarity_flip_77.0=0x0
+phy_xaui_rx_polarity_flip_78.0=0x0
+phy_xaui_rx_polarity_flip_79.0=0x0
 phy_xaui_rx_polarity_flip_80.0=0x8
+phy_xaui_rx_polarity_flip_81.0=0x4
+phy_xaui_rx_polarity_flip_82.0=0x2
+phy_xaui_rx_polarity_flip_83.0=0x1
 phy_xaui_rx_polarity_flip_84.0=0x7
+phy_xaui_rx_polarity_flip_85.0=0x3
+phy_xaui_rx_polarity_flip_86.0=0x1
+phy_xaui_rx_polarity_flip_87.0=0x0
 phy_xaui_rx_polarity_flip_88.0=0xc
+phy_xaui_rx_polarity_flip_89.0=0x6
+phy_xaui_rx_polarity_flip_90.0=0x3
+phy_xaui_rx_polarity_flip_91.0=0x1
 phy_xaui_rx_polarity_flip_92.0=0x7
+phy_xaui_rx_polarity_flip_93.0=0x3
+phy_xaui_rx_polarity_flip_94.0=0x1
+phy_xaui_rx_polarity_flip_95.0=0x0
 phy_xaui_rx_polarity_flip_96.0=0x8
+phy_xaui_rx_polarity_flip_97.0=0x4
+phy_xaui_rx_polarity_flip_98.0=0x2
+phy_xaui_rx_polarity_flip_99.0=0x1
 phy_xaui_rx_polarity_flip_102.0=0xb
+phy_xaui_rx_polarity_flip_103.0=0x5
+phy_xaui_rx_polarity_flip_104.0=0x2
+phy_xaui_rx_polarity_flip_105.0=0x1
 phy_xaui_rx_polarity_flip_106.0=0xc
+phy_xaui_rx_polarity_flip_107.0=0x6
+phy_xaui_rx_polarity_flip_108.0=0x3
+phy_xaui_rx_polarity_flip_109.0=0x1
 phy_xaui_rx_polarity_flip_110.0=0x3
+phy_xaui_rx_polarity_flip_111.0=0x1
+phy_xaui_rx_polarity_flip_112.0=0x0
+phy_xaui_rx_polarity_flip_113.0=0x0
 phy_xaui_rx_polarity_flip_114.0=0xc
+phy_xaui_rx_polarity_flip_115.0=0x6
+phy_xaui_rx_polarity_flip_116.0=0x3
+phy_xaui_rx_polarity_flip_117.0=0x1
 phy_xaui_rx_polarity_flip_118.0=0xb
+phy_xaui_rx_polarity_flip_119.0=0x5
+phy_xaui_rx_polarity_flip_120.0=0x2
+phy_xaui_rx_polarity_flip_121.0=0x1
 phy_xaui_rx_polarity_flip_122.0=0x5
+phy_xaui_rx_polarity_flip_123.0=0x2
+phy_xaui_rx_polarity_flip_124.0=0x1
+phy_xaui_rx_polarity_flip_125.0=0x0
 phy_xaui_rx_polarity_flip_126.0=0x1
+phy_xaui_rx_polarity_flip_127.0=0x0
+phy_xaui_rx_polarity_flip_128.0=0x0
+phy_xaui_rx_polarity_flip_129.0=0x0
 phy_xaui_rx_polarity_flip_130.0=0x9
+phy_xaui_rx_polarity_flip_131.0=0x4
+phy_xaui_rx_polarity_flip_132.0=0x2
+phy_xaui_rx_polarity_flip_133.0=0x1
 phy_xaui_rx_polarity_flip_66.0=0x0
 phy_xaui_rx_polarity_flip_100.0=0x0
 phy_xaui_tx_polarity_flip_1.0=0x0
+phy_xaui_tx_polarity_flip_2.0=0x0
+phy_xaui_tx_polarity_flip_3.0=0x0
+phy_xaui_tx_polarity_flip_4.0=0x0
 phy_xaui_tx_polarity_flip_5.0=0xe
+phy_xaui_tx_polarity_flip_6.0=0x7
+phy_xaui_tx_polarity_flip_7.0=0x3
+phy_xaui_tx_polarity_flip_8.0=0x1
 phy_xaui_tx_polarity_flip_9.0=0x2
+phy_xaui_tx_polarity_flip_10.0=0x1
+phy_xaui_tx_polarity_flip_11.0=0x0
+phy_xaui_tx_polarity_flip_12.0=0x0
 phy_xaui_tx_polarity_flip_13.0=0xe
+phy_xaui_tx_polarity_flip_14.0=0x7
+phy_xaui_tx_polarity_flip_15.0=0x3
+phy_xaui_tx_polarity_flip_16.0=0x1
 phy_xaui_tx_polarity_flip_17.0=0xc
+phy_xaui_tx_polarity_flip_18.0=0x6
+phy_xaui_tx_polarity_flip_19.0=0x3
+phy_xaui_tx_polarity_flip_20.0=0x1
 phy_xaui_tx_polarity_flip_21.0=0xf
+phy_xaui_tx_polarity_flip_22.0=0x7
+phy_xaui_tx_polarity_flip_23.0=0x3
+phy_xaui_tx_polarity_flip_24.0=0x1
 phy_xaui_tx_polarity_flip_25.0=0xc
+phy_xaui_tx_polarity_flip_26.0=0x6
+phy_xaui_tx_polarity_flip_27.0=0x3
+phy_xaui_tx_polarity_flip_28.0=0x1
 phy_xaui_tx_polarity_flip_29.0=0xf
+phy_xaui_tx_polarity_flip_30.0=0x7
+phy_xaui_tx_polarity_flip_31.0=0x3
+phy_xaui_tx_polarity_flip_32.0=0x1
 phy_xaui_tx_polarity_flip_34.0=0x0
+phy_xaui_tx_polarity_flip_35.0=0x0
+phy_xaui_tx_polarity_flip_36.0=0x0
+phy_xaui_tx_polarity_flip_37.0=0x0
 phy_xaui_tx_polarity_flip_38.0=0xe
+phy_xaui_tx_polarity_flip_39.0=0x7
+phy_xaui_tx_polarity_flip_40.0=0x3
+phy_xaui_tx_polarity_flip_41.0=0x1
 phy_xaui_tx_polarity_flip_42.0=0x0
+phy_xaui_tx_polarity_flip_43.0=0x0
+phy_xaui_tx_polarity_flip_44.0=0x0
+phy_xaui_tx_polarity_flip_45.0=0x0
 phy_xaui_tx_polarity_flip_46.0=0xe
+phy_xaui_tx_polarity_flip_47.0=0x7
+phy_xaui_tx_polarity_flip_48.0=0x3
+phy_xaui_tx_polarity_flip_49.0=0x1
 phy_xaui_tx_polarity_flip_50.0=0xf
+phy_xaui_tx_polarity_flip_51.0=0x7
+phy_xaui_tx_polarity_flip_52.0=0x3
+phy_xaui_tx_polarity_flip_53.0=0x1
 phy_xaui_tx_polarity_flip_54.0=0xe
+phy_xaui_tx_polarity_flip_55.0=0x7
+phy_xaui_tx_polarity_flip_56.0=0x3
+phy_xaui_tx_polarity_flip_57.0=0x1
 phy_xaui_tx_polarity_flip_58.0=0x6
-phy_xaui_tx_polarity_flip_61.0=0xb
+phy_xaui_tx_polarity_flip_59.0=0x3
+phy_xaui_tx_polarity_flip_60.0=0x1
+phy_xaui_tx_polarity_flip_61.0=0x0
+phy_xaui_tx_polarity_flip_62.0=0xb
+phy_xaui_tx_polarity_flip_63.0=0x5
+phy_xaui_tx_polarity_flip_64.0=0x2
+phy_xaui_tx_polarity_flip_65.0=0x1
 phy_xaui_tx_polarity_flip_68.0=0x9
+phy_xaui_tx_polarity_flip_69.0=0x4
+phy_xaui_tx_polarity_flip_70.0=0x2
+phy_xaui_tx_polarity_flip_71.0=0x1
 phy_xaui_tx_polarity_flip_72.0=0xb
+phy_xaui_tx_polarity_flip_73.0=0x5
+phy_xaui_tx_polarity_flip_74.0=0x2
+phy_xaui_tx_polarity_flip_75.0=0x1
 phy_xaui_tx_polarity_flip_76.0=0xd
+phy_xaui_tx_polarity_flip_77.0=0x6
+phy_xaui_tx_polarity_flip_78.0=0x3
+phy_xaui_tx_polarity_flip_79.0=0x1
 phy_xaui_tx_polarity_flip_80.0=0x9
+phy_xaui_tx_polarity_flip_81.0=0x4
+phy_xaui_tx_polarity_flip_82.0=0x2
+phy_xaui_tx_polarity_flip_83.0=0x1
 phy_xaui_tx_polarity_flip_84.0=0x6
+phy_xaui_tx_polarity_flip_85.0=0x3
+phy_xaui_tx_polarity_flip_86.0=0x1
+phy_xaui_tx_polarity_flip_87.0=0x0
 phy_xaui_tx_polarity_flip_88.0=0xc
+phy_xaui_tx_polarity_flip_89.0=0x6
+phy_xaui_tx_polarity_flip_90.0=0x3
+phy_xaui_tx_polarity_flip_91.0=0x1
 phy_xaui_tx_polarity_flip_92.0=0x9
+phy_xaui_tx_polarity_flip_93.0=0x4
+phy_xaui_tx_polarity_flip_94.0=0x2
+phy_xaui_tx_polarity_flip_95.0=0x1
 phy_xaui_tx_polarity_flip_96.0=0x9
+phy_xaui_tx_polarity_flip_97.0=0x4
+phy_xaui_tx_polarity_flip_98.0=0x2
+phy_xaui_tx_polarity_flip_99.0=0x1
 phy_xaui_tx_polarity_flip_102.0=0x6
+phy_xaui_tx_polarity_flip_103.0=0x3
+phy_xaui_tx_polarity_flip_104.0=0x1
+phy_xaui_tx_polarity_flip_105.0=0x0
 phy_xaui_tx_polarity_flip_106.0=0xb
+phy_xaui_tx_polarity_flip_107.0=0x5
+phy_xaui_tx_polarity_flip_108.0=0x2
+phy_xaui_tx_polarity_flip_109.0=0x1
 phy_xaui_tx_polarity_flip_110.0=0x6
+phy_xaui_tx_polarity_flip_111.0=0x3
+phy_xaui_tx_polarity_flip_112.0=0x1
+phy_xaui_tx_polarity_flip_113.0=0x0
 phy_xaui_tx_polarity_flip_114.0=0xb
+phy_xaui_tx_polarity_flip_115.0=0x5
+phy_xaui_tx_polarity_flip_116.0=0x2
+phy_xaui_tx_polarity_flip_117.0=0x1
 phy_xaui_tx_polarity_flip_118.0=0x6
+phy_xaui_tx_polarity_flip_119.0=0x3
+phy_xaui_tx_polarity_flip_120.0=0x1
+phy_xaui_tx_polarity_flip_121.0=0x0
 phy_xaui_tx_polarity_flip_122.0=0xf
+phy_xaui_tx_polarity_flip_123.0=0x7
+phy_xaui_tx_polarity_flip_124.0=0x3
+phy_xaui_tx_polarity_flip_125.0=0x1
 phy_xaui_tx_polarity_flip_126.0=0x6
+phy_xaui_tx_polarity_flip_127.0=0x3
+phy_xaui_tx_polarity_flip_128.0=0x1
+phy_xaui_tx_polarity_flip_129.0=0x0
 phy_xaui_tx_polarity_flip_130.0=0xc
+phy_xaui_tx_polarity_flip_131.0=0x6
+phy_xaui_tx_polarity_flip_132.0=0x3
+phy_xaui_tx_polarity_flip_133.0=0x1
 phy_xaui_tx_polarity_flip_66.0=0x0
 phy_xaui_tx_polarity_flip_100.0=0x0
 portmap_1.0=1:100
@@ -245,7 +437,7 @@ xgxs_rx_lane_map_46.0=0x0321
 xgxs_rx_lane_map_50.0=0x1230
 xgxs_rx_lane_map_54.0=0x2301
 xgxs_rx_lane_map_58.0=0x1230
-xgxs_rx_lane_map_61.0=0x2103
+xgxs_rx_lane_map_62.0=0x2103
 xgxs_rx_lane_map_68.0=0x1230
 xgxs_rx_lane_map_72.0=0x2301
 xgxs_rx_lane_map_76.0=0x1230
@@ -278,7 +470,7 @@ xgxs_tx_lane_map_46.0=0x0321
 xgxs_tx_lane_map_50.0=0x0123
 xgxs_tx_lane_map_54.0=0x1230
 xgxs_tx_lane_map_58.0=0x2301
-xgxs_tx_lane_map_61.0=0x1032
+xgxs_tx_lane_map_62.0=0x1032
 xgxs_tx_lane_map_68.0=0x0123
 xgxs_tx_lane_map_72.0=0x1230
 xgxs_tx_lane_map_76.0=0x2301