Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Meru800] General PM & Sensor config updates and clean up #208

Closed
wants to merge 6 commits into from
Closed

[Meru800] General PM & Sensor config updates and clean up #208

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
bb0c0d1
Update Meru800 PM & sensor configs
aalamsi22 Aug 16, 2024
931f582
added /run/devmap/flashes
aalamsi22 Aug 17, 2024
c0e5c65
updated temp sensor driver to lm75
aalamsi22 Aug 17, 2024
a50aeb6
Merge branch 'main' into update_meru800_configs
aalamsi22 Sep 16, 2024
400de2f
Merge branch 'main' into update_meru800_configs
aalamsi22 Sep 16, 2024
b8c8929
Add p2 meru800bia devices to sensor_service.json
aalamsi22 Sep 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 24 additions & 19 deletions fboss/platform/configs/meru800bfa/platform_manager.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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]",
Expand Down Expand Up @@ -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]",
Expand Down Expand Up @@ -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]",
Expand Down Expand Up @@ -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]",
Expand Down Expand Up @@ -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]",
Expand All @@ -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]",
Expand All @@ -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]",
Expand Down Expand Up @@ -4438,7 +4435,15 @@
"/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_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]",
"/run/devmap/sensors/PSU4_PMBUS": "/SMB_SLOT@0/PSU_SLOT@3/[PSU_PMBUS]"
},
"bspKmodsRpmName": "arista_bsp_kmods",
"bspKmodsRpmVersion": "0.7.3-1",
Expand Down
98 changes: 76 additions & 22 deletions fboss/platform/configs/meru800bfa/sensor_service.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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": {
Expand All @@ -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": {
Expand Down Expand Up @@ -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": {
Expand Down
Loading
Loading