[pull] master from Azure:master

device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/buffers.json.j2

@@ -1,3 +1,3 @@
-{%- set default_topo = 't0' %}
+{%- set default_topo = 't1' %}
 {%- include 'buffers_config.j2' %}
 

device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/buffers_defaults_t1.j2

@@ -0,0 +1,46 @@
+{%- set default_cable = '300m' %}
+
+{%- macro generate_port_lists(PORT_ALL) %}
+    {# Generate list of ports #}
+    {%- for port_idx in range(0,64) %}
+        {%- if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{%- endif %}
+    {%- endfor %}
+{%- endmacro %}
+
+{%- macro generate_buffer_pool_and_profiles() %}
+    "BUFFER_POOL": {
+        "ingress_lossless_pool": {
+            "size": "33329088",
+            "type": "ingress",
+            "mode": "dynamic",
+            "xoff": "7827456"
+        },
+        "egress_lossy_pool": {
+            "size": "26663272",
+            "type": "egress",
+            "mode": "dynamic"
+        },
+        "egress_lossless_pool": {
+            "size": "42349632",
+            "type": "egress",
+            "mode": "static"
+        }
+    },
+    "BUFFER_PROFILE": {
+        "ingress_lossy_profile": {
+            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
+            "size":"0",
+            "static_th":"44302336"
+        },
+        "egress_lossless_profile": {
+            "pool":"[BUFFER_POOL|egress_lossless_pool]",
+            "size":"0",
+            "static_th":"42349632"
+        },
+        "egress_lossy_profile": {
+            "pool":"[BUFFER_POOL|egress_lossy_pool]",
+            "size":"1664",
+            "dynamic_th":"-1"
+        }
+    },
+{%- endmacro %}

device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/config.bcm.j2

@@ -1,11 +1,20 @@
 {# Construct config.bcm to include additional soc properties per specific device metadata requirement #}
+{%- set mmu_sock = 'mmu_init_config="MSFT-TH2-Tier1"' -%}
 {%- set IPinIP_sock = '' -%}
-{%- if DEVICE_METADATA is defined and DEVICE_METADATA['localhost'] is defined and DEVICE_METADATA['localhost']['subtype'] is defined -%}
-{%-     set switch_subtype = DEVICE_METADATA['localhost']['subtype'] -%}
-{%-     if 'dualtor' in switch_subtype.lower() %}
-{%-         set IPinIP_sock = 'sai_tunnel_support=1
-                               host_as_route_disable=1
-                               l3_ecmp_levels=2' -%}
+{%- if DEVICE_METADATA is defined and DEVICE_METADATA['localhost'] is defined -%}
+{%-     if DEVICE_METADATA['localhost']['type'] is defined -%}
+{%-         set switch_role = DEVICE_METADATA['localhost']['type'] -%}
+{%-         if 'torrouter' in switch_role.lower() or 'torswitch' in switch_role.lower() %}
+{%-             set mmu_sock = 'mmu_init_config="MSFT-TH2-Tier0"' -%}
+{%-         endif %}
+{%-     endif %}
+{%-     if DEVICE_METADATA['localhost']['subtype'] is defined -%}
+{%-         set switch_subtype = DEVICE_METADATA['localhost']['subtype'] -%}
+{%-         if 'dualtor' in switch_subtype.lower() %}
+{%-             set IPinIP_sock = 'sai_tunnel_support=1
+                                   host_as_route_disable=1
+                                   l3_ecmp_levels=2' -%}
+{%-         endif %}
 {%-     endif %}
 {%- endif %}
 {# The following is the common soc properties that used to be named "th2-a7260cx3-64-64x40G.config.bcm" #}
@@ -1023,5 +1032,5 @@ serdes_preemphasis_115=0x61c01
 serdes_preemphasis_116=0x105004
 serdes_preemphasis_117=0x105004
 
-mmu_init_config="MSFT-TH2-Tier0"
+{{ mmu_sock }}
 {{ IPinIP_sock }}

device/mellanox/x86_64-mlnx_msn4600-r0/get_sensors_conf_path

@@ -0,0 +1 @@
+../x86_64-mlnx_msn4700-r0/get_sensors_conf_path

device/mellanox/x86_64-mlnx_msn4600-r0/sensors.conf.a1

@@ -0,0 +1,133 @@
+################################################################################
+# Copyright (c) 2021 Mellanox Technologies
+#
+# Platform specific sensors config for SN4600
+################################################################################
+
+# 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 "mp2975-i2c-*-62"
+        label in1 "PMIC-1 PSU 12V Rail (in1)"
+        label in2 "PMIC-1 ASIC 0.8V VCORE MAIN Rail (out)"
+        label temp1 "PMIC-1 Temp 1"
+        label power1 "PMIC-1 PSU 12V Rail Pwr (in1)"
+        label power2 "PMIC-1 ASIC 0.8V VCORE MAIN Rail Pwr (out)"
+        label curr1 "PMIC-1 PSU 12V Rail Curr (in1)"
+        label curr2 "PMIC-1 ASIC 0.8V VCORE MAIN Rail Curr (out)"
+    chip "mp2975-i2c-*-64"
+        label in1 "PMIC-2 PSU 12V Rail (in1)"
+        label in2 "PMIC-2 ASIC 1.8V VCORE MAIN Rail (out)"
+        label in3 "PMIC-2 ASIC 1.2V VCORE MAIN Rail (out)"
+        label temp1 "PMIC-2 Temp 1"
+        label power1 "PMIC-2 PSU 12V Rail Pwr (in1)"
+        label power2 "PMIC-2 ASIC 1.8V VCORE MAIN Rail Pwr (out)"
+        label curr1 "PMIC-2 PSU 12V Rail Curr (in1)"
+        label curr2 "PMIC-2 ASIC 1.8V VCORE MAIN Rail Curr (out)"
+        label curr3 "PMIC-2 ASIC 1.2V VCORE MAIN Rail Curr (out)"
+    chip "mp2975-i2c-*-66"
+        label in1 "PMIC-3 PSU 12V Rail (in1)"
+        label in2 "PMIC-3 ASIC 0.85V T0_1 Rail (out)"
+        label in3 "PMIC-3 ASIC 1.8V T0_1 Rail (out)"
+        label temp1 "PMIC-3 Temp 1"
+        label power1 "PMIC-3 PSU 12V Rail Pwr (in1)"
+        label power2 "PMIC-3 ASIC 0.85V T0_1 Rail Pwr (out)"
+        label curr1 "PMIC-3 PSU 12V Rail Curr (in1)"
+        label curr2 "PMIC-3 ASIC 0.85V T0_1 Rail Curr (out)"
+        label curr3 "PMIC-3 ASIC 1.8V T0_1 Rail Curr (out)"
+    chip "mp2975-i2c-*-6a"
+        label in1 "PMIC-4 PSU 12V Rail (in1)"
+        label in2 "PMIC-4 ASIC 0.85V T2_3 Rail (out)"
+        label in3 "PMIC-4 ASIC 1.8V T2_3 Rail (out)"
+        label temp1 "PMIC-4 Temp 1"
+        label power1 "PMIC-4 PSU 12V Rail Pwr (in1)"
+        label power2 "PMIC-4 ASIC 0.85V T2_3 Rail Pwr (out)"
+        label curr1 "PMIC-4 PSU 12V Rail Curr (in1)"
+        label curr2 "PMIC-4 ASIC 0.85V T2_3 Rail Curr (out)"
+        label curr3 "PMIC-4 ASIC 1.8V T2_3 Rail Curr (out)"
+    chip "mp2975-i2c-*-6e"
+        label in1 "PMIC-5 PSU 12V Rail (in1)"
+        label in2 "PMIC-5 ASIC 1.2V T0_3 Rail_1 (out)"
+        label in3 "PMIC-5 ASIC 1.2V T4_7 Rail_2 (out)"
+        label temp1 "PMIC-5 Temp 1"
+        label power1 "PMIC-5 PSU 12V Rail Pwr (in1)"
+        label power2 "PMIC-5 ASIC 1.2V T0_3 Rail_1 Pwr (out)"
+        label power3 "PMIC-5 ASIC 1.2V T4_7 Rail_2 Pwr (out)"
+        label curr1 "PMIC-5 PSU 12V Rail Curr (in1)"
+        label curr2 "PMIC-5 ASIC 1.2V T0_3 Rail_1 Curr (out)"
+        label curr3 "PMIC-5 ASIC 1.2V T4_7 Rail_2 Curr (out)"
+
+bus "i2c-15" "i2c-1-mux (chan_id 6)"
+    chip "tps53679-i2c-*-58"
+        label in1 "PMIC-6 PSU 12V Rail (in1)"
+        label in2 "PMIC-6 PSU 12V Rail (in2)"
+        label in3 "PMIC-6 COMEX 1.8V Rail (out)"
+        label in4 "PMIC-6 COMEX 1.05V Rail (out)"
+        label temp1 "PMIC-6 Temp 1"
+        label temp2 "PMIC-6 Temp 2"
+        label power1 "PMIC-6 COMEX 1.8V Rail Pwr (out)"
+        label power2 "PMIC-6 COMEX 1.05V Rail Pwr (out)"
+        label curr1 "PMIC-6 COMEX 1.8V Rail Curr (out)"
+        label curr2 "PMIC-6 COMEX 1.05V Rail Curr (out)"
+    chip "tps53679-i2c-*-61"
+        label in1 "PMIC-7 PSU 12V Rail (in1)"
+        label in2 "PMIC-7 PSU 12V Rail (in2)"
+        label in3 "PMIC-7 COMEX 1.2V Rail (out)"
+        ignore in4
+        label temp1 "PMIC-7 Temp 1"
+        label temp2 "PMIC-7 Temp 2"
+        label power1 "PMIC-7 COMEX 1.2V Rail Pwr (out)"
+        ignore power2
+        label curr1 "PMIC-7 COMEX 1.2V Rail Curr (out)"
+        ignore curr2
+
+# Power supplies
+bus "i2c-4" "i2c-1-mux (chan_id 3)"
+    chip "dps460-i2c-*-58"
+        label in1 "PSU-1(L) 220V Rail (in)"
+        ignore in2
+        label in3 "PSU-1(L) 12V Rail (out)"
+        label fan1 "PSU-1(L) Fan 1"
+        ignore fan2
+        ignore fan3
+        label temp1 "PSU-1(L) Temp 1"
+        label temp2 "PSU-1(L) Temp 2"
+        label temp3 "PSU-1(L) Temp 3"
+        label power1 "PSU-1(L) 220V Rail Pwr (in)"
+        label power2 "PSU-1(L) 12V Rail Pwr (out)"
+        label curr1 "PSU-1(L) 220V Rail Curr (in)"
+        label curr2 "PSU-1(L) 12V Rail Curr (out)"
+    chip "dps460-i2c-*-59"
+        label in1 "PSU-2(R) 220V Rail (in)"
+        ignore in2
+        label in3 "PSU-2(R) 12V Rail (out)"
+        label fan1 "PSU-2(R) Fan 1"
+        ignore fan2
+        ignore fan3
+        label temp1 "PSU-2(R) Temp 1"
+        label temp2 "PSU-2(R) Temp 2"
+        label temp3 "PSU-2(R) Temp 3"
+        label power1 "PSU-2(R) 220V Rail Pwr (in)"
+        label power2 "PSU-2(R) 12V Rail Pwr (out)"
+        label curr1 "PSU-2(R) 220V Rail Curr (in)"
+        label curr2 "PSU-2(R) 12V Rail Curr (out)"
+
+# Chassis fans
+chip "mlxreg_fan-isa-*"
+    label fan1 "Chassis Fan Drawer-1"
+    label fan2 "Chassis Fan Drawer-2"
+    label fan3 "Chassis Fan Drawer-3"

platform/mellanox/hw-management.mk

@@ -1,6 +1,6 @@
 # Mellanox HW Management
 
-MLNX_HW_MANAGEMENT_VERSION = 7.0010.2303
+MLNX_HW_MANAGEMENT_VERSION = 7.0010.2304
 
 export MLNX_HW_MANAGEMENT_VERSION
 

platform/mellanox/hw-management/0002-hw-mgmt-system-MSN4600-A1-BU-config1-fix.patch

@@ -0,0 +1,28 @@
+From 1b2c2343d62b2fadb5c8fc9e61f2f654f4085193 Mon Sep 17 00:00:00 2001
+From: Mykola Kostenok <[email protected]>
+Date: Wed, 12 May 2021 10:59:57 +0300
+Subject: [PATCH] hw-mgmt: system: MSN4600 A1 BU config1 fix
+
+Fix config1 matching for MSN4600.
+
+Signed-off-by: Mykola Kostenok <[email protected]>
+---
+ usr/usr/bin/hw-management.sh |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/usr/usr/bin/hw-management.sh b/usr/usr/bin/hw-management.sh
+index d5b2728..150e583 100755
+--- a/usr/usr/bin/hw-management.sh
++++ b/usr/usr/bin/hw-management.sh
+@@ -728,7 +728,7 @@ msn46xx_specific()
+ 	if [ $res -eq 0 ]; then
+ 		sys_ver=$(cut "$regio_path"/config1 -d' ' -f 1)
+ 		case $sys_ver in
+-			3)
++			1)
+ 				connect_msn4700_msn4600_A1
+ 			;;
+ 			*)
+-- 
+1.7.1
+