From 6d88b687141a44c3a91d95ae7dfad6501eb321a7 Mon Sep 17 00:00:00 2001
From: bofish-arista <128172814+bofish-arista@users.noreply.github.com>
Date: Mon, 29 Apr 2024 20:47:01 -0400
Subject: [PATCH] Misc platform improvements for DCS-7060DX5-64S - 202305 port
(#18701)
Why I did it
Misc platform improvements for DCS-7060DX5-64S.
NOTE: these changes have been committed to master and 202311 branches via PR #13875. Objective of this PR is to bring equivalent changes to 202305 branch.
Includes changes for:
Add 7060DX5-64S brcm tunnel config support
Set port config ENABLE:0 in 7060DX5-64S brcm config
Sensor.conf fixes
SFP port support
Add copper 50g tuning to babbagelp
How I did it
Commits describe the changes
How to verify it
Fixes have been uncovered and validated in our in-house testing and running sonic-mgmt testing on DCS-7060DX5-64S. For this backport request, the fixes are retested on 202305 via in-house testing.
---
.../Arista-7060DX5-64S/hwsku.json | 8 +++
.../Arista-7060DX5-64S/port_config.ini | 2 +
.../th4-a7060dx5-64s.config.bcm | 19 +++++-
.../x86_64-arista_7060dx5_64s/platform.json | 66 ++++++++++++-------
.../Arista-7060PX5-64S/blackhawk.xml | 25 +++++--
.../x86_64-arista_7060px5_64s/sensors.conf | 34 ++++++----
6 files changed, 111 insertions(+), 43 deletions(-)
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
index 7862b2cd46..56c0816289 100644
--- 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
index 1aaf907498..c7bdcf79be 100644
--- 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
index 12225a79ce..1d58944983 100644
--- 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
index 6442500a35..fa89a17687 100644
--- 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
index 5db2840cef..b9fe12f1e4 100644
--- 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 @@
0
retimer
1
-
- 2,-8,17,0,0
- 0,-8,17,0,0
-
- 0,0,1,0,0
-
@@ -26,4 +20,23 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/device/arista/x86_64-arista_7060px5_64s/sensors.conf b/device/arista/x86_64-arista_7060px5_64s/sensors.conf
index e9f43494d6..cbfb543698 100644
--- a/device/arista/x86_64-arista_7060px5_64s/sensors.conf
+++ b/device/arista/x86_64-arista_7060px5_64s/sensors.conf
@@ -7,29 +7,41 @@ 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"
- label temp1 "Board sensor"
- label temp2 "TH4 exhaust temp sensor"
- label temp3 "Left edge PCB rear temp sensor"
- label temp4 "Inlet temp sensor"
+chip "tmp464-i2c-19-48"
+ label temp1 "Switch card"
+ label temp2 "Air outlet"
+ label temp3 "Air inlet"
+ ignore temp4
ignore temp5
ignore temp6
- label temp7 "Diode temp sensor 1"
- label temp8 "Diode temp sensor 2"
+ ignore temp7
+ ignore temp8
+ ignore temp9
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
+
+ ignore fan2
+ ignore fan3
+ ignore fan4
chip "dps800-i2c-23-58"
label temp1 "Power supply 2 hotspot sensor"
label temp2 "Power supply 2 inlet temp sensor"
- label temp3 "Power supply 2 exhaust temp sensor"
+ ignore temp3
+
+ ignore fan2
+ ignore fan3
+ ignore fan4
chip "lm73-i2c-24-48"
- label temp1 "Front panel temp sensor"
+ label temp1 "Front-panel temp sensor"
chip "max6658-i2c-107-4c"
label temp1 "CPU board temp sensor"
- label temp2 "Back panel temp sensor"
+ label temp2 "Back-panel temp sensor"
+
+chip "k10temp-pci-00c3"
+ label temp1 "Cpu temp sensor"