From 0418fc1cb6eb8accdcc68720b735fd09af74c7c5 Mon Sep 17 00:00:00 2001 From: edward Date: Tue, 18 Feb 2025 21:08:26 -0500 Subject: [PATCH] Delete all patch files and upload only the original files for the rack fan service --- .../configs/janga800bic/fan_service.json | 381 +++++++++--- .../janga800bic/fan_service_rack.patch | 542 ----------------- .../configs/janga800bic/platform_manager.json | 8 + .../janga800bic/platform_service_rack.patch | 24 - .../configs/tahan800bc/fan_service.json | 417 ++++++++++--- .../configs/tahan800bc/fan_service_rack.patch | 574 ------------------ .../configs/tahan800bc/platform_manager.json | 8 + .../tahan800bc/platform_service_rack.patch | 24 - 8 files changed, 656 insertions(+), 1322 deletions(-) delete mode 100644 fboss/platform/configs/janga800bic/fan_service_rack.patch delete mode 100644 fboss/platform/configs/janga800bic/platform_service_rack.patch delete mode 100644 fboss/platform/configs/tahan800bc/fan_service_rack.patch delete mode 100644 fboss/platform/configs/tahan800bc/platform_service_rack.patch diff --git a/fboss/platform/configs/janga800bic/fan_service.json b/fboss/platform/configs/janga800bic/fan_service.json index 99d18c14df7c1..a32c926906885 100644 --- a/fboss/platform/configs/janga800bic/fan_service.json +++ b/fboss/platform/configs/janga800bic/fan_service.json @@ -2,8 +2,8 @@ "pwmBoostOnNumDeadFan": 1, "pwmBoostOnNumDeadSensor": 0, "pwmBoostOnNoQsfpAfterInSec": 55, - "pwmBoostValue": 100, - "pwmTransitionValue": 50, + "pwmBoostValue": 85, + "pwmTransitionValue": 55, "pwmLowerThreshold": 30, "pwmUpperThreshold": 100, "controlInterval": { @@ -17,77 +17,101 @@ "accessType": "ACCESS_TYPE_QSFP" }, "portList": [], - "aggregationType": "OPTIC_AGGREGATION_TYPE_PID", - "pidSettings": { + "aggregationType": "OPTIC_AGGREGATION_TYPE_MAX", + "tempToPwmMaps": { "OPTIC_TYPE_800_GENERIC": { - "kp": -4, - "ki": -0.06, - "kd": 0, - "setPoint": 67.0, - "posHysteresis": 0.0, - "negHysteresis": 2.0 - }, - "OPTIC_TYPE_400_GENERIC": { - "kp": -4, - "ki": -0.06, - "kd": 0, - "setPoint": 67.0, - "posHysteresis": 0.0, - "negHysteresis": 2.0 - }, - "OPTIC_TYPE_200_GENERIC": { - "kp": -4, - "ki": -0.06, - "kd": 0, - "setPoint": 67.0, - "posHysteresis": 0.0, - "negHysteresis": 2.0 - }, - "OPTIC_TYPE_100_GENERIC": { - "kp": -4, - "ki": -0.06, - "kd": 0, - "setPoint": 67.0, - "posHysteresis": 0.0, - "negHysteresis": 2.0 + "30": 10, + "40": 20, + "44": 25, + "47": 30, + "50": 35, + "54": 40, + "57": 45, + "60": 50, + "64": 55, + "67": 60, + "70": 80 } } } ], "sensors": [ { - "sensorName": "SMB_INNER_LEFT_LM75_TEMP", + "sensorName": "PDB_U1_LM75_TEMP", "access": { "accessType": "ACCESS_TYPE_THRIFT" }, "pwmCalcType": "SENSOR_PWM_CALC_TYPE_FOUR_LINEAR_TABLE", "normalUpTable": { - "41": 55, - "42": 60, - "45": 70, - "48": 85, - "51": 100 + "20": 30, + "25": 40, + "30": 50, + "35": 60, + "40": 70, + "45": 100 }, "normalDownTable": { - "38": 55, - "41": 60, - "44": 70, - "47": 85, - "48": 100 + "20": 30, + "25": 40, + "30": 50, + "35": 60, + "40": 70, + "45": 100 }, "failUpTable": { - "41": 55, - "42": 60, - "45": 70, - "48": 85, - "51": 100 + "20": 30, + "25": 40, + "30": 50, + "35": 60, + "40": 70, + "45": 100 }, "failDownTable": { - "38": 55, - "41": 60, - "44": 70, - "47": 85, - "48": 100 + "20": 30, + "25": 40, + "30": 50, + "35": 60, + "40": 70, + "45": 100 + } + }, + { + "sensorName": "SMB_U17_INNER_RIGHT_LM75_TEMP", + "access": { + "accessType": "ACCESS_TYPE_THRIFT" + }, + "pwmCalcType": "SENSOR_PWM_CALC_TYPE_FOUR_LINEAR_TABLE", + "normalUpTable": { + "20": 30, + "25": 40, + "30": 50, + "35": 60, + "40": 70, + "45": 100 + }, + "normalDownTable": { + "20": 30, + "25": 40, + "30": 50, + "35": 60, + "40": 70, + "45": 100 + }, + "failUpTable": { + "20": 30, + "25": 40, + "30": 50, + "35": 60, + "40": 70, + "45": 100 + }, + "failDownTable": { + "20": 30, + "25": 40, + "30": 50, + "35": 60, + "40": 70, + "45": 100 } }, { @@ -95,14 +119,143 @@ "access": { "accessType": "ACCESS_TYPE_THRIFT" }, - "pwmCalcType": "SENSOR_PWM_CALC_TYPE_PID", - "pidSetting": { - "kp": -4, - "ki": -0.06, - "kd": 0, - "setPoint": 97.0, - "posHysteresis": 0.0, - "negHysteresis": 5.0 + "pwmCalcType": "SENSOR_PWM_CALC_TYPE_FOUR_LINEAR_TABLE", + "normalUpTable": { + "80": 20, + "85": 30, + "90": 40, + "95": 50, + "99": 80 + }, + "normalDownTable": { + "80": 20, + "85": 30, + "90": 40, + "95": 50, + "99": 80 + }, + "failUpTable": { + "80": 20, + "85": 30, + "90": 40, + "95": 50, + "99": 80 + }, + "failDownTable": { + "80": 20, + "85": 30, + "90": 40, + "95": 50, + "99": 80 + } + }, + { + "sensorName": "SMB_E1S_SSD_TEMP", + "access": { + "accessType": "ACCESS_TYPE_THRIFT" + }, + "pwmCalcType": "SENSOR_PWM_CALC_TYPE_FOUR_LINEAR_TABLE", + "normalUpTable": { + "55": 20, + "65": 30, + "75": 40, + "80": 80 + }, + "normalDownTable": { + "55": 20, + "65": 30, + "75": 40, + "80": 80 + }, + "failUpTable": { + "55": 20, + "65": 30, + "75": 40, + "80": 80 + }, + "failDownTable": { + "55": 20, + "65": 30, + "75": 40, + "80": 80 + } + }, + { + "sensorName": "PDB_PS1_12V_TEMP", + "access": { + "accessType": "ACCESS_TYPE_THRIFT" + }, + "pwmCalcType": "SENSOR_PWM_CALC_TYPE_FOUR_LINEAR_TABLE", + "normalUpTable": { + "55": 20, + "65": 25, + "75": 30, + "85": 35, + "95": 40, + "100": 80 + }, + "normalDownTable": { + "55": 20, + "65": 25, + "75": 30, + "85": 35, + "95": 40, + "100": 80 + }, + "failUpTable": { + "55": 20, + "65": 25, + "75": 30, + "85": 35, + "95": 40, + "100": 80 + }, + "failDownTable": { + "55": 20, + "65": 25, + "75": 30, + "85": 35, + "95": 40, + "100": 80 + } + }, + { + "sensorName": "PDB_PS2_12V_TEMP", + "access": { + "accessType": "ACCESS_TYPE_THRIFT" + }, + "pwmCalcType": "SENSOR_PWM_CALC_TYPE_FOUR_LINEAR_TABLE", + "normalUpTable": { + "55": 20, + "65": 25, + "75": 30, + "85": 35, + "95": 40, + "100": 80 + }, + "normalDownTable": { + "55": 20, + "65": 25, + "75": 30, + "85": 35, + "95": 40, + "100": 80 + }, + "failUpTable": { + "55": 20, + "65": 25, + "75": 30, + "85": 35, + "95": 40, + "100": 80 + }, + "failDownTable": { + "55": 20, + "65": 25, + "75": 30, + "85": 35, + "95": 40, + "100": 80 } } ], @@ -111,7 +264,11 @@ "fanName": "FANTRAY1_FAN1", "rpmSysfsPath": "/run/devmap/sensors/BCB_FAN_CPLD/fan1_input", "pwmSysfsPath": "/run/devmap/sensors/BCB_FAN_CPLD/pwm3", - "presenceSysfsPath": "/run/devmap/sensors/BCB_FAN/fan1_present", + "presenceGpio": { + "path": "/run/devmap/gpiochips/FCB_GPIO_CHIP_2", + "lineIndex": 8, + "desiredValue": 1 + }, "pwmMin": 1, "pwmMax": 255, "fanPresentVal": 1, @@ -124,7 +281,11 @@ "fanName": "FANTRAY1_FAN2", "rpmSysfsPath": "/run/devmap/sensors/BCB_FAN_CPLD/fan2_input", "pwmSysfsPath": "/run/devmap/sensors/BCB_FAN_CPLD/pwm3", - "presenceSysfsPath": "/run/devmap/sensors/BCB_FAN/fan1_present", + "presenceGpio": { + "path": "/run/devmap/gpiochips/FCB_GPIO_CHIP_2", + "lineIndex": 8, + "desiredValue": 1 + }, "pwmMin": 1, "pwmMax": 255, "fanPresentVal": 1, @@ -137,7 +298,11 @@ "fanName": "FANTRAY1_FAN3", "rpmSysfsPath": "/run/devmap/sensors/BCB_FAN_CPLD/fan3_input", "pwmSysfsPath": "/run/devmap/sensors/BCB_FAN_CPLD/pwm3", - "presenceSysfsPath": "/run/devmap/sensors/BCB_FAN/fan2_present", + "presenceGpio": { + "path": "/run/devmap/gpiochips/FCB_GPIO_CHIP_2", + "lineIndex": 9, + "desiredValue": 1 + }, "pwmMin": 1, "pwmMax": 255, "fanPresentVal": 1, @@ -150,7 +315,11 @@ "fanName": "FANTRAY1_FAN4", "rpmSysfsPath": "/run/devmap/sensors/BCB_FAN_CPLD/fan4_input", "pwmSysfsPath": "/run/devmap/sensors/BCB_FAN_CPLD/pwm3", - "presenceSysfsPath": "/run/devmap/sensors/BCB_FAN/fan2_present", + "presenceGpio": { + "path": "/run/devmap/gpiochips/FCB_GPIO_CHIP_2", + "lineIndex": 9, + "desiredValue": 1 + }, "pwmMin": 1, "pwmMax": 255, "fanPresentVal": 1, @@ -163,7 +332,11 @@ "fanName": "FANTRAY1_FAN5", "rpmSysfsPath": "/run/devmap/sensors/BCB_FAN_CPLD/fan5_input", "pwmSysfsPath": "/run/devmap/sensors/BCB_FAN_CPLD/pwm3", - "presenceSysfsPath": "/run/devmap/sensors/BCB_FAN/fan3_present", + "presenceGpio": { + "path": "/run/devmap/gpiochips/FCB_GPIO_CHIP_2", + "lineIndex": 10, + "desiredValue": 1 + }, "pwmMin": 1, "pwmMax": 255, "fanPresentVal": 1, @@ -176,7 +349,11 @@ "fanName": "FANTRAY1_FAN6", "rpmSysfsPath": "/run/devmap/sensors/BCB_FAN_CPLD/fan6_input", "pwmSysfsPath": "/run/devmap/sensors/BCB_FAN_CPLD/pwm3", - "presenceSysfsPath": "/run/devmap/sensors/BCB_FAN/fan3_present", + "presenceGpio": { + "path": "/run/devmap/gpiochips/FCB_GPIO_CHIP_2", + "lineIndex": 10, + "desiredValue": 1 + }, "pwmMin": 1, "pwmMax": 255, "fanPresentVal": 1, @@ -189,7 +366,11 @@ "fanName": "FANTRAY1_FAN7", "rpmSysfsPath": "/run/devmap/sensors/BCB_FAN_CPLD/fan7_input", "pwmSysfsPath": "/run/devmap/sensors/BCB_FAN_CPLD/pwm3", - "presenceSysfsPath": "/run/devmap/sensors/BCB_FAN/fan4_present", + "presenceGpio": { + "path": "/run/devmap/gpiochips/FCB_GPIO_CHIP_2", + "lineIndex": 11, + "desiredValue": 1 + }, "pwmMin": 1, "pwmMax": 255, "fanPresentVal": 1, @@ -202,7 +383,11 @@ "fanName": "FANTRAY1_FAN8", "rpmSysfsPath": "/run/devmap/sensors/BCB_FAN_CPLD/fan8_input", "pwmSysfsPath": "/run/devmap/sensors/BCB_FAN_CPLD/pwm3", - "presenceSysfsPath": "/run/devmap/sensors/BCB_FAN/fan4_present", + "presenceGpio": { + "path": "/run/devmap/gpiochips/FCB_GPIO_CHIP_2", + "lineIndex": 11, + "desiredValue": 1 + }, "pwmMin": 1, "pwmMax": 255, "fanPresentVal": 1, @@ -215,7 +400,11 @@ "fanName": "FANTRAY2_FAN1", "rpmSysfsPath": "/run/devmap/sensors/BCB_FAN_CPLD_2/fan1_input", "pwmSysfsPath": "/run/devmap/sensors/BCB_FAN_CPLD_2/pwm3", - "presenceSysfsPath": "/run/devmap/sensors/BCB_FAN_2/fan1_present", + "presenceGpio": { + "path": "/run/devmap/gpiochips/FCB_GPIO_CHIP_2", + "lineIndex": 8, + "desiredValue": 1 + }, "pwmMin": 1, "pwmMax": 255, "fanPresentVal": 1, @@ -228,7 +417,11 @@ "fanName": "FANTRAY2_FAN2", "rpmSysfsPath": "/run/devmap/sensors/BCB_FAN_CPLD_2/fan2_input", "pwmSysfsPath": "/run/devmap/sensors/BCB_FAN_CPLD_2/pwm3", - "presenceSysfsPath": "/run/devmap/sensors/BCB_FAN_2/fan1_present", + "presenceGpio": { + "path": "/run/devmap/gpiochips/FCB_GPIO_CHIP_2", + "lineIndex": 8, + "desiredValue": 1 + }, "pwmMin": 1, "pwmMax": 255, "fanPresentVal": 1, @@ -241,7 +434,11 @@ "fanName": "FANTRAY2_FAN3", "rpmSysfsPath": "/run/devmap/sensors/BCB_FAN_CPLD_2/fan3_input", "pwmSysfsPath": "/run/devmap/sensors/BCB_FAN_CPLD_2/pwm3", - "presenceSysfsPath": "/run/devmap/sensors/BCB_FAN_2/fan2_present", + "presenceGpio": { + "path": "/run/devmap/gpiochips/FCB_GPIO_CHIP_2", + "lineIndex": 9, + "desiredValue": 1 + }, "pwmMin": 1, "pwmMax": 255, "fanPresentVal": 1, @@ -254,7 +451,11 @@ "fanName": "FANTRAY2_FAN4", "rpmSysfsPath": "/run/devmap/sensors/BCB_FAN_CPLD_2/fan4_input", "pwmSysfsPath": "/run/devmap/sensors/BCB_FAN_CPLD_2/pwm3", - "presenceSysfsPath": "/run/devmap/sensors/BCB_FAN_2/fan2_present", + "presenceGpio": { + "path": "/run/devmap/gpiochips/FCB_GPIO_CHIP_2", + "lineIndex": 9, + "desiredValue": 1 + }, "pwmMin": 1, "pwmMax": 255, "fanPresentVal": 1, @@ -267,7 +468,11 @@ "fanName": "FANTRAY2_FAN5", "rpmSysfsPath": "/run/devmap/sensors/BCB_FAN_CPLD_2/fan5_input", "pwmSysfsPath": "/run/devmap/sensors/BCB_FAN_CPLD_2/pwm3", - "presenceSysfsPath": "/run/devmap/sensors/BCB_FAN_2/fan3_present", + "presenceGpio": { + "path": "/run/devmap/gpiochips/FCB_GPIO_CHIP_2", + "lineIndex": 10, + "desiredValue": 1 + }, "pwmMin": 1, "pwmMax": 255, "fanPresentVal": 1, @@ -280,7 +485,11 @@ "fanName": "FANTRAY2_FAN6", "rpmSysfsPath": "/run/devmap/sensors/BCB_FAN_CPLD_2/fan6_input", "pwmSysfsPath": "/run/devmap/sensors/BCB_FAN_CPLD_2/pwm3", - "presenceSysfsPath": "/run/devmap/sensors/BCB_FAN_2/fan3_present", + "presenceGpio": { + "path": "/run/devmap/gpiochips/FCB_GPIO_CHIP_2", + "lineIndex": 10, + "desiredValue": 1 + }, "pwmMin": 1, "pwmMax": 255, "fanPresentVal": 1, @@ -293,7 +502,11 @@ "fanName": "FANTRAY2_FAN7", "rpmSysfsPath": "/run/devmap/sensors/BCB_FAN_CPLD_2/fan7_input", "pwmSysfsPath": "/run/devmap/sensors/BCB_FAN_CPLD_2/pwm3", - "presenceSysfsPath": "/run/devmap/sensors/BCB_FAN_2/fan4_present", + "presenceGpio": { + "path": "/run/devmap/gpiochips/FCB_GPIO_CHIP_2", + "lineIndex": 11, + "desiredValue": 1 + }, "pwmMin": 1, "pwmMax": 255, "fanPresentVal": 1, @@ -306,7 +519,11 @@ "fanName": "FANTRAY2_FAN8", "rpmSysfsPath": "/run/devmap/sensors/BCB_FAN_CPLD_2/fan8_input", "pwmSysfsPath": "/run/devmap/sensors/BCB_FAN_CPLD_2/pwm3", - "presenceSysfsPath": "/run/devmap/sensors/BCB_FAN_2/fan4_present", + "presenceGpio": { + "path": "/run/devmap/gpiochips/FCB_GPIO_CHIP_2", + "lineIndex": 11, + "desiredValue": 1 + }, "pwmMin": 1, "pwmMax": 255, "fanPresentVal": 1, @@ -321,8 +538,12 @@ "zoneType": "ZONE_TYPE_MAX", "zoneName": "zone1", "sensorNames": [ - "SMB_INNER_LEFT_LM75_TEMP", + "PDB_U1_LM75_TEMP", + "SMB_U17_INNER_RIGHT_LM75_TEMP", "CPU_UNCORE_TEMP", + "SMB_E1S_SSD_TEMP", + "PDB_PS1_12V_TEMP", + "PDB_PS2_12V_TEMP", "qsfp_group_1" ], "fanNames": [ diff --git a/fboss/platform/configs/janga800bic/fan_service_rack.patch b/fboss/platform/configs/janga800bic/fan_service_rack.patch deleted file mode 100644 index 2048f473c152b..0000000000000 --- a/fboss/platform/configs/janga800bic/fan_service_rack.patch +++ /dev/null @@ -1,542 +0,0 @@ ---- janga_2_17_fboss_config/fan_service.json 2025-02-16 21:54:40.000000000 -0500 -+++ janga_2_17_fboss_config_my_change/fan_service.json 2025-02-17 00:13:42.000000000 -0500 -@@ -2,8 +2,8 @@ - "pwmBoostOnNumDeadFan": 1, - "pwmBoostOnNumDeadSensor": 0, - "pwmBoostOnNoQsfpAfterInSec": 55, -- "pwmBoostValue": 100, -- "pwmTransitionValue": 50, -+ "pwmBoostValue": 85, -+ "pwmTransitionValue": 55, - "pwmLowerThreshold": 30, - "pwmUpperThreshold": 100, - "controlInterval": { -@@ -17,77 +17,101 @@ - "accessType": "ACCESS_TYPE_QSFP" - }, - "portList": [], -- "aggregationType": "OPTIC_AGGREGATION_TYPE_PID", -- "pidSettings": { -+ "aggregationType": "OPTIC_AGGREGATION_TYPE_MAX", -+ "tempToPwmMaps": { - "OPTIC_TYPE_800_GENERIC": { -- "kp": -4, -- "ki": -0.06, -- "kd": 0, -- "setPoint": 67.0, -- "posHysteresis": 0.0, -- "negHysteresis": 2.0 -- }, -- "OPTIC_TYPE_400_GENERIC": { -- "kp": -4, -- "ki": -0.06, -- "kd": 0, -- "setPoint": 67.0, -- "posHysteresis": 0.0, -- "negHysteresis": 2.0 -- }, -- "OPTIC_TYPE_200_GENERIC": { -- "kp": -4, -- "ki": -0.06, -- "kd": 0, -- "setPoint": 67.0, -- "posHysteresis": 0.0, -- "negHysteresis": 2.0 -- }, -- "OPTIC_TYPE_100_GENERIC": { -- "kp": -4, -- "ki": -0.06, -- "kd": 0, -- "setPoint": 67.0, -- "posHysteresis": 0.0, -- "negHysteresis": 2.0 -+ "30": 10, -+ "40": 20, -+ "44": 25, -+ "47": 30, -+ "50": 35, -+ "54": 40, -+ "57": 45, -+ "60": 50, -+ "64": 55, -+ "67": 60, -+ "70": 80 - } - } - } - ], - "sensors": [ - { -- "sensorName": "SMB_INNER_LEFT_LM75_TEMP", -+ "sensorName": "PDB_U1_LM75_TEMP", - "access": { - "accessType": "ACCESS_TYPE_THRIFT" - }, - "pwmCalcType": "SENSOR_PWM_CALC_TYPE_FOUR_LINEAR_TABLE", - "normalUpTable": { -- "41": 55, -- "42": 60, -- "45": 70, -- "48": 85, -- "51": 100 -+ "20": 30, -+ "25": 40, -+ "30": 50, -+ "35": 60, -+ "40": 70, -+ "45": 100 - }, - "normalDownTable": { -- "38": 55, -- "41": 60, -- "44": 70, -- "47": 85, -- "48": 100 -+ "20": 30, -+ "25": 40, -+ "30": 50, -+ "35": 60, -+ "40": 70, -+ "45": 100 - }, - "failUpTable": { -- "41": 55, -- "42": 60, -- "45": 70, -- "48": 85, -- "51": 100 -+ "20": 30, -+ "25": 40, -+ "30": 50, -+ "35": 60, -+ "40": 70, -+ "45": 100 - }, - "failDownTable": { -- "38": 55, -- "41": 60, -- "44": 70, -- "47": 85, -- "48": 100 -+ "20": 30, -+ "25": 40, -+ "30": 50, -+ "35": 60, -+ "40": 70, -+ "45": 100 -+ } -+ }, -+ { -+ "sensorName": "SMB_U17_INNER_RIGHT_LM75_TEMP", -+ "access": { -+ "accessType": "ACCESS_TYPE_THRIFT" -+ }, -+ "pwmCalcType": "SENSOR_PWM_CALC_TYPE_FOUR_LINEAR_TABLE", -+ "normalUpTable": { -+ "20": 30, -+ "25": 40, -+ "30": 50, -+ "35": 60, -+ "40": 70, -+ "45": 100 -+ }, -+ "normalDownTable": { -+ "20": 30, -+ "25": 40, -+ "30": 50, -+ "35": 60, -+ "40": 70, -+ "45": 100 -+ }, -+ "failUpTable": { -+ "20": 30, -+ "25": 40, -+ "30": 50, -+ "35": 60, -+ "40": 70, -+ "45": 100 -+ }, -+ "failDownTable": { -+ "20": 30, -+ "25": 40, -+ "30": 50, -+ "35": 60, -+ "40": 70, -+ "45": 100 - } - }, - { -@@ -95,14 +119,143 @@ - "access": { - "accessType": "ACCESS_TYPE_THRIFT" - }, -- "pwmCalcType": "SENSOR_PWM_CALC_TYPE_PID", -- "pidSetting": { -- "kp": -4, -- "ki": -0.06, -- "kd": 0, -- "setPoint": 97.0, -- "posHysteresis": 0.0, -- "negHysteresis": 5.0 -+ "pwmCalcType": "SENSOR_PWM_CALC_TYPE_FOUR_LINEAR_TABLE", -+ "normalUpTable": { -+ "80": 20, -+ "85": 30, -+ "90": 40, -+ "95": 50, -+ "99": 80 -+ }, -+ "normalDownTable": { -+ "80": 20, -+ "85": 30, -+ "90": 40, -+ "95": 50, -+ "99": 80 -+ }, -+ "failUpTable": { -+ "80": 20, -+ "85": 30, -+ "90": 40, -+ "95": 50, -+ "99": 80 -+ }, -+ "failDownTable": { -+ "80": 20, -+ "85": 30, -+ "90": 40, -+ "95": 50, -+ "99": 80 -+ } -+ }, -+ { -+ "sensorName": "SMB_E1S_SSD_TEMP", -+ "access": { -+ "accessType": "ACCESS_TYPE_THRIFT" -+ }, -+ "pwmCalcType": "SENSOR_PWM_CALC_TYPE_FOUR_LINEAR_TABLE", -+ "normalUpTable": { -+ "55": 20, -+ "65": 30, -+ "75": 40, -+ "80": 80 -+ }, -+ "normalDownTable": { -+ "55": 20, -+ "65": 30, -+ "75": 40, -+ "80": 80 -+ }, -+ "failUpTable": { -+ "55": 20, -+ "65": 30, -+ "75": 40, -+ "80": 80 -+ }, -+ "failDownTable": { -+ "55": 20, -+ "65": 30, -+ "75": 40, -+ "80": 80 -+ } -+ }, -+ { -+ "sensorName": "PDB_PS1_12V_TEMP", -+ "access": { -+ "accessType": "ACCESS_TYPE_THRIFT" -+ }, -+ "pwmCalcType": "SENSOR_PWM_CALC_TYPE_FOUR_LINEAR_TABLE", -+ "normalUpTable": { -+ "55": 20, -+ "65": 25, -+ "75": 30, -+ "85": 35, -+ "95": 40, -+ "100": 80 -+ }, -+ "normalDownTable": { -+ "55": 20, -+ "65": 25, -+ "75": 30, -+ "85": 35, -+ "95": 40, -+ "100": 80 -+ }, -+ "failUpTable": { -+ "55": 20, -+ "65": 25, -+ "75": 30, -+ "85": 35, -+ "95": 40, -+ "100": 80 -+ }, -+ "failDownTable": { -+ "55": 20, -+ "65": 25, -+ "75": 30, -+ "85": 35, -+ "95": 40, -+ "100": 80 -+ } -+ }, -+ { -+ "sensorName": "PDB_PS2_12V_TEMP", -+ "access": { -+ "accessType": "ACCESS_TYPE_THRIFT" -+ }, -+ "pwmCalcType": "SENSOR_PWM_CALC_TYPE_FOUR_LINEAR_TABLE", -+ "normalUpTable": { -+ "55": 20, -+ "65": 25, -+ "75": 30, -+ "85": 35, -+ "95": 40, -+ "100": 80 -+ }, -+ "normalDownTable": { -+ "55": 20, -+ "65": 25, -+ "75": 30, -+ "85": 35, -+ "95": 40, -+ "100": 80 -+ }, -+ "failUpTable": { -+ "55": 20, -+ "65": 25, -+ "75": 30, -+ "85": 35, -+ "95": 40, -+ "100": 80 -+ }, -+ "failDownTable": { -+ "55": 20, -+ "65": 25, -+ "75": 30, -+ "85": 35, -+ "95": 40, -+ "100": 80 - } - } - ], -@@ -111,7 +264,11 @@ - "fanName": "FANTRAY1_FAN1", - "rpmSysfsPath": "/run/devmap/sensors/BCB_FAN_CPLD/fan1_input", - "pwmSysfsPath": "/run/devmap/sensors/BCB_FAN_CPLD/pwm3", -- "presenceSysfsPath": "/run/devmap/sensors/BCB_FAN/fan1_present", -+ "presenceGpio": { -+ "path": "/run/devmap/gpiochips/FCB_GPIO_CHIP_2", -+ "lineIndex": 8, -+ "desiredValue": 1 -+ }, - "pwmMin": 1, - "pwmMax": 255, - "fanPresentVal": 1, -@@ -124,7 +281,11 @@ - "fanName": "FANTRAY1_FAN2", - "rpmSysfsPath": "/run/devmap/sensors/BCB_FAN_CPLD/fan2_input", - "pwmSysfsPath": "/run/devmap/sensors/BCB_FAN_CPLD/pwm3", -- "presenceSysfsPath": "/run/devmap/sensors/BCB_FAN/fan1_present", -+ "presenceGpio": { -+ "path": "/run/devmap/gpiochips/FCB_GPIO_CHIP_2", -+ "lineIndex": 8, -+ "desiredValue": 1 -+ }, - "pwmMin": 1, - "pwmMax": 255, - "fanPresentVal": 1, -@@ -137,7 +298,11 @@ - "fanName": "FANTRAY1_FAN3", - "rpmSysfsPath": "/run/devmap/sensors/BCB_FAN_CPLD/fan3_input", - "pwmSysfsPath": "/run/devmap/sensors/BCB_FAN_CPLD/pwm3", -- "presenceSysfsPath": "/run/devmap/sensors/BCB_FAN/fan2_present", -+ "presenceGpio": { -+ "path": "/run/devmap/gpiochips/FCB_GPIO_CHIP_2", -+ "lineIndex": 9, -+ "desiredValue": 1 -+ }, - "pwmMin": 1, - "pwmMax": 255, - "fanPresentVal": 1, -@@ -150,7 +315,11 @@ - "fanName": "FANTRAY1_FAN4", - "rpmSysfsPath": "/run/devmap/sensors/BCB_FAN_CPLD/fan4_input", - "pwmSysfsPath": "/run/devmap/sensors/BCB_FAN_CPLD/pwm3", -- "presenceSysfsPath": "/run/devmap/sensors/BCB_FAN/fan2_present", -+ "presenceGpio": { -+ "path": "/run/devmap/gpiochips/FCB_GPIO_CHIP_2", -+ "lineIndex": 9, -+ "desiredValue": 1 -+ }, - "pwmMin": 1, - "pwmMax": 255, - "fanPresentVal": 1, -@@ -163,7 +332,11 @@ - "fanName": "FANTRAY1_FAN5", - "rpmSysfsPath": "/run/devmap/sensors/BCB_FAN_CPLD/fan5_input", - "pwmSysfsPath": "/run/devmap/sensors/BCB_FAN_CPLD/pwm3", -- "presenceSysfsPath": "/run/devmap/sensors/BCB_FAN/fan3_present", -+ "presenceGpio": { -+ "path": "/run/devmap/gpiochips/FCB_GPIO_CHIP_2", -+ "lineIndex": 10, -+ "desiredValue": 1 -+ }, - "pwmMin": 1, - "pwmMax": 255, - "fanPresentVal": 1, -@@ -176,7 +349,11 @@ - "fanName": "FANTRAY1_FAN6", - "rpmSysfsPath": "/run/devmap/sensors/BCB_FAN_CPLD/fan6_input", - "pwmSysfsPath": "/run/devmap/sensors/BCB_FAN_CPLD/pwm3", -- "presenceSysfsPath": "/run/devmap/sensors/BCB_FAN/fan3_present", -+ "presenceGpio": { -+ "path": "/run/devmap/gpiochips/FCB_GPIO_CHIP_2", -+ "lineIndex": 10, -+ "desiredValue": 1 -+ }, - "pwmMin": 1, - "pwmMax": 255, - "fanPresentVal": 1, -@@ -189,7 +366,11 @@ - "fanName": "FANTRAY1_FAN7", - "rpmSysfsPath": "/run/devmap/sensors/BCB_FAN_CPLD/fan7_input", - "pwmSysfsPath": "/run/devmap/sensors/BCB_FAN_CPLD/pwm3", -- "presenceSysfsPath": "/run/devmap/sensors/BCB_FAN/fan4_present", -+ "presenceGpio": { -+ "path": "/run/devmap/gpiochips/FCB_GPIO_CHIP_2", -+ "lineIndex": 11, -+ "desiredValue": 1 -+ }, - "pwmMin": 1, - "pwmMax": 255, - "fanPresentVal": 1, -@@ -202,7 +383,11 @@ - "fanName": "FANTRAY1_FAN8", - "rpmSysfsPath": "/run/devmap/sensors/BCB_FAN_CPLD/fan8_input", - "pwmSysfsPath": "/run/devmap/sensors/BCB_FAN_CPLD/pwm3", -- "presenceSysfsPath": "/run/devmap/sensors/BCB_FAN/fan4_present", -+ "presenceGpio": { -+ "path": "/run/devmap/gpiochips/FCB_GPIO_CHIP_2", -+ "lineIndex": 11, -+ "desiredValue": 1 -+ }, - "pwmMin": 1, - "pwmMax": 255, - "fanPresentVal": 1, -@@ -215,7 +400,11 @@ - "fanName": "FANTRAY2_FAN1", - "rpmSysfsPath": "/run/devmap/sensors/BCB_FAN_CPLD_2/fan1_input", - "pwmSysfsPath": "/run/devmap/sensors/BCB_FAN_CPLD_2/pwm3", -- "presenceSysfsPath": "/run/devmap/sensors/BCB_FAN_2/fan1_present", -+ "presenceGpio": { -+ "path": "/run/devmap/gpiochips/FCB_GPIO_CHIP_2", -+ "lineIndex": 8, -+ "desiredValue": 1 -+ }, - "pwmMin": 1, - "pwmMax": 255, - "fanPresentVal": 1, -@@ -228,7 +417,11 @@ - "fanName": "FANTRAY2_FAN2", - "rpmSysfsPath": "/run/devmap/sensors/BCB_FAN_CPLD_2/fan2_input", - "pwmSysfsPath": "/run/devmap/sensors/BCB_FAN_CPLD_2/pwm3", -- "presenceSysfsPath": "/run/devmap/sensors/BCB_FAN_2/fan1_present", -+ "presenceGpio": { -+ "path": "/run/devmap/gpiochips/FCB_GPIO_CHIP_2", -+ "lineIndex": 8, -+ "desiredValue": 1 -+ }, - "pwmMin": 1, - "pwmMax": 255, - "fanPresentVal": 1, -@@ -241,7 +434,11 @@ - "fanName": "FANTRAY2_FAN3", - "rpmSysfsPath": "/run/devmap/sensors/BCB_FAN_CPLD_2/fan3_input", - "pwmSysfsPath": "/run/devmap/sensors/BCB_FAN_CPLD_2/pwm3", -- "presenceSysfsPath": "/run/devmap/sensors/BCB_FAN_2/fan2_present", -+ "presenceGpio": { -+ "path": "/run/devmap/gpiochips/FCB_GPIO_CHIP_2", -+ "lineIndex": 9, -+ "desiredValue": 1 -+ }, - "pwmMin": 1, - "pwmMax": 255, - "fanPresentVal": 1, -@@ -254,7 +451,11 @@ - "fanName": "FANTRAY2_FAN4", - "rpmSysfsPath": "/run/devmap/sensors/BCB_FAN_CPLD_2/fan4_input", - "pwmSysfsPath": "/run/devmap/sensors/BCB_FAN_CPLD_2/pwm3", -- "presenceSysfsPath": "/run/devmap/sensors/BCB_FAN_2/fan2_present", -+ "presenceGpio": { -+ "path": "/run/devmap/gpiochips/FCB_GPIO_CHIP_2", -+ "lineIndex": 9, -+ "desiredValue": 1 -+ }, - "pwmMin": 1, - "pwmMax": 255, - "fanPresentVal": 1, -@@ -267,7 +468,11 @@ - "fanName": "FANTRAY2_FAN5", - "rpmSysfsPath": "/run/devmap/sensors/BCB_FAN_CPLD_2/fan5_input", - "pwmSysfsPath": "/run/devmap/sensors/BCB_FAN_CPLD_2/pwm3", -- "presenceSysfsPath": "/run/devmap/sensors/BCB_FAN_2/fan3_present", -+ "presenceGpio": { -+ "path": "/run/devmap/gpiochips/FCB_GPIO_CHIP_2", -+ "lineIndex": 10, -+ "desiredValue": 1 -+ }, - "pwmMin": 1, - "pwmMax": 255, - "fanPresentVal": 1, -@@ -280,7 +485,11 @@ - "fanName": "FANTRAY2_FAN6", - "rpmSysfsPath": "/run/devmap/sensors/BCB_FAN_CPLD_2/fan6_input", - "pwmSysfsPath": "/run/devmap/sensors/BCB_FAN_CPLD_2/pwm3", -- "presenceSysfsPath": "/run/devmap/sensors/BCB_FAN_2/fan3_present", -+ "presenceGpio": { -+ "path": "/run/devmap/gpiochips/FCB_GPIO_CHIP_2", -+ "lineIndex": 10, -+ "desiredValue": 1 -+ }, - "pwmMin": 1, - "pwmMax": 255, - "fanPresentVal": 1, -@@ -293,7 +502,11 @@ - "fanName": "FANTRAY2_FAN7", - "rpmSysfsPath": "/run/devmap/sensors/BCB_FAN_CPLD_2/fan7_input", - "pwmSysfsPath": "/run/devmap/sensors/BCB_FAN_CPLD_2/pwm3", -- "presenceSysfsPath": "/run/devmap/sensors/BCB_FAN_2/fan4_present", -+ "presenceGpio": { -+ "path": "/run/devmap/gpiochips/FCB_GPIO_CHIP_2", -+ "lineIndex": 11, -+ "desiredValue": 1 -+ }, - "pwmMin": 1, - "pwmMax": 255, - "fanPresentVal": 1, -@@ -306,7 +519,11 @@ - "fanName": "FANTRAY2_FAN8", - "rpmSysfsPath": "/run/devmap/sensors/BCB_FAN_CPLD_2/fan8_input", - "pwmSysfsPath": "/run/devmap/sensors/BCB_FAN_CPLD_2/pwm3", -- "presenceSysfsPath": "/run/devmap/sensors/BCB_FAN_2/fan4_present", -+ "presenceGpio": { -+ "path": "/run/devmap/gpiochips/FCB_GPIO_CHIP_2", -+ "lineIndex": 11, -+ "desiredValue": 1 -+ }, - "pwmMin": 1, - "pwmMax": 255, - "fanPresentVal": 1, -@@ -321,8 +538,12 @@ - "zoneType": "ZONE_TYPE_MAX", - "zoneName": "zone1", - "sensorNames": [ -- "SMB_INNER_LEFT_LM75_TEMP", -+ "PDB_U1_LM75_TEMP", -+ "SMB_U17_INNER_RIGHT_LM75_TEMP", - "CPU_UNCORE_TEMP", -+ "SMB_E1S_SSD_TEMP", -+ "PDB_PS1_12V_TEMP", -+ "PDB_PS2_12V_TEMP", - "qsfp_group_1" - ], - "fanNames": [ diff --git a/fboss/platform/configs/janga800bic/platform_manager.json b/fboss/platform/configs/janga800bic/platform_manager.json index 826f0fccf23ca..e3108a92a4831 100644 --- a/fboss/platform/configs/janga800bic/platform_manager.json +++ b/fboss/platform/configs/janga800bic/platform_manager.json @@ -2058,6 +2058,13 @@ } ], "i2cDeviceConfigs": [ + { + "busName": "SMB_IOB_I2C_MASTER_1", + "address": "0x12", + "kernelDeviceName": "pca9555", + "pmUnitScopedName": "FCB_GPIO_CHIP_2", + "isGpioChip": true + }, { "busName": "SMB_IOB_I2C_MASTER_4", "address": "0x48", @@ -2652,6 +2659,7 @@ "/run/devmap/xcvrs/xcvr_45": "/[SMB_DOM_XCVR_CTRL_PORT_45]", "/run/devmap/xcvrs/xcvr_46": "/[SMB_DOM_XCVR_CTRL_PORT_46]", "/run/devmap/gpiochips/SMB_GPIO_CHIP_1": "/[SMB_GPIO_CHIP_1]", + "/run/devmap/gpiochips/FCB_GPIO_CHIP_2": "/[FCB_GPIO_CHIP_2]", "/run/devmap/flashes/SMB_SPI_MASTER_1_DEVICE_1": "/[SMB_SPI_MASTER_1_DEVICE_1]", "/run/devmap/flashes/SMB_SPI_MASTER_2_DEVICE_1": "/[SMB_SPI_MASTER_2_DEVICE_1]", "/run/devmap/flashes/SMB_SPI_MASTER_3_DEVICE_1": "/[SMB_SPI_MASTER_3_DEVICE_1]", diff --git a/fboss/platform/configs/janga800bic/platform_service_rack.patch b/fboss/platform/configs/janga800bic/platform_service_rack.patch deleted file mode 100644 index 5c3588cd92c99..0000000000000 --- a/fboss/platform/configs/janga800bic/platform_service_rack.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- janga_2_17_fboss_config/platform_manager.json 2025-01-21 21:25:17.000000000 -0500 -+++ janga_2_17_fboss_config_my_change/platform_manager.json 2025-01-21 21:37:27.000000000 -0500 -@@ -2059,6 +2059,13 @@ - ], - "i2cDeviceConfigs": [ - { -+ "busName": "SMB_IOB_I2C_MASTER_1", -+ "address": "0x12", -+ "kernelDeviceName": "pca9555", -+ "pmUnitScopedName": "FCB_GPIO_CHIP_2", -+ "isGpioChip": true -+ }, -+ { - "busName": "SMB_IOB_I2C_MASTER_4", - "address": "0x48", - "kernelDeviceName": "lm75b", -@@ -2652,6 +2659,7 @@ - "/run/devmap/xcvrs/xcvr_45": "/[SMB_DOM_XCVR_CTRL_PORT_45]", - "/run/devmap/xcvrs/xcvr_46": "/[SMB_DOM_XCVR_CTRL_PORT_46]", - "/run/devmap/gpiochips/SMB_GPIO_CHIP_1": "/[SMB_GPIO_CHIP_1]", -+ "/run/devmap/gpiochips/FCB_GPIO_CHIP_2": "/[FCB_GPIO_CHIP_2]", - "/run/devmap/flashes/SMB_SPI_MASTER_1_DEVICE_1": "/[SMB_SPI_MASTER_1_DEVICE_1]", - "/run/devmap/flashes/SMB_SPI_MASTER_2_DEVICE_1": "/[SMB_SPI_MASTER_2_DEVICE_1]", - "/run/devmap/flashes/SMB_SPI_MASTER_3_DEVICE_1": "/[SMB_SPI_MASTER_3_DEVICE_1]", diff --git a/fboss/platform/configs/tahan800bc/fan_service.json b/fboss/platform/configs/tahan800bc/fan_service.json index 746e162b9d246..abed596560bfb 100644 --- a/fboss/platform/configs/tahan800bc/fan_service.json +++ b/fboss/platform/configs/tahan800bc/fan_service.json @@ -2,8 +2,8 @@ "pwmBoostOnNumDeadFan": 1, "pwmBoostOnNumDeadSensor": 0, "pwmBoostOnNoQsfpAfterInSec": 55, - "pwmBoostValue": 100, - "pwmTransitionValue": 50, + "pwmBoostValue": 85, + "pwmTransitionValue": 55, "pwmLowerThreshold": 30, "pwmUpperThreshold": 100, "controlInterval": { @@ -17,39 +17,20 @@ "accessType": "ACCESS_TYPE_QSFP" }, "portList": [], - "aggregationType": "OPTIC_AGGREGATION_TYPE_PID", - "pidSettings": { + "aggregationType": "OPTIC_AGGREGATION_TYPE_MAX", + "tempToPwmMaps": { "OPTIC_TYPE_800_GENERIC": { - "kp": -4, - "ki": -0.06, - "kd": 0, - "setPoint": 67.0, - "posHysteresis": 0.0, - "negHysteresis": 2.0 - }, - "OPTIC_TYPE_400_GENERIC": { - "kp": -4, - "ki": -0.06, - "kd": 0, - "setPoint": 67.0, - "posHysteresis": 0.0, - "negHysteresis": 2.0 - }, - "OPTIC_TYPE_200_GENERIC": { - "kp": -4, - "ki": -0.06, - "kd": 0, - "setPoint": 67.0, - "posHysteresis": 0.0, - "negHysteresis": 2.0 - }, - "OPTIC_TYPE_100_GENERIC": { - "kp": -4, - "ki": -0.06, - "kd": 0, - "setPoint": 67.0, - "posHysteresis": 0.0, - "negHysteresis": 2.0 + "30": 10, + "40": 20, + "44": 25, + "47": 30, + "50": 35, + "54": 40, + "57": 45, + "60": 50, + "64": 55, + "67": 60, + "70": 80 } } } @@ -62,32 +43,114 @@ }, "pwmCalcType": "SENSOR_PWM_CALC_TYPE_FOUR_LINEAR_TABLE", "normalUpTable": { - "38": 45, - "39": 50, - "44": 60, - "47": 70, - "48": 100 + "20": 30, + "25": 40, + "30": 50, + "35": 60, + "40": 70, + "45": 100 }, "normalDownTable": { - "35": 45, - "40": 50, - "43": 60, - "48": 70, - "49": 100 + "20": 30, + "25": 40, + "30": 50, + "35": 60, + "40": 70, + "45": 100 }, "failUpTable": { - "38": 45, - "39": 50, - "44": 60, - "47": 70, - "48": 100 + "20": 30, + "25": 40, + "30": 50, + "35": 60, + "40": 70, + "45": 100 }, "failDownTable": { - "35": 45, - "40": 50, - "43": 60, - "48": 70, - "49": 100 + "20": 30, + "25": 40, + "30": 50, + "35": 60, + "40": 70, + "45": 100 + } + }, + { + "sensorName": "SMB_U67_INLET_RIGHT_LM75_TEMP", + "access": { + "accessType": "ACCESS_TYPE_THRIFT" + }, + "pwmCalcType": "SENSOR_PWM_CALC_TYPE_FOUR_LINEAR_TABLE", + "normalUpTable": { + "20": 30, + "25": 40, + "30": 50, + "35": 60, + "40": 70, + "45": 100 + }, + "normalDownTable": { + "20": 30, + "25": 40, + "30": 50, + "35": 60, + "40": 70, + "45": 100 + }, + "failUpTable": { + "20": 30, + "25": 40, + "30": 50, + "35": 60, + "40": 70, + "45": 100 + }, + "failDownTable": { + "20": 30, + "25": 40, + "30": 50, + "35": 60, + "40": 70, + "45": 100 + } + }, + { + "sensorName": "SMB_U69_INLET_RIGHT_BOT_LM75_TEMP", + "access": { + "accessType": "ACCESS_TYPE_THRIFT" + }, + "pwmCalcType": "SENSOR_PWM_CALC_TYPE_FOUR_LINEAR_TABLE", + "normalUpTable": { + "20": 30, + "25": 40, + "30": 50, + "35": 60, + "40": 70, + "45": 100 + }, + "normalDownTable": { + "20": 30, + "25": 40, + "30": 50, + "35": 60, + "40": 70, + "45": 100 + }, + "failUpTable": { + "20": 30, + "25": 40, + "30": 50, + "35": 60, + "40": 70, + "45": 100 + }, + "failDownTable": { + "20": 30, + "25": 40, + "30": 50, + "35": 60, + "40": 70, + "45": 100 } }, { @@ -95,14 +158,143 @@ "access": { "accessType": "ACCESS_TYPE_THRIFT" }, - "pwmCalcType": "SENSOR_PWM_CALC_TYPE_PID", - "pidSetting": { - "kp": -4, - "ki": -0.06, - "kd": 0, - "setPoint": 97.0, - "posHysteresis": 0.0, - "negHysteresis": 5.0 + "pwmCalcType": "SENSOR_PWM_CALC_TYPE_FOUR_LINEAR_TABLE", + "normalUpTable": { + "80": 20, + "85": 30, + "90": 40, + "95": 50, + "99": 80 + }, + "normalDownTable": { + "80": 20, + "85": 30, + "90": 40, + "95": 50, + "99": 80 + }, + "failUpTable": { + "80": 20, + "85": 30, + "90": 40, + "95": 50, + "99": 80 + }, + "failDownTable": { + "80": 20, + "85": 30, + "90": 40, + "95": 50, + "99": 80 + } + }, + { + "sensorName": "SMB_E1S_SSD_TEMP", + "access": { + "accessType": "ACCESS_TYPE_THRIFT" + }, + "pwmCalcType": "SENSOR_PWM_CALC_TYPE_FOUR_LINEAR_TABLE", + "normalUpTable": { + "55": 20, + "65": 30, + "75": 40, + "80": 80 + }, + "normalDownTable": { + "55": 20, + "65": 30, + "75": 40, + "80": 80 + }, + "failUpTable": { + "55": 20, + "65": 30, + "75": 40, + "80": 80 + }, + "failDownTable": { + "55": 20, + "65": 30, + "75": 40, + "80": 80 + } + }, + { + "sensorName": "POWER_BRICK1_TEMP1", + "access": { + "accessType": "ACCESS_TYPE_THRIFT" + }, + "pwmCalcType": "SENSOR_PWM_CALC_TYPE_FOUR_LINEAR_TABLE", + "normalUpTable": { + "55": 20, + "65": 25, + "75": 30, + "85": 35, + "95": 40, + "100": 80 + }, + "normalDownTable": { + "55": 20, + "65": 25, + "75": 30, + "85": 35, + "95": 40, + "100": 80 + }, + "failUpTable": { + "55": 20, + "65": 25, + "75": 30, + "85": 35, + "95": 40, + "100": 80 + }, + "failDownTable": { + "55": 20, + "65": 25, + "75": 30, + "85": 35, + "95": 40, + "100": 80 + } + }, + { + "sensorName": "POWER_BRICK2_TEMP1", + "access": { + "accessType": "ACCESS_TYPE_THRIFT" + }, + "pwmCalcType": "SENSOR_PWM_CALC_TYPE_FOUR_LINEAR_TABLE", + "normalUpTable": { + "55": 20, + "65": 25, + "75": 30, + "85": 35, + "95": 40, + "100": 80 + }, + "normalDownTable": { + "55": 20, + "65": 25, + "75": 30, + "85": 35, + "95": 40, + "100": 80 + }, + "failUpTable": { + "55": 20, + "65": 25, + "75": 30, + "85": 35, + "95": 40, + "100": 80 + }, + "failDownTable": { + "55": 20, + "65": 25, + "75": 30, + "85": 35, + "95": 40, + "100": 80 } } ], @@ -111,7 +303,11 @@ "fanName": "FANTRAY1_FAN1", "rpmSysfsPath": "/run/devmap/sensors/SMB_BCB_FAN_CPLD/fan1_input", "pwmSysfsPath": "/run/devmap/sensors/SMB_BCB_FAN_CPLD/pwm3", - "presenceSysfsPath": "/run/devmap/sensors/BCB_FAN/fan1_present", + "presenceGpio": { + "path": "/run/devmap/gpiochips/FCB_GPIO_CHIP_2", + "lineIndex": 8, + "desiredValue": 1 + }, "pwmMin": 1, "pwmMax": 255, "fanPresentVal": 1, @@ -124,7 +320,11 @@ "fanName": "FANTRAY1_FAN2", "rpmSysfsPath": "/run/devmap/sensors/SMB_BCB_FAN_CPLD/fan2_input", "pwmSysfsPath": "/run/devmap/sensors/SMB_BCB_FAN_CPLD/pwm3", - "presenceSysfsPath": "/run/devmap/sensors/BCB_FAN/fan1_present", + "presenceGpio": { + "path": "/run/devmap/gpiochips/FCB_GPIO_CHIP_2", + "lineIndex": 8, + "desiredValue": 1 + }, "pwmMin": 1, "pwmMax": 255, "fanPresentVal": 1, @@ -137,7 +337,11 @@ "fanName": "FANTRAY1_FAN3", "rpmSysfsPath": "/run/devmap/sensors/SMB_BCB_FAN_CPLD/fan3_input", "pwmSysfsPath": "/run/devmap/sensors/SMB_BCB_FAN_CPLD/pwm3", - "presenceSysfsPath": "/run/devmap/sensors/BCB_FAN/fan2_present", + "presenceGpio": { + "path": "/run/devmap/gpiochips/FCB_GPIO_CHIP_2", + "lineIndex": 9, + "desiredValue": 1 + }, "pwmMin": 1, "pwmMax": 255, "fanPresentVal": 1, @@ -150,7 +354,11 @@ "fanName": "FANTRAY1_FAN4", "rpmSysfsPath": "/run/devmap/sensors/SMB_BCB_FAN_CPLD/fan4_input", "pwmSysfsPath": "/run/devmap/sensors/SMB_BCB_FAN_CPLD/pwm3", - "presenceSysfsPath": "/run/devmap/sensors/BCB_FAN/fan2_present", + "presenceGpio": { + "path": "/run/devmap/gpiochips/FCB_GPIO_CHIP_2", + "lineIndex": 9, + "desiredValue": 1 + }, "pwmMin": 1, "pwmMax": 255, "fanPresentVal": 1, @@ -163,7 +371,11 @@ "fanName": "FANTRAY1_FAN5", "rpmSysfsPath": "/run/devmap/sensors/SMB_BCB_FAN_CPLD/fan5_input", "pwmSysfsPath": "/run/devmap/sensors/SMB_BCB_FAN_CPLD/pwm3", - "presenceSysfsPath": "/run/devmap/sensors/BCB_FAN/fan3_present", + "presenceGpio": { + "path": "/run/devmap/gpiochips/FCB_GPIO_CHIP_2", + "lineIndex": 10, + "desiredValue": 1 + }, "pwmMin": 1, "pwmMax": 255, "fanPresentVal": 1, @@ -176,7 +388,11 @@ "fanName": "FANTRAY1_FAN6", "rpmSysfsPath": "/run/devmap/sensors/SMB_BCB_FAN_CPLD/fan6_input", "pwmSysfsPath": "/run/devmap/sensors/SMB_BCB_FAN_CPLD/pwm3", - "presenceSysfsPath": "/run/devmap/sensors/BCB_FAN/fan3_present", + "presenceGpio": { + "path": "/run/devmap/gpiochips/FCB_GPIO_CHIP_2", + "lineIndex": 10, + "desiredValue": 1 + }, "pwmMin": 1, "pwmMax": 255, "fanPresentVal": 1, @@ -189,7 +405,11 @@ "fanName": "FANTRAY1_FAN7", "rpmSysfsPath": "/run/devmap/sensors/SMB_BCB_FAN_CPLD/fan7_input", "pwmSysfsPath": "/run/devmap/sensors/SMB_BCB_FAN_CPLD/pwm3", - "presenceSysfsPath": "/run/devmap/sensors/BCB_FAN/fan4_present", + "presenceGpio": { + "path": "/run/devmap/gpiochips/FCB_GPIO_CHIP_2", + "lineIndex": 11, + "desiredValue": 1 + }, "pwmMin": 1, "pwmMax": 255, "fanPresentVal": 1, @@ -202,7 +422,11 @@ "fanName": "FANTRAY1_FAN8", "rpmSysfsPath": "/run/devmap/sensors/SMB_BCB_FAN_CPLD/fan8_input", "pwmSysfsPath": "/run/devmap/sensors/SMB_BCB_FAN_CPLD/pwm3", - "presenceSysfsPath": "/run/devmap/sensors/BCB_FAN/fan4_present", + "presenceGpio": { + "path": "/run/devmap/gpiochips/FCB_GPIO_CHIP_2", + "lineIndex": 11, + "desiredValue": 1 + }, "pwmMin": 1, "pwmMax": 255, "fanPresentVal": 1, @@ -215,7 +439,11 @@ "fanName": "FANTRAY2_FAN1", "rpmSysfsPath": "/run/devmap/sensors/SMB_BCB_FAN_CPLD_2/fan1_input", "pwmSysfsPath": "/run/devmap/sensors/SMB_BCB_FAN_CPLD_2/pwm3", - "presenceSysfsPath": "/run/devmap/sensors/BCB_FAN_2/fan1_present", + "presenceGpio": { + "path": "/run/devmap/gpiochips/FCB_GPIO_CHIP_2", + "lineIndex": 8, + "desiredValue": 1 + }, "pwmMin": 1, "pwmMax": 255, "fanPresentVal": 1, @@ -228,7 +456,11 @@ "fanName": "FANTRAY2_FAN2", "rpmSysfsPath": "/run/devmap/sensors/SMB_BCB_FAN_CPLD_2/fan2_input", "pwmSysfsPath": "/run/devmap/sensors/SMB_BCB_FAN_CPLD_2/pwm3", - "presenceSysfsPath": "/run/devmap/sensors/BCB_FAN_2/fan1_present", + "presenceGpio": { + "path": "/run/devmap/gpiochips/FCB_GPIO_CHIP_2", + "lineIndex": 8, + "desiredValue": 1 + }, "pwmMin": 1, "pwmMax": 255, "fanPresentVal": 1, @@ -241,7 +473,11 @@ "fanName": "FANTRAY2_FAN3", "rpmSysfsPath": "/run/devmap/sensors/SMB_BCB_FAN_CPLD_2/fan3_input", "pwmSysfsPath": "/run/devmap/sensors/SMB_BCB_FAN_CPLD_2/pwm3", - "presenceSysfsPath": "/run/devmap/sensors/BCB_FAN_2/fan2_present", + "presenceGpio": { + "path": "/run/devmap/gpiochips/FCB_GPIO_CHIP_2", + "lineIndex": 9, + "desiredValue": 1 + }, "pwmMin": 1, "pwmMax": 255, "fanPresentVal": 1, @@ -254,7 +490,11 @@ "fanName": "FANTRAY2_FAN4", "rpmSysfsPath": "/run/devmap/sensors/SMB_BCB_FAN_CPLD_2/fan4_input", "pwmSysfsPath": "/run/devmap/sensors/SMB_BCB_FAN_CPLD_2/pwm3", - "presenceSysfsPath": "/run/devmap/sensors/BCB_FAN_2/fan2_present", + "presenceGpio": { + "path": "/run/devmap/gpiochips/FCB_GPIO_CHIP_2", + "lineIndex": 9, + "desiredValue": 1 + }, "pwmMin": 1, "pwmMax": 255, "fanPresentVal": 1, @@ -267,7 +507,11 @@ "fanName": "FANTRAY2_FAN5", "rpmSysfsPath": "/run/devmap/sensors/SMB_BCB_FAN_CPLD_2/fan5_input", "pwmSysfsPath": "/run/devmap/sensors/SMB_BCB_FAN_CPLD_2/pwm3", - "presenceSysfsPath": "/run/devmap/sensors/BCB_FAN_2/fan3_present", + "presenceGpio": { + "path": "/run/devmap/gpiochips/FCB_GPIO_CHIP_2", + "lineIndex": 10, + "desiredValue": 1 + }, "pwmMin": 1, "pwmMax": 255, "fanPresentVal": 1, @@ -280,7 +524,11 @@ "fanName": "FANTRAY2_FAN6", "rpmSysfsPath": "/run/devmap/sensors/SMB_BCB_FAN_CPLD_2/fan6_input", "pwmSysfsPath": "/run/devmap/sensors/SMB_BCB_FAN_CPLD_2/pwm3", - "presenceSysfsPath": "/run/devmap/sensors/BCB_FAN_2/fan3_present", + "presenceGpio": { + "path": "/run/devmap/gpiochips/FCB_GPIO_CHIP_2", + "lineIndex": 10, + "desiredValue": 1 + }, "pwmMin": 1, "pwmMax": 255, "fanPresentVal": 1, @@ -293,7 +541,11 @@ "fanName": "FANTRAY2_FAN7", "rpmSysfsPath": "/run/devmap/sensors/SMB_BCB_FAN_CPLD_2/fan7_input", "pwmSysfsPath": "/run/devmap/sensors/SMB_BCB_FAN_CPLD_2/pwm3", - "presenceSysfsPath": "/run/devmap/sensors/BCB_FAN_2/fan4_present", + "presenceGpio": { + "path": "/run/devmap/gpiochips/FCB_GPIO_CHIP_2", + "lineIndex": 11, + "desiredValue": 1 + }, "pwmMin": 1, "pwmMax": 255, "fanPresentVal": 1, @@ -306,7 +558,11 @@ "fanName": "FANTRAY2_FAN8", "rpmSysfsPath": "/run/devmap/sensors/SMB_BCB_FAN_CPLD_2/fan8_input", "pwmSysfsPath": "/run/devmap/sensors/SMB_BCB_FAN_CPLD_2/pwm3", - "presenceSysfsPath": "/run/devmap/sensors/BCB_FAN_2/fan4_present", + "presenceGpio": { + "path": "/run/devmap/gpiochips/FCB_GPIO_CHIP_2", + "lineIndex": 11, + "desiredValue": 1 + }, "pwmMin": 1, "pwmMax": 255, "fanPresentVal": 1, @@ -322,7 +578,12 @@ "zoneName": "zone1", "sensorNames": [ "SMB_U77_INLET_LEFT_BOT_LM75_TEMP", + "SMB_U67_INLET_RIGHT_LM75_TEMP", + "SMB_U69_INLET_RIGHT_BOT_LM75_TEMP", "CPU_UNCORE_TEMP", + "SMB_E1S_SSD_TEMP", + "POWER_BRICK1_TEMP1", + "POWER_BRICK2_TEMP1", "qsfp_group_1" ], "fanNames": [ diff --git a/fboss/platform/configs/tahan800bc/fan_service_rack.patch b/fboss/platform/configs/tahan800bc/fan_service_rack.patch deleted file mode 100644 index b2642b6aa8529..0000000000000 --- a/fboss/platform/configs/tahan800bc/fan_service_rack.patch +++ /dev/null @@ -1,574 +0,0 @@ ---- tahan_2_17_fboss_config/fan_service.json 2025-02-16 21:54:40.000000000 -0500 -+++ tahan_2_17_fboss_config_my_change/fan_service.json 2025-02-17 00:46:19.000000000 -0500 -@@ -2,8 +2,8 @@ - "pwmBoostOnNumDeadFan": 1, - "pwmBoostOnNumDeadSensor": 0, - "pwmBoostOnNoQsfpAfterInSec": 55, -- "pwmBoostValue": 100, -- "pwmTransitionValue": 50, -+ "pwmBoostValue": 85, -+ "pwmTransitionValue": 55, - "pwmLowerThreshold": 30, - "pwmUpperThreshold": 100, - "controlInterval": { -@@ -17,39 +17,20 @@ - "accessType": "ACCESS_TYPE_QSFP" - }, - "portList": [], -- "aggregationType": "OPTIC_AGGREGATION_TYPE_PID", -- "pidSettings": { -+ "aggregationType": "OPTIC_AGGREGATION_TYPE_MAX", -+ "tempToPwmMaps": { - "OPTIC_TYPE_800_GENERIC": { -- "kp": -4, -- "ki": -0.06, -- "kd": 0, -- "setPoint": 67.0, -- "posHysteresis": 0.0, -- "negHysteresis": 2.0 -- }, -- "OPTIC_TYPE_400_GENERIC": { -- "kp": -4, -- "ki": -0.06, -- "kd": 0, -- "setPoint": 67.0, -- "posHysteresis": 0.0, -- "negHysteresis": 2.0 -- }, -- "OPTIC_TYPE_200_GENERIC": { -- "kp": -4, -- "ki": -0.06, -- "kd": 0, -- "setPoint": 67.0, -- "posHysteresis": 0.0, -- "negHysteresis": 2.0 -- }, -- "OPTIC_TYPE_100_GENERIC": { -- "kp": -4, -- "ki": -0.06, -- "kd": 0, -- "setPoint": 67.0, -- "posHysteresis": 0.0, -- "negHysteresis": 2.0 -+ "30": 10, -+ "40": 20, -+ "44": 25, -+ "47": 30, -+ "50": 35, -+ "54": 40, -+ "57": 45, -+ "60": 50, -+ "64": 55, -+ "67": 60, -+ "70": 80 - } - } - } -@@ -62,32 +43,114 @@ - }, - "pwmCalcType": "SENSOR_PWM_CALC_TYPE_FOUR_LINEAR_TABLE", - "normalUpTable": { -- "38": 45, -- "39": 50, -- "44": 60, -- "47": 70, -- "48": 100 -+ "20": 30, -+ "25": 40, -+ "30": 50, -+ "35": 60, -+ "40": 70, -+ "45": 100 - }, - "normalDownTable": { -- "35": 45, -- "40": 50, -- "43": 60, -- "48": 70, -- "49": 100 -+ "20": 30, -+ "25": 40, -+ "30": 50, -+ "35": 60, -+ "40": 70, -+ "45": 100 - }, - "failUpTable": { -- "38": 45, -- "39": 50, -- "44": 60, -- "47": 70, -- "48": 100 -+ "20": 30, -+ "25": 40, -+ "30": 50, -+ "35": 60, -+ "40": 70, -+ "45": 100 - }, - "failDownTable": { -- "35": 45, -- "40": 50, -- "43": 60, -- "48": 70, -- "49": 100 -+ "20": 30, -+ "25": 40, -+ "30": 50, -+ "35": 60, -+ "40": 70, -+ "45": 100 -+ } -+ }, -+ { -+ "sensorName": "SMB_U67_INLET_RIGHT_LM75_TEMP", -+ "access": { -+ "accessType": "ACCESS_TYPE_THRIFT" -+ }, -+ "pwmCalcType": "SENSOR_PWM_CALC_TYPE_FOUR_LINEAR_TABLE", -+ "normalUpTable": { -+ "20": 30, -+ "25": 40, -+ "30": 50, -+ "35": 60, -+ "40": 70, -+ "45": 100 -+ }, -+ "normalDownTable": { -+ "20": 30, -+ "25": 40, -+ "30": 50, -+ "35": 60, -+ "40": 70, -+ "45": 100 -+ }, -+ "failUpTable": { -+ "20": 30, -+ "25": 40, -+ "30": 50, -+ "35": 60, -+ "40": 70, -+ "45": 100 -+ }, -+ "failDownTable": { -+ "20": 30, -+ "25": 40, -+ "30": 50, -+ "35": 60, -+ "40": 70, -+ "45": 100 -+ } -+ }, -+ { -+ "sensorName": "SMB_U69_INLET_RIGHT_BOT_LM75_TEMP", -+ "access": { -+ "accessType": "ACCESS_TYPE_THRIFT" -+ }, -+ "pwmCalcType": "SENSOR_PWM_CALC_TYPE_FOUR_LINEAR_TABLE", -+ "normalUpTable": { -+ "20": 30, -+ "25": 40, -+ "30": 50, -+ "35": 60, -+ "40": 70, -+ "45": 100 -+ }, -+ "normalDownTable": { -+ "20": 30, -+ "25": 40, -+ "30": 50, -+ "35": 60, -+ "40": 70, -+ "45": 100 -+ }, -+ "failUpTable": { -+ "20": 30, -+ "25": 40, -+ "30": 50, -+ "35": 60, -+ "40": 70, -+ "45": 100 -+ }, -+ "failDownTable": { -+ "20": 30, -+ "25": 40, -+ "30": 50, -+ "35": 60, -+ "40": 70, -+ "45": 100 - } - }, - { -@@ -95,14 +158,143 @@ - "access": { - "accessType": "ACCESS_TYPE_THRIFT" - }, -- "pwmCalcType": "SENSOR_PWM_CALC_TYPE_PID", -- "pidSetting": { -- "kp": -4, -- "ki": -0.06, -- "kd": 0, -- "setPoint": 97.0, -- "posHysteresis": 0.0, -- "negHysteresis": 5.0 -+ "pwmCalcType": "SENSOR_PWM_CALC_TYPE_FOUR_LINEAR_TABLE", -+ "normalUpTable": { -+ "80": 20, -+ "85": 30, -+ "90": 40, -+ "95": 50, -+ "99": 80 -+ }, -+ "normalDownTable": { -+ "80": 20, -+ "85": 30, -+ "90": 40, -+ "95": 50, -+ "99": 80 -+ }, -+ "failUpTable": { -+ "80": 20, -+ "85": 30, -+ "90": 40, -+ "95": 50, -+ "99": 80 -+ }, -+ "failDownTable": { -+ "80": 20, -+ "85": 30, -+ "90": 40, -+ "95": 50, -+ "99": 80 -+ } -+ }, -+ { -+ "sensorName": "SMB_E1S_SSD_TEMP", -+ "access": { -+ "accessType": "ACCESS_TYPE_THRIFT" -+ }, -+ "pwmCalcType": "SENSOR_PWM_CALC_TYPE_FOUR_LINEAR_TABLE", -+ "normalUpTable": { -+ "55": 20, -+ "65": 30, -+ "75": 40, -+ "80": 80 -+ }, -+ "normalDownTable": { -+ "55": 20, -+ "65": 30, -+ "75": 40, -+ "80": 80 -+ }, -+ "failUpTable": { -+ "55": 20, -+ "65": 30, -+ "75": 40, -+ "80": 80 -+ }, -+ "failDownTable": { -+ "55": 20, -+ "65": 30, -+ "75": 40, -+ "80": 80 -+ } -+ }, -+ { -+ "sensorName": "POWER_BRICK1_TEMP1", -+ "access": { -+ "accessType": "ACCESS_TYPE_THRIFT" -+ }, -+ "pwmCalcType": "SENSOR_PWM_CALC_TYPE_FOUR_LINEAR_TABLE", -+ "normalUpTable": { -+ "55": 20, -+ "65": 25, -+ "75": 30, -+ "85": 35, -+ "95": 40, -+ "100": 80 -+ }, -+ "normalDownTable": { -+ "55": 20, -+ "65": 25, -+ "75": 30, -+ "85": 35, -+ "95": 40, -+ "100": 80 -+ }, -+ "failUpTable": { -+ "55": 20, -+ "65": 25, -+ "75": 30, -+ "85": 35, -+ "95": 40, -+ "100": 80 -+ }, -+ "failDownTable": { -+ "55": 20, -+ "65": 25, -+ "75": 30, -+ "85": 35, -+ "95": 40, -+ "100": 80 -+ } -+ }, -+ { -+ "sensorName": "POWER_BRICK2_TEMP1", -+ "access": { -+ "accessType": "ACCESS_TYPE_THRIFT" -+ }, -+ "pwmCalcType": "SENSOR_PWM_CALC_TYPE_FOUR_LINEAR_TABLE", -+ "normalUpTable": { -+ "55": 20, -+ "65": 25, -+ "75": 30, -+ "85": 35, -+ "95": 40, -+ "100": 80 -+ }, -+ "normalDownTable": { -+ "55": 20, -+ "65": 25, -+ "75": 30, -+ "85": 35, -+ "95": 40, -+ "100": 80 -+ }, -+ "failUpTable": { -+ "55": 20, -+ "65": 25, -+ "75": 30, -+ "85": 35, -+ "95": 40, -+ "100": 80 -+ }, -+ "failDownTable": { -+ "55": 20, -+ "65": 25, -+ "75": 30, -+ "85": 35, -+ "95": 40, -+ "100": 80 - } - } - ], -@@ -111,7 +303,11 @@ - "fanName": "FANTRAY1_FAN1", - "rpmSysfsPath": "/run/devmap/sensors/SMB_BCB_FAN_CPLD/fan1_input", - "pwmSysfsPath": "/run/devmap/sensors/SMB_BCB_FAN_CPLD/pwm3", -- "presenceSysfsPath": "/run/devmap/sensors/BCB_FAN/fan1_present", -+ "presenceGpio": { -+ "path": "/run/devmap/gpiochips/FCB_GPIO_CHIP_2", -+ "lineIndex": 8, -+ "desiredValue": 1 -+ }, - "pwmMin": 1, - "pwmMax": 255, - "fanPresentVal": 1, -@@ -124,7 +320,11 @@ - "fanName": "FANTRAY1_FAN2", - "rpmSysfsPath": "/run/devmap/sensors/SMB_BCB_FAN_CPLD/fan2_input", - "pwmSysfsPath": "/run/devmap/sensors/SMB_BCB_FAN_CPLD/pwm3", -- "presenceSysfsPath": "/run/devmap/sensors/BCB_FAN/fan1_present", -+ "presenceGpio": { -+ "path": "/run/devmap/gpiochips/FCB_GPIO_CHIP_2", -+ "lineIndex": 8, -+ "desiredValue": 1 -+ }, - "pwmMin": 1, - "pwmMax": 255, - "fanPresentVal": 1, -@@ -137,7 +337,11 @@ - "fanName": "FANTRAY1_FAN3", - "rpmSysfsPath": "/run/devmap/sensors/SMB_BCB_FAN_CPLD/fan3_input", - "pwmSysfsPath": "/run/devmap/sensors/SMB_BCB_FAN_CPLD/pwm3", -- "presenceSysfsPath": "/run/devmap/sensors/BCB_FAN/fan2_present", -+ "presenceGpio": { -+ "path": "/run/devmap/gpiochips/FCB_GPIO_CHIP_2", -+ "lineIndex": 9, -+ "desiredValue": 1 -+ }, - "pwmMin": 1, - "pwmMax": 255, - "fanPresentVal": 1, -@@ -150,7 +354,11 @@ - "fanName": "FANTRAY1_FAN4", - "rpmSysfsPath": "/run/devmap/sensors/SMB_BCB_FAN_CPLD/fan4_input", - "pwmSysfsPath": "/run/devmap/sensors/SMB_BCB_FAN_CPLD/pwm3", -- "presenceSysfsPath": "/run/devmap/sensors/BCB_FAN/fan2_present", -+ "presenceGpio": { -+ "path": "/run/devmap/gpiochips/FCB_GPIO_CHIP_2", -+ "lineIndex": 9, -+ "desiredValue": 1 -+ }, - "pwmMin": 1, - "pwmMax": 255, - "fanPresentVal": 1, -@@ -163,7 +371,11 @@ - "fanName": "FANTRAY1_FAN5", - "rpmSysfsPath": "/run/devmap/sensors/SMB_BCB_FAN_CPLD/fan5_input", - "pwmSysfsPath": "/run/devmap/sensors/SMB_BCB_FAN_CPLD/pwm3", -- "presenceSysfsPath": "/run/devmap/sensors/BCB_FAN/fan3_present", -+ "presenceGpio": { -+ "path": "/run/devmap/gpiochips/FCB_GPIO_CHIP_2", -+ "lineIndex": 10, -+ "desiredValue": 1 -+ }, - "pwmMin": 1, - "pwmMax": 255, - "fanPresentVal": 1, -@@ -176,7 +388,11 @@ - "fanName": "FANTRAY1_FAN6", - "rpmSysfsPath": "/run/devmap/sensors/SMB_BCB_FAN_CPLD/fan6_input", - "pwmSysfsPath": "/run/devmap/sensors/SMB_BCB_FAN_CPLD/pwm3", -- "presenceSysfsPath": "/run/devmap/sensors/BCB_FAN/fan3_present", -+ "presenceGpio": { -+ "path": "/run/devmap/gpiochips/FCB_GPIO_CHIP_2", -+ "lineIndex": 10, -+ "desiredValue": 1 -+ }, - "pwmMin": 1, - "pwmMax": 255, - "fanPresentVal": 1, -@@ -189,7 +405,11 @@ - "fanName": "FANTRAY1_FAN7", - "rpmSysfsPath": "/run/devmap/sensors/SMB_BCB_FAN_CPLD/fan7_input", - "pwmSysfsPath": "/run/devmap/sensors/SMB_BCB_FAN_CPLD/pwm3", -- "presenceSysfsPath": "/run/devmap/sensors/BCB_FAN/fan4_present", -+ "presenceGpio": { -+ "path": "/run/devmap/gpiochips/FCB_GPIO_CHIP_2", -+ "lineIndex": 11, -+ "desiredValue": 1 -+ }, - "pwmMin": 1, - "pwmMax": 255, - "fanPresentVal": 1, -@@ -202,7 +422,11 @@ - "fanName": "FANTRAY1_FAN8", - "rpmSysfsPath": "/run/devmap/sensors/SMB_BCB_FAN_CPLD/fan8_input", - "pwmSysfsPath": "/run/devmap/sensors/SMB_BCB_FAN_CPLD/pwm3", -- "presenceSysfsPath": "/run/devmap/sensors/BCB_FAN/fan4_present", -+ "presenceGpio": { -+ "path": "/run/devmap/gpiochips/FCB_GPIO_CHIP_2", -+ "lineIndex": 11, -+ "desiredValue": 1 -+ }, - "pwmMin": 1, - "pwmMax": 255, - "fanPresentVal": 1, -@@ -215,7 +439,11 @@ - "fanName": "FANTRAY2_FAN1", - "rpmSysfsPath": "/run/devmap/sensors/SMB_BCB_FAN_CPLD_2/fan1_input", - "pwmSysfsPath": "/run/devmap/sensors/SMB_BCB_FAN_CPLD_2/pwm3", -- "presenceSysfsPath": "/run/devmap/sensors/BCB_FAN_2/fan1_present", -+ "presenceGpio": { -+ "path": "/run/devmap/gpiochips/FCB_GPIO_CHIP_2", -+ "lineIndex": 8, -+ "desiredValue": 1 -+ }, - "pwmMin": 1, - "pwmMax": 255, - "fanPresentVal": 1, -@@ -228,7 +456,11 @@ - "fanName": "FANTRAY2_FAN2", - "rpmSysfsPath": "/run/devmap/sensors/SMB_BCB_FAN_CPLD_2/fan2_input", - "pwmSysfsPath": "/run/devmap/sensors/SMB_BCB_FAN_CPLD_2/pwm3", -- "presenceSysfsPath": "/run/devmap/sensors/BCB_FAN_2/fan1_present", -+ "presenceGpio": { -+ "path": "/run/devmap/gpiochips/FCB_GPIO_CHIP_2", -+ "lineIndex": 8, -+ "desiredValue": 1 -+ }, - "pwmMin": 1, - "pwmMax": 255, - "fanPresentVal": 1, -@@ -241,7 +473,11 @@ - "fanName": "FANTRAY2_FAN3", - "rpmSysfsPath": "/run/devmap/sensors/SMB_BCB_FAN_CPLD_2/fan3_input", - "pwmSysfsPath": "/run/devmap/sensors/SMB_BCB_FAN_CPLD_2/pwm3", -- "presenceSysfsPath": "/run/devmap/sensors/BCB_FAN_2/fan2_present", -+ "presenceGpio": { -+ "path": "/run/devmap/gpiochips/FCB_GPIO_CHIP_2", -+ "lineIndex": 9, -+ "desiredValue": 1 -+ }, - "pwmMin": 1, - "pwmMax": 255, - "fanPresentVal": 1, -@@ -254,7 +490,11 @@ - "fanName": "FANTRAY2_FAN4", - "rpmSysfsPath": "/run/devmap/sensors/SMB_BCB_FAN_CPLD_2/fan4_input", - "pwmSysfsPath": "/run/devmap/sensors/SMB_BCB_FAN_CPLD_2/pwm3", -- "presenceSysfsPath": "/run/devmap/sensors/BCB_FAN_2/fan2_present", -+ "presenceGpio": { -+ "path": "/run/devmap/gpiochips/FCB_GPIO_CHIP_2", -+ "lineIndex": 9, -+ "desiredValue": 1 -+ }, - "pwmMin": 1, - "pwmMax": 255, - "fanPresentVal": 1, -@@ -267,7 +507,11 @@ - "fanName": "FANTRAY2_FAN5", - "rpmSysfsPath": "/run/devmap/sensors/SMB_BCB_FAN_CPLD_2/fan5_input", - "pwmSysfsPath": "/run/devmap/sensors/SMB_BCB_FAN_CPLD_2/pwm3", -- "presenceSysfsPath": "/run/devmap/sensors/BCB_FAN_2/fan3_present", -+ "presenceGpio": { -+ "path": "/run/devmap/gpiochips/FCB_GPIO_CHIP_2", -+ "lineIndex": 10, -+ "desiredValue": 1 -+ }, - "pwmMin": 1, - "pwmMax": 255, - "fanPresentVal": 1, -@@ -280,7 +524,11 @@ - "fanName": "FANTRAY2_FAN6", - "rpmSysfsPath": "/run/devmap/sensors/SMB_BCB_FAN_CPLD_2/fan6_input", - "pwmSysfsPath": "/run/devmap/sensors/SMB_BCB_FAN_CPLD_2/pwm3", -- "presenceSysfsPath": "/run/devmap/sensors/BCB_FAN_2/fan3_present", -+ "presenceGpio": { -+ "path": "/run/devmap/gpiochips/FCB_GPIO_CHIP_2", -+ "lineIndex": 10, -+ "desiredValue": 1 -+ }, - "pwmMin": 1, - "pwmMax": 255, - "fanPresentVal": 1, -@@ -293,7 +541,11 @@ - "fanName": "FANTRAY2_FAN7", - "rpmSysfsPath": "/run/devmap/sensors/SMB_BCB_FAN_CPLD_2/fan7_input", - "pwmSysfsPath": "/run/devmap/sensors/SMB_BCB_FAN_CPLD_2/pwm3", -- "presenceSysfsPath": "/run/devmap/sensors/BCB_FAN_2/fan4_present", -+ "presenceGpio": { -+ "path": "/run/devmap/gpiochips/FCB_GPIO_CHIP_2", -+ "lineIndex": 11, -+ "desiredValue": 1 -+ }, - "pwmMin": 1, - "pwmMax": 255, - "fanPresentVal": 1, -@@ -306,7 +558,11 @@ - "fanName": "FANTRAY2_FAN8", - "rpmSysfsPath": "/run/devmap/sensors/SMB_BCB_FAN_CPLD_2/fan8_input", - "pwmSysfsPath": "/run/devmap/sensors/SMB_BCB_FAN_CPLD_2/pwm3", -- "presenceSysfsPath": "/run/devmap/sensors/BCB_FAN_2/fan4_present", -+ "presenceGpio": { -+ "path": "/run/devmap/gpiochips/FCB_GPIO_CHIP_2", -+ "lineIndex": 11, -+ "desiredValue": 1 -+ }, - "pwmMin": 1, - "pwmMax": 255, - "fanPresentVal": 1, -@@ -322,7 +578,12 @@ - "zoneName": "zone1", - "sensorNames": [ - "SMB_U77_INLET_LEFT_BOT_LM75_TEMP", -+ "SMB_U67_INLET_RIGHT_LM75_TEMP", -+ "SMB_U69_INLET_RIGHT_BOT_LM75_TEMP", - "CPU_UNCORE_TEMP", -+ "SMB_E1S_SSD_TEMP", -+ "POWER_BRICK1_TEMP1", -+ "POWER_BRICK2_TEMP1", - "qsfp_group_1" - ], - "fanNames": [ diff --git a/fboss/platform/configs/tahan800bc/platform_manager.json b/fboss/platform/configs/tahan800bc/platform_manager.json index 1beca4a34640b..5f585dafa2da3 100644 --- a/fboss/platform/configs/tahan800bc/platform_manager.json +++ b/fboss/platform/configs/tahan800bc/platform_manager.json @@ -1585,6 +1585,13 @@ } ], "i2cDeviceConfigs": [ + { + "busName": "SMB_IOB_I2C_MASTER_1", + "address": "0x12", + "kernelDeviceName": "pca9555", + "pmUnitScopedName": "FCB_GPIO_CHIP_2", + "isGpioChip": true + }, { "busName": "SMB_IOB_I2C_MASTER_13", "address": "0x48", @@ -1988,6 +1995,7 @@ "/run/devmap/i2c-busses/XCVR_32": "/[SMB_DOM_I2C_MASTER_32]", "/run/devmap/i2c-busses/XCVR_33": "/[SMB_DOM_I2C_MASTER_33]", "/run/devmap/gpiochips/SMB_GPIO_CHIP_1": "/[SMB_GPIO_CHIP_1]", + "/run/devmap/gpiochips/FCB_GPIO_CHIP_2": "/[FCB_GPIO_CHIP_2]", "/run/devmap/xcvrs/xcvr_1": "/[SMB_DOM_XCVR_CTRL_PORT_1]", "/run/devmap/xcvrs/xcvr_2": "/[SMB_DOM_XCVR_CTRL_PORT_2]", "/run/devmap/xcvrs/xcvr_3": "/[SMB_DOM_XCVR_CTRL_PORT_3]", diff --git a/fboss/platform/configs/tahan800bc/platform_service_rack.patch b/fboss/platform/configs/tahan800bc/platform_service_rack.patch deleted file mode 100644 index 79a93d0f425b7..0000000000000 --- a/fboss/platform/configs/tahan800bc/platform_service_rack.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- tahan_2_17_fboss_config/platform_manager.json 2025-01-21 21:25:17.000000000 -0500 -+++ tahan_2_17_fboss_config_my_change/platform_manager.json 2025-01-22 21:01:36.000000000 -0500 -@@ -1586,6 +1586,13 @@ - ], - "i2cDeviceConfigs": [ - { -+ "busName": "SMB_IOB_I2C_MASTER_1", -+ "address": "0x12", -+ "kernelDeviceName": "pca9555", -+ "pmUnitScopedName": "FCB_GPIO_CHIP_2", -+ "isGpioChip": true -+ }, -+ { - "busName": "SMB_IOB_I2C_MASTER_13", - "address": "0x48", - "kernelDeviceName": "lm75b", -@@ -1988,6 +1995,7 @@ - "/run/devmap/i2c-busses/XCVR_32": "/[SMB_DOM_I2C_MASTER_32]", - "/run/devmap/i2c-busses/XCVR_33": "/[SMB_DOM_I2C_MASTER_33]", - "/run/devmap/gpiochips/SMB_GPIO_CHIP_1": "/[SMB_GPIO_CHIP_1]", -+ "/run/devmap/gpiochips/FCB_GPIO_CHIP_2": "/[FCB_GPIO_CHIP_2]", - "/run/devmap/xcvrs/xcvr_1": "/[SMB_DOM_XCVR_CTRL_PORT_1]", - "/run/devmap/xcvrs/xcvr_2": "/[SMB_DOM_XCVR_CTRL_PORT_2]", - "/run/devmap/xcvrs/xcvr_3": "/[SMB_DOM_XCVR_CTRL_PORT_3]",