From 6c1caca70063aa707ba809a6b4695d0f0c5646f1 Mon Sep 17 00:00:00 2001 From: "Jason M. Bills" Date: Thu, 27 Feb 2020 15:57:13 -0800 Subject: Update to internal 2020-02-27 Signed-off-by: Jason M. Bills --- .../entity-manager/CPC-Baseboard.json | 84 +--- .../entity-manager/CYP-baseboard.json | 18 +- .../configuration/entity-manager/J85894-HSBP.json | 1 + .../entity-manager/TNP-baseboard.json | 58 +-- .../configuration/entity-manager/WC-Baseboard.json | 493 ++++++++++++++++++++- .../configuration/entity-manager/WC-Chassis.json | 455 +++++++++++++++++++ .../configuration/entity-manager/WP-Baseboard.json | 493 ++++++++++++++++++++- .../configuration/entity-manager_%.bbappend | 3 +- 8 files changed, 1459 insertions(+), 146 deletions(-) create mode 100644 meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager/WC-Chassis.json (limited to 'meta-openbmc-mods/meta-ast2500/recipes-phosphor') diff --git a/meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager/CPC-Baseboard.json b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager/CPC-Baseboard.json index 637de563b..71ea74135 100644 --- a/meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager/CPC-Baseboard.json +++ b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager/CPC-Baseboard.json @@ -619,13 +619,6 @@ ], "Type": "CFMSensor" }, - { - "Direction": "Input", - "Index": 40, - "Name": "NMI Input", - "Polarity": "Low", - "Type": "Gpio" - }, { "Name": "System Fan connector 1", "Pwm": 0, @@ -859,38 +852,6 @@ ], "Type": "IpmbSensor" }, - { - "Address": "0x4A", - "Class": "IRBridgeTemp", - "Name": "CPU1 VR P1V8", - "Thresholds": [ - { - "Direction": "greater than", - "Name": "upper critical", - "Severity": 1, - "Value": 115 - }, - { - "Direction": "greater than", - "Name": "upper non critical", - "Severity": 0, - "Value": 110 - }, - { - "Direction": "less than", - "Name": "lower non critical", - "Severity": 0, - "Value": 5 - }, - { - "Direction": "less than", - "Name": "lower critical", - "Severity": 1, - "Value": 0 - } - ], - "Type": "IpmbSensor" - }, { "Address": "0xCC", "Class": "MpsBridgeTemp", @@ -1019,38 +980,6 @@ ], "Type": "IpmbSensor" }, - { - "Address": "0x4C", - "Class": "IRBridgeTemp", - "Name": "CPU2 VR P1V8", - "Thresholds": [ - { - "Direction": "greater than", - "Name": "upper critical", - "Severity": 1, - "Value": 115 - }, - { - "Direction": "greater than", - "Name": "upper non critical", - "Severity": 0, - "Value": 110 - }, - { - "Direction": "less than", - "Name": "lower non critical", - "Severity": 0, - "Value": 5 - }, - { - "Direction": "less than", - "Name": "lower critical", - "Severity": 1, - "Value": 0 - } - ], - "Type": "IpmbSensor" - }, { "Address": "0x71", "Bus": 2, @@ -1625,8 +1554,7 @@ "ILimitMin": 30, "Inputs": [ "CPU1 VR Mem ABCD Temp", - "CPU1 VR Mem ABCD Temp", - "CPU1 VR P1V8" + "CPU1 VR Mem ABCD Temp" ], "Name": "CPU 1 VR Temp", "NegativeHysteresis": 5.0, @@ -1652,8 +1580,7 @@ "ILimitMin": 30, "Inputs": [ "CPU2 VR Mem ABCD Temp", - "CPU2 VR Mem ABCD Temp", - "CPU2 VR P1V8" + "CPU2 VR Mem ABCD Temp" ], "Name": "CPU 2 VR Temp", "NegativeHysteresis": 5.0, @@ -1946,7 +1873,6 @@ "OR", "xyz.openbmc_project.FruDevice({'PRODUCT_PRODUCT_NAME': '.*CPC'})" ], - "ProductId": 157, "Type": "Board", "xyz.openbmc_project.Inventory.Decorator.Asset": { "Manufacturer": "$PRODUCT_MANUFACTURER", @@ -1957,6 +1883,8 @@ "xyz.openbmc_project.Inventory.Decorator.AssetTag": { "AssetTag": "$PRODUCT_ASSET_TAG" }, - "xyz.openbmc_project.Inventory.Item.Baseboard": {}, + "xyz.openbmc_project.Inventory.Item.Board.Motherboard": { + "ProductId": 157 +}, "xyz.openbmc_project.Inventory.Item.System": {} -} +} \ No newline at end of file diff --git a/meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager/CYP-baseboard.json b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager/CYP-baseboard.json index 845c444b2..b06f1d266 100644 --- a/meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager/CYP-baseboard.json +++ b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager/CYP-baseboard.json @@ -527,9 +527,9 @@ "Type": "ADC" }, { - "BindGpioIntrusion": "Chassis Intrusion GPIO", "Class": "Gpio", "Name": "Chassis Intrusion Sensor", + "GpioPolarity": "Low", "Type": "ChassisIntrusionSensor" }, { @@ -819,13 +819,6 @@ "Polarity": "Low", "Type": "Gpio" }, - { - "Direction": "Input", - "Index": 143, - "Name": "Chassis Intrusion GPIO", - "Polarity": "Low", - "Type": "Gpio" - }, { "Direction": "Input", "Index": 144, @@ -1417,7 +1410,6 @@ "OR", "xyz.openbmc_project.FruDevice({'PRODUCT_PRODUCT_NAME': '.*CYP'})" ], - "ProductId": 152, "Type": "Board", "xyz.openbmc_project.Inventory.Decorator.Asset": { "Manufacturer": "$PRODUCT_MANUFACTURER", @@ -1425,5 +1417,11 @@ "PartNumber": "$PRODUCT_PART_NUMBER", "SerialNumber": "$PRODUCT_SERIAL_NUMBER" }, - "xyz.openbmc_project.Inventory.Item.Baseboard": {} + "xyz.openbmc_project.Inventory.Decorator.AssetTag": { + "AssetTag": "$PRODUCT_ASSET_TAG" + }, + "xyz.openbmc_project.Inventory.Item.Board.Motherboard": { + "ProductId": 152 + }, + "xyz.openbmc_project.Inventory.Item.System": {} } \ No newline at end of file diff --git a/meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager/J85894-HSBP.json b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager/J85894-HSBP.json index 660b4e2d7..f5b222909 100644 --- a/meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager/J85894-HSBP.json +++ b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager/J85894-HSBP.json @@ -41,6 +41,7 @@ "Address": "0x4b", "Bus": "$bus", "Name": "HSBP $index Temp", + "PowerState": "On", "Thresholds": [ { "Direction": "greater than", diff --git a/meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager/TNP-baseboard.json b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager/TNP-baseboard.json index c66cc86a2..24a65437e 100644 --- a/meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager/TNP-baseboard.json +++ b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager/TNP-baseboard.json @@ -527,48 +527,6 @@ ], "Type": "ADC" }, - { - "Direction": "Input", - "Index": 40, - "Name": "NMI Out", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "Input", - "Index": 50, - "Name": "PCH Thermaltrip", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "Input", - "Index": 51, - "Name": "Lcp Enter Button", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "Input", - "Index": 52, - "Name": "Lcp Left Button", - "Polarity": "High", - "Type": "Gpio" - }, - { - "Direction": "Input", - "Index": 53, - "Name": "Lcp Right Button", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "Input", - "Index": 63, - "Name": "PU 240VA Status", - "Polarity": "Low", - "Type": "Gpio" - }, { "Direction": "Input", "Index": 214, @@ -576,13 +534,6 @@ "Polarity": "High", "Type": "Gpio" }, - { - "Direction": "Input", - "Index": 218, - "Name": "ID Button", - "Polarity": "Low", - "Type": "Gpio" - }, { "Direction": "Out", "Index": 232, @@ -1809,7 +1760,6 @@ "OR", "xyz.openbmc_project.FruDevice({'PRODUCT_PRODUCT_NAME': '.*TNP'})" ], - "ProductId": 153, "Type": "Board", "xyz.openbmc_project.Inventory.Decorator.Asset": { "Manufacturer": "$PRODUCT_MANUFACTURER", @@ -1817,5 +1767,11 @@ "PartNumber": "$PRODUCT_PART_NUMBER", "SerialNumber": "$PRODUCT_SERIAL_NUMBER" }, - "xyz.openbmc_project.Inventory.Item.Baseboard": {} + "xyz.openbmc_project.Inventory.Decorator.AssetTag": { + "AssetTag": "$PRODUCT_ASSET_TAG" + }, + "xyz.openbmc_project.Inventory.Item.Board.Motherboard": { + "ProductId": 153 + }, + "xyz.openbmc_project.Inventory.Item.System": {} } \ No newline at end of file diff --git a/meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager/WC-Baseboard.json b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager/WC-Baseboard.json index dd18a889d..caf960748 100644 --- a/meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager/WC-Baseboard.json +++ b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager/WC-Baseboard.json @@ -619,6 +619,492 @@ ], "Type": "CFMSensor" }, + { + "Dcpmm": [ + { + "Channel": 0, + "DimmID": 1, + "I2cAddress": "0xB0", + "I2cbus": "MemoryChannel1", + "Imc": 0, + "Slot": 0, + "Socket": 0, + "Spdpcibus": "0x7E", + "Spdpcicmdregister": "0x80", + "Spdpcidataregister": "0x88", + "Spdpcidevice": 11, + "Spdpcifunction": 0, + "Spdpcistatusregister": "0x84" + }, + { + "Channel": 0, + "DimmID": 2, + "I2cAddress": "0xB2", + "I2cbus": "MemoryChannel1", + "Imc": 0, + "Slot": 1, + "Socket": 0, + "Spdpcibus": "0x7E", + "Spdpcicmdregister": "0x80", + "Spdpcidataregister": "0x88", + "Spdpcidevice": 11, + "Spdpcifunction": 0, + "Spdpcistatusregister": "0x84" + }, + { + "Channel": 1, + "DimmID": 3, + "I2cAddress": "0xB4", + "I2cbus": "MemoryChannel1", + "Imc": 0, + "Slot": 0, + "Socket": 0, + "Spdpcibus": "0x7E", + "Spdpcicmdregister": "0x80", + "Spdpcidataregister": "0x88", + "Spdpcidevice": 11, + "Spdpcifunction": 0, + "Spdpcistatusregister": "0x84" + }, + { + "Channel": 1, + "DimmID": 4, + "I2cAddress": "0xB6", + "I2cbus": "MemoryChannel1", + "Imc": 0, + "Slot": 1, + "Socket": 0, + "Spdpcibus": "0x7E", + "Spdpcicmdregister": "0x80", + "Spdpcidataregister": "0x88", + "Spdpcidevice": 11, + "Spdpcifunction": 0, + "Spdpcistatusregister": "0x84" + }, + { + "Channel": 0, + "DimmID": 5, + "I2cAddress": "0xB8", + "I2cbus": "MemoryChannel1", + "Imc": 1, + "Slot": 0, + "Socket": 0, + "Spdpcibus": "0x7E", + "Spdpcicmdregister": "0x80", + "Spdpcidataregister": "0x88", + "Spdpcidevice": 11, + "Spdpcifunction": 0, + "Spdpcistatusregister": "0x84" + }, + { + "Channel": 0, + "DimmID": 6, + "I2cAddress": "0xBA", + "I2cbus": "MemoryChannel1", + "Imc": 1, + "Slot": 1, + "Socket": 0, + "Spdpcibus": "0x7E", + "Spdpcicmdregister": "0x80", + "Spdpcidataregister": "0x88", + "Spdpcidevice": 11, + "Spdpcifunction": 0, + "Spdpcistatusregister": "0x84" + }, + { + "Channel": 1, + "DimmID": 7, + "I2cAddress": "0xBC", + "I2cbus": "MemoryChannel1", + "Imc": 1, + "Slot": 0, + "Socket": 0, + "Spdpcibus": "0x7E", + "Spdpcicmdregister": "0x80", + "Spdpcidataregister": "0x88", + "Spdpcidevice": 11, + "Spdpcifunction": 0, + "Spdpcistatusregister": "0x84" + }, + { + "Channel": 1, + "DimmID": 8, + "I2cAddress": "0xBE", + "I2cbus": "MemoryChannel1", + "Imc": 1, + "Slot": 1, + "Socket": 0, + "Spdpcibus": "0x7E", + "Spdpcicmdregister": "0x80", + "Spdpcidataregister": "0x88", + "Spdpcidevice": 11, + "Spdpcifunction": 0, + "Spdpcistatusregister": "0x84" + }, + { + "Channel": 0, + "DimmID": 9, + "I2cAddress": "0xB0", + "I2cbus": "MemoryChannel2", + "Imc": 2, + "Slot": 0, + "Socket": 0, + "Spdpcibus": "0x7E", + "Spdpcicmdregister": "0x80", + "Spdpcidataregister": "0x88", + "Spdpcidevice": 11, + "Spdpcifunction": 1, + "Spdpcistatusregister": "0x84" + }, + { + "Channel": 0, + "DimmID": 10, + "I2cAddress": "0xB2", + "I2cbus": "MemoryChannel2", + "Imc": 2, + "Slot": 1, + "Socket": 0, + "Spdpcibus": "0x7E", + "Spdpcicmdregister": "0x80", + "Spdpcidataregister": "0x88", + "Spdpcidevice": 11, + "Spdpcifunction": 1, + "Spdpcistatusregister": "0x84" + }, + { + "Channel": 1, + "DimmID": 11, + "I2cAddress": "0xB4", + "I2cbus": "MemoryChannel2", + "Imc": 2, + "Slot": 0, + "Socket": 0, + "Spdpcibus": "0x7E", + "Spdpcicmdregister": "0x80", + "Spdpcidataregister": "0x88", + "Spdpcidevice": 11, + "Spdpcifunction": 1, + "Spdpcistatusregister": "0x84" + }, + { + "Channel": 1, + "DimmID": 12, + "I2cAddress": "0xB6", + "I2cbus": "MemoryChannel2", + "Imc": 2, + "Slot": 1, + "Socket": 0, + "Spdpcibus": "0x7E", + "Spdpcicmdregister": "0x80", + "Spdpcidataregister": "0x88", + "Spdpcidevice": 11, + "Spdpcifunction": 1, + "Spdpcistatusregister": "0x84" + }, + { + "Channel": 0, + "DimmID": 13, + "I2cAddress": "0xB8", + "I2cbus": "MemoryChannel2", + "Imc": 3, + "Slot": 0, + "Socket": 0, + "Spdpcibus": "0x7E", + "Spdpcicmdregister": "0x80", + "Spdpcidataregister": "0x88", + "Spdpcidevice": 11, + "Spdpcifunction": 1, + "Spdpcistatusregister": "0x84" + }, + { + "Channel": 0, + "DimmID": 14, + "I2cAddress": "0xBA", + "I2cbus": "MemoryChannel2", + "Imc": 3, + "Slot": 1, + "Socket": 0, + "Spdpcibus": "0x7E", + "Spdpcicmdregister": "0x80", + "Spdpcidataregister": "0x88", + "Spdpcidevice": 11, + "Spdpcifunction": 1, + "Spdpcistatusregister": "0x84" + }, + { + "Channel": 1, + "DimmID": 15, + "I2cAddress": "0xBC", + "I2cbus": "MemoryChannel2", + "Imc": 3, + "Slot": 0, + "Socket": 0, + "Spdpcibus": "0x7E", + "Spdpcicmdregister": "0x80", + "Spdpcidataregister": "0x88", + "Spdpcidevice": 11, + "Spdpcifunction": 1, + "Spdpcistatusregister": "0x84" + }, + { + "Channel": 1, + "DimmID": 16, + "I2cAddress": "0xBE", + "I2cbus": "MemoryChannel2", + "Imc": 3, + "Slot": 1, + "Socket": 0, + "Spdpcibus": "0x7E", + "Spdpcicmdregister": "0x80", + "Spdpcidataregister": "0x88", + "Spdpcidevice": 11, + "Spdpcifunction": 1, + "Spdpcistatusregister": "0x84" + }, + { + "Channel": 0, + "DimmID": 17, + "I2cAddress": "0xB0", + "I2cbus": "MemoryChannel3", + "Imc": 0, + "Slot": 0, + "Socket": 1, + "Spdpcibus": "0x7E", + "Spdpcicmdregister": "0x80", + "Spdpcidataregister": "0x88", + "Spdpcidevice": 11, + "Spdpcifunction": 0, + "Spdpcistatusregister": "0x84" + }, + { + "Channel": 0, + "DimmID": 18, + "I2cAddress": "0xB2", + "I2cbus": "MemoryChannel3", + "Imc": 0, + "Slot": 1, + "Socket": 1, + "Spdpcibus": "0x7E", + "Spdpcicmdregister": "0x80", + "Spdpcidataregister": "0x88", + "Spdpcidevice": 11, + "Spdpcifunction": 0, + "Spdpcistatusregister": "0x84" + }, + { + "Channel": 1, + "DimmID": 19, + "I2cAddress": "0xB4", + "I2cbus": "MemoryChannel3", + "Imc": 0, + "Slot": 0, + "Socket": 1, + "Spdpcibus": "0x7E", + "Spdpcicmdregister": "0x80", + "Spdpcidataregister": "0x88", + "Spdpcidevice": 11, + "Spdpcifunction": 0, + "Spdpcistatusregister": "0x84" + }, + { + "Channel": 1, + "DimmID": 20, + "I2cAddress": "0xB6", + "I2cbus": "MemoryChannel3", + "Imc": 0, + "Slot": 1, + "Socket": 1, + "Spdpcibus": "0x7E", + "Spdpcicmdregister": "0x80", + "Spdpcidataregister": "0x88", + "Spdpcidevice": 11, + "Spdpcifunction": 0, + "Spdpcistatusregister": "0x84" + }, + { + "Channel": 0, + "DimmID": 21, + "I2cAddress": "0xB8", + "I2cbus": "MemoryChannel3", + "Imc": 1, + "Slot": 0, + "Socket": 1, + "Spdpcibus": "0x7E", + "Spdpcicmdregister": "0x80", + "Spdpcidataregister": "0x88", + "Spdpcidevice": 11, + "Spdpcifunction": 0, + "Spdpcistatusregister": "0x84" + }, + { + "Channel": 0, + "DimmID": 22, + "I2cAddress": "0xBA", + "I2cbus": "MemoryChannel3", + "Imc": 1, + "Slot": 1, + "Socket": 1, + "Spdpcibus": "0x7E", + "Spdpcicmdregister": "0x80", + "Spdpcidataregister": "0x88", + "Spdpcidevice": 11, + "Spdpcifunction": 0, + "Spdpcistatusregister": "0x84" + }, + { + "Channel": 1, + "DimmID": 23, + "I2cAddress": "0xBC", + "I2cbus": "MemoryChannel3", + "Imc": 1, + "Slot": 0, + "Socket": 1, + "Spdpcibus": "0x7E", + "Spdpcicmdregister": "0x80", + "Spdpcidataregister": "0x88", + "Spdpcidevice": 11, + "Spdpcifunction": 0, + "Spdpcistatusregister": "0x84" + }, + { + "Channel": 1, + "DimmID": 24, + "I2cAddress": "0xBE", + "I2cbus": "MemoryChannel3", + "Imc": 1, + "Slot": 1, + "Socket": 1, + "Spdpcibus": "0x7E", + "Spdpcicmdregister": "0x80", + "Spdpcidataregister": "0x88", + "Spdpcidevice": 11, + "Spdpcifunction": 0, + "Spdpcistatusregister": "0x84" + }, + { + "Channel": 0, + "DimmID": 25, + "I2cAddress": "0xB0", + "I2cbus": "MemoryChannel4", + "Imc": 2, + "Slot": 0, + "Socket": 1, + "Spdpcibus": "0x7E", + "Spdpcicmdregister": "0x80", + "Spdpcidataregister": "0x88", + "Spdpcidevice": 11, + "Spdpcifunction": 1, + "Spdpcistatusregister": "0x84" + }, + { + "Channel": 0, + "DimmID": 26, + "I2cAddress": "0xB2", + "I2cbus": "MemoryChannel4", + "Imc": 2, + "Slot": 1, + "Socket": 1, + "Spdpcibus": "0x7E", + "Spdpcicmdregister": "0x80", + "Spdpcidataregister": "0x88", + "Spdpcidevice": 11, + "Spdpcifunction": 1, + "Spdpcistatusregister": "0x84" + }, + { + "Channel": 1, + "DimmID": 27, + "I2cAddress": "0xB4", + "I2cbus": "MemoryChannel4", + "Imc": 2, + "Slot": 0, + "Socket": 1, + "Spdpcibus": "0x7E", + "Spdpcicmdregister": "0x80", + "Spdpcidataregister": "0x88", + "Spdpcidevice": 11, + "Spdpcifunction": 1, + "Spdpcistatusregister": "0x84" + }, + { + "Channel": 1, + "DimmID": 28, + "I2cAddress": "0xB6", + "I2cbus": "MemoryChannel4", + "Imc": 2, + "Slot": 1, + "Socket": 1, + "Spdpcibus": "0x7E", + "Spdpcicmdregister": "0x80", + "Spdpcidataregister": "0x88", + "Spdpcidevice": 11, + "Spdpcifunction": 1, + "Spdpcistatusregister": "0x84" + }, + { + "Channel": 0, + "DimmID": 29, + "I2cAddress": "0xB8", + "I2cbus": "MemoryChannel4", + "Imc": 3, + "Slot": 0, + "Socket": 1, + "Spdpcibus": "0x7E", + "Spdpcicmdregister": "0x80", + "Spdpcidataregister": "0x88", + "Spdpcidevice": 11, + "Spdpcifunction": 1, + "Spdpcistatusregister": "0x84" + }, + { + "Channel": 0, + "DimmID": 30, + "I2cAddress": "0xBA", + "I2cbus": "MemoryChannel4", + "Imc": 3, + "Slot": 1, + "Socket": 1, + "Spdpcibus": "0x7E", + "Spdpcicmdregister": "0x80", + "Spdpcidataregister": "0x88", + "Spdpcidevice": 11, + "Spdpcifunction": 1, + "Spdpcistatusregister": "0x84" + }, + { + "Channel": 1, + "DimmID": 31, + "I2cAddress": "0xBC", + "I2cbus": "MemoryChannel4", + "Imc": 3, + "Slot": 0, + "Socket": 1, + "Spdpcibus": "0x7E", + "Spdpcicmdregister": "0x80", + "Spdpcidataregister": "0x88", + "Spdpcidevice": 11, + "Spdpcifunction": 1, + "Spdpcistatusregister": "0x84" + }, + { + "Channel": 1, + "DimmID": 32, + "I2cAddress": "0xBE", + "I2cbus": "MemoryChannel4", + "Imc": 3, + "Slot": 1, + "Socket": 1, + "Spdpcibus": "0x7E", + "Spdpcicmdregister": "0x80", + "Spdpcidataregister": "0x88", + "Spdpcidevice": 11, + "Spdpcifunction": 1, + "Spdpcistatusregister": "0x84" + } + ], + "Name": "DCPMM", + "Type": "DCPMM" + }, { "Direction": "Input", "Index": 40, @@ -1892,7 +2378,6 @@ "OR", "xyz.openbmc_project.FruDevice({'PRODUCT_PRODUCT_NAME': '.*WC'})" ], - "ProductId": 145, "Type": "Board", "xyz.openbmc_project.Inventory.Decorator.Asset": { "Manufacturer": "$PRODUCT_MANUFACTURER", @@ -1903,6 +2388,8 @@ "xyz.openbmc_project.Inventory.Decorator.AssetTag": { "AssetTag": "$PRODUCT_ASSET_TAG" }, - "xyz.openbmc_project.Inventory.Item.Baseboard": {}, + "xyz.openbmc_project.Inventory.Item.Board.Motherboard": { + "ProductId": 145 + }, "xyz.openbmc_project.Inventory.Item.System": {} -} +} \ No newline at end of file diff --git a/meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager/WC-Chassis.json b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager/WC-Chassis.json new file mode 100644 index 000000000..a30626daa --- /dev/null +++ b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager/WC-Chassis.json @@ -0,0 +1,455 @@ +{ + "Exposes": [ + { + "BindConnector": "System Fan connector 1", + "Index": 0, + "Name": "Fan 1", + "Thresholds": [ + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 1750 + }, + { + "Direction": "less than", + "Name": "lower non critical", + "Severity": 0, + "Value": 2000 + } + ], + "Type": "AspeedFan" + }, + { + "BindConnector": "System Fan connector 2", + "Index": 2, + "Name": "Fan 2", + "Thresholds": [ + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 1750 + }, + { + "Direction": "less than", + "Name": "lower non critical", + "Severity": 0, + "Value": 2000 + } + ], + "Type": "AspeedFan" + }, + { + "BindConnector": "System Fan connector 3", + "Index": 4, + "Name": "Fan 3", + "Thresholds": [ + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 1750 + }, + { + "Direction": "less than", + "Name": "lower non critical", + "Severity": 0, + "Value": 2000 + } + ], + "Type": "AspeedFan" + }, + { + "BindConnector": "System Fan connector 6", + "Index": 10, + "Name": "Fan 4", + "Thresholds": [ + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 1750 + }, + { + "Direction": "less than", + "Name": "lower non critical", + "Severity": 0, + "Value": 2000 + } + ], + "Type": "AspeedFan" + }, + { + "BindConnector": "System Fan connector 7", + "Index": 12, + "Name": "Fan 5", + "Thresholds": [ + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 1750 + }, + { + "Direction": "less than", + "Name": "lower non critical", + "Severity": 0, + "Value": 2000 + } + ], + "Type": "AspeedFan" + }, + { + "BindConnector": "System Fan connector 8", + "Index": 14, + "Name": "Fan 6", + "Thresholds": [ + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 1750 + }, + { + "Direction": "less than", + "Name": "lower non critical", + "Severity": 0, + "Value": 2000 + } + ], + "Type": "AspeedFan" + }, + { + "C1": 92.16, + "C2": 107.52, + "MaxCFM": 17.5, + "Name": "System Airflow", + "TachMaxPercent": 100, + "TachMinPercent": 20, + "Tachs": [ + "Fan 1", + "Fan 2", + "Fan 3", + "Fan 4", + "Fan 5", + "Fan 6" + ], + "Type": "CFMSensor" + }, + { + "DisableNode": [ + "Fan 1a", + "Fan 1b", + "Fan 2a", + "Fan 2b", + "Fan 3a", + "Fan 3b", + "Fan 4a", + "Fan 4b", + "Fan 5a", + "Fan 5b", + "Fan 6a", + "Fan 6b", + "Fan 7a", + "Fan 7b", + "Fan 8a", + "Fan 8b", + "Fan 1", + "Fan 2", + "Fan 3", + "Fan 4", + "Fan 5", + "Fan 6", + "Fan 7", + "Fan 8", + "System Airflow" + ], + "Name": "Disable Baseboard Configurations", + "Type": "Disable" + }, + { + "AlphaF": 4.352, + "AlphaS": 0.512, + "Name": "Exit Air Temp", + "PowerFactorMax": 1.2, + "PowerFactorMin": 0.9, + "QMax": 165, + "QMin": 31, + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 85 + }, + { + "Direction": "greater than", + "Name": "upper non critical", + "Severity": 0, + "Value": 80 + }, + { + "Direction": "less than", + "Name": "lower non critical", + "Severity": 0, + "Value": 5 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 0 + } + ], + "Type": "ExitAirTempSensor" + }, + { + "Class": "temp", + "FFGainCoefficient": 0.0, + "FFOffCoefficient": 0.0, + "ICoefficient": -4.64, + "ILimitMax": 100, + "ILimitMin": 30, + "Inputs": [ + "Exit Air Temp" + ], + "Name": "Exit Air Temp", + "NegativeHysteresis": 5.0, + "OutLimitMax": 100, + "OutLimitMin": 30, + "Outputs": [], + "PCoefficient": -0.15, + "PositiveHysteresis": 0.0, + "SetPoint": 75.0, + "SlewNeg": -1, + "SlewPos": 0.0, + "Type": "Pid", + "Zones": [ + "Left", + "Right" + ] + }, + { + "Class": "fan", + "FFGainCoefficient": 1.0, + "FFOffCoefficient": 0.0, + "ICoefficient": 0.0, + "ILimitMax": 0.0, + "ILimitMin": 0.0, + "Inputs": [ + "Fan 1" + ], + "Name": "Fan 1", + "NegativeHysteresis": 0.0, + "OutLimitMax": 100.0, + "OutLimitMin": 30.0, + "Outputs": [ + "Pwm 1" + ], + "PCoefficient": 0.0, + "PositiveHysteresis": 0.0, + "SlewNeg": 0.0, + "SlewPos": 0.0, + "Type": "Pid", + "Zones": [ + "Left" + ] + }, + { + "Class": "fan", + "FFGainCoefficient": 1.0, + "FFOffCoefficient": 0.0, + "ICoefficient": 0.0, + "ILimitMax": 0.0, + "ILimitMin": 0.0, + "Inputs": [ + "Fan 2" + ], + "Name": "Fan 2", + "NegativeHysteresis": 0.0, + "OutLimitMax": 100.0, + "OutLimitMin": 30.0, + "Outputs": [ + "Pwm 2" + ], + "PCoefficient": 0.0, + "PositiveHysteresis": 0.0, + "SlewNeg": 0.0, + "SlewPos": 0.0, + "Type": "Pid", + "Zones": [ + "Left" + ] + }, + { + "Class": "fan", + "FFGainCoefficient": 1.0, + "FFOffCoefficient": 0.0, + "ICoefficient": 0.0, + "ILimitMax": 0.0, + "ILimitMin": 0.0, + "Inputs": [ + "Fan 3" + ], + "Name": "Fan 3", + "NegativeHysteresis": 0.0, + "OutLimitMax": 100.0, + "OutLimitMin": 30.0, + "Outputs": [ + "Pwm 3" + ], + "PCoefficient": 0.0, + "PositiveHysteresis": 0.0, + "SlewNeg": 0.0, + "SlewPos": 0.0, + "Type": "Pid", + "Zones": [ + "Left" + ] + }, + { + "Class": "fan", + "FFGainCoefficient": 1.0, + "FFOffCoefficient": 0.0, + "ICoefficient": 0.0, + "ILimitMax": 0.0, + "ILimitMin": 0.0, + "Inputs": [ + "Fan 4" + ], + "Name": "Fan 4", + "NegativeHysteresis": 0.0, + "OutLimitMax": 100.0, + "OutLimitMin": 30.0, + "Outputs": [ + "Pwm 6" + ], + "PCoefficient": 0.0, + "PositiveHysteresis": 0.0, + "SlewNeg": 0.0, + "SlewPos": 0.0, + "Type": "Pid", + "Zones": [ + "Right" + ] + }, + { + "Class": "fan", + "FFGainCoefficient": 1.0, + "FFOffCoefficient": 0.0, + "ICoefficient": 0.0, + "ILimitMax": 0.0, + "ILimitMin": 0.0, + "Inputs": [ + "Fan 5" + ], + "Name": "Fan 5", + "NegativeHysteresis": 0.0, + "OutLimitMax": 100.0, + "OutLimitMin": 30.0, + "Outputs": [ + "Pwm 7" + ], + "PCoefficient": 0.0, + "PositiveHysteresis": 0.0, + "SlewNeg": 0.0, + "SlewPos": 0.0, + "Type": "Pid", + "Zones": [ + "Right" + ] + }, + { + "Class": "fan", + "FFGainCoefficient": 1.0, + "FFOffCoefficient": 0.0, + "ICoefficient": 0.0, + "ILimitMax": 0.0, + "ILimitMin": 0.0, + "Inputs": [ + "Fan 6" + ], + "Name": "Fan 6", + "NegativeHysteresis": 0.0, + "OutLimitMax": 100.0, + "OutLimitMin": 30.0, + "Outputs": [ + "Pwm 8" + ], + "PCoefficient": 0.0, + "PositiveHysteresis": 0.0, + "SlewNeg": 0.0, + "SlewPos": 0.0, + "Type": "Pid", + "Zones": [ + "Right" + ] + }, + { + "Class": "Floor", + "Inputs": [ + "Front Panel Temp" + ], + "Name": "Front Panel LCC", + "NegativeHysteresis": 2, + "Output": [ + 50.0, + 60.0 + ], + "PositiveHysteresis": 0, + "Reading": [ + 20.0, + 30.0 + ], + "Type": "Stepwise", + "Zones": [ + "Left", + "Right" + ] + }, + { + "Class": "Ceiling", + "Inputs": [ + "Front Panel Temp" + ], + "Name": "Front Panel UCC", + "NegativeHysteresis": 2, + "Output": [ + 70.0, + 80.0 + ], + "PositiveHysteresis": 0, + "Profiles": [ + "Acoustic" + ], + "Reading": [ + 22.0, + 32.0 + ], + "Type": "Stepwise", + "Zones": [ + "Left", + "Right" + ] + } + ], + "Name": "R4000 Chassis", + "Probe": [ + "FOUND('Intel Front Panel')", + "AND", + "FOUND('WC Baseboard')", + "AND", + "xyz.openbmc_project.FruDevice({'PRODUCT_PRODUCT_NAME': 'WilsonCity'})" + ], + "Type": "Chassis", + "xyz.openbmc_project.Inventory.Decorator.Asset": { + "Manufacturer": "$PRODUCT_MANUFACTURER", + "Model": "$PRODUCT_PRODUCT_NAME", + "PartNumber": "$PRODUCT_PART_NUMBER", + "SerialNumber": "$PRODUCT_SERIAL_NUMBER" + }, + "xyz.openbmc_project.Inventory.Decorator.AssetTag": { + "AssetTag": "$PRODUCT_ASSET_TAG" + } +} \ No newline at end of file diff --git a/meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager/WP-Baseboard.json b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager/WP-Baseboard.json index 29c6f9d52..de98c78fa 100644 --- a/meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager/WP-Baseboard.json +++ b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager/WP-Baseboard.json @@ -619,6 +619,492 @@ ], "Type": "CFMSensor" }, + { + "Dcpmm": [ + { + "Channel": 0, + "DimmID": 1, + "I2cAddress": "0xB0", + "I2cbus": "MemoryChannel1", + "Imc": 0, + "Slot": 0, + "Socket": 0, + "Spdpcibus": "0x7E", + "Spdpcicmdregister": "0x80", + "Spdpcidataregister": "0x88", + "Spdpcidevice": 11, + "Spdpcifunction": 0, + "Spdpcistatusregister": "0x84" + }, + { + "Channel": 0, + "DimmID": 2, + "I2cAddress": "0xB2", + "I2cbus": "MemoryChannel1", + "Imc": 0, + "Slot": 1, + "Socket": 0, + "Spdpcibus": "0x7E", + "Spdpcicmdregister": "0x80", + "Spdpcidataregister": "0x88", + "Spdpcidevice": 11, + "Spdpcifunction": 0, + "Spdpcistatusregister": "0x84" + }, + { + "Channel": 1, + "DimmID": 3, + "I2cAddress": "0xB4", + "I2cbus": "MemoryChannel1", + "Imc": 0, + "Slot": 0, + "Socket": 0, + "Spdpcibus": "0x7E", + "Spdpcicmdregister": "0x80", + "Spdpcidataregister": "0x88", + "Spdpcidevice": 11, + "Spdpcifunction": 0, + "Spdpcistatusregister": "0x84" + }, + { + "Channel": 1, + "DimmID": 4, + "I2cAddress": "0xB6", + "I2cbus": "MemoryChannel1", + "Imc": 0, + "Slot": 1, + "Socket": 0, + "Spdpcibus": "0x7E", + "Spdpcicmdregister": "0x80", + "Spdpcidataregister": "0x88", + "Spdpcidevice": 11, + "Spdpcifunction": 0, + "Spdpcistatusregister": "0x84" + }, + { + "Channel": 0, + "DimmID": 5, + "I2cAddress": "0xB8", + "I2cbus": "MemoryChannel1", + "Imc": 1, + "Slot": 0, + "Socket": 0, + "Spdpcibus": "0x7E", + "Spdpcicmdregister": "0x80", + "Spdpcidataregister": "0x88", + "Spdpcidevice": 11, + "Spdpcifunction": 0, + "Spdpcistatusregister": "0x84" + }, + { + "Channel": 0, + "DimmID": 6, + "I2cAddress": "0xBA", + "I2cbus": "MemoryChannel1", + "Imc": 1, + "Slot": 1, + "Socket": 0, + "Spdpcibus": "0x7E", + "Spdpcicmdregister": "0x80", + "Spdpcidataregister": "0x88", + "Spdpcidevice": 11, + "Spdpcifunction": 0, + "Spdpcistatusregister": "0x84" + }, + { + "Channel": 1, + "DimmID": 7, + "I2cAddress": "0xBC", + "I2cbus": "MemoryChannel1", + "Imc": 1, + "Slot": 0, + "Socket": 0, + "Spdpcibus": "0x7E", + "Spdpcicmdregister": "0x80", + "Spdpcidataregister": "0x88", + "Spdpcidevice": 11, + "Spdpcifunction": 0, + "Spdpcistatusregister": "0x84" + }, + { + "Channel": 1, + "DimmID": 8, + "I2cAddress": "0xBE", + "I2cbus": "MemoryChannel1", + "Imc": 1, + "Slot": 1, + "Socket": 0, + "Spdpcibus": "0x7E", + "Spdpcicmdregister": "0x80", + "Spdpcidataregister": "0x88", + "Spdpcidevice": 11, + "Spdpcifunction": 0, + "Spdpcistatusregister": "0x84" + }, + { + "Channel": 0, + "DimmID": 9, + "I2cAddress": "0xB0", + "I2cbus": "MemoryChannel2", + "Imc": 2, + "Slot": 0, + "Socket": 0, + "Spdpcibus": "0x7E", + "Spdpcicmdregister": "0x80", + "Spdpcidataregister": "0x88", + "Spdpcidevice": 11, + "Spdpcifunction": 1, + "Spdpcistatusregister": "0x84" + }, + { + "Channel": 0, + "DimmID": 10, + "I2cAddress": "0xB2", + "I2cbus": "MemoryChannel2", + "Imc": 2, + "Slot": 1, + "Socket": 0, + "Spdpcibus": "0x7E", + "Spdpcicmdregister": "0x80", + "Spdpcidataregister": "0x88", + "Spdpcidevice": 11, + "Spdpcifunction": 1, + "Spdpcistatusregister": "0x84" + }, + { + "Channel": 1, + "DimmID": 11, + "I2cAddress": "0xB4", + "I2cbus": "MemoryChannel2", + "Imc": 2, + "Slot": 0, + "Socket": 0, + "Spdpcibus": "0x7E", + "Spdpcicmdregister": "0x80", + "Spdpcidataregister": "0x88", + "Spdpcidevice": 11, + "Spdpcifunction": 1, + "Spdpcistatusregister": "0x84" + }, + { + "Channel": 1, + "DimmID": 12, + "I2cAddress": "0xB6", + "I2cbus": "MemoryChannel2", + "Imc": 2, + "Slot": 1, + "Socket": 0, + "Spdpcibus": "0x7E", + "Spdpcicmdregister": "0x80", + "Spdpcidataregister": "0x88", + "Spdpcidevice": 11, + "Spdpcifunction": 1, + "Spdpcistatusregister": "0x84" + }, + { + "Channel": 0, + "DimmID": 13, + "I2cAddress": "0xB8", + "I2cbus": "MemoryChannel2", + "Imc": 3, + "Slot": 0, + "Socket": 0, + "Spdpcibus": "0x7E", + "Spdpcicmdregister": "0x80", + "Spdpcidataregister": "0x88", + "Spdpcidevice": 11, + "Spdpcifunction": 1, + "Spdpcistatusregister": "0x84" + }, + { + "Channel": 0, + "DimmID": 14, + "I2cAddress": "0xBA", + "I2cbus": "MemoryChannel2", + "Imc": 3, + "Slot": 1, + "Socket": 0, + "Spdpcibus": "0x7E", + "Spdpcicmdregister": "0x80", + "Spdpcidataregister": "0x88", + "Spdpcidevice": 11, + "Spdpcifunction": 1, + "Spdpcistatusregister": "0x84" + }, + { + "Channel": 1, + "DimmID": 15, + "I2cAddress": "0xBC", + "I2cbus": "MemoryChannel2", + "Imc": 3, + "Slot": 0, + "Socket": 0, + "Spdpcibus": "0x7E", + "Spdpcicmdregister": "0x80", + "Spdpcidataregister": "0x88", + "Spdpcidevice": 11, + "Spdpcifunction": 1, + "Spdpcistatusregister": "0x84" + }, + { + "Channel": 1, + "DimmID": 16, + "I2cAddress": "0xBE", + "I2cbus": "MemoryChannel2", + "Imc": 3, + "Slot": 1, + "Socket": 0, + "Spdpcibus": "0x7E", + "Spdpcicmdregister": "0x80", + "Spdpcidataregister": "0x88", + "Spdpcidevice": 11, + "Spdpcifunction": 1, + "Spdpcistatusregister": "0x84" + }, + { + "Channel": 0, + "DimmID": 17, + "I2cAddress": "0xB0", + "I2cbus": "MemoryChannel3", + "Imc": 0, + "Slot": 0, + "Socket": 1, + "Spdpcibus": "0x7E", + "Spdpcicmdregister": "0x80", + "Spdpcidataregister": "0x88", + "Spdpcidevice": 11, + "Spdpcifunction": 0, + "Spdpcistatusregister": "0x84" + }, + { + "Channel": 0, + "DimmID": 18, + "I2cAddress": "0xB2", + "I2cbus": "MemoryChannel3", + "Imc": 0, + "Slot": 1, + "Socket": 1, + "Spdpcibus": "0x7E", + "Spdpcicmdregister": "0x80", + "Spdpcidataregister": "0x88", + "Spdpcidevice": 11, + "Spdpcifunction": 0, + "Spdpcistatusregister": "0x84" + }, + { + "Channel": 1, + "DimmID": 19, + "I2cAddress": "0xB4", + "I2cbus": "MemoryChannel3", + "Imc": 0, + "Slot": 0, + "Socket": 1, + "Spdpcibus": "0x7E", + "Spdpcicmdregister": "0x80", + "Spdpcidataregister": "0x88", + "Spdpcidevice": 11, + "Spdpcifunction": 0, + "Spdpcistatusregister": "0x84" + }, + { + "Channel": 1, + "DimmID": 20, + "I2cAddress": "0xB6", + "I2cbus": "MemoryChannel3", + "Imc": 0, + "Slot": 1, + "Socket": 1, + "Spdpcibus": "0x7E", + "Spdpcicmdregister": "0x80", + "Spdpcidataregister": "0x88", + "Spdpcidevice": 11, + "Spdpcifunction": 0, + "Spdpcistatusregister": "0x84" + }, + { + "Channel": 0, + "DimmID": 21, + "I2cAddress": "0xB8", + "I2cbus": "MemoryChannel3", + "Imc": 1, + "Slot": 0, + "Socket": 1, + "Spdpcibus": "0x7E", + "Spdpcicmdregister": "0x80", + "Spdpcidataregister": "0x88", + "Spdpcidevice": 11, + "Spdpcifunction": 0, + "Spdpcistatusregister": "0x84" + }, + { + "Channel": 0, + "DimmID": 22, + "I2cAddress": "0xBA", + "I2cbus": "MemoryChannel3", + "Imc": 1, + "Slot": 1, + "Socket": 1, + "Spdpcibus": "0x7E", + "Spdpcicmdregister": "0x80", + "Spdpcidataregister": "0x88", + "Spdpcidevice": 11, + "Spdpcifunction": 0, + "Spdpcistatusregister": "0x84" + }, + { + "Channel": 1, + "DimmID": 23, + "I2cAddress": "0xBC", + "I2cbus": "MemoryChannel3", + "Imc": 1, + "Slot": 0, + "Socket": 1, + "Spdpcibus": "0x7E", + "Spdpcicmdregister": "0x80", + "Spdpcidataregister": "0x88", + "Spdpcidevice": 11, + "Spdpcifunction": 0, + "Spdpcistatusregister": "0x84" + }, + { + "Channel": 1, + "DimmID": 24, + "I2cAddress": "0xBE", + "I2cbus": "MemoryChannel3", + "Imc": 1, + "Slot": 1, + "Socket": 1, + "Spdpcibus": "0x7E", + "Spdpcicmdregister": "0x80", + "Spdpcidataregister": "0x88", + "Spdpcidevice": 11, + "Spdpcifunction": 0, + "Spdpcistatusregister": "0x84" + }, + { + "Channel": 0, + "DimmID": 25, + "I2cAddress": "0xB0", + "I2cbus": "MemoryChannel4", + "Imc": 2, + "Slot": 0, + "Socket": 1, + "Spdpcibus": "0x7E", + "Spdpcicmdregister": "0x80", + "Spdpcidataregister": "0x88", + "Spdpcidevice": 11, + "Spdpcifunction": 1, + "Spdpcistatusregister": "0x84" + }, + { + "Channel": 0, + "DimmID": 26, + "I2cAddress": "0xB2", + "I2cbus": "MemoryChannel4", + "Imc": 2, + "Slot": 1, + "Socket": 1, + "Spdpcibus": "0x7E", + "Spdpcicmdregister": "0x80", + "Spdpcidataregister": "0x88", + "Spdpcidevice": 11, + "Spdpcifunction": 1, + "Spdpcistatusregister": "0x84" + }, + { + "Channel": 1, + "DimmID": 27, + "I2cAddress": "0xB4", + "I2cbus": "MemoryChannel4", + "Imc": 2, + "Slot": 0, + "Socket": 1, + "Spdpcibus": "0x7E", + "Spdpcicmdregister": "0x80", + "Spdpcidataregister": "0x88", + "Spdpcidevice": 11, + "Spdpcifunction": 1, + "Spdpcistatusregister": "0x84" + }, + { + "Channel": 1, + "DimmID": 28, + "I2cAddress": "0xB6", + "I2cbus": "MemoryChannel4", + "Imc": 2, + "Slot": 1, + "Socket": 1, + "Spdpcibus": "0x7E", + "Spdpcicmdregister": "0x80", + "Spdpcidataregister": "0x88", + "Spdpcidevice": 11, + "Spdpcifunction": 1, + "Spdpcistatusregister": "0x84" + }, + { + "Channel": 0, + "DimmID": 29, + "I2cAddress": "0xB8", + "I2cbus": "MemoryChannel4", + "Imc": 3, + "Slot": 0, + "Socket": 1, + "Spdpcibus": "0x7E", + "Spdpcicmdregister": "0x80", + "Spdpcidataregister": "0x88", + "Spdpcidevice": 11, + "Spdpcifunction": 1, + "Spdpcistatusregister": "0x84" + }, + { + "Channel": 0, + "DimmID": 30, + "I2cAddress": "0xBA", + "I2cbus": "MemoryChannel4", + "Imc": 3, + "Slot": 1, + "Socket": 1, + "Spdpcibus": "0x7E", + "Spdpcicmdregister": "0x80", + "Spdpcidataregister": "0x88", + "Spdpcidevice": 11, + "Spdpcifunction": 1, + "Spdpcistatusregister": "0x84" + }, + { + "Channel": 1, + "DimmID": 31, + "I2cAddress": "0xBC", + "I2cbus": "MemoryChannel4", + "Imc": 3, + "Slot": 0, + "Socket": 1, + "Spdpcibus": "0x7E", + "Spdpcicmdregister": "0x80", + "Spdpcidataregister": "0x88", + "Spdpcidevice": 11, + "Spdpcifunction": 1, + "Spdpcistatusregister": "0x84" + }, + { + "Channel": 1, + "DimmID": 32, + "I2cAddress": "0xBE", + "I2cbus": "MemoryChannel4", + "Imc": 3, + "Slot": 1, + "Socket": 1, + "Spdpcibus": "0x7E", + "Spdpcicmdregister": "0x80", + "Spdpcidataregister": "0x88", + "Spdpcidevice": 11, + "Spdpcifunction": 1, + "Spdpcistatusregister": "0x84" + } + ], + "Name": "DCPMM", + "Type": "DCPMM" + }, { "Name": "System Fan connector 1", "Pwm": 0, @@ -1876,7 +2362,6 @@ "OR", "xyz.openbmc_project.FruDevice({'PRODUCT_PRODUCT_NAME': '.*WP'})" ], - "ProductId": 154, "Type": "Board", "xyz.openbmc_project.Inventory.Decorator.Asset": { "Manufacturer": "$PRODUCT_MANUFACTURER", @@ -1887,6 +2372,8 @@ "xyz.openbmc_project.Inventory.Decorator.AssetTag": { "AssetTag": "$PRODUCT_ASSET_TAG" }, - "xyz.openbmc_project.Inventory.Item.Baseboard": {}, + "xyz.openbmc_project.Inventory.Item.Board.Motherboard": { + "ProductId": 154 + }, "xyz.openbmc_project.Inventory.Item.System": {} -} +} \ No newline at end of file diff --git a/meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager_%.bbappend b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager_%.bbappend index 1e0d2b1b4..6528bd513 100644 --- a/meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager_%.bbappend +++ b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager_%.bbappend @@ -8,7 +8,8 @@ SRC_URI_append = " file://0001-Blacklist-DIMM-Bus.patch \ file://CYP-baseboard.json \ file://J85894-HSBP.json \ file://CPC-Baseboard.json \ - file://MIDPLANE-2U2X12SWITCH.json" + file://MIDPLANE-2U2X12SWITCH.json \ + file://WC-Chassis.json" RDEPENDS_${PN} += " default-fru" -- cgit v1.2.3