From ff916a657cf783752f0df985306f305f15cdb277 Mon Sep 17 00:00:00 2001 From: Matt Spinler Date: Fri, 4 Feb 2022 16:21:59 -0600 Subject: ibm:p10bmc: Add some sensor inventory assocs Add the associations from the sensors on the panel and the sensors on the motherboard to their parent FRUs in the inventory. The chassis association isn't needed here because hwmontempsensor already creates it. The association will be used for sensor callouts. Signed-off-by: Matt Spinler Change-Id: I4292646b0b101608f2bcd4c2d0f65e13f16d3d87 --- .../p10bmc/ibm,everest_associations.json | 77 +++++++++++++++------- .../p10bmc/ibm,rainier-2u_associations.json | 27 ++++++++ .../p10bmc/ibm,rainier-4u_associations.json | 27 ++++++++ 3 files changed, 106 insertions(+), 25 deletions(-) (limited to 'meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager') diff --git a/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager/p10bmc/ibm,everest_associations.json b/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager/p10bmc/ibm,everest_associations.json index 8693e7d1d0..81ad07069a 100644 --- a/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager/p10bmc/ibm,everest_associations.json +++ b/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager/p10bmc/ibm,everest_associations.json @@ -1289,6 +1289,18 @@ [ "/xyz/openbmc_project/led/groups/planar_identify" ] + }, + { + "types": + { + "rType": "inventory", + "fType": "sensors" + }, + "paths": + [ + "/xyz/openbmc_project/sensors/temperature/PCIE_0_Temp", + "/xyz/openbmc_project/sensors/temperature/PCIE_1_Temp" + ] } ] }, @@ -4344,33 +4356,48 @@ } ] }, - { + { "path": "system/chassis/motherboard/dasd_backplane/panel0", - "endpoints": - [ - { - "types": - { - "rType": "fault_inventory_object", - "fType": "fault_led_group" - }, - "paths": - [ + "endpoints": + [ + { + "types": + { + "rType": "fault_inventory_object", + "fType": "fault_led_group" + }, + "paths": + [ "/xyz/openbmc_project/led/groups/op_panel_base_fault" - ] - }, - { - "types": - { - "rType": "identify_inventory_object", - "fType": "identify_led_group" - }, - "paths": - [ + ] + }, + { + "types": + { + "rType": "identify_inventory_object", + "fType": "identify_led_group" + }, + "paths": + [ "/xyz/openbmc_project/led/groups/op_panel_base_identify" ] - } - ] + }, + { + "types": + { + "rType": "inventory", + "fType": "sensors" + }, + "paths": + [ + "/xyz/openbmc_project/sensors/temperature/Ambient_0_Temp", + "/xyz/openbmc_project/sensors/temperature/Ambient_1_Temp", + "/xyz/openbmc_project/sensors/temperature/Ambient_2_Temp", + "/xyz/openbmc_project/sensors/pressure/Station_Pressure", + "/xyz/openbmc_project/sensors/humidity/Relative_Humidity" + ] + } + ] } - ] -} + ] +} diff --git a/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager/p10bmc/ibm,rainier-2u_associations.json b/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager/p10bmc/ibm,rainier-2u_associations.json index 2ea36bc672..9193d0f15f 100644 --- a/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager/p10bmc/ibm,rainier-2u_associations.json +++ b/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager/p10bmc/ibm,rainier-2u_associations.json @@ -442,6 +442,18 @@ [ "/xyz/openbmc_project/led/groups/planar_identify" ] + }, + { + "types": + { + "rType": "inventory", + "fType": "sensors" + }, + "paths": + [ + "/xyz/openbmc_project/sensors/temperature/PCIE_0_Temp", + "/xyz/openbmc_project/sensors/temperature/PCIE_1_Temp" + ] } ] }, @@ -470,6 +482,21 @@ [ "/xyz/openbmc_project/led/groups/base_blyth_identify" ] + }, + { + "types": + { + "rType": "inventory", + "fType": "sensors" + }, + "paths": + [ + "/xyz/openbmc_project/sensors/temperature/Ambient_0_Temp", + "/xyz/openbmc_project/sensors/temperature/Ambient_1_Temp", + "/xyz/openbmc_project/sensors/temperature/Ambient_2_Temp", + "/xyz/openbmc_project/sensors/pressure/Station_Pressure", + "/xyz/openbmc_project/sensors/humidity/Relative_Humidity" + ] } ] }, diff --git a/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager/p10bmc/ibm,rainier-4u_associations.json b/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager/p10bmc/ibm,rainier-4u_associations.json index 6d9bc42f12..b08f1f3984 100644 --- a/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager/p10bmc/ibm,rainier-4u_associations.json +++ b/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager/p10bmc/ibm,rainier-4u_associations.json @@ -508,6 +508,18 @@ [ "/xyz/openbmc_project/led/groups/planar_identify" ] + }, + { + "types": + { + "rType": "inventory", + "fType": "sensors" + }, + "paths": + [ + "/xyz/openbmc_project/sensors/temperature/PCIE_0_Temp", + "/xyz/openbmc_project/sensors/temperature/PCIE_1_Temp" + ] } ] }, @@ -536,6 +548,21 @@ [ "/xyz/openbmc_project/led/groups/base_blyth_identify" ] + }, + { + "types": + { + "rType": "inventory", + "fType": "sensors" + }, + "paths": + [ + "/xyz/openbmc_project/sensors/temperature/Ambient_0_Temp", + "/xyz/openbmc_project/sensors/temperature/Ambient_1_Temp", + "/xyz/openbmc_project/sensors/temperature/Ambient_2_Temp", + "/xyz/openbmc_project/sensors/pressure/Station_Pressure", + "/xyz/openbmc_project/sensors/humidity/Relative_Humidity" + ] } ] }, -- cgit v1.2.3