Skip to content

Commit

Permalink
Merged PR 6362354: Manual merge from github/202012 to internal-202012
Browse files Browse the repository at this point in the history 
Related work items: sonic-net#90, sonic-net#282, sonic-net#7652, sonic-net#11220, sonic-net#11333, sonic-net#11358, sonic-net#11359, sonic-net#11371, sonic-net#11383, sonic-net#11386, sonic-net#11391, sonic-net#11398, sonic-net#11400, sonic-net#11406, sonic-net#11414, sonic-net#11421, sonic-net#11422, sonic-net#11427, sonic-net#11448, sonic-net#11451
  • Loading branch information
@neethajohn
neethajohn committed Jul 21, 2022
2 parents 876ec71 + b90e1ff commit eee28a4
Show file tree
Hide file tree
Showing 61 changed files with 2,299 additions and 163 deletions.
2 changes: 1 addition & 1 deletion azure-pipelines.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ stages:

- stage: Test
dependsOn: BuildVS
condition: and(ne(stageDependencies.BuildVS.outputs['vs.SetVar.SKIP_VSTEST'], 'YES'), succeeded())
condition: and(ne(stageDependencies.BuildVS.outputs['vs.SetVar.SKIP_VSTEST'], 'YES'), in(dependencies.BuildVS.result, 'Succeeded', 'SucceededWithIssues'))
variables:
- name: inventory
value: veos_vtb
Expand Down
12 changes: 6 additions & 6 deletions device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D96C16/pg_profile_lookup.ini
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# PG lossless profiles.
# speed cable size xon xoff threshold xon_offset
50000 5m 1248 1248 56160 -3 2496
100000 5m 1248 1248 96928 -3 2496
50000 40m 1248 1248 96096 -3 2496
100000 40m 1248 1248 177632 -3 2496
50000 300m 1248 1248 141856 -3 2496
100000 300m 1248 1248 268736 -3 2496
50000 5m 1248 1248 56160 0 2496
100000 5m 1248 1248 96928 0 2496
50000 40m 1248 1248 96096 0 2496
100000 40m 1248 1248 177632 0 2496
50000 300m 1248 1248 141856 0 2496
100000 300m 1248 1248 268736 0 2496
20 changes: 20 additions & 0 deletions device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D96C16/qos.json.j2
View file
Original file line number Diff line number Diff line change
@@ -1 +1,21 @@
{%- macro generate_wred_profiles() %}
"WRED_PROFILE": {
"AZURE_LOSSLESS" : {
"wred_green_enable" : "true",
"wred_yellow_enable" : "true",
"wred_red_enable" : "true",
"ecn" : "ecn_all",
"green_max_threshold" : "10000000",
"green_min_threshold" : "2000000",
"yellow_max_threshold" : "2097152",
"yellow_min_threshold" : "1048576",
"red_max_threshold" : "2097152",
"red_min_threshold" : "1048576",
"green_drop_probability" : "5",
"yellow_drop_probability": "5",
"red_drop_probability" : "5"
}
},
{%- endmacro %}

{%- include 'qos_config.j2' %}
18 changes: 9 additions & 9 deletions device/common/profiles/th2/7260/BALANCED/pg_profile_lookup.ini
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
# PG lossless profiles.
# speed cable size xon xoff threshold xon_offset
100000 5m 1248 1248 54080 -3 2496
100000 40m 1248 1248 59696 -3 2496
100000 300m 1248 1248 101088 -3 2496
50000 5m 1248 1248 54080 -3 2496
50000 40m 1248 1248 59696 -3 2496
50000 300m 1248 1248 101088 -3 2496
40000 5m 1248 1248 29536 -3 2496
40000 40m 1248 1248 31616 -3 2496
40000 300m 1248 1248 48256 -3 2496
100000 5m 1248 1248 54080 0 2496
100000 40m 1248 1248 59696 0 2496
100000 300m 1248 1248 101088 0 2496
50000 5m 1248 1248 54080 0 2496
50000 40m 1248 1248 59696 0 2496
50000 300m 1248 1248 101088 0 2496
40000 5m 1248 1248 29536 0 2496
40000 40m 1248 1248 31616 0 2496
40000 300m 1248 1248 48256 0 2496
20 changes: 20 additions & 0 deletions device/common/profiles/th2/7260/BALANCED/qos.json.j2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -289,4 +289,24 @@
{%- endmacro %}
{% endif %}

{%- macro generate_wred_profiles() %}
"WRED_PROFILE": {
"AZURE_LOSSLESS" : {
"wred_green_enable" : "true",
"wred_yellow_enable" : "true",
"wred_red_enable" : "true",
"ecn" : "ecn_all",
"green_max_threshold" : "10000000",
"green_min_threshold" : "2000000",
"yellow_max_threshold" : "2097152",
"yellow_min_threshold" : "1048576",
"red_max_threshold" : "2097152",
"red_min_threshold" : "1048576",
"green_drop_probability" : "5",
"yellow_drop_probability": "5",
"red_drop_probability" : "5"
}
},
{%- endmacro %}

{%- include 'qos_config.j2' %}
18 changes: 9 additions & 9 deletions device/common/profiles/th2/7260/RDMA-CENTRIC/pg_profile_lookup.ini
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
# PG lossless profiles.
# speed cable size xon xoff threshold xon_offset
100000 5m 1248 1248 54080 -3 2496
100000 40m 1248 1248 59696 -3 2496
100000 300m 1248 1248 101088 -3 2496
50000 5m 1248 1248 54080 -3 2496
50000 40m 1248 1248 59696 -3 2496
50000 300m 1248 1248 101088 -3 2496
40000 5m 1248 1248 29536 -3 2496
40000 40m 1248 1248 31616 -3 2496
40000 300m 1248 1248 48256 -3 2496
100000 5m 1248 1248 54080 0 2496
100000 40m 1248 1248 59696 0 2496
100000 300m 1248 1248 101088 0 2496
50000 5m 1248 1248 54080 0 2496
50000 40m 1248 1248 59696 0 2496
50000 300m 1248 1248 101088 0 2496
40000 5m 1248 1248 29536 0 2496
40000 40m 1248 1248 31616 0 2496
40000 300m 1248 1248 48256 0 2496
20 changes: 20 additions & 0 deletions device/common/profiles/th2/7260/RDMA-CENTRIC/qos.json.j2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -289,4 +289,24 @@
{%- endmacro %}
{% endif %}

{%- macro generate_wred_profiles() %}
"WRED_PROFILE": {
"AZURE_LOSSLESS" : {
"wred_green_enable" : "true",
"wred_yellow_enable" : "true",
"wred_red_enable" : "true",
"ecn" : "ecn_all",
"green_max_threshold" : "10000000",
"green_min_threshold" : "2000000",
"yellow_max_threshold" : "2097152",
"yellow_min_threshold" : "1048576",
"red_max_threshold" : "2097152",
"red_min_threshold" : "1048576",
"green_drop_probability" : "5",
"yellow_drop_probability": "5",
"red_drop_probability" : "5"
}
},
{%- endmacro %}

{%- include 'qos_config.j2' %}
21 changes: 21 additions & 0 deletions device/mellanox/x86_64-mlnx_msn3700-r0/get_sensors_conf_path
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
#!/bin/bash

HW_RESPIN_VERSION="/var/run/hw-management/system/config3"
SENSORS_CONF_FILE="/usr/share/sonic/platform/sensors.conf"
SENSORS_RESPIN_CONF_FILE="/usr/share/sonic/platform/sensors_respin.conf"

function get_sensor_conf_path() {
local _HW_RESPIN_VERSION="0"
if [[ -e $HW_RESPIN_VERSION ]]; then
_HW_RESPIN_VERSION=$(cat $HW_RESPIN_VERSION 2>&1)
if [[ "$_HW_RESPIN_VERSION" == "1" ]]; then
if [[ -e $SENSORS_RESPIN_CONF_FILE ]]; then
echo $SENSORS_RESPIN_CONF_FILE
return
fi
fi
fi
echo $SENSORS_CONF_FILE
}

get_sensor_conf_path
187 changes: 187 additions & 0 deletions device/mellanox/x86_64-mlnx_msn3700-r0/sensors_respin.conf
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,187 @@
##
## Copyright (c) 2022 NVIDIA CORPORATION & AFFILIATES.
## Apache-2.0
##
## Licensed under the Apache License, Version 2.0 (the "License");
## you may not use this file except in compliance with the License.
## You may obtain a copy of the License at
##
## http://www.apache.org/licenses/LICENSE-2.0
##
## Unless required by applicable law or agreed to in writing, software
## distributed under the License is distributed on an "AS IS" BASIS,
## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
## See the License for the specific language governing permissions and
## limitations under the License.
##

# Temperature sensors
bus "i2c-2" "i2c-1-mux (chan_id 1)"
chip "mlxsw-i2c-*-48"
label temp1 "Ambient ASIC Temp"

bus "i2c-7" "i2c-1-mux (chan_id 6)"
chip "tmp102-i2c-*-49"
label temp1 "Ambient Fan Side Temp (air intake)"
chip "tmp102-i2c-*-4a"
label temp1 "Ambient Port Side Temp (air exhaust)"

bus "i2c-15" "i2c-1-mux (chan_id 6)"
chip "tmp102-i2c-15-49"
label temp1 "Ambient COMEX Temp"

# Power controllers
bus "i2c-5" "i2c-1-mux (chan_id 4)"
chip "tps53679-i2c-*-70"
label in1 "PMIC-1 PSU 12V Rail (in1)"
label in2 "PMIC-1 PSU 12V Rail (in2)"
label in3 "PMIC-1 ASIC 0.8V VCORE Rail (out)"
label in4 "PMIC-1 ASIC 1.2V Rail (out)"
label temp1 "PMIC-1 Temp 1"
label temp2 "PMIC-1 Temp 2"
label power1 "PMIC-1 ASIC 0.8V VCORE Rail Pwr (out)"
label power2 "PMIC-1 ASIC 1.2V Rail Pwr (out)"
label curr1 "PMIC-1 ASIC 0.8V VCORE Rail Curr (out)"
label curr2 "PMIC-1 ASIC 1.2V Rail Curr (out)"
chip "tps53679-i2c-*-71"
label in1 "PMIC-2 PSU 12V Rail (in1)"
label in2 "PMIC-2 PSU 12V Rail (in2)"
label in3 "PMIC-2 ASIC 3.3V Rail (out)"
compute in3 (1.5)*@, @/(1.5)
label in4 "PMIC-2 ASIC 1.8V Rail (out)"
label temp1 "PMIC-2 Temp 1"
label temp2 "PMIC-2 Temp 2"
label power1 "PMIC-2 ASIC 3.3V Rail Pwr (out)"
label power2 "PMIC-2 ASIC 1.8V Rail Pwr (out)"
label curr1 "PMIC-2 ASIC 3.3V Rail Curr (out)"
label curr2 "PMIC-2 ASIC 1.8V Rail Curr (out)"

chip "mp2975-i2c-*-62"
label in1 "PMIC-1 PSU 12V Rail (in)"
label in2 "PMIC-1 ASIC 0.8V VCORE Rail (out)"
label in3 "PMIC-1 ASIC 1.2V Rail (out)"
ignore in4
label temp1 "PMIC-1 Temp 1"
label temp2 "PMIC-1 Temp 2"
label power1 "PMIC-1 ASIC 0.8V VCORE Rail Pwr (out)"
label power2 "PMIC-1 ASIC 1.2V Rail Pwr (out)"
label curr1 "PMIC-1 ASIC 0.8V VCORE Rail Curr (out)"
label curr2 "PMIC-1 ASIC 1.2V Rail Curr (out)"
chip "mp2975-i2c-*-66"
label in1 "PMIC-2 PSU 12V Rail (in)"
label in2 "PMIC-2 ASIC 3.3V Rail (out)"
compute in2 (2)*@, @/(2)
label in3 "PMIC-2 ASIC 1.8V Rail (out)"
ignore in4
label temp1 "PMIC-2 Temp 1"
label temp2 "PMIC-2 Temp 2"
label power1 "PMIC-2 ASIC 3.3V Rail Pwr (out)"
label power2 "PMIC-2 ASIC 1.8V Rail Pwr (out)"
label curr1 "PMIC-2 ASIC 3.3V Rail Curr (out)"
label curr2 "PMIC-2 ASIC 1.8V Rail Curr (out)"

bus "i2c-15" "i2c-1-mux (chan_id 6)"
chip "tps53679-i2c-*-58"
label in1 "PMIC-3 PSU 12V Rail (in1)"
label in2 "PMIC-3 PSU 12V Rail (in2)"
label in3 "PMIC-3 COMEX 1.8V Rail (out)"
label in4 "PMIC-3 COMEX 1.05V Rail (out)"
label temp1 "PMIC-3 Temp 1"
label temp2 "PMIC-3 Temp 2"
label power1 "PMIC-3 COMEX 1.8V Rail Pwr (out)"
label power2 "PMIC-3 COMEX 1.05V Rail Pwr (out)"
label curr1 "PMIC-3 COMEX 1.8V Rail Curr (out)"
label curr2 "PMIC-3 COMEX 1.05V Rail Curr (out)"
chip "tps53679-i2c-*-61"
label in1 "PMIC-4 PSU 12V Rail (in1)"
label in2 "PMIC-4 PSU 12V Rail (in2)"
label in3 "PMIC-4 COMEX 1.2V Rail (out)"
ignore in4
label temp1 "PMIC-4 Temp 1"
label temp2 "PMIC-4 Temp 2"
label power1 "PMIC-4 COMEX 1.2V Rail Pwr (out)"
ignore power2
label curr1 "PMIC-4 COMEX 1.2V Rail Curr (out)"
ignore curr2

chip "mp2975-i2c-*-6a"
label in1 "PMIC-3 PSU 12V Rail (in1)"
label in2 "PMIC-3 COMEX 1.8V Rail (out)"
label in3 "PMIC-3 COMEX 1.05V Rail (out)"
label temp1 "PMIC-3 Temp 1"
label power1 "PMIC-3 COMEX 12V Rail Pwr (in)"
label power2 "PMIC-3 COMEX 1.8V Rail Pwr (out)"
label power3 "PMIC-3 COMEX 1.05V Rail Pwr (out)"
label curr1 "PMIC-3 COMEX 12V Rail Curr (in)"
label curr2 "PMIC-3 COMEX 1.8V Rail Curr (out)"
ignore curr3
ignore curr4
label curr5 "PMIC-3 COMEX 1.05V Rail Curr (out)"
ignore curr6

chip "mp2975-i2c-*-61"
label in1 "PMIC-4 PSU 12V Rail (in1)"
label in2 "PMIC-4 COMEX 1.2V Rail (out)"
label temp1 "PMIC-4 Temp 1"
label temp2 "PMIC-4 Temp 2"
label power1 "PMIC-4 COMEX 12V Rail Pwr (in)"
label power2 "PMIC-4 COMEX 1.2V Rail Pwr (out)"
label curr1 "PMIC-4 COMEX 12V Rail Curr (in)"
label curr2 "PMIC-4 COMEX 1.2V Rail Curr (out)"
ignore curr3

# Power supplies
bus "i2c-4" "i2c-1-mux (chan_id 3)"
chip "dps460-i2c-*-58"
label in1 "PSU-1 220V Rail (in)"
ignore in2
label in3 "PSU-1 12V Rail (out)"
label fan1 "PSU-1 Fan 1"
ignore fan2
ignore fan3
label temp1 "PSU-1 Temp 1"
label temp2 "PSU-1 Temp 2"
label temp3 "PSU-1 Temp 3"
label power1 "PSU-1 220V Rail Pwr (in)"
label power2 "PSU-1 12V Rail Pwr (out)"
label curr1 "PSU-1 220V Rail Curr (in)"
label curr2 "PSU-1 12V Rail Curr (out)"
set in3_lcrit in3_crit * 0.662
set in3_min in3_crit * 0.745
set in3_max in3_crit * 0.952
chip "dps460-i2c-*-59"
label in1 "PSU-2 220V Rail (in)"
ignore in2
label in3 "PSU-2 12V Rail (out)"
label fan1 "PSU-2 Fan 1"
ignore fan2
ignore fan3
label temp1 "PSU-2 Temp 1"
label temp2 "PSU-2 Temp 2"
label temp3 "PSU-2 Temp 3"
label power1 "PSU-2 220V Rail Pwr (in)"
label power2 "PSU-2 12V Rail Pwr (out)"
label curr1 "PSU-2 220V Rail Curr (in)"
label curr2 "PSU-2 12V Rail Curr (out)"
set in3_lcrit in3_crit * 0.662
set in3_min in3_crit * 0.745
set in3_max in3_crit * 0.952

# Chassis fans
chip "mlxreg_fan-isa-*"
label fan1 "Chassis Fan Drawer-1 Tach 1"
label fan2 "Chassis Fan Drawer-1 Tach 2"
label fan3 "Chassis Fan Drawer-2 Tach 1"
label fan4 "Chassis Fan Drawer-2 Tach 2"
label fan5 "Chassis Fan Drawer-3 Tach 1"
label fan6 "Chassis Fan Drawer-3 Tach 2"
label fan7 "Chassis Fan Drawer-4 Tach 1"
label fan8 "Chassis Fan Drawer-4 Tach 2"
label fan9 "Chassis Fan Drawer-5 Tach 1"
label fan10 "Chassis Fan Drawer-5 Tach 2"
label fan11 "Chassis Fan Drawer-6 Tach 1"
label fan12 "Chassis Fan Drawer-6 Tach 2"

# Miscellaneous
chip "*-virtual-*"
ignore temp1
1 change: 1 addition & 0 deletions device/mellanox/x86_64-mlnx_msn3700c-r0/get_sensors_conf_path
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../x86_64-mlnx_msn3700-r0/get_sensors_conf_path
Loading

0 comments on commit eee28a4

Please sign in to comment.