From 621d216fb9849bdfa107a490f1b4b9d8f9925321 Mon Sep 17 00:00:00 2001 From: frank-nexthop Date: Thu, 19 Nov 2026 23:48:31 +0000 Subject: [PATCH] Fix the m4061nhp switch-card TMP464 channel mapping The switch-card TMP464 has five channels, in hwmon order: temp1 local, temp2 near the FPGA, temp3 the ASIC thermal diode, temp4 near the ASIC, temp5 near the right PDC connector. The config followed an older four-channel mapping that put the ASIC diode on temp2, so the diode had board limits and two board sensors had diode limits, and temp5 was not read. Rename temp2-temp4 and set their limits to match, add temp5, and point the fan_service thermal shutdown conditions at the corrected sensors. Verified on hardware: after disabling all ports, only temp3 follows the ASIC's own temperature sensors. Signed-off-by: frank-nexthop --- .../m4061nhp/platform_stack/fan_service.json | 9 ++++++-- .../platform_stack/sensor_service.json | 22 ++++++++++++++----- 2 files changed, 23 insertions(+), 8 deletions(-) diff --git a/fboss/configs/platforms/nexthop/m4061nhp/platform_stack/fan_service.json b/fboss/configs/platforms/nexthop/m4061nhp/platform_stack/fan_service.json index fa433adcf66..28fd50622e6 100644 --- a/fboss/configs/platforms/nexthop/m4061nhp/platform_stack/fan_service.json +++ b/fboss/configs/platforms/nexthop/m4061nhp/platform_stack/fan_service.json @@ -79,14 +79,19 @@ "overtempThreshold": 92.0, "slidingWindowSize": 10 }, + { + "sensorName": "SWITCH_CARD_NEAR_FPGA", + "overtempThreshold": 92.0, + "slidingWindowSize": 10 + }, { "sensorName": "SWITCH_CARD_NEAR_ASIC", "overtempThreshold": 92.0, "slidingWindowSize": 10 }, { - "sensorName": "SWITCH_CARD_PDC_INTAKE", - "overtempThreshold": 122.0, + "sensorName": "SWITCH_CARD_NEAR_PDC_RIGHT", + "overtempThreshold": 92.0, "slidingWindowSize": 10 }, { diff --git a/fboss/configs/platforms/nexthop/m4061nhp/platform_stack/sensor_service.json b/fboss/configs/platforms/nexthop/m4061nhp/platform_stack/sensor_service.json index 4fa919aac56..71ad8163118 100644 --- a/fboss/configs/platforms/nexthop/m4061nhp/platform_stack/sensor_service.json +++ b/fboss/configs/platforms/nexthop/m4061nhp/platform_stack/sensor_service.json @@ -712,9 +712,19 @@ "compute": "@/1000.0" }, { - "name": "ASIC_DIODE_0", + "name": "SWITCH_CARD_NEAR_FPGA", "sysfsPath": "/run/devmap/sensors/SWITCH_CARD_TEMP_SENSOR/temp2_input", "type": 3, + "thresholds": { + "maxAlarmVal": 87, + "upperCriticalVal": 92 + }, + "compute": "@/1000.0" + }, + { + "name": "ASIC_DIODE_0", + "sysfsPath": "/run/devmap/sensors/SWITCH_CARD_TEMP_SENSOR/temp3_input", + "type": 3, "thresholds": { "maxAlarmVal": 115, "upperCriticalVal": 122 @@ -723,7 +733,7 @@ }, { "name": "SWITCH_CARD_NEAR_ASIC", - "sysfsPath": "/run/devmap/sensors/SWITCH_CARD_TEMP_SENSOR/temp3_input", + "sysfsPath": "/run/devmap/sensors/SWITCH_CARD_TEMP_SENSOR/temp4_input", "type": 3, "thresholds": { "maxAlarmVal": 87, @@ -732,12 +742,12 @@ "compute": "@/1000.0" }, { - "name": "SWITCH_CARD_PDC_INTAKE", - "sysfsPath": "/run/devmap/sensors/SWITCH_CARD_TEMP_SENSOR/temp4_input", + "name": "SWITCH_CARD_NEAR_PDC_RIGHT", + "sysfsPath": "/run/devmap/sensors/SWITCH_CARD_TEMP_SENSOR/temp5_input", "type": 3, "thresholds": { - "maxAlarmVal": 115, - "upperCriticalVal": 122 + "maxAlarmVal": 87, + "upperCriticalVal": 92 }, "compute": "@/1000.0" },