meru800: Remove SCM VRM monitoring (#286)

Summary: # Description The VRM readings on the SCM are not stable and should not be monitored as they will throw false alarms. This PR removes monitoring of those VRM devices on the SCM. Note that the devices will still be supported and can be accessed via sysfs. +PR also includes threshold correction from this PR: #276 +meru800biab includes change to sync PSU pmUnitName with that of meru800bia Pull Request resolved: #286 Reviewed By: somasun Differential Revision: D65791490 Pulled By: joancaneus fbshipit-source-id: b53e2c37a908b7cb58b598bfb91575532f6f63f7
facebook · Dec 5, 2024 · 130d3c0 · 130d3c0
1 parent f469422
commit 130d3c0
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 326 deletions.
diff --git 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
@@ -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
@@ -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"
         },