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

tahan: config: adjusted sensor config to support 2nd source #296

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

tahan: config: adjusted sensor config to support 2nd source #296

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5c4af84
support tahan 2nd source sensor service
zhongedward Nov 21, 2024
e2a5640
Merge branch 'main' into tahan_2nd_sensor_3
zhongedward Nov 22, 2024
1089108
Merge branch 'facebook:main' into tahan_2nd_sensor_3
zhongedward Nov 28, 2024
7a3ba27
add / in BCB_SLOT
zhongedward Nov 28, 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
207 changes: 138 additions & 69 deletions fboss/platform/configs/tahan800bc/platform_manager.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"platformName": "tahan800bc",
"rootPmUnitName": "TAHAN",
"rootSlotType": "SMB_SLOT",
"rootSlotType": "TAHAN_SLOT",
"slotTypeConfigs": {
"SMB_SLOT": {
"TAHAN_SLOT": {
"numOutgoingI2cBuses": 0,
"idpromConfig": {
"busName": "SMBus I801 adapter at 5000",
Expand All @@ -12,6 +12,15 @@
},
"pmUnitName": "TAHAN"
},
"SMB_FRU_SLOT": {
"numOutgoingI2cBuses": 4,
"idpromConfig": {
"busName": "INCOMING@1",
"address": "0x56",
"kernelDeviceName": "24c64"
},
"pmUnitName": "SMB_FRU"
},
"RUNBMC_SLOT": {
"numOutgoingI2cBuses": 1,
"idpromConfig": {
Expand All @@ -33,6 +42,10 @@
"PDB_SLOT": {
"numOutgoingI2cBuses": 1,
"pmUnitName": "PDB"
},
"BCB_SLOT": {
"numOutgoingI2cBuses": 2,
"pmUnitName": "BCB"
}
},
"i2cAdaptersFromCpu": [
Expand Down Expand Up @@ -90,11 +103,51 @@
},
"productSubVersion": 2
}
],
"SMB_FRU": [
{
"pmUnitConfig": {
"pluggedInSlotType": "SMB_FRU_SLOT",
"i2cDeviceConfigs": [
{
"busName": "INCOMING@0",
"address": "0x21",
"kernelDeviceName": "bp4f_mp2891",
"pmUnitScopedName": "SMB_U122_PMBUS_1"
},
{
"busName": "INCOMING@2",
"address": "0x7e",
"kernelDeviceName": "mp2975",
"pmUnitScopedName": "SMB_U20_XDPE12284_1"
},
{
"busName": "INCOMING@2",
"address": "0x7d",
"kernelDeviceName": "mp2975",
"pmUnitScopedName": "SMB_U86_XDPE12284_2"
},
{
"busName": "INCOMING@3",
"address": "0x7a",
"kernelDeviceName": "mp2975",
"pmUnitScopedName": "SMB_U229_XDPE12284_1"
},
{
"busName": "INCOMING@3",
"address": "0x7b",
"kernelDeviceName": "mp2975",
"pmUnitScopedName": "SMB_U92_XDPE12284_2"
}
]
},
"productSubVersion": 10
}
]
},
"pmUnitConfigs": {
"TAHAN": {
"pluggedInSlotType": "SMB_SLOT",
"pluggedInSlotType": "TAHAN_SLOT",
"embeddedSensorConfigs": [
{
"pmUnitScopedName": "CPU_CORE_TEMP",
Expand Down Expand Up @@ -1532,49 +1585,6 @@
}
],
"i2cDeviceConfigs": [
{
"busName": "SMB_IOB_I2C_MASTER_1",
"address": "0x5e",
"kernelDeviceName": "bp4f_max31790",
"pmUnitScopedName": "SMB_BCB_FAN_CPLD"
},
{
"busName": "SMB_IOB_I2C_MASTER_1",
"address": "0x16",
"kernelDeviceName": "mtia_fan_watchdog",
"pmUnitScopedName": "BCB_FAN_WATCHDOG",
"isWatchdog": true
},
{
"busName": "SMB_IOB_I2C_MASTER_4",
"address": "0x76",
"kernelDeviceName": "pmbus",
"pmUnitScopedName": "SMB_U122_PMBUS_1"
},
{
"busName": "SMB_IOB_I2C_MASTER_11",
"address": "0x68",
"kernelDeviceName": "bp4f_xdpe12284",
"pmUnitScopedName": "SMB_U20_XDPE12284_1"
},
{
"busName": "SMB_IOB_I2C_MASTER_11",
"address": "0x6a",
"kernelDeviceName": "bp4f_xdpe12284",
"pmUnitScopedName": "SMB_U86_XDPE12284_2"
},
{
"busName": "SMB_IOB_I2C_MASTER_12",
"address": "0x72",
"kernelDeviceName": "bp4f_xdpe12284",
"pmUnitScopedName": "SMB_U229_XDPE12284_1"
},
{
"busName": "SMB_IOB_I2C_MASTER_12",
"address": "0x70",
"kernelDeviceName": "bp4f_xdpe12284",
"pmUnitScopedName": "SMB_U92_XDPE12284_2"
},
{
"busName": "SMB_IOB_I2C_MASTER_13",
"address": "0x48",
Expand Down Expand Up @@ -1605,12 +1615,6 @@
"kernelDeviceName": "lm75b",
"pmUnitScopedName": "SMB_U57_LM75B_2"
},
{
"busName": "SMB_IOB_I2C_MASTER_19",
"address": "0x5e",
"kernelDeviceName": "bp4f_max31790",
"pmUnitScopedName": "SMB_BCB_FAN_CPLD_2"
},
{
"busName": "SMB_IOB_I2C_MASTER_21",
"address": "0x48",
Expand Down Expand Up @@ -1649,7 +1653,9 @@
"initRegSettings": [
{
"regOffset": 11,
"ioBuf": [2]
"ioBuf": [
2
]
}
]
},
Expand All @@ -1661,7 +1667,9 @@
"initRegSettings": [
{
"regOffset": 11,
"ioBuf": [2]
"ioBuf": [
2
]
}
]
},
Expand Down Expand Up @@ -1700,12 +1708,6 @@
"address": "0x60",
"kernelDeviceName": "mtia_pwrcpld",
"pmUnitScopedName": "PWR_CPLD"
},
{
"busName": "SMB_IOB_I2C_MASTER_9",
"address": "0x56",
"kernelDeviceName": "24c64",
"pmUnitScopedName": "SMB_EEPROM"
}
],
"outgoingSlotConfigs": {
Expand All @@ -1722,14 +1724,65 @@
"SMB_IOB_I2C_MASTER_24"
]
},
"BCB_SLOT@0": {
"slotType": "BCB_SLOT",
"outgoingI2cBusNames": [
"SMB_IOB_I2C_MASTER_1",
"SMB_IOB_I2C_MASTER_19"
]
},
"PDB_SLOT@0": {
"slotType": "PDB_SLOT",
"outgoingI2cBusNames": [
"SMB_IOB_I2C_MASTER_22"
]
},
"SMB_FRU_SLOT@0": {
"slotType": "SMB_FRU_SLOT",
"outgoingI2cBusNames": [
"SMB_IOB_I2C_MASTER_4",
"SMB_IOB_I2C_MASTER_9",
"SMB_IOB_I2C_MASTER_11",
"SMB_IOB_I2C_MASTER_12"
]
}
}
},
"SMB_FRU": {
"pluggedInSlotType": "SMB_FRU_SLOT",
"i2cDeviceConfigs": [
{
"busName": "INCOMING@0",
"address": "0x76",
"kernelDeviceName": "pmbus",
"pmUnitScopedName": "SMB_U122_PMBUS_1"
},
{
"busName": "INCOMING@2",
"address": "0x68",
"kernelDeviceName": "bp4f_xdpe12284",
"pmUnitScopedName": "SMB_U20_XDPE12284_1"
},
{
"busName": "INCOMING@2",
"address": "0x6a",
"kernelDeviceName": "bp4f_xdpe12284",
"pmUnitScopedName": "SMB_U86_XDPE12284_2"
},
{
"busName": "INCOMING@3",
"address": "0x72",
"kernelDeviceName": "bp4f_xdpe12284",
"pmUnitScopedName": "SMB_U229_XDPE12284_1"
},
{
"busName": "INCOMING@3",
"address": "0x70",
"kernelDeviceName": "bp4f_xdpe12284",
"pmUnitScopedName": "SMB_U92_XDPE12284_2"
}
]
},
"MINERVA_BMC": {
"pluggedInSlotType": "RUNBMC_SLOT",
"i2cDeviceConfigs": [
Expand Down Expand Up @@ -1810,24 +1863,40 @@
"pmUnitScopedName": "PDB_PMBUS_2"
}
]
},
"BCB": {
"pluggedInSlotType": "BCB_SLOT",
"i2cDeviceConfigs": [
{
"busName": "INCOMING@0",
"address": "0x5e",
"kernelDeviceName": "bp4f_max31790",
"pmUnitScopedName": "SMB_BCB_FAN_CPLD"
},
{
"busName": "INCOMING@1",
"address": "0x5e",
"kernelDeviceName": "bp4f_max31790",
"pmUnitScopedName": "SMB_BCB_FAN_CPLD_2"
}
]
}
},
"symbolicLinkToDevicePath": {
"/run/devmap/eeproms/COME_EEPROM": "/[IDPROM]",
"/run/devmap/eeproms/COME_FRU": "/COME_SLOT@0/[IDPROM]",
"/run/devmap/eeproms/SMB_EEPROM": "/[SMB_EEPROM]",
"/run/devmap/eeproms/SMB_EEPROM": "/SMB_FRU_SLOT@0/[IDPROM]",
"/run/devmap/eeproms/RUNBMC_EEPROM": "/RUNBMC_SLOT@0/[IDPROM]",
"/run/devmap/sensors/CPU_CORE_TEMP": "/[CPU_CORE_TEMP]",
"/run/devmap/sensors/SMB_E1S_SSD_TEMP": "/[SMB_E1S_SSD_TEMP]",
"/run/devmap/sensors/SMB_BCB_FAN_CPLD": "/[SMB_BCB_FAN_CPLD]",
"/run/devmap/sensors/SMB_BCB_FAN_CPLD_2": "/[SMB_BCB_FAN_CPLD_2]",
"/run/devmap/watchdogs/BCB_FAN_WATCHDOG": "/[BCB_FAN_WATCHDOG]",
"/run/devmap/sensors/SMB_BCB_FAN_CPLD": "/BCB_SLOT@0/[SMB_BCB_FAN_CPLD]",
"/run/devmap/sensors/SMB_BCB_FAN_CPLD_2": "/BCB_SLOT@0/[SMB_BCB_FAN_CPLD_2]",
"/run/devmap/sensors/BMC_U9_THERMAL_SENSOR": "/RUNBMC_SLOT@0/[BMC_U9_THERMAL_SENSOR]",
"/run/devmap/sensors/SMB_U122_PMBUS_1": "/[SMB_U122_PMBUS_1]",
"/run/devmap/sensors/SMB_U20_XDPE12284_1": "/[SMB_U20_XDPE12284_1]",
"/run/devmap/sensors/SMB_U86_XDPE12284_2": "/[SMB_U86_XDPE12284_2]",
"/run/devmap/sensors/SMB_U229_XDPE12284_1": "/[SMB_U229_XDPE12284_1]",
"/run/devmap/sensors/SMB_U92_XDPE12284_2": "/[SMB_U92_XDPE12284_2]",
"/run/devmap/sensors/SMB_U122_PMBUS_1": "/SMB_FRU_SLOT@0/[SMB_U122_PMBUS_1]",
"/run/devmap/sensors/SMB_U20_XDPE12284_1": "/SMB_FRU_SLOT@0/[SMB_U20_XDPE12284_1]",
"/run/devmap/sensors/SMB_U86_XDPE12284_2": "/SMB_FRU_SLOT@0/[SMB_U86_XDPE12284_2]",
"/run/devmap/sensors/SMB_U229_XDPE12284_1": "/SMB_FRU_SLOT@0/[SMB_U229_XDPE12284_1]",
"/run/devmap/sensors/SMB_U92_XDPE12284_2": "/SMB_FRU_SLOT@0/[SMB_U92_XDPE12284_2]",
"/run/devmap/sensors/SMB_U327_TPS25990_COME": "/[SMB_U327_TPS25990_COME]",
"/run/devmap/sensors/SMB_U69_LM75B_1": "/[SMB_U69_LM75B_1]",
"/run/devmap/sensors/SMB_U67_LM75B_2": "/[SMB_U67_LM75B_2]",
Expand Down
Loading