From c5f8058613ea0a242ccdc744dfceea2c7233f867 Mon Sep 17 00:00:00 2001 From: Sunny Srivastava Date: Tue, 19 Apr 2022 22:25:02 +0530 Subject: meta-ibm: Link PCIeSlots to Processor association This commit is to populate link(s) to processor associated with given PCIeDevice which is established via the assoication with PCIeSlot. https://gerrit.openbmc.org/c/openbmc/phosphor-dbus-interfaces/+/65076 Tested: - dbus has the association between processor and slot ``` /xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot10 \ xyz.openbmc_project.Association.Definitions Associations ... "connected_to" "connecting" "/xyz/openbmc_project/inventory/system/chassis/motherboard/dcm0/cpu0" ``` Change-Id: I983c8444e4e3b206c60cf86c83d5b5cbf575f386 Signed-off-by: Myung Bae --- .../p10bmc/ibm,everest_associations.json | 187 +++++++++++++++++++++ .../p10bmc/ibm,rainier-2u_associations.json | 110 ++++++++++++ .../p10bmc/ibm,rainier-4u_associations.json | 112 +++++++++++- 3 files changed, 408 insertions(+), 1 deletion(-) (limited to 'meta-ibm') 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 c4acef031b..f9d91b3ea0 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 @@ -4637,6 +4637,193 @@ ] } ] + }, + { + "path": "/system/chassis/motherboard/pcieslot1", + "endpoints": + [ + { + "types": + { + "rType": "connecting", + "fType": "connected_to" + }, + "paths": + [ + "/xyz/openbmc_project/inventory/system/chassis/motherboard/dcm0/cpu0" + ] + } + ] + }, + { + "path": "/system/chassis/motherboard/pcieslot2", + "endpoints": + [ + { + "types": + { + "rType": "connecting", + "fType": "connected_to" + }, + "paths": + [ + "/xyz/openbmc_project/inventory/system/chassis/motherboard/dcm2/cpu1" + ] + } + ] + }, + { + "path": "/system/chassis/motherboard/pcieslot3", + "endpoints": + [ + { + "types": + { + "rType": "connecting", + "fType": "connected_to" + }, + "paths": + [ + "/xyz/openbmc_project/inventory/system/chassis/motherboard/dcm2/cpu1" + ] + } + ] + }, + { + "path": "/system/chassis/motherboard/pcieslot4", + "endpoints": + [ + { + "types": + { + "rType": "connecting", + "fType": "connected_to" + }, + "paths": + [ + "/xyz/openbmc_project/inventory/system/chassis/motherboard/dcm2/cpu0" + ] + } + ] + }, + { + "path": "/system/chassis/motherboard/pcieslot5", + "endpoints": + [ + { + "types": + { + "rType": "connecting", + "fType": "connected_to" + }, + "paths": + [ + "/xyz/openbmc_project/inventory/system/chassis/motherboard/dcm2/cpu0" + ] + } + ] + }, + { + "path": "/system/chassis/motherboard/pcieslot6", + "endpoints": + [ + { + "types": + { + "rType": "connecting", + "fType": "connected_to" + }, + "paths": + [ + "/xyz/openbmc_project/inventory/system/chassis/motherboard/dcm1/cpu1" + ] + } + ] + }, + { + "path": "/system/chassis/motherboard/pcieslot7", + "endpoints": + [ + { + "types": + { + "rType": "connecting", + "fType": "connected_to" + }, + "paths": + [ + "/xyz/openbmc_project/inventory/system/chassis/motherboard/dcm1/cpu1" + ] + } + ] + }, + { + "path": "/system/chassis/motherboard/pcieslot8", + "endpoints": + [ + { + "types": + { + "rType": "connecting", + "fType": "connected_to" + }, + "paths": + [ + "/xyz/openbmc_project/inventory/system/chassis/motherboard/dcm1/cpu1" + ] + } + ] + }, + { + "path": "/system/chassis/motherboard/pcieslot9", + "endpoints": + [ + { + "types": + { + "rType": "connecting", + "fType": "connected_to" + }, + "paths": + [ + "/xyz/openbmc_project/inventory/system/chassis/motherboard/dcm1/cpu0" + ] + } + ] + }, + { + "path": "/system/chassis/motherboard/pcieslot10", + "endpoints": + [ + { + "types": + { + "rType": "connecting", + "fType": "connected_to" + }, + "paths": + [ + "/xyz/openbmc_project/inventory/system/chassis/motherboard/dcm1/cpu0" + ] + } + ] + }, + { + "path": "/system/chassis/motherboard/pcieslot11", + "endpoints": + [ + { + "types": + { + "rType": "connecting", + "fType": "connected_to" + }, + "paths": + [ + "/xyz/openbmc_project/inventory/system/chassis/motherboard/dcm1/cpu0" + ] + } + ] } ] } 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 de4334b1e1..e1fd054d07 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 @@ -1881,6 +1881,17 @@ [ "/xyz/openbmc_project/inventory/system/chassis" ] + }, + { + "types": + { + "rType": "connecting", + "fType": "connected_to" + }, + "paths": + [ + "/xyz/openbmc_project/inventory/system/chassis/motherboard/dcm1/cpu1" + ] } ] }, @@ -1920,6 +1931,17 @@ [ "/xyz/openbmc_project/inventory/system/chassis" ] + }, + { + "types": + { + "rType": "connecting", + "fType": "connected_to" + }, + "paths": + [ + "/xyz/openbmc_project/inventory/system/chassis/motherboard/dcm1/cpu1" + ] } ] }, @@ -1959,6 +1981,17 @@ [ "/xyz/openbmc_project/inventory/system/chassis" ] + }, + { + "types": + { + "rType": "connecting", + "fType": "connected_to" + }, + "paths": + [ + "/xyz/openbmc_project/inventory/system/chassis/motherboard/dcm1/cpu1" + ] } ] }, @@ -1998,6 +2031,17 @@ [ "/xyz/openbmc_project/inventory/system/chassis" ] + }, + { + "types": + { + "rType": "connecting", + "fType": "connected_to" + }, + "paths": + [ + "/xyz/openbmc_project/inventory/system/chassis/motherboard/dcm1/cpu0" + ] } ] }, @@ -2037,6 +2081,17 @@ [ "/xyz/openbmc_project/inventory/system/chassis" ] + }, + { + "types": + { + "rType": "connecting", + "fType": "connected_to" + }, + "paths": + [ + "/xyz/openbmc_project/inventory/system/chassis/motherboard/dcm1/cpu0" + ] } ] }, @@ -2115,6 +2170,17 @@ [ "/xyz/openbmc_project/inventory/system/chassis" ] + }, + { + "types": + { + "rType": "connecting", + "fType": "connected_to" + }, + "paths": + [ + "/xyz/openbmc_project/inventory/system/chassis/motherboard/dcm0/cpu1" + ] } ] }, @@ -2154,6 +2220,17 @@ [ "/xyz/openbmc_project/inventory/system/chassis" ] + }, + { + "types": + { + "rType": "connecting", + "fType": "connected_to" + }, + "paths": + [ + "/xyz/openbmc_project/inventory/system/chassis/motherboard/dcm0/cpu1" + ] } ] }, @@ -2193,6 +2270,17 @@ [ "/xyz/openbmc_project/inventory/system/chassis" ] + }, + { + "types": + { + "rType": "connecting", + "fType": "connected_to" + }, + "paths": + [ + "/xyz/openbmc_project/inventory/system/chassis/motherboard/dcm0/cpu1" + ] } ] }, @@ -2232,6 +2320,17 @@ [ "/xyz/openbmc_project/inventory/system/chassis" ] + }, + { + "types": + { + "rType": "connecting", + "fType": "connected_to" + }, + "paths": + [ + "/xyz/openbmc_project/inventory/system/chassis/motherboard/dcm0/cpu0" + ] } ] }, @@ -2271,6 +2370,17 @@ [ "/xyz/openbmc_project/inventory/system/chassis" ] + }, + { + "types": + { + "rType": "connecting", + "fType": "connected_to" + }, + "paths": + [ + "/xyz/openbmc_project/inventory/system/chassis/motherboard/dcm0/cpu0" + ] } ] }, 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 107727ceaa..84cb0ba30b 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 @@ -1995,7 +1995,18 @@ [ "/xyz/openbmc_project/inventory/system/chassis" ] - } + }, + { + "types": + { + "rType": "connecting", + "fType": "connected_to" + }, + "paths": + [ + "/xyz/openbmc_project/inventory/system/chassis/motherboard/dcm1/cpu1" + ] + } ] }, { @@ -2034,6 +2045,17 @@ [ "/xyz/openbmc_project/inventory/system/chassis" ] + }, + { + "types": + { + "rType": "connecting", + "fType": "connected_to" + }, + "paths": + [ + "/xyz/openbmc_project/inventory/system/chassis/motherboard/dcm1/cpu1" + ] } ] }, @@ -2073,6 +2095,17 @@ [ "/xyz/openbmc_project/inventory/system/chassis" ] + }, + { + "types": + { + "rType": "connecting", + "fType": "connected_to" + }, + "paths": + [ + "/xyz/openbmc_project/inventory/system/chassis/motherboard/dcm1/cpu1" + ] } ] }, @@ -2112,6 +2145,17 @@ [ "/xyz/openbmc_project/inventory/system/chassis" ] + }, + { + "types": + { + "rType": "connecting", + "fType": "connected_to" + }, + "paths": + [ + "/xyz/openbmc_project/inventory/system/chassis/motherboard/dcm1/cpu0" + ] } ] }, @@ -2151,6 +2195,17 @@ [ "/xyz/openbmc_project/inventory/system/chassis" ] + }, + { + "types": + { + "rType": "connecting", + "fType": "connected_to" + }, + "paths": + [ + "/xyz/openbmc_project/inventory/system/chassis/motherboard/dcm1/cpu0" + ] } ] }, @@ -2229,6 +2284,17 @@ [ "/xyz/openbmc_project/inventory/system/chassis" ] + }, + { + "types": + { + "rType": "connecting", + "fType": "connected_to" + }, + "paths": + [ + "/xyz/openbmc_project/inventory/system/chassis/motherboard/dcm0/cpu1" + ] } ] }, @@ -2268,6 +2334,17 @@ [ "/xyz/openbmc_project/inventory/system/chassis" ] + }, + { + "types": + { + "rType": "connecting", + "fType": "connected_to" + }, + "paths": + [ + "/xyz/openbmc_project/inventory/system/chassis/motherboard/dcm0/cpu1" + ] } ] }, @@ -2307,6 +2384,17 @@ [ "/xyz/openbmc_project/inventory/system/chassis" ] + }, + { + "types": + { + "rType": "connecting", + "fType": "connected_to" + }, + "paths": + [ + "/xyz/openbmc_project/inventory/system/chassis/motherboard/dcm0/cpu1" + ] } ] }, @@ -2346,6 +2434,17 @@ [ "/xyz/openbmc_project/inventory/system/chassis" ] + }, + { + "types": + { + "rType": "connecting", + "fType": "connected_to" + }, + "paths": + [ + "/xyz/openbmc_project/inventory/system/chassis/motherboard/dcm0/cpu0" + ] } ] }, @@ -2385,6 +2484,17 @@ [ "/xyz/openbmc_project/inventory/system/chassis" ] + }, + { + "types": + { + "rType": "connecting", + "fType": "connected_to" + }, + "paths": + [ + "/xyz/openbmc_project/inventory/system/chassis/motherboard/dcm0/cpu0" + ] } ] }, -- cgit v1.2.3