Misc platform improvements for DCS-7060DX5-64S (#13875)

aaronpayment · abdullahenesoncu · byu343 · web-flow · commit a4098de52956 · 2023-08-18T13:05:05.000-07:00
* sonic-buildimage: Add 7060DX5-64S brcm tunnel config

Add bcm_tunnel_term_compatible_mode: 1 support, which allows
Loopback configuration to no longer result in SAI failure
"tunnel terminator add failed with error Feature unavailable"
that caused Orchagent SIGABRT

Signed-off-by: Aaron Payment &lt;aaronp@arista.com&gt;

* sonic-buildimage: Set port config ENABLE:0 in 7060DX5-64S brcm config

Set ENABLE:0 for the front panel ports in the brcm config so that the
ports are default admin down. This change prevents the issue that ports
are able to link up and pass traffic resulting in mac learn events after
SAI create switch and before SAI admin state up. The unexpected mac learn events
resulted in Orch agent crash in PortsOrch init, which occurs after SAI
create switch and before SAI admin state up.

* fix sensors.conf on CatalinaDD

* Add support for two sfp ports

* Add copper 50g tuning to babbagelp on catalina

---------

Signed-off-by: Aaron Payment &lt;aaronp@arista.com&gt;
Co-authored-by: enes.oncu &lt;enes.oncu@arista.com&gt;
Co-authored-by: Boyang Yu &lt;byu@arista.com&gt;
diff --git a/device/arista/x86_64-arista_7060dx5_64s/Arista-7060DX5-64S/hwsku.json b/device/arista/x86_64-arista_7060dx5_64s/Arista-7060DX5-64S/hwsku.json
@@ -255,6 +255,14 @@
         "Ethernet504": {
             "default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G]",
             "fec": "rs"
+        },
+        "Ethernet512": {
+            "default_brkout_mode": "1x10G",
+            "fec": "none"
+        },
+        "Ethernet513": {
+            "default_brkout_mode": "1x10G",
+            "fec": "none"
         }
     }
 }
diff --git a/device/arista/x86_64-arista_7060dx5_64s/Arista-7060DX5-64S/port_config.ini b/device/arista/x86_64-arista_7060dx5_64s/Arista-7060DX5-64S/port_config.ini
@@ -63,3 +63,5 @@ Ethernet480     237,238,239,240,241,242,243,244 Ethernet61/1 61     400000    rs
 Ethernet488     229,230,231,232,233,234,235,236 Ethernet62/1 62     400000    rs
 Ethernet496     249,250,251,252,253,254,255,256 Ethernet63/1 63     400000    rs
 Ethernet504     245,246,247,248,249,250,251,252 Ethernet64/1 64     400000    rs
+Ethernet512     258                             Ethernet65   65     10000     none
+Ethernet513     257                             Ethernet66   66     10000     none
diff --git a/device/arista/x86_64-arista_7060dx5_64s/Arista-7060DX5-64S/th4-a7060dx5-64s.config.bcm b/device/arista/x86_64-arista_7060dx5_64s/Arista-7060DX5-64S/th4-a7060dx5-64s.config.bcm
@@ -34,7 +34,7 @@ bcm_device:
             sai_field_group_auto_prioritize: 1
             #l3_intf_vlan_split_egress for MTU at L3IF
             l3_intf_vlan_split_egress : 1
-
+            bcm_tunnel_term_compatible_mode: 1
 ---
 device:
     0:
@@ -1073,6 +1073,14 @@ device:
                 PORT_ID: 258
             :
                 PC_PHYS_PORT_ID: 253
+            ?
+                PORT_ID: 152
+            :
+                PC_PHYS_PORT_ID: 257
+            ?
+                PORT_ID: 50
+            :
+                PC_PHYS_PORT_ID: 258
 ...
 ---
 device:
@@ -1085,6 +1093,13 @@ device:
                 ENABLE: 1
                 SPEED: 10000
                 NUM_LANES: 1
+            ?
+                PORT_ID: [[50, 50], [152, 152]]
+            :
+                ENABLE: 1
+                MAX_FRAME_SIZE: 9416
+                SPEED: 10000
+                NUM_LANES: 1
             ?
                 PORT_ID: [[1, 4],
                           [17, 20],
@@ -1103,7 +1118,7 @@ device:
                           [238, 241],
                           [255, 258]]
             :
-                ENABLE: 1
+                ENABLE: 0
                 SPEED: 400000
                 NUM_LANES: 8
                 FEC_MODE: PC_FEC_RS544_2XN
diff --git a/device/arista/x86_64-arista_7060dx5_64s/platform.json b/device/arista/x86_64-arista_7060dx5_64s/platform.json
@@ -49,52 +49,52 @@
         ],
         "thermals": [
             {
-                "name": "Cpu temp sensor"
+                "name": "Board sensor",
+                "controllable": false
             },
             {
-                "name": "CPU board temp sensor"
+                "name": "TH4 exhaust temp sensor",
+                "controllable": false
             },
             {
-                "name": "Back-panel temp sensor"
+                "name": "Inlet temp sensor",
+                "controllable": false
             },
             {
-                "name": "Board sensor"
+                "name": "CPU board temp sensor",
+                "controllable": false
             },
             {
-                "name": "Switch board middle sensor"
+                "name": "Back panel temp sensor",
+                "controllable": false
             },
             {
-                "name": "Switch board left sensor"
+                "name": "Front panel temp sensor",
+                "controllable": false
             },
             {
-                "name": "Front-panel temp sensor"
+                "name": "Power supply 1 hotspot sensor",
+                "controllable": false
             },
             {
-                "name": "Switch chip diode 1 sensor"
+                "name": "Power supply 1 inlet temp sensor",
+                "controllable": false
             },
             {
-                "name": "Switch chip diode 2 sensor"
+                "name": "Power supply 1 exhaust temp sensor",
+                "controllable": false
             },
             {
-                "name": "Front-panel temp sensor"
+                "name": "Power supply 2 hotspot sensor",
+                "controllable": false
             },
             {
-                "name": "Power supply 1 inlet temp sensor"
+                "name": "Power supply 2 inlet temp sensor",
+                "controllable": false
             },
             {
-                "name": "Power supply 1 secondary hotspot sensor"
-            },
-            {
-                "name": "Power supply 1 primary hotspot sensor"
-            },
-            {
-                "name": "Power supply 2 inlet temp sensor"
-            },
-            {
-                "name": "Power supply 2 secondary hotspot sensor"
-            },
-            {
-                "name": "Power supply 2 primary hotspot sensor"
+                "name": "Power supply 2 exhaust temp sensor",
+                "controllable": false
             }
         ],
         "sfps": [
@@ -2154,6 +2154,24 @@
                     "Ethernet64/8"
                 ]
             }
+        },
+        "Ethernet512": {
+            "index": "65",
+            "lanes": "258",
+            "breakout_modes": {
+                "1x10G": [
+                    "Ethernet65"
+                ]
+            }
+        },
+        "Ethernet513": {
+            "index": "66",
+            "lanes": "257",
+            "breakout_modes": {
+                "1x10G": [
+                    "Ethernet66"
+                ]
+            }
         }
     }
 }
diff --git a/device/arista/x86_64-arista_7060px5_64s/Arista-7060PX5-64S/blackhawk.xml b/device/arista/x86_64-arista_7060px5_64s/Arista-7060PX5-64S/blackhawk.xml
@@ -4,12 +4,6 @@
   <phy_addr>0</phy_addr>
   <mode>retimer</mode>
   <topology>1</topology>
-  <tx-taps>
-      <PAM4>2,-8,17,0,0</PAM4>
-      <NRZ>0,-8,17,0,0</NRZ>
-   </tx-taps>
-   <tx-taps-scale>0,0,1,0,0</tx-taps-scale>
-
   <lane id="0" tx-polarity="0" rx-polarity="0" />
   <lane id="1" tx-polarity="0" rx-polarity="0" />
   <lane id="2" tx-polarity="0" rx-polarity="0" />
@@ -26,4 +20,23 @@
   <lane id="13" tx-polarity="0" rx-polarity="0" />
   <lane id="14" tx-polarity="0" rx-polarity="0" />
   <lane id="15" tx-polarity="0" rx-polarity="0" />
+
+  <PAM4>
+    <lane id="0" tx-taps="0,0,-8,117,-2,0,0"/>
+    <lane id="1" tx-taps="0,0,-8,117,-2,0,0"/>
+    <lane id="2" tx-taps="0,0,-8,117,-2,0,0"/>
+    <lane id="3" tx-taps="0,0,-8,117,-2,0,0"/>
+    <lane id="4" tx-taps="0,0,-8,117,-2,0,0"/>
+    <lane id="5" tx-taps="0,0,-8,117,-2,0,0"/>
+    <lane id="6" tx-taps="0,0,-8,117,-2,0,0"/>
+    <lane id="7" tx-taps="0,0,-8,117,-2,0,0"/>
+    <lane id="8" tx-taps="0,10,-22,93,-2,0,0"/>
+    <lane id="9" tx-taps="0,10,-22,93,-2,0,0"/>
+    <lane id="10" tx-taps="0,10,-22,93,-2,0,0"/>
+    <lane id="11" tx-taps="0,10,-22,93,-2,0,0"/>
+    <lane id="12" tx-taps="0,10,-22,93,-2,0,0"/>
+    <lane id="13" tx-taps="0,10,-22,93,-2,0,0"/>
+    <lane id="14" tx-taps="0,10,-22,93,-2,0,0"/>
+    <lane id="15" tx-taps="0,10,-22,93,-2,0,0"/>
+  </PAM4>
 </root>
diff --git a/device/arista/x86_64-arista_7060px5_64s/sensors.conf b/device/arista/x86_64-arista_7060px5_64s/sensors.conf
@@ -7,20 +7,15 @@ bus "i2c-23" "SCD 0000:01:00.0 SMBus master 1 bus 4"
 bus "i2c-24" "SCD 0000:01:00.0 SMBus master 1 bus 5"
 bus "i2c-107" "SCD 0000:00:18.7 SMBus master 0 bus 0"
 
-chip "max6581-i2c-19-4d"
+chip "tmp464-i2c-19-48"
     label temp1 "Board sensor"
     label temp2 "TH4 exhaust temp sensor"
-    label temp3 "Left edge PCB rear temp sensor"
-    label temp4 "Inlet temp sensor"
-    ignore temp5
-    ignore temp6
-    label temp7 "Diode temp sensor 1"
-    label temp8 "Diode temp sensor 2"
+    label temp3 "Inlet temp sensor"
 
 chip "dps800-i2c-22-58"
     label temp1 "Power supply 1 hotspot sensor"
     label temp2 "Power supply 1 inlet temp sensor"
-    label temp3 "Power supply 1 exhaust temp sensor"
+    ignore temp3 "Power supply 1 exhaust temp sensor"
 
 chip "dps800-i2c-23-58"
     label temp1 "Power supply 2 hotspot sensor"

Original file line number	Diff line number	Diff line change
`@@ -255,6 +255,14 @@`
`255`	`255`	`"Ethernet504": {`
`256`	`256`	`"default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G]",`
`257`	`257`	`"fec": "rs"`
	`258`	`+ },`
	`259`	`+ "Ethernet512": {`
	`260`	`+ "default_brkout_mode": "1x10G",`
	`261`	`+ "fec": "none"`
	`262`	`+ },`
	`263`	`+ "Ethernet513": {`
	`264`	`+ "default_brkout_mode": "1x10G",`
	`265`	`+ "fec": "none"`
`258`	`266`	`}`
`259`	`267`	`}`
`260`	`268`	`}`