From 47809320989d074f3f7720434c45f05bb5fad6cb Mon Sep 17 00:00:00 2001 From: aalamsi22 Date: Thu, 25 Sep 2025 01:55:03 +0000 Subject: [PATCH] [MERU800BIA]: Change voltage readings to mili in sensor_service --- .../configs/meru800bia/sensor_service.json | 222 ++++++++++++++---- 1 file changed, 173 insertions(+), 49 deletions(-) diff --git a/fboss/platform/configs/meru800bia/sensor_service.json b/fboss/platform/configs/meru800bia/sensor_service.json index d7c36c992f2ef..c0846e077edac 100644 --- a/fboss/platform/configs/meru800bia/sensor_service.json +++ b/fboss/platform/configs/meru800bia/sensor_service.json @@ -108,20 +108,20 @@ "sysfsPath": "/run/devmap/sensors/CPU_MPS_PMBUS/in1_input", "type": 1, "thresholds": { - "upperCriticalVal": 14.4, - "lowerCriticalVal": 10.5 + "upperCriticalVal": 14400.0, + "lowerCriticalVal": 10500.0 }, - "compute": "@/32000.0" + "compute": "@/32.0" }, { "name": "SCM_ECB_VOUT", "sysfsPath": "/run/devmap/sensors/CPU_MPS_PMBUS/in2_input", "type": 1, "thresholds": { - "upperCriticalVal": 14.4, - "lowerCriticalVal": 9.6 + "upperCriticalVal": 14400.0, + "lowerCriticalVal": 9600.0 }, - "compute": "@/32000.0" + "compute": "@/32.0" }, { "name": "SCM_ECB_IOUT", @@ -250,20 +250,18 @@ "sysfsPath": "/run/devmap/sensors/SMB_RAA228926_J3/in1_input", "type": 1, "thresholds": { - "upperCriticalVal": 14.4, - "lowerCriticalVal": 9.6 - }, - "compute": "@/1000.0" + "upperCriticalVal": 14400.0, + "lowerCriticalVal": 9600.0 + } }, { "name": "SMB_VRM1_VOUT_J3_0V85_CORE", "sysfsPath": "/run/devmap/sensors/SMB_RAA228926_J3/in3_input", "type": 1, "thresholds": { - "upperCriticalVal": 0.93, - "lowerCriticalVal": 0.62 - }, - "compute": "@/1000.0" + "upperCriticalVal": 930.0, + "lowerCriticalVal": 620.0 + } }, { "name": "SMB_VRM1_TEMP", @@ -275,45 +273,68 @@ }, "compute": "@/1000.0" }, + { + "name": "SMB_VRM1_IIN", + "sysfsPath": "/run/devmap/sensors/SMB_RAA228926_J3/curr1_input", + "type": 2, + "compute": "@/1000.0" + }, + { + "name": "SMB_VRM1_IOUT_J3_0V85_CORE", + "sysfsPath": "/run/devmap/sensors/SMB_RAA228926_J3/curr3_input", + "type": 2, + "thresholds": { + "upperCriticalVal": 950.0 + }, + "compute": "@/1000.0" + }, + { + "name": "SMB_VRM1_POUT", + "sysfsPath": "/run/devmap/sensors/SMB_RAA228926_J3/power1_input", + "type": 0, + "compute": "@/1000000.0" + }, + { + "name": "SMB_VRM1_POUT_J3_0V85_CORE", + "sysfsPath": "/run/devmap/sensors/SMB_RAA228926_J3/power3_input", + "type": 0, + "compute": "@/1000000.0" + }, { "name": "SMB_VRM2_VIN", "sysfsPath": "/run/devmap/sensors/SMB_ISL68226_J3/in1_input", "type": 1, "thresholds": { - "upperCriticalVal": 14.4, - "lowerCriticalVal": 9.6 - }, - "compute": "@/1000.0" + "upperCriticalVal": 14400.0, + "lowerCriticalVal": 9600.0 + } }, { "name": "SMB_VRM2_VOUT_J3_0V9", "sysfsPath": "/run/devmap/sensors/SMB_ISL68226_J3/in3_input", "type": 1, "thresholds": { - "upperCriticalVal": 1.08, - "lowerCriticalVal": 0.72 - }, - "compute": "@/1000.0" + "upperCriticalVal": 1080.0, + "lowerCriticalVal": 720.0 + } }, { "name": "SMB_VRM2_VOUT_J3_0V75", "sysfsPath": "/run/devmap/sensors/SMB_ISL68226_J3/in4_input", "type": 1, "thresholds": { - "upperCriticalVal": 0.9, - "lowerCriticalVal": 0.6 - }, - "compute": "@/1000.0" + "upperCriticalVal": 900.0, + "lowerCriticalVal": 600.0 + } }, { "name": "SMB_VRM2_VOUT_J3_1V2", "sysfsPath": "/run/devmap/sensors/SMB_ISL68226_J3/in5_input", "type": 1, "thresholds": { - "upperCriticalVal": 1.44, - "lowerCriticalVal": 0.96 - }, - "compute": "@/1000.0" + "upperCriticalVal": 1440.0, + "lowerCriticalVal": 960.0 + } }, { "name": "SMB_VRM2_TEMP1", @@ -345,25 +366,105 @@ }, "compute": "@/1000.0" }, + { + "name": "SMB_VRM2_IIN_1", + "sysfsPath": "/run/devmap/sensors/SMB_ISL68226_J3/curr1_input", + "type": 2, + "compute": "@/1000.0" + }, + { + "name": "SMB_VRM2_IIN_2", + "sysfsPath": "/run/devmap/sensors/SMB_ISL68226_J3/curr2_input", + "type": 2, + "compute": "@/1000.0" + }, + { + "name": "SMB_VRM2_IIN_3", + "sysfsPath": "/run/devmap/sensors/SMB_ISL68226_J3/curr3_input", + "type": 2, + "compute": "@/1000.0" + }, + { + "name": "SMB_VRM2_IOUT_J3_0V9", + "sysfsPath": "/run/devmap/sensors/SMB_ISL68226_J3/curr4_input", + "type": 2, + "thresholds": { + "upperCriticalVal": 150.0 + }, + "compute": "@/1000.0" + }, + { + "name": "SMB_VRM2_IOUT_J3_0V75", + "sysfsPath": "/run/devmap/sensors/SMB_ISL68226_J3/curr5_input", + "type": 2, + "thresholds": { + "upperCriticalVal": 70.0 + }, + "compute": "@/1000.0" + }, + { + "name": "SMB_VRM2_IOUT_J3_1V2", + "sysfsPath": "/run/devmap/sensors/SMB_ISL68226_J3/curr6_input", + "type": 2, + "thresholds": { + "upperCriticalVal": 65.0 + }, + "compute": "@/1000.0" + }, + { + "name": "SMB_VRM2_POUT_1", + "sysfsPath": "/run/devmap/sensors/SMB_ISL68226_J3/power1_input", + "type": 0, + "compute": "@/1000000.0" + }, + { + "name": "SMB_VRM2_POUT_2", + "sysfsPath": "/run/devmap/sensors/SMB_ISL68226_J3/power2_input", + "type": 0, + "compute": "@/1000000.0" + }, + { + "name": "SMB_VRM2_POUT_3", + "sysfsPath": "/run/devmap/sensors/SMB_ISL68226_J3/power3_input", + "type": 0, + "compute": "@/1000000.0" + }, + { + "name": "SMB_VRM2_POUT_J3_0V9", + "sysfsPath": "/run/devmap/sensors/SMB_ISL68226_J3/power4_input", + "type": 0, + "compute": "@/1000000.0" + }, + { + "name": "SMB_VRM2_POUT_J3_0V75", + "sysfsPath": "/run/devmap/sensors/SMB_ISL68226_J3/power5_input", + "type": 0, + "compute": "@/1000000.0" + }, + { + "name": "SMB_VRM2_POUT_J3_1V2", + "sysfsPath": "/run/devmap/sensors/SMB_ISL68226_J3/power6_input", + "type": 0, + "compute": "@/1000000.0" + }, { "name": "SMB_VRM3_VIN", "sysfsPath": "/run/devmap/sensors/SMB_ISL68226_OPTICS/in1_input", "type": 1, "thresholds": { - "upperCriticalVal": 14.4, - "lowerCriticalVal": 9.6 - }, - "compute": "@/1000.0" + "upperCriticalVal": 14400.0, + "lowerCriticalVal": 9600.0 + } }, { "name": "SMB_VRM3_VOUT_OPTICS_3V3", "sysfsPath": "/run/devmap/sensors/SMB_ISL68226_OPTICS/in3_input", "type": 1, "thresholds": { - "upperCriticalVal": 3.96, - "lowerCriticalVal": 2.64 + "upperCriticalVal": 3960.0, + "lowerCriticalVal": 2640.0 }, - "compute": "1.2*@/1000.0" + "compute": "1.2*@" }, { "name": "SMB_VRM3_TEMP", @@ -375,6 +476,33 @@ }, "compute": "@/1000.0" }, + { + "name": "SMB_VRM3_IIN", + "sysfsPath": "/run/devmap/sensors/SMB_ISL68226_OPTICS/curr1_input", + "type": 2, + "compute": "@/1000.0" + }, + { + "name": "SMB_VRM3_IOUT_OPTICS_3V3", + "sysfsPath": "/run/devmap/sensors/SMB_ISL68226_OPTICS/curr4_input", + "type": 2, + "thresholds": { + "upperCriticalVal": 350.0 + }, + "compute": "@/1000.0" + }, + { + "name": "SMB_VRM3_POUT", + "sysfsPath": "/run/devmap/sensors/SMB_ISL68226_OPTICS/power1_input", + "type": 0, + "compute": "@/1000000.0" + }, + { + "name": "SMB_VRM3_POUT_OPTICS_3V3", + "sysfsPath": "/run/devmap/sensors/SMB_ISL68226_OPTICS/power4_input", + "type": 0, + "compute": "@/1000000.0" + }, { "name": "SMB_MGMT_INLET_TEMP", "sysfsPath": "/run/devmap/sensors/SMB_MGMT_TMP75/temp1_input", @@ -430,18 +558,16 @@ { "name": "PSU1_VIN", "sysfsPath": "/run/devmap/sensors/PSU1_PMBUS/in1_input", - "type": 1, - "compute": "@/1000.0" + "type": 1 }, { "name": "PSU1_VOUT", "sysfsPath": "/run/devmap/sensors/PSU1_PMBUS/in3_input", "type": 1, "thresholds": { - "upperCriticalVal": 14.4, - "lowerCriticalVal": 9.6 - }, - "compute": "@/1000.0" + "upperCriticalVal": 14400.0, + "lowerCriticalVal": 9600.0 + } }, { "name": "PSU1_FAN1_RPM", @@ -524,18 +650,16 @@ { "name": "PSU2_VIN", "sysfsPath": "/run/devmap/sensors/PSU2_PMBUS/in1_input", - "type": 1, - "compute": "@/1000.0" + "type": 1 }, { "name": "PSU2_VOUT", "sysfsPath": "/run/devmap/sensors/PSU2_PMBUS/in3_input", "type": 1, "thresholds": { - "upperCriticalVal": 14.4, - "lowerCriticalVal": 9.6 - }, - "compute": "@/1000.0" + "upperCriticalVal": 14400.0, + "lowerCriticalVal": 9600.0 + } }, { "name": "PSU2_FAN1_RPM",