Skip to content

Commit

Permalink
Remove SCM VRM monitoring from meru800 SCMs
Browse files Browse the repository at this point in the history
  • Loading branch information
@aalamsi22
aalamsi22 committed Nov 2, 2024
1 parent 7bb3375 commit 2a63cf2
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 328 deletions.
164 changes: 2 additions & 162 deletions fboss/platform/configs/meru800bfa/sensor_service.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand All @@ -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"
}
]
},
Expand Down
164 changes: 2 additions & 162 deletions fboss/platform/configs/meru800bia/sensor_service.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand All @@ -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"
}
]
},
Expand Down
8 changes: 4 additions & 4 deletions fboss/platform/configs/meru800biab/sensor_service.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand Down Expand Up @@ -425,7 +425,7 @@
},
{
"slotPath": "/SMB_SLOT@0/PSU_SLOT@0",
"pmUnitName": "PSU1",
"pmUnitName": "PSU",
"sensors": [
{
"name": "PSU1_VIN",
Expand Down Expand Up @@ -519,7 +519,7 @@
},
{
"slotPath": "/SMB_SLOT@0/PSU_SLOT@1",
"pmUnitName": "PSU2",
"pmUnitName": "PSU",
"sensors": [
{
"name": "PSU2_VIN",
Expand Down

0 comments on commit 2a63cf2

Please sign in to comment.