From 2a63cf2786a94fb236d792bbbd8653680f2e551f Mon Sep 17 00:00:00 2001 From: aalamsi22 Date: Sat, 2 Nov 2024 00:03:34 +0000 Subject: [PATCH] Remove SCM VRM monitoring from meru800 SCMs --- .../configs/meru800bfa/sensor_service.json | 164 +----------------- .../configs/meru800bia/sensor_service.json | 164 +----------------- .../configs/meru800biab/sensor_service.json | 8 +- 3 files changed, 8 insertions(+), 328 deletions(-) diff --git a/fboss/platform/configs/meru800bfa/sensor_service.json b/fboss/platform/configs/meru800bfa/sensor_service.json index 7117f80eae5db..2f8451f15203a 100644 --- a/fboss/platform/configs/meru800bfa/sensor_service.json +++ b/fboss/platform/configs/meru800bfa/sensor_service.json @@ -99,8 +99,8 @@ "sysfsPath": "/run/devmap/sensors/CPU_MPS_PMBUS/in1_input", "type": 1, "thresholds": { - "upperCriticalVal": 3.96, - "lowerCriticalVal": 2.64 + "upperCriticalVal": 14.4, + "lowerCriticalVal": 10.5 }, "compute": "@/32000.0" }, @@ -119,166 +119,6 @@ "sysfsPath": "/run/devmap/sensors/CPU_MPS_PMBUS/curr1_input", "type": 2, "compute": "@/1000.0" - }, - { - "name": "SCM_VRM1_VIN", - "sysfsPath": "/run/devmap/sensors/CPU_PXM1310_1/in1_input", - "type": 1, - "thresholds": { - "upperCriticalVal": 14.4, - "lowerCriticalVal": 9.6 - }, - "compute": "@/1000.0" - }, - { - "name": "SCM_VRM1_VOUT_VCCIN", - "sysfsPath": "/run/devmap/sensors/CPU_PXM1310_1/in3_input", - "type": 1, - "thresholds": { - "upperCriticalVal": 2.16, - "lowerCriticalVal": 1.44 - }, - "compute": "@/1000.0" - }, - { - "name": "SCM_VRM1_VOUT_1V8_CPU", - "sysfsPath": "/run/devmap/sensors/CPU_PXM1310_1/in4_input", - "type": 1, - "thresholds": { - "upperCriticalVal": 2.16, - "lowerCriticalVal": 1.44 - }, - "compute": "@/1000.0" - }, - { - "name": "SCM_VRM1_TEMP1", - "sysfsPath": "/run/devmap/sensors/CPU_PXM1310_1/temp1_input", - "type": 3, - "thresholds": { - "upperCriticalVal": 110.0, - "maxAlarmVal": 105.0 - }, - "compute": "@/1000.0" - }, - { - "name": "SCM_VRM1_TEMP2", - "sysfsPath": "/run/devmap/sensors/CPU_PXM1310_1/temp2_input", - "type": 3, - "thresholds": { - "upperCriticalVal": 110.0, - "maxAlarmVal": 105.0 - }, - "compute": "@/1000.0" - }, - { - "name": "SCM_VRM2_VIN", - "sysfsPath": "/run/devmap/sensors/CPU_PXE1211/in1_input", - "type": 1, - "thresholds": { - "upperCriticalVal": 14.4, - "lowerCriticalVal": 9.6 - }, - "compute": "@/1000.0" - }, - { - "name": "SCM_VRM2_VOUT_1V2_VDDQ", - "sysfsPath": "/run/devmap/sensors/CPU_PXE1211/in4_input", - "type": 1, - "thresholds": { - "upperCriticalVal": 1.44, - "lowerCriticalVal": 0.96 - }, - "compute": "@/1000.0" - }, - { - "name": "SCM_VRM2_VOUT_VNN_NAC", - "sysfsPath": "/run/devmap/sensors/CPU_PXE1211/in5_input", - "type": 1, - "thresholds": { - "upperCriticalVal": 1.44, - "lowerCriticalVal": 0.48 - }, - "compute": "@/1000.0" - }, - { - "name": "SCM_VRM2_VOUT_1V0_CPU", - "sysfsPath": "/run/devmap/sensors/CPU_PXE1211/in6_input", - "type": 1, - "thresholds": { - "upperCriticalVal": 1.2, - "lowerCriticalVal": 0.8 - }, - "compute": "@/1000.0" - }, - { - "name": "SCM_VRM2_TEMP1", - "sysfsPath": "/run/devmap/sensors/CPU_PXE1211/temp1_input", - "type": 3, - "thresholds": { - "upperCriticalVal": 110.0, - "maxAlarmVal": 105.0 - }, - "compute": "@/1000.0" - }, - { - "name": "SCM_VRM2_TEMP2", - "sysfsPath": "/run/devmap/sensors/CPU_PXE1211/temp2_input", - "type": 3, - "thresholds": { - "upperCriticalVal": 110.0, - "maxAlarmVal": 105.0 - }, - "compute": "@/1000.0" - }, - { - "name": "SCM_VRM3_VIN", - "sysfsPath": "/run/devmap/sensors/CPU_PXM1310_2/in1_input", - "type": 1, - "thresholds": { - "upperCriticalVal": 14.4, - "lowerCriticalVal": 9.6 - }, - "compute": "@/1000.0" - }, - { - "name": "SCM_VRM3_VOUT_1V05_CPU", - "sysfsPath": "/run/devmap/sensors/CPU_PXM1310_2/in3_input", - "type": 1, - "thresholds": { - "upperCriticalVal": 1.272, - "lowerCriticalVal": 0.848 - }, - "compute": "@/1000.0" - }, - { - "name": "SCM_VRM3_VOUT_VNN_PCH", - "sysfsPath": "/run/devmap/sensors/CPU_PXM1310_2/in4_input", - "type": 1, - "thresholds": { - "upperCriticalVal": 1.44, - "lowerCriticalVal": 0.48 - }, - "compute": "@/1000.0" - }, - { - "name": "SCM_VRM3_TEMP1", - "sysfsPath": "/run/devmap/sensors/CPU_PXM1310_2/temp1_input", - "type": 3, - "thresholds": { - "upperCriticalVal": 110.0, - "maxAlarmVal": 105.0 - }, - "compute": "@/1000.0" - }, - { - "name": "SCM_VRM3_TEMP2", - "sysfsPath": "/run/devmap/sensors/CPU_PXM1310_2/temp2_input", - "type": 3, - "thresholds": { - "upperCriticalVal": 110.0, - "maxAlarmVal": 105.0 - }, - "compute": "@/1000.0" } ] }, diff --git a/fboss/platform/configs/meru800bia/sensor_service.json b/fboss/platform/configs/meru800bia/sensor_service.json index 1d243224c56c1..f67c7708b99da 100644 --- a/fboss/platform/configs/meru800bia/sensor_service.json +++ b/fboss/platform/configs/meru800bia/sensor_service.json @@ -99,8 +99,8 @@ "sysfsPath": "/run/devmap/sensors/CPU_MPS_PMBUS/in1_input", "type": 1, "thresholds": { - "upperCriticalVal": 3.96, - "lowerCriticalVal": 2.64 + "upperCriticalVal": 14.4, + "lowerCriticalVal": 10.5 }, "compute": "@/32000.0" }, @@ -119,166 +119,6 @@ "sysfsPath": "/run/devmap/sensors/CPU_MPS_PMBUS/curr1_input", "type": 2, "compute": "@/1000.0" - }, - { - "name": "SCM_VRM1_VIN", - "sysfsPath": "/run/devmap/sensors/CPU_PXM1310_1/in1_input", - "type": 1, - "thresholds": { - "upperCriticalVal": 14.4, - "lowerCriticalVal": 9.6 - }, - "compute": "@/1000.0" - }, - { - "name": "SCM_VRM1_VOUT_VCCIN", - "sysfsPath": "/run/devmap/sensors/CPU_PXM1310_1/in3_input", - "type": 1, - "thresholds": { - "upperCriticalVal": 2.16, - "lowerCriticalVal": 1.44 - }, - "compute": "@/1000.0" - }, - { - "name": "SCM_VRM1_VOUT_1V8_CPU", - "sysfsPath": "/run/devmap/sensors/CPU_PXM1310_1/in4_input", - "type": 1, - "thresholds": { - "upperCriticalVal": 2.16, - "lowerCriticalVal": 1.44 - }, - "compute": "@/1000.0" - }, - { - "name": "SCM_VRM1_TEMP1", - "sysfsPath": "/run/devmap/sensors/CPU_PXM1310_1/temp1_input", - "type": 3, - "thresholds": { - "upperCriticalVal": 110.0, - "maxAlarmVal": 105.0 - }, - "compute": "@/1000.0" - }, - { - "name": "SCM_VRM1_TEMP2", - "sysfsPath": "/run/devmap/sensors/CPU_PXM1310_1/temp2_input", - "type": 3, - "thresholds": { - "upperCriticalVal": 110.0, - "maxAlarmVal": 105.0 - }, - "compute": "@/1000.0" - }, - { - "name": "SCM_VRM2_VIN", - "sysfsPath": "/run/devmap/sensors/CPU_PXE1211/in1_input", - "type": 1, - "thresholds": { - "upperCriticalVal": 14.4, - "lowerCriticalVal": 9.6 - }, - "compute": "@/1000.0" - }, - { - "name": "SCM_VRM2_VOUT_1V2_VDDQ", - "sysfsPath": "/run/devmap/sensors/CPU_PXE1211/in4_input", - "type": 1, - "thresholds": { - "upperCriticalVal": 1.44, - "lowerCriticalVal": 0.96 - }, - "compute": "@/1000.0" - }, - { - "name": "SCM_VRM2_VOUT_VNN_NAC", - "sysfsPath": "/run/devmap/sensors/CPU_PXE1211/in5_input", - "type": 1, - "thresholds": { - "upperCriticalVal": 1.44, - "lowerCriticalVal": 0.48 - }, - "compute": "@/1000.0" - }, - { - "name": "SCM_VRM2_VOUT_1V0_CPU", - "sysfsPath": "/run/devmap/sensors/CPU_PXE1211/in6_input", - "type": 1, - "thresholds": { - "upperCriticalVal": 1.2, - "lowerCriticalVal": 0.8 - }, - "compute": "@/1000.0" - }, - { - "name": "SCM_VRM2_TEMP1", - "sysfsPath": "/run/devmap/sensors/CPU_PXE1211/temp1_input", - "type": 3, - "thresholds": { - "upperCriticalVal": 110.0, - "maxAlarmVal": 105.0 - }, - "compute": "@/1000.0" - }, - { - "name": "SCM_VRM2_TEMP2", - "sysfsPath": "/run/devmap/sensors/CPU_PXE1211/temp2_input", - "type": 3, - "thresholds": { - "upperCriticalVal": 110.0, - "maxAlarmVal": 105.0 - }, - "compute": "@/1000.0" - }, - { - "name": "SCM_VRM3_VIN", - "sysfsPath": "/run/devmap/sensors/CPU_PXM1310_2/in1_input", - "type": 1, - "thresholds": { - "upperCriticalVal": 14.4, - "lowerCriticalVal": 9.6 - }, - "compute": "@/1000.0" - }, - { - "name": "SCM_VRM3_VOUT_1V05_CPU", - "sysfsPath": "/run/devmap/sensors/CPU_PXM1310_2/in3_input", - "type": 1, - "thresholds": { - "upperCriticalVal": 1.272, - "lowerCriticalVal": 0.848 - }, - "compute": "@/1000.0" - }, - { - "name": "SCM_VRM3_VOUT_VNN_PCH", - "sysfsPath": "/run/devmap/sensors/CPU_PXM1310_2/in4_input", - "type": 1, - "thresholds": { - "upperCriticalVal": 1.44, - "lowerCriticalVal": 0.48 - }, - "compute": "@/1000.0" - }, - { - "name": "SCM_VRM3_TEMP1", - "sysfsPath": "/run/devmap/sensors/CPU_PXM1310_2/temp1_input", - "type": 3, - "thresholds": { - "upperCriticalVal": 110.0, - "maxAlarmVal": 105.0 - }, - "compute": "@/1000.0" - }, - { - "name": "SCM_VRM3_TEMP2", - "sysfsPath": "/run/devmap/sensors/CPU_PXM1310_2/temp2_input", - "type": 3, - "thresholds": { - "upperCriticalVal": 110.0, - "maxAlarmVal": 105.0 - }, - "compute": "@/1000.0" } ] }, diff --git a/fboss/platform/configs/meru800biab/sensor_service.json b/fboss/platform/configs/meru800biab/sensor_service.json index 650fd657af768..9a14cbfe9a21e 100644 --- a/fboss/platform/configs/meru800biab/sensor_service.json +++ b/fboss/platform/configs/meru800biab/sensor_service.json @@ -108,8 +108,8 @@ "sysfsPath": "/run/devmap/sensors/CPU_MPS_PMBUS/in1_input", "type": 1, "thresholds": { - "upperCriticalVal": 3.96, - "lowerCriticalVal": 2.64 + "upperCriticalVal": 14.4, + "lowerCriticalVal": 10.5 }, "compute": "@/32000.0" }, @@ -425,7 +425,7 @@ }, { "slotPath": "/SMB_SLOT@0/PSU_SLOT@0", - "pmUnitName": "PSU1", + "pmUnitName": "PSU", "sensors": [ { "name": "PSU1_VIN", @@ -519,7 +519,7 @@ }, { "slotPath": "/SMB_SLOT@0/PSU_SLOT@1", - "pmUnitName": "PSU2", + "pmUnitName": "PSU", "sensors": [ { "name": "PSU2_VIN",