Skip to content

[code sync] Merge code from sonic-net/sonic-buildimage:202305 to 202305 #357

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mssonicbld merged 2 commits into from
Apr 30, 2024
Merged

[code sync] Merge code from sonic-net/sonic-buildimage:202305 to 202305 #357

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6d88b68
Misc platform improvements for DCS-7060DX5-64S - 202305 port (#18701)
bofish-arista Apr 30, 2024
3ab6bce
Merge branch '202305' of https://github.com/sonic-net/sonic-buildimag…
mssonicbld Apr 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions device/arista/x86_64-arista_7060dx5_64s/Arista-7060DX5-64S/hwsku.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
}
2 changes: 2 additions & 0 deletions device/arista/x86_64-arista_7060dx5_64s/Arista-7060DX5-64S/port_config.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
19 changes: 17 additions & 2 deletions device/arista/x86_64-arista_7060dx5_64s/Arista-7060DX5-64S/th4-a7060dx5-64s.config.bcm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand All @@ -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],
Expand All @@ -1103,7 +1118,7 @@ device:
[238, 241],
[255, 258]]
:
ENABLE: 1
ENABLE: 0
SPEED: 400000
NUM_LANES: 8
FEC_MODE: PC_FEC_RS544_2XN
Expand Down
66 changes: 42 additions & 24 deletions device/arista/x86_64-arista_7060dx5_64s/platform.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
Expand Down Expand Up @@ -2154,6 +2154,24 @@
"Ethernet64/8"
]
}
},
"Ethernet512": {
"index": "65",
"lanes": "258",
"breakout_modes": {
"1x10G": [
"Ethernet65"
]
}
},
"Ethernet513": {
"index": "66",
"lanes": "257",
"breakout_modes": {
"1x10G": [
"Ethernet66"
]
}
}
}
}
25 changes: 19 additions & 6 deletions device/arista/x86_64-arista_7060px5_64s/Arista-7060PX5-64S/blackhawk.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand All @@ -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>
34 changes: 23 additions & 11 deletions device/arista/x86_64-arista_7060px5_64s/sensors.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"