From 99efd5346e347ab2c1e099f98ae22c4e8a40e4e9 Mon Sep 17 00:00:00 2001 From: Samuel Angebault Date: Thu, 5 Aug 2021 18:35:31 -0700 Subject: [PATCH] [202012][Arista] Update platform library submodules (#8339) This PR only contains backports from master Fix leak discovered on master, though 202012 is not affected it's better to have the fix (fixes [master] thermalctld leak on Arista devices makes them unreachable when memory is exhausted #7515) Fix EepromDecoderimplementation in the platform API (fixes syseepromd crashing repeatedly on SONiC.20201231.02 #8263) Fix Mineral platform definition and configuration Fix build issues in environments where /proc is not mounted/restricted (fixes PLATFORM=broadcom fails arista "ReloadCauseManagerTest" first time #7800) Fix some pytest issues Add sfp-eeprom C API and also mount it in pmon --- .../Arista-7170-32C-C32/board_lane_map.json | 62 +++++++++---------- .../arista/x86_64-arista_7170_32c/default_sku | 2 +- .../x86_64-arista_7170_32c/sensors.conf | 58 ++++++++++++++++- .../x86_64-arista_7170_32cd/sensors.conf | 2 +- .../barefoot/sonic-platform-modules-arista | 2 +- .../broadcom/sonic-platform-modules-arista | 2 +- rules/docker-platform-monitor.mk | 1 + 7 files changed, 93 insertions(+), 36 deletions(-) mode change 120000 => 100644 device/arista/x86_64-arista_7170_32c/sensors.conf diff --git a/device/arista/x86_64-arista_7170_32c/Arista-7170-32C-C32/board_lane_map.json b/device/arista/x86_64-arista_7170_32c/Arista-7170-32C-C32/board_lane_map.json index 6ab72e55ab47..b78f75fbf284 100644 --- a/device/arista/x86_64-arista_7170_32c/Arista-7170-32C-C32/board_lane_map.json +++ b/device/arista/x86_64-arista_7170_32c/Arista-7170-32C-C32/board_lane_map.json @@ -5,7 +5,7 @@ { "connector": 1, "device_id": 0, - "mac_block": 14, + "mac_block": 7, "media_type": "copper", "lane0": { "mac_ch": 0, @@ -59,7 +59,7 @@ { "connector": 2, "device_id": 0, - "mac_block": 12, + "mac_block": 6, "media_type": "copper", "lane0": { "mac_ch": 0, @@ -113,7 +113,7 @@ { "connector": 3, "device_id": 0, - "mac_block": 10, + "mac_block": 5, "media_type": "copper", "lane0": { "mac_ch": 0, @@ -167,7 +167,7 @@ { "connector": 4, "device_id": 0, - "mac_block": 8, + "mac_block": 4, "media_type": "copper", "lane0": { "mac_ch": 0, @@ -221,7 +221,7 @@ { "connector": 5, "device_id": 0, - "mac_block": 6, + "mac_block": 3, "media_type": "copper", "lane0": { "mac_ch": 0, @@ -275,7 +275,7 @@ { "connector": 6, "device_id": 0, - "mac_block": 4, + "mac_block": 2, "media_type": "copper", "lane0": { "mac_ch": 0, @@ -329,7 +329,7 @@ { "connector": 7, "device_id": 0, - "mac_block": 2, + "mac_block": 1, "media_type": "copper", "lane0": { "mac_ch": 0, @@ -437,7 +437,7 @@ { "connector": 9, "device_id": 0, - "mac_block": 62, + "mac_block": 31, "media_type": "copper", "lane0": { "mac_ch": 0, @@ -491,7 +491,7 @@ { "connector": 10, "device_id": 0, - "mac_block": 60, + "mac_block": 30, "media_type": "copper", "lane0": { "mac_ch": 0, @@ -545,7 +545,7 @@ { "connector": 11, "device_id": 0, - "mac_block": 58, + "mac_block": 29, "media_type": "copper", "lane0": { "mac_ch": 0, @@ -599,7 +599,7 @@ { "connector": 12, "device_id": 0, - "mac_block": 56, + "mac_block": 28, "media_type": "copper", "lane0": { "mac_ch": 0, @@ -653,7 +653,7 @@ { "connector": 13, "device_id": 0, - "mac_block": 54, + "mac_block": 27, "media_type": "copper", "lane0": { "mac_ch": 0, @@ -707,7 +707,7 @@ { "connector": 14, "device_id": 0, - "mac_block": 52, + "mac_block": 26, "media_type": "copper", "lane0": { "mac_ch": 0, @@ -761,7 +761,7 @@ { "connector": 15, "device_id": 0, - "mac_block": 50, + "mac_block": 25, "media_type": "copper", "lane0": { "mac_ch": 0, @@ -815,7 +815,7 @@ { "connector": 16, "device_id": 0, - "mac_block": 48, + "mac_block": 24, "media_type": "copper", "lane0": { "mac_ch": 0, @@ -869,7 +869,7 @@ { "connector": 17, "device_id": 0, - "mac_block": 46, + "mac_block": 23, "media_type": "copper", "lane0": { "mac_ch": 0, @@ -923,7 +923,7 @@ { "connector": 18, "device_id": 0, - "mac_block": 44, + "mac_block": 22, "media_type": "copper", "lane0": { "mac_ch": 0, @@ -977,7 +977,7 @@ { "connector": 19, "device_id": 0, - "mac_block": 42, + "mac_block": 21, "media_type": "copper", "lane0": { "mac_ch": 0, @@ -1031,7 +1031,7 @@ { "connector": 20, "device_id": 0, - "mac_block": 40, + "mac_block": 20, "media_type": "copper", "lane0": { "mac_ch": 0, @@ -1085,7 +1085,7 @@ { "connector": 21, "device_id": 0, - "mac_block": 38, + "mac_block": 19, "media_type": "copper", "lane0": { "mac_ch": 0, @@ -1139,7 +1139,7 @@ { "connector": 22, "device_id": 0, - "mac_block": 36, + "mac_block": 18, "media_type": "copper", "lane0": { "mac_ch": 0, @@ -1193,7 +1193,7 @@ { "connector": 23, "device_id": 0, - "mac_block": 34, + "mac_block": 17, "media_type": "copper", "lane0": { "mac_ch": 0, @@ -1247,7 +1247,7 @@ { "connector": 24, "device_id": 0, - "mac_block": 32, + "mac_block": 16, "media_type": "copper", "lane0": { "mac_ch": 0, @@ -1301,7 +1301,7 @@ { "connector": 25, "device_id": 0, - "mac_block": 30, + "mac_block": 15, "media_type": "copper", "lane0": { "mac_ch": 0, @@ -1355,7 +1355,7 @@ { "connector": 26, "device_id": 0, - "mac_block": 28, + "mac_block": 14, "media_type": "copper", "lane0": { "mac_ch": 0, @@ -1409,7 +1409,7 @@ { "connector": 27, "device_id": 0, - "mac_block": 26, + "mac_block": 13, "media_type": "copper", "lane0": { "mac_ch": 0, @@ -1463,7 +1463,7 @@ { "connector": 28, "device_id": 0, - "mac_block": 24, + "mac_block": 12, "media_type": "copper", "lane0": { "mac_ch": 0, @@ -1517,7 +1517,7 @@ { "connector": 29, "device_id": 0, - "mac_block": 22, + "mac_block": 11, "media_type": "copper", "lane0": { "mac_ch": 0, @@ -1571,7 +1571,7 @@ { "connector": 30, "device_id": 0, - "mac_block": 20, + "mac_block": 10, "media_type": "copper", "lane0": { "mac_ch": 0, @@ -1625,7 +1625,7 @@ { "connector": 31, "device_id": 0, - "mac_block": 18, + "mac_block": 9, "media_type": "copper", "lane0": { "mac_ch": 0, @@ -1679,7 +1679,7 @@ { "connector": 32, "device_id": 0, - "mac_block": 16, + "mac_block": 8, "media_type": "copper", "lane0": { "mac_ch": 0, diff --git a/device/arista/x86_64-arista_7170_32c/default_sku b/device/arista/x86_64-arista_7170_32c/default_sku index 536bad44f086..e396ca3395f6 100644 --- a/device/arista/x86_64-arista_7170_32c/default_sku +++ b/device/arista/x86_64-arista_7170_32c/default_sku @@ -1 +1 @@ -Arista-7170-32CD-C32 t1 +Arista-7170-32C-C32 t1 diff --git a/device/arista/x86_64-arista_7170_32c/sensors.conf b/device/arista/x86_64-arista_7170_32c/sensors.conf deleted file mode 120000 index 1ab9e0f47704..000000000000 --- a/device/arista/x86_64-arista_7170_32c/sensors.conf +++ /dev/null @@ -1 +0,0 @@ -../x86_64-arista_7170_64c/sensors.conf \ No newline at end of file diff --git a/device/arista/x86_64-arista_7170_32c/sensors.conf b/device/arista/x86_64-arista_7170_32c/sensors.conf new file mode 100644 index 000000000000..d3de228da97a --- /dev/null +++ b/device/arista/x86_64-arista_7170_32c/sensors.conf @@ -0,0 +1,57 @@ +# libsensors configuration file for DCS-7170-32C +# ------------------------------------------------ + +bus "i2c-6" "SCD 0000:06:00.0 SMBus master 0 bus 5" +bus "i2c-7" "SCD 0000:06:00.0 SMBus master 0 bus 6" +bus "i2c-8" "SCD 0000:06:00.0 SMBus master 0 bus 7" +bus "i2c-81" "SCD 0000:ff:0b.3 SMBus master 0 bus 0" + +chip "max6658-i2c-8-4c" + label temp1 "Temp sensor near ASIC" + + set temp1_max 100 + set temp1_crit 110 + set temp1_min -55 + + set temp2_max 100 + set temp2_crit 110 + set temp2_min -55 + ignore temp2 + +chip "pmbus-i2c-6-58" + label temp1 "PSU1 primary hotspot temp" + label temp2 "PSU1 inlet temp" + label temp3 "PSU1 exhaust temp" + + # setting maximum and critical thresholds is not supported for this psu + # fault and warning limits defined internally by hardware + + ignore fan2 + ignore fan3 + +chip "pmbus-i2c-7-58" + label temp1 "PSU2 primary hotspot temp" + label temp2 "PSU2 inlet temp" + label temp3 "PSU2 exhaust temp" + + # setting maximum and critical thresholds is not supported for this psu + # fault and warning limits defined internally by hardware + + ignore fan2 + ignore fan3 + +chip "max6658-i2c-81-4c" + label temp1 "Rear air temp1" + label temp2 "Rear air temp2" + + set temp1_max 70 + set temp1_crit 80 + set temp1_min -55 + set temp2_max 70 + set temp2_crit 80 + set temp2_min -55 + +chip "lm73-i2c-8-4a" + label temp1 "Front air temp" + + set temp1_max 65 diff --git a/device/arista/x86_64-arista_7170_32cd/sensors.conf b/device/arista/x86_64-arista_7170_32cd/sensors.conf index 1ab9e0f47704..39485db7bba1 120000 --- a/device/arista/x86_64-arista_7170_32cd/sensors.conf +++ b/device/arista/x86_64-arista_7170_32cd/sensors.conf @@ -1 +1 @@ -../x86_64-arista_7170_64c/sensors.conf \ No newline at end of file +../x86_64-arista_7170_32c/sensors.conf \ No newline at end of file diff --git a/platform/barefoot/sonic-platform-modules-arista b/platform/barefoot/sonic-platform-modules-arista index 00c8e731a213..cf24d4c8c8ce 160000 --- a/platform/barefoot/sonic-platform-modules-arista +++ b/platform/barefoot/sonic-platform-modules-arista @@ -1 +1 @@ -Subproject commit 00c8e731a213d39e29dcf2626e55361d49027ce7 +Subproject commit cf24d4c8c8ce4d33cbec8a82f6e2d949a6b339b5 diff --git a/platform/broadcom/sonic-platform-modules-arista b/platform/broadcom/sonic-platform-modules-arista index 00c8e731a213..cf24d4c8c8ce 160000 --- a/platform/broadcom/sonic-platform-modules-arista +++ b/platform/broadcom/sonic-platform-modules-arista @@ -1 +1 @@ -Subproject commit 00c8e731a213d39e29dcf2626e55361d49027ce7 +Subproject commit cf24d4c8c8ce4d33cbec8a82f6e2d949a6b339b5 diff --git a/rules/docker-platform-monitor.mk b/rules/docker-platform-monitor.mk index b650f74a174d..807513e39af4 100644 --- a/rules/docker-platform-monitor.mk +++ b/rules/docker-platform-monitor.mk @@ -57,6 +57,7 @@ $(DOCKER_PLATFORM_MONITOR)_RUN_OPT += -v /var/run/platform_cache:/var/run/platfo $(DOCKER_PLATFORM_MONITOR)_RUN_OPT += -v /usr/share/sonic/device/pddf:/usr/share/sonic/device/pddf:ro # Mount Arista python library on Aboot images to be used by plugins +$(DOCKER_PLATFORM_MONITOR)_aboot_RUN_OPT += -v /usr/lib/libsfp-eeprom.so:/usr/lib/libsfp-eeprom.so:ro $(DOCKER_PLATFORM_MONITOR)_aboot_RUN_OPT += -v /usr/lib/python2.7/dist-packages/arista:/usr/lib/python2.7/dist-packages/arista:ro $(DOCKER_PLATFORM_MONITOR)_aboot_RUN_OPT += -v /usr/lib/python3/dist-packages/arista:/usr/lib/python3/dist-packages/arista:ro $(DOCKER_PLATFORM_MONITOR)_aboot_RUN_OPT += -v /usr/lib/python2.7/dist-packages/sonic_platform:/usr/lib/python2.7/dist-packages/sonic_platform:ro