From bb0c0d1a645ea0f8784c8f86a28ad5be7b11e2c7 Mon Sep 17 00:00:00 2001 From: aalamsi22 Date: Fri, 16 Aug 2024 23:43:17 +0000 Subject: [PATCH 1/4] Update Meru800 PM & sensor configs --- .../configs/meru800bfa/platform_manager.json | 24 ++--- .../configs/meru800bfa/sensor_service.json | 98 ++++++++++++++----- .../configs/meru800bia/platform_manager.json | 98 +++++++++++++++---- 3 files changed, 167 insertions(+), 53 deletions(-) diff --git a/fboss/platform/configs/meru800bfa/platform_manager.json b/fboss/platform/configs/meru800bfa/platform_manager.json index 84c8193b6061d..87d7d37840d54 100644 --- a/fboss/platform/configs/meru800bfa/platform_manager.json +++ b/fboss/platform/configs/meru800bfa/platform_manager.json @@ -4114,12 +4114,17 @@ "/run/devmap/i2c-busses/MERU_SCM_CPLD_SMBUS1_CH5": "/[SCM_I2C_MASTER1@5]", "/run/devmap/i2c-busses/MERU_SCM_CPLD_SMBUS1_CH6": "/[SCM_I2C_MASTER1@6]", "/run/devmap/i2c-busses/MERU_SCM_CPLD_SMBUS1_CH7": "/[SCM_I2C_MASTER1@7]", - "/run/devmap/eeproms/MERU_SCM_EEPROM_P1": "/[SCM_IDPROM_P1]", + "/run/devmap/eeproms/MERU800BFA_SMB_EEPROM": "/SMB_SLOT@0/[IDPROM]", "/run/devmap/sensors/CPU_MPS_PMBUS": "/[SCM_MPS_PMBUS]", + "/run/devmap/eeproms/MERU_SCM_EEPROM_P1": "/[SCM_IDPROM_P1]", "/run/devmap/sensors/CPU_PXM1310_1": "/[SCM_PXM1310_1]", "/run/devmap/sensors/CPU_PXE1211": "/[SCM_PXE1211]", "/run/devmap/sensors/CPU_PXM1310_2": "/[SCM_PXM1310_2]", + "/run/devmap/sensors/CPU_CORE_TEMP": "/[CPU_CORE_TEMP]", "/run/devmap/fpgas/MERU800BFA_SMB_FPGA0": "/SMB_SLOT@0/[SMB_FPGA0]", + "/run/devmap/fpgas/MERU800BFA_SMB_FPGA1": "/SMB_SLOT@0/[SMB_FPGA1]", + "/run/devmap/fpgas/MERU800BFA_SMB_FPGA2": "/SMB_SLOT@0/[SMB_FPGA2]", + "/run/devmap/fpgas/MERU800BFA_SMB_FPGA3": "/SMB_SLOT@0/[SMB_FPGA3]", "/run/devmap/i2c-busses/MERU800BFA_SMB_FPGA0_SMBUS0_CH0": "/SMB_SLOT@0/[SMB_FPGA0_I2C_MASTER0@0]", "/run/devmap/i2c-busses/MERU800BFA_SMB_FPGA0_SMBUS0_CH1": "/SMB_SLOT@0/[SMB_FPGA0_I2C_MASTER0@1]", "/run/devmap/i2c-busses/MERU800BFA_SMB_FPGA0_SMBUS0_CH2": "/SMB_SLOT@0/[SMB_FPGA0_I2C_MASTER0@2]", @@ -4160,7 +4165,6 @@ "/run/devmap/i2c-busses/MERU800BFA_SMB_FPGA0_SMBUS4_CH5": "/SMB_SLOT@0/[SMB_FPGA0_I2C_MASTER4@5]", "/run/devmap/i2c-busses/MERU800BFA_SMB_FPGA0_SMBUS4_CH6": "/SMB_SLOT@0/[SMB_FPGA0_I2C_MASTER4@6]", "/run/devmap/i2c-busses/MERU800BFA_SMB_FPGA0_SMBUS4_CH7": "/SMB_SLOT@0/[SMB_FPGA0_I2C_MASTER4@7]", - "/run/devmap/fpgas/MERU800BFA_SMB_FPGA1": "/SMB_SLOT@0/[SMB_FPGA1]", "/run/devmap/i2c-busses/MERU800BFA_SMB_FPGA1_SMBUS0_CH0": "/SMB_SLOT@0/[SMB_FPGA1_I2C_MASTER0@0]", "/run/devmap/i2c-busses/MERU800BFA_SMB_FPGA1_SMBUS0_CH1": "/SMB_SLOT@0/[SMB_FPGA1_I2C_MASTER0@1]", "/run/devmap/i2c-busses/MERU800BFA_SMB_FPGA1_SMBUS0_CH2": "/SMB_SLOT@0/[SMB_FPGA1_I2C_MASTER0@2]", @@ -4201,7 +4205,6 @@ "/run/devmap/i2c-busses/MERU800BFA_SMB_FPGA1_SMBUS4_CH5": "/SMB_SLOT@0/[SMB_FPGA1_I2C_MASTER4@5]", "/run/devmap/i2c-busses/MERU800BFA_SMB_FPGA1_SMBUS4_CH6": "/SMB_SLOT@0/[SMB_FPGA1_I2C_MASTER4@6]", "/run/devmap/i2c-busses/MERU800BFA_SMB_FPGA1_SMBUS4_CH7": "/SMB_SLOT@0/[SMB_FPGA1_I2C_MASTER4@7]", - "/run/devmap/fpgas/MERU800BFA_SMB_FPGA2": "/SMB_SLOT@0/[SMB_FPGA2]", "/run/devmap/i2c-busses/MERU800BFA_SMB_FPGA2_SMBUS0_CH0": "/SMB_SLOT@0/[SMB_FPGA2_I2C_MASTER0@0]", "/run/devmap/i2c-busses/MERU800BFA_SMB_FPGA2_SMBUS0_CH1": "/SMB_SLOT@0/[SMB_FPGA2_I2C_MASTER0@1]", "/run/devmap/i2c-busses/MERU800BFA_SMB_FPGA2_SMBUS0_CH2": "/SMB_SLOT@0/[SMB_FPGA2_I2C_MASTER0@2]", @@ -4242,7 +4245,6 @@ "/run/devmap/i2c-busses/MERU800BFA_SMB_FPGA2_SMBUS4_CH5": "/SMB_SLOT@0/[SMB_FPGA2_I2C_MASTER4@5]", "/run/devmap/i2c-busses/MERU800BFA_SMB_FPGA2_SMBUS4_CH6": "/SMB_SLOT@0/[SMB_FPGA2_I2C_MASTER4@6]", "/run/devmap/i2c-busses/MERU800BFA_SMB_FPGA2_SMBUS4_CH7": "/SMB_SLOT@0/[SMB_FPGA2_I2C_MASTER4@7]", - "/run/devmap/fpgas/MERU800BFA_SMB_FPGA3": "/SMB_SLOT@0/[SMB_FPGA3]", "/run/devmap/i2c-busses/MERU800BFA_SMB_FPGA3_SMBUS0_CH0": "/SMB_SLOT@0/[SMB_FPGA3_I2C_MASTER0@0]", "/run/devmap/i2c-busses/MERU800BFA_SMB_FPGA3_SMBUS0_CH1": "/SMB_SLOT@0/[SMB_FPGA3_I2C_MASTER0@1]", "/run/devmap/i2c-busses/MERU800BFA_SMB_FPGA3_SMBUS0_CH2": "/SMB_SLOT@0/[SMB_FPGA3_I2C_MASTER0@2]", @@ -4283,9 +4285,7 @@ "/run/devmap/i2c-busses/MERU800BFA_SMB_FPGA3_SMBUS4_CH5": "/SMB_SLOT@0/[SMB_FPGA3_I2C_MASTER4@5]", "/run/devmap/i2c-busses/MERU800BFA_SMB_FPGA3_SMBUS4_CH6": "/SMB_SLOT@0/[SMB_FPGA3_I2C_MASTER4@6]", "/run/devmap/i2c-busses/MERU800BFA_SMB_FPGA3_SMBUS4_CH7": "/SMB_SLOT@0/[SMB_FPGA3_I2C_MASTER4@7]", - "/run/devmap/eeproms/MERU800BFA_SMB_EEPROM": "/SMB_SLOT@0/[IDPROM]", "/run/devmap/cplds/MERU800BFA_SMB_CPLD": "/SMB_SLOT@0/[SMB_CPLD]", - "/run/devmap/sensors/CPU_CORE_TEMP": "/[CPU_CORE_TEMP]", "/run/devmap/sensors/SMB_MAX6581": "/SMB_SLOT@0/[SMB_MAX6581]", "/run/devmap/sensors/SMB_TMP75": "/SMB_SLOT@0/[SMB_TMP75]", "/run/devmap/sensors/SMB_RAA228926_R3R0_CORE": "/SMB_SLOT@0/[SMB_RAA228926_R3R0_CORE]", @@ -4298,6 +4298,7 @@ "/run/devmap/sensors/SMB_ISL68226_OSFP_TR": "/SMB_SLOT@0/[SMB_ISL68226_OSFP_TR]", "/run/devmap/sensors/SMB_ISL68226_OSFP_BL": "/SMB_SLOT@0/[SMB_ISL68226_OSFP_BL]", "/run/devmap/sensors/SMB_ISL68226_OSFP_BR": "/SMB_SLOT@0/[SMB_ISL68226_OSFP_BR]", + "/run/devmap/sensors/SMB_UCD90320": "/SMB_SLOT@0/[SMB_UCD90320]", "/run/devmap/sensors/FAN0_TMP75": "/SMB_SLOT@0/[FAN0_TMP75]", "/run/devmap/cplds/FAN0_CPLD": "/SMB_SLOT@0/[FAN0_CPLD]", "/run/devmap/sensors/FAN_CPLD0": "/SMB_SLOT@0/[FAN0_CPLD]", @@ -4307,10 +4308,6 @@ "/run/devmap/sensors/FAN2_TMP75": "/SMB_SLOT@0/[FAN2_TMP75]", "/run/devmap/cplds/FAN2_CPLD": "/SMB_SLOT@0/[FAN2_CPLD]", "/run/devmap/sensors/FAN_CPLD2": "/SMB_SLOT@0/[FAN2_CPLD]", - "/run/devmap/sensors/PSU1_PMBUS": "/SMB_SLOT@0/PSU_SLOT@0/[PSU_PMBUS]", - "/run/devmap/sensors/PSU2_PMBUS": "/SMB_SLOT@0/PSU_SLOT@1/[PSU_PMBUS]", - "/run/devmap/sensors/PSU3_PMBUS": "/SMB_SLOT@0/PSU_SLOT@2/[PSU_PMBUS]", - "/run/devmap/sensors/PSU4_PMBUS": "/SMB_SLOT@0/PSU_SLOT@3/[PSU_PMBUS]", "/run/devmap/xcvrs/xcvr_1": "/SMB_SLOT@0/[OSFP_PORT1_XCVR]", "/run/devmap/xcvrs/xcvr_2": "/SMB_SLOT@0/[OSFP_PORT2_XCVR]", "/run/devmap/xcvrs/xcvr_3": "/SMB_SLOT@0/[OSFP_PORT3_XCVR]", @@ -4438,7 +4435,12 @@ "/run/devmap/xcvrs/xcvr_125": "/SMB_SLOT@0/[OSFP_PORT125_XCVR]", "/run/devmap/xcvrs/xcvr_126": "/SMB_SLOT@0/[OSFP_PORT126_XCVR]", "/run/devmap/xcvrs/xcvr_127": "/SMB_SLOT@0/[OSFP_PORT127_XCVR]", - "/run/devmap/xcvrs/xcvr_128": "/SMB_SLOT@0/[OSFP_PORT128_XCVR]" + "/run/devmap/xcvrs/xcvr_128": "/SMB_SLOT@0/[OSFP_PORT128_XCVR]", + "/run/devmap/flashes/SMB_SPI_MASTER0_DEVICE1": "/SMB_SLOT@0/[SMB_SPI_MASTER0_DEVICE1]", + "/run/devmap/sensors/PSU1_PMBUS": "/SMB_SLOT@0/PSU_SLOT@0/[PSU_PMBUS]", + "/run/devmap/sensors/PSU2_PMBUS": "/SMB_SLOT@0/PSU_SLOT@1/[PSU_PMBUS]", + "/run/devmap/sensors/PSU3_PMBUS": "/SMB_SLOT@0/PSU_SLOT@2/[PSU_PMBUS]", + "/run/devmap/sensors/PSU4_PMBUS": "/SMB_SLOT@0/PSU_SLOT@3/[PSU_PMBUS]" }, "bspKmodsRpmName": "arista_bsp_kmods", "bspKmodsRpmVersion": "0.7.2-1", diff --git a/fboss/platform/configs/meru800bfa/sensor_service.json b/fboss/platform/configs/meru800bfa/sensor_service.json index 4a6df40885f40..a6047f75e5b90 100644 --- a/fboss/platform/configs/meru800bfa/sensor_service.json +++ b/fboss/platform/configs/meru800bfa/sensor_service.json @@ -260,6 +260,24 @@ "compute": "@/1000.0", "type": 3 }, + "R3_0_TEMP": { + "path": "/run/devmap/sensors/SMB_MAX6581/temp2_input", + "thresholds": { + "upperCriticalVal": 125.0, + "maxAlarmVal": 110.0 + }, + "compute": "@/1000.0", + "type": 3 + }, + "R3_1_TEMP": { + "path": "/run/devmap/sensors/SMB_MAX6581/temp3_input", + "thresholds": { + "upperCriticalVal": 125.0, + "maxAlarmVal": 110.0 + }, + "compute": "@/1000.0", + "type": 3 + }, "SMB_BOARD_REAR_RIGHT_TEMP": { "path": "/run/devmap/sensors/SMB_MAX6581/temp5_input", "thresholds": { @@ -530,7 +548,7 @@ "compute": "@/1000.0", "type": 3 }, - "SMB_VRM_R3R1_ANLG0_TEMP0V75": { + "SMB_VRM_R3R1_ANLG0_TEMP_0V75": { "path": "/run/devmap/sensors/SMB_ISL68226_R3R1_ANLG0/temp2_input", "thresholds": { "upperCriticalVal": 120.0, @@ -593,7 +611,7 @@ "compute": "@/1000.0", "type": 3 }, - "SMB_VRM_R3R1_ANLG1_TEMP0V75": { + "SMB_VRM_R3R1_ANLG1_TEMP_0V75": { "path": "/run/devmap/sensors/SMB_ISL68226_R3R1_ANLG1/temp2_input", "thresholds": { "upperCriticalVal": 120.0, @@ -719,6 +737,60 @@ "compute": "@/1000.0", "type": 3 }, + "SMB_DPM_12V": { + "path": "/run/devmap/sensors/SMB_UCD90320/in1_input", + "thresholds": { + "upperCriticalVal": 14.4, + "lowerCriticalVal": 9.6 + }, + "compute": "@/1000.0", + "type": 1 + }, + "SMB_DPM_3V3_DKR": { + "path": "/run/devmap/sensors/SMB_UCD90320/in2_input", + "thresholds": { + "upperCriticalVal": 3.96, + "lowerCriticalVal": 2.64 + }, + "compute": "@/1000.0", + "type": 1 + }, + "SMB_DPM_1V9_DKR": { + "path": "/run/devmap/sensors/SMB_UCD90320/in3_input", + "thresholds": { + "upperCriticalVal": 2.16, + "lowerCriticalVal": 1.44 + }, + "compute": "@/1000.0", + "type": 1 + }, + "SMB_DPM_1V2_DKR": { + "path": "/run/devmap/sensors/SMB_UCD90320/in4_input", + "thresholds": { + "upperCriticalVal": 1.44, + "lowerCriticalVal": 0.96 + }, + "compute": "@/1000.0", + "type": 1 + }, + "SMB_DPM_3V3": { + "path": "/run/devmap/sensors/SMB_UCD90320/in7_input", + "thresholds": { + "upperCriticalVal": 3.96, + "lowerCriticalVal": 2.64 + }, + "compute": "@/1000.0", + "type": 1 + }, + "SMB_DPM_5V0": { + "path": "/run/devmap/sensors/SMB_UCD90320/in8_input", + "thresholds": { + "upperCriticalVal": 6.0, + "lowerCriticalVal": 4.0 + }, + "compute": "@/1000.0", + "type": 1 + }, "FAN_BOARD0_TEMP": { "path": "/run/devmap/sensors/FAN0_TMP75/temp1_input", "thresholds": { @@ -745,24 +817,6 @@ }, "compute": "@/1000.0", "type": 3 - }, - "R3_0_TEMP": { - "path": "/run/devmap/sensors/SMB_MAX6581/temp2_input", - "thresholds": { - "upperCriticalVal": 125.0, - "maxAlarmVal": 110.0 - }, - "compute": "@/1000.0", - "type": 3 - }, - "R3_1_TEMP": { - "path": "/run/devmap/sensors/SMB_MAX6581/temp3_input", - "thresholds": { - "upperCriticalVal": 125.0, - "maxAlarmVal": 110.0 - }, - "compute": "@/1000.0", - "type": 3 } }, "FAN1": { @@ -956,12 +1010,12 @@ "PSU1_PIN": { "path": "/run/devmap/sensors/PSU1_PMBUS/power1_input", "compute": "@/1000000.0", - "type": 4 + "type": 0 }, "PSU1_POUT": { "path": "/run/devmap/sensors/PSU1_PMBUS/power2_input", "compute": "@/1000000.0", - "type": 4 + "type": 0 } }, "PSU2": { diff --git a/fboss/platform/configs/meru800bia/platform_manager.json b/fboss/platform/configs/meru800bia/platform_manager.json index a182e3516274d..34f8861d6ea03 100644 --- a/fboss/platform/configs/meru800bia/platform_manager.json +++ b/fboss/platform/configs/meru800bia/platform_manager.json @@ -118,13 +118,6 @@ "SMB": { "pluggedInSlotType": "SMB_SLOT", "i2cDeviceConfigs": [ - { - "busName": "INCOMING@0", - "address": "0x50", - "kernelDeviceName": "24c512", - "pmUnitScopedName": "SMB_IDPROM", - "deviceType": "EEPROM" - }, { "busName": "INCOMING@0", "address": "0x74", @@ -136,19 +129,77 @@ "busName": "INCOMING@1", "address": "0x49", "kernelDeviceName": "tmp75", - "pmUnitScopedName": "SMB_TMP75_FRONT" + "pmUnitScopedName": "SMB_TMP75_FRONT", + "initRegSettings": [ + { + "regOffset": 3, + "ioBuf": [95] + } + ] }, { "busName": "INCOMING@1", "address": "0x4a", "kernelDeviceName": "tmp75", - "pmUnitScopedName": "SMB_TMP75_REAR" + "pmUnitScopedName": "SMB_TMP75_REAR", + "initRegSettings": [ + { + "regOffset": 3, + "ioBuf": [95] + } + ] + }, + { + "busName": "INCOMING@1", + "address": "0x4d", + "kernelDeviceName": "max6581", + "pmUnitScopedName": "SMB_MAX6581", + "initRegSettings": [ + { + "regOffset": 32, + "ioBuf": [110] + }, + { + "regOffset": 33, + "ioBuf": [-121] + }, + { + "regOffset": 34, + "ioBuf": [-121] + }, + { + "regOffset": 35, + "ioBuf": [-121] + }, + { + "regOffset": 36, + "ioBuf": [-121] + }, + { + "regOffset": 37, + "ioBuf": [-121] + }, + { + "regOffset": 38, + "ioBuf": [-121] + }, + { + "regOffset": 39, + "ioBuf": [-121] + } + ] }, { "busName": "INCOMING@2", "address": "0x48", "kernelDeviceName": "tmp75", - "pmUnitScopedName": "FAN_TMP75" + "pmUnitScopedName": "FAN_TMP75", + "initRegSettings": [ + { + "regOffset": 3, + "ioBuf": [95] + } + ] }, { "busName": "INCOMING@2", @@ -173,6 +224,12 @@ "address": "0x55", "kernelDeviceName": "isl68226", "pmUnitScopedName": "SMB_ISL68226_OPTICS" + }, + { + "busName": "SMB_I2C_MASTER0@2", + "address": "0x48", + "kernelDeviceName": "tmp75", + "pmUnitScopedName": "SMB_MGMT_TMP75" } ], "outgoingSlotConfigs": { @@ -1437,14 +1494,13 @@ "/run/devmap/i2c-busses/MERU_SCM_CPLD_SMBUS1_CH5": "/[SCM_I2C_MASTER1@5]", "/run/devmap/i2c-busses/MERU_SCM_CPLD_SMBUS1_CH6": "/[SCM_I2C_MASTER1@6]", "/run/devmap/i2c-busses/MERU_SCM_CPLD_SMBUS1_CH7": "/[SCM_I2C_MASTER1@7]", - "/run/devmap/eeproms/MERU_SCM_EEPROM_P1": "/[SCM_IDPROM_P1]", - "/run/devmap/eeproms/MERU_SCM_EEPROM": "/[IDPROM]", - "/run/devmap/sensors/CPU_CORE_TEMP": "/[CPU_CORE_TEMP]", + "/run/devmap/eeproms/MERU800BIA_SMB_EEPROM": "/SMB_SLOT@0/[IDPROM]", "/run/devmap/sensors/CPU_MPS_PMBUS": "/[SCM_MPS_PMBUS]", + "/run/devmap/eeproms/MERU_SCM_EEPROM_P1": "/[SCM_IDPROM_P1]", "/run/devmap/sensors/CPU_PXM1310_1": "/[SCM_PXM1310_1]", "/run/devmap/sensors/CPU_PXE1211": "/[SCM_PXE1211]", "/run/devmap/sensors/CPU_PXM1310_2": "/[SCM_PXM1310_2]", - "/run/devmap/eeproms/MERU800BIA_SMB_EEPROM": "/SMB_SLOT@0/[SMB_IDPROM]", + "/run/devmap/sensors/CPU_CORE_TEMP": "/[CPU_CORE_TEMP]", "/run/devmap/fpgas/MERU800BIA_SMB_FPGA": "/SMB_SLOT@0/[SMB_FPGA]", "/run/devmap/i2c-busses/MERU800BIA_SMB_FPGA_SMBUS0_CH0": "/SMB_SLOT@0/[SMB_I2C_MASTER0@0]", "/run/devmap/i2c-busses/MERU800BIA_SMB_FPGA_SMBUS0_CH1": "/SMB_SLOT@0/[SMB_I2C_MASTER0@1]", @@ -1497,14 +1553,14 @@ "/run/devmap/gpiochips/SMB_PCA": "/SMB_SLOT@0/[SMB_PCA]", "/run/devmap/sensors/SMB_TMP75_FRONT": "/SMB_SLOT@0/[SMB_TMP75_FRONT]", "/run/devmap/sensors/SMB_TMP75_REAR": "/SMB_SLOT@0/[SMB_TMP75_REAR]", - "/run/devmap/sensors/SMB_RAA228926_J3": "/SMB_SLOT@0/[SMB_RAA228926_J3]", - "/run/devmap/sensors/SMB_ISL68226_J3": "/SMB_SLOT@0/[SMB_ISL68226_J3]", - "/run/devmap/sensors/SMB_ISL68226_OPTICS": "/SMB_SLOT@0/[SMB_ISL68226_OPTICS]", + "/run/devmap/sensors/SMB_MAX6581": "/SMB_SLOT@0/[SMB_MAX6581]", "/run/devmap/sensors/FAN_TMP75": "/SMB_SLOT@0/[FAN_TMP75]", "/run/devmap/cplds/FAN_CPLD": "/SMB_SLOT@0/[FAN_CPLD]", "/run/devmap/sensors/FAN_CPLD": "/SMB_SLOT@0/[FAN_CPLD]", - "/run/devmap/sensors/PSU1_PMBUS": "/SMB_SLOT@0/PSU_SLOT@0/[PSU_PMBUS]", - "/run/devmap/sensors/PSU2_PMBUS": "/SMB_SLOT@0/PSU_SLOT@1/[PSU_PMBUS]", + "/run/devmap/sensors/SMB_RAA228926_J3": "/SMB_SLOT@0/[SMB_RAA228926_J3]", + "/run/devmap/sensors/SMB_ISL68226_J3": "/SMB_SLOT@0/[SMB_ISL68226_J3]", + "/run/devmap/sensors/SMB_ISL68226_OPTICS": "/SMB_SLOT@0/[SMB_ISL68226_OPTICS]", + "/run/devmap/sensors/SMB_MGMT_TMP75": "/SMB_SLOT@0/[SMB_MGMT_TMP75]", "/run/devmap/xcvrs/xcvr_1": "/SMB_SLOT@0/[OSFP_PORT1_XCVR]", "/run/devmap/xcvrs/xcvr_2": "/SMB_SLOT@0/[OSFP_PORT2_XCVR]", "/run/devmap/xcvrs/xcvr_3": "/SMB_SLOT@0/[OSFP_PORT3_XCVR]", @@ -1544,7 +1600,9 @@ "/run/devmap/xcvrs/xcvr_37": "/SMB_SLOT@0/[OSFP_PORT37_XCVR]", "/run/devmap/xcvrs/xcvr_38": "/SMB_SLOT@0/[OSFP_PORT38_XCVR]", "/run/devmap/xcvrs/xcvr_39": "/SMB_SLOT@0/[QSFP_PORT39_XCVR]", - "/run/devmap/flashes/SMB_SPI_MASTER0_DEVICE1": "/SMB_SLOT@0/[SMB_SPI_MASTER0_DEVICE1]" + "/run/devmap/flashes/SMB_SPI_MASTER0_DEVICE1": "/SMB_SLOT@0/[SMB_SPI_MASTER0_DEVICE1]", + "/run/devmap/sensors/PSU1_PMBUS": "/SMB_SLOT@0/PSU_SLOT@0/[PSU_PMBUS]", + "/run/devmap/sensors/PSU2_PMBUS": "/SMB_SLOT@0/PSU_SLOT@1/[PSU_PMBUS]" }, "bspKmodsRpmName": "arista_bsp_kmods", "bspKmodsRpmVersion": "0.7.2-1", From 931f5827b9477cf2880a7dca7202a75b98ffe8fb Mon Sep 17 00:00:00 2001 From: aalamsi22 Date: Sat, 17 Aug 2024 01:57:39 +0000 Subject: [PATCH 2/4] added /run/devmap/flashes --- .../configs/meru800bfa/platform_manager.json | 21 +++++++++++-------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/fboss/platform/configs/meru800bfa/platform_manager.json b/fboss/platform/configs/meru800bfa/platform_manager.json index 87d7d37840d54..c61b2f37a3de3 100644 --- a/fboss/platform/configs/meru800bfa/platform_manager.json +++ b/fboss/platform/configs/meru800bfa/platform_manager.json @@ -478,13 +478,13 @@ "spiMasterConfigs": [ { "fpgaIpBlockConfig": { - "pmUnitScopedName": "SMB_SPI_MASTER0", + "pmUnitScopedName": "SMB_SPI0_MASTER0", "deviceName": "spi_master", "csrOffset": "0x7900" }, "spiDeviceConfigs": [ { - "pmUnitScopedName": "SMB_SPI_MASTER0_DEVICE1", + "pmUnitScopedName": "SMB_SPI0_MASTER0_DEVICE1", "chipSelect": 0, "modalias": "spidev", "maxSpeedHz": 25000000 @@ -1380,13 +1380,13 @@ "spiMasterConfigs": [ { "fpgaIpBlockConfig": { - "pmUnitScopedName": "SMB_SPI_MASTER0", + "pmUnitScopedName": "SMB_SPI1_MASTER0", "deviceName": "spi_master", "csrOffset": "0x7900" }, "spiDeviceConfigs": [ { - "pmUnitScopedName": "SMB_SPI_MASTER0_DEVICE1", + "pmUnitScopedName": "SMB_SPI1_MASTER0_DEVICE1", "chipSelect": 0, "modalias": "spidev", "maxSpeedHz": 25000000 @@ -2282,13 +2282,13 @@ "spiMasterConfigs": [ { "fpgaIpBlockConfig": { - "pmUnitScopedName": "SMB_SPI_MASTER0", + "pmUnitScopedName": "SMB_SPI2_MASTER0", "deviceName": "spi_master", "csrOffset": "0x7900" }, "spiDeviceConfigs": [ { - "pmUnitScopedName": "SMB_SPI_MASTER0_DEVICE1", + "pmUnitScopedName": "SMB_SPI2_MASTER0_DEVICE1", "chipSelect": 0, "modalias": "spidev", "maxSpeedHz": 25000000 @@ -3220,13 +3220,13 @@ "spiMasterConfigs": [ { "fpgaIpBlockConfig": { - "pmUnitScopedName": "SMB_SPI_MASTER0", + "pmUnitScopedName": "SMB_SPI3_MASTER0", "deviceName": "spi_master", "csrOffset": "0x7900" }, "spiDeviceConfigs": [ { - "pmUnitScopedName": "SMB_SPI_MASTER0_DEVICE1", + "pmUnitScopedName": "SMB_SPI3_MASTER0_DEVICE1", "chipSelect": 0, "modalias": "spidev", "maxSpeedHz": 25000000 @@ -4436,7 +4436,10 @@ "/run/devmap/xcvrs/xcvr_126": "/SMB_SLOT@0/[OSFP_PORT126_XCVR]", "/run/devmap/xcvrs/xcvr_127": "/SMB_SLOT@0/[OSFP_PORT127_XCVR]", "/run/devmap/xcvrs/xcvr_128": "/SMB_SLOT@0/[OSFP_PORT128_XCVR]", - "/run/devmap/flashes/SMB_SPI_MASTER0_DEVICE1": "/SMB_SLOT@0/[SMB_SPI_MASTER0_DEVICE1]", + "/run/devmap/flashes/SMB_SPI0_MASTER0_DEVICE1": "/SMB_SLOT@0/[SMB_SPI0_MASTER0_DEVICE1]", + "/run/devmap/flashes/SMB_SPI1_MASTER0_DEVICE1": "/SMB_SLOT@0/[SMB_SPI1_MASTER0_DEVICE1]", + "/run/devmap/flashes/SMB_SPI2_MASTER0_DEVICE1": "/SMB_SLOT@0/[SMB_SPI2_MASTER0_DEVICE1]", + "/run/devmap/flashes/SMB_SPI3_MASTER0_DEVICE1": "/SMB_SLOT@0/[SMB_SPI3_MASTER0_DEVICE1]", "/run/devmap/sensors/PSU1_PMBUS": "/SMB_SLOT@0/PSU_SLOT@0/[PSU_PMBUS]", "/run/devmap/sensors/PSU2_PMBUS": "/SMB_SLOT@0/PSU_SLOT@1/[PSU_PMBUS]", "/run/devmap/sensors/PSU3_PMBUS": "/SMB_SLOT@0/PSU_SLOT@2/[PSU_PMBUS]", From c0e5c657e405e4c7b0dd2e24c3389593b4d8c830 Mon Sep 17 00:00:00 2001 From: aalamsi22 Date: Sat, 17 Aug 2024 02:14:04 +0000 Subject: [PATCH 3/4] updated temp sensor driver to lm75 --- fboss/platform/configs/meru800bia/platform_manager.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/fboss/platform/configs/meru800bia/platform_manager.json b/fboss/platform/configs/meru800bia/platform_manager.json index 34f8861d6ea03..ac672e408aa35 100644 --- a/fboss/platform/configs/meru800bia/platform_manager.json +++ b/fboss/platform/configs/meru800bia/platform_manager.json @@ -128,7 +128,7 @@ { "busName": "INCOMING@1", "address": "0x49", - "kernelDeviceName": "tmp75", + "kernelDeviceName": "lm75", "pmUnitScopedName": "SMB_TMP75_FRONT", "initRegSettings": [ { @@ -140,7 +140,7 @@ { "busName": "INCOMING@1", "address": "0x4a", - "kernelDeviceName": "tmp75", + "kernelDeviceName": "lm75", "pmUnitScopedName": "SMB_TMP75_REAR", "initRegSettings": [ { @@ -192,7 +192,7 @@ { "busName": "INCOMING@2", "address": "0x48", - "kernelDeviceName": "tmp75", + "kernelDeviceName": "lm75", "pmUnitScopedName": "FAN_TMP75", "initRegSettings": [ { @@ -228,7 +228,7 @@ { "busName": "SMB_I2C_MASTER0@2", "address": "0x48", - "kernelDeviceName": "tmp75", + "kernelDeviceName": "lm75", "pmUnitScopedName": "SMB_MGMT_TMP75" } ], From b8c8929a0e17061360ddb06474a988f850b29d54 Mon Sep 17 00:00:00 2001 From: aalamsi22 Date: Wed, 18 Sep 2024 20:59:23 +0000 Subject: [PATCH 4/4] Add p2 meru800bia devices to sensor_service.json --- .../configs/meru800bia/sensor_service.json | 81 +++++++++++++++++++ 1 file changed, 81 insertions(+) diff --git a/fboss/platform/configs/meru800bia/sensor_service.json b/fboss/platform/configs/meru800bia/sensor_service.json index 4b4837de96f7d..5d12ee3beee53 100644 --- a/fboss/platform/configs/meru800bia/sensor_service.json +++ b/fboss/platform/configs/meru800bia/sensor_service.json @@ -269,6 +269,78 @@ "compute": "@/1000.0", "type": 3 }, + "SMB_J3_BOARD_TEMP": { + "path": "/run/devmap/sensors/SMB_MAX6581/temp1_input", + "thresholds": { + "upperCriticalVal": 90.0, + "maxAlarmVal": 85.0 + }, + "compute": "@/1000.0", + "type": 3 + }, + "SMB_J3_DIODE_CORE_TEMP": { + "path": "/run/devmap/sensors/SMB_MAX6581/temp2_input", + "thresholds": { + "upperCriticalVal": 135.0, + "maxAlarmVal": 120.0 + }, + "compute": "@/1000.0", + "type": 3 + }, + "SMB_J3_DIODE_FAB0_TEMP": { + "path": "/run/devmap/sensors/SMB_MAX6581/temp3_input", + "thresholds": { + "upperCriticalVal": 135.0, + "maxAlarmVal": 120.0 + }, + "compute": "@/1000.0", + "type": 3 + }, + "SMB_J3_DIODE_FAB1_TEMP": { + "path": "/run/devmap/sensors/SMB_MAX6581/temp4_input", + "thresholds": { + "upperCriticalVal": 135.0, + "maxAlarmVal": 120.0 + }, + "compute": "@/1000.0", + "type": 3 + }, + "SMB_J3_DIODE_NIF0_TEMP": { + "path": "/run/devmap/sensors/SMB_MAX6581/temp5_input", + "thresholds": { + "upperCriticalVal": 135.0, + "maxAlarmVal": 120.0 + }, + "compute": "@/1000.0", + "type": 3 + }, + "SMB_J3_DIODE_NIF1_TEMP": { + "path": "/run/devmap/sensors/SMB_MAX6581/temp6_input", + "thresholds": { + "upperCriticalVal": 135.0, + "maxAlarmVal": 120.0 + }, + "compute": "@/1000.0", + "type": 3 + }, + "SMB_J3_DIODE_HBM0_TEMP": { + "path": "/run/devmap/sensors/SMB_MAX6581/temp7_input", + "thresholds": { + "upperCriticalVal": 135.0, + "maxAlarmVal": 120.0 + }, + "compute": "@/1000.0", + "type": 3 + }, + "SMB_J3_DIODE_HBM1_TEMP": { + "path": "/run/devmap/sensors/SMB_MAX6581/temp8_input", + "thresholds": { + "upperCriticalVal": 135.0, + "maxAlarmVal": 120.0 + }, + "compute": "@/1000.0", + "type": 3 + }, "FAN_BOARD_TEMP": { "path": "/run/devmap/sensors/FAN_TMP75/temp1_input", "thresholds": { @@ -394,6 +466,15 @@ }, "compute": "@/1000.0", "type": 3 + }, + "SMB_MGMT_INLET_TEMP": { + "path": "/run/devmap/sensors/SMB_MGMT_TMP75/temp1_input", + "thresholds": { + "upperCriticalVal": 75.0, + "maxAlarmVal": 70.0 + }, + "compute": "@/1000.0", + "type": 3 } }, "FAN1": {