From e0297579c53a0ea9d6eed0cea9acf00522246c88 Mon Sep 17 00:00:00 2001 From: eportnov Date: Fri, 1 Jul 2022 15:26:12 +0300 Subject: Repair board and chassis --- .../chassis.yaml | 6 +-- .../phosphor-inventory-manager-cpu/cpu.yaml | 28 +++++++------- .../phosphor-inventory-manager-dimm/dimm.yaml | 22 +++++------ .../phosphor-inventory-manager-fans/fans.yaml | 10 ++--- .../phosphor-inventory-manager-motherboard.bb | 18 +++++++++ .../motherboard.yaml | 44 ++++++++++++++++++++++ .../phosphor-inventory-manager_%.bbappend | 1 + 7 files changed, 96 insertions(+), 33 deletions(-) create mode 100644 meta-ibs/meta-cp2-5422/recipes-phosphor/inventory/phosphor-inventory-manager-motherboard.bb create mode 100644 meta-ibs/meta-cp2-5422/recipes-phosphor/inventory/phosphor-inventory-manager-motherboard/motherboard.yaml diff --git a/meta-ibs/meta-cp2-5422/recipes-phosphor/inventory/phosphor-inventory-manager-chassis/chassis.yaml b/meta-ibs/meta-cp2-5422/recipes-phosphor/inventory/phosphor-inventory-manager-chassis/chassis.yaml index eb43fc84ae..2eedd401af 100644 --- a/meta-ibs/meta-cp2-5422/recipes-phosphor/inventory/phosphor-inventory-manager-chassis/chassis.yaml +++ b/meta-ibs/meta-cp2-5422/recipes-phosphor/inventory/phosphor-inventory-manager-chassis/chassis.yaml @@ -6,7 +6,7 @@ events: actions: - name: createObjects objs: - /system/board: + /system/chassis: xyz.openbmc_project.Inventory.Item.Chassis: Type: value: "xyz.openbmc_project.Inventory.Item.Chassis.ChassisType.RackMount" @@ -14,7 +14,7 @@ events: - name: createObjects objs: - /system/board: + /system/chassis: xyz.openbmc_project.Inventory.Decorator.Asset: Manufacturer: value: "Manufacturer" @@ -40,7 +40,7 @@ events: - name: createObjects objs: - /system/board: + /system/chassis: xyz.openbmc_project.Inventory.Decorator.AssetTag: AssetTag: value: "AssetTag" diff --git a/meta-ibs/meta-cp2-5422/recipes-phosphor/inventory/phosphor-inventory-manager-cpu/cpu.yaml b/meta-ibs/meta-cp2-5422/recipes-phosphor/inventory/phosphor-inventory-manager-cpu/cpu.yaml index 0d96757f67..d2863b548d 100644 --- a/meta-ibs/meta-cp2-5422/recipes-phosphor/inventory/phosphor-inventory-manager-cpu/cpu.yaml +++ b/meta-ibs/meta-cp2-5422/recipes-phosphor/inventory/phosphor-inventory-manager-cpu/cpu.yaml @@ -6,7 +6,7 @@ events: actions: - name: createObjects objs: - /system/board/cpu0: + /system/chassis/motherboard/cpu0: xyz.openbmc_project.Inventory.Item.Cpu: Socket: value: "FCLGA2011-3" @@ -17,7 +17,7 @@ events: - name: createObjects objs: - /system/board/cpu0: + /system/chassis/motherboard/cpu0: xyz.openbmc_project.Inventory.Decorator.Asset: Manufacturer: value: "Manufacturer" @@ -43,7 +43,7 @@ events: - name: createObjects objs: - /system/board/cpu0: + /system/chassis/motherboard/cpu0: xyz.openbmc_project.Inventory.Decorator.AssetTag: AssetTag: value: "AssetTag" @@ -51,12 +51,12 @@ events: - name: createObjects objs: - /system/board/cpu0/core0: + /system/chassis/motherboard/cpu0/core0: xyz.openbmc_project.Inventory.Item.CpuCore: - name: createObjects objs: - /system/board/cpu0/core0: + /system/chassis/motherboard/cpu0/core0: xyz.openbmc_project.Inventory.Decorator.Asset: Manufacturer: value: "Manufacturer" @@ -66,7 +66,7 @@ events: interface: xyz.openbmc_project.Inventory.Item.Cpu property: EffectiveFamily paths: - - /system/board/cpu0 + - /system/chassis/motherboard/cpu0 value: type: uint16 value: 888 @@ -75,7 +75,7 @@ events: interface: xyz.openbmc_project.Inventory.Item.Cpu property: EffectiveModel paths: - - /system/board/cpu0 + - /system/chassis/motherboard/cpu0 value: type: uint16 value: 321 @@ -84,7 +84,7 @@ events: interface: xyz.openbmc_project.Inventory.Item.Cpu property: Id paths: - - /system/board/cpu0 + - /system/chassis/motherboard/cpu0 value: type: uint64 value: 7008 @@ -93,7 +93,7 @@ events: interface: xyz.openbmc_project.Inventory.Item.Cpu property: MaxSpeedInMhz paths: - - /system/board/cpu0 + - /system/chassis/motherboard/cpu0 value: type: uint32 value: 4200 @@ -102,7 +102,7 @@ events: interface: xyz.openbmc_project.Inventory.Item.Cpu property: CoreCount paths: - - /system/board/cpu0 + - /system/chassis/motherboard/cpu0 value: type: uint16 value: 1234 @@ -111,7 +111,7 @@ events: interface: xyz.openbmc_project.Inventory.Item.Cpu property: ThreadCount paths: - - /system/board/cpu0 + - /system/chassis/motherboard/cpu0 value: type: uint16 value: 152 @@ -120,7 +120,7 @@ events: interface: xyz.openbmc_project.Inventory.Item.Cpu property: Step paths: - - /system/board/cpu0 + - /system/chassis/motherboard/cpu0 value: type: uint16 value: 999 @@ -129,7 +129,7 @@ events: interface: xyz.openbmc_project.Inventory.Item.Cpu property: Microcode paths: - - /system/board/cpu0 + - /system/chassis/motherboard/cpu0 value: type: uint32 value: 111 @@ -138,7 +138,7 @@ events: interface: xyz.openbmc_project.Inventory.Item.CpuCore property: Microcode paths: - - /system/board/cpu0/core0 + - /system/chassis/motherboard/cpu0/core0 value: type: uint32 value: 111 diff --git a/meta-ibs/meta-cp2-5422/recipes-phosphor/inventory/phosphor-inventory-manager-dimm/dimm.yaml b/meta-ibs/meta-cp2-5422/recipes-phosphor/inventory/phosphor-inventory-manager-dimm/dimm.yaml index 7c8d147d66..6331d50b00 100644 --- a/meta-ibs/meta-cp2-5422/recipes-phosphor/inventory/phosphor-inventory-manager-dimm/dimm.yaml +++ b/meta-ibs/meta-cp2-5422/recipes-phosphor/inventory/phosphor-inventory-manager-dimm/dimm.yaml @@ -6,7 +6,7 @@ events: actions: - name: createObjects objs: - /system/board/dimm0: + /system/chassis/motherboard/dimm0: xyz.openbmc_project.Inventory.Item.Dimm: MemoryDeviceLocator: value: "CPU1_DIMM_B1" @@ -17,7 +17,7 @@ events: - name: createObjects objs: - /system/board/dimm0: + /system/chassis/motherboard/dimm0: xyz.openbmc_project.Inventory.Decorator.Asset: Manufacturer: value: "Manufacturer" @@ -43,7 +43,7 @@ events: - name: createObjects objs: - /system/board/dimm0: + /system/chassis/motherboard/dimm0: xyz.openbmc_project.Inventory.Decorator.AssetTag: AssetTag: value: "AssetTag" @@ -53,7 +53,7 @@ events: interface: xyz.openbmc_project.Inventory.Item.Dimm property: MemoryDataWidth paths: - - /system/board/dimm0 + - /system/chassis/motherboard/dimm0 value: type: uint16 value: 256 @@ -62,7 +62,7 @@ events: interface: xyz.openbmc_project.Inventory.Item.Dimm property: MemorySizeInKB paths: - - /system/board/dimm0 + - /system/chassis/motherboard/dimm0 value: type: size value: 32000 @@ -71,7 +71,7 @@ events: interface: xyz.openbmc_project.Inventory.Item.Dimm property: MaxMemorySpeedInMhz paths: - - /system/board/dimm0 + - /system/chassis/motherboard/dimm0 value: type: uint16 value: 2600 @@ -80,7 +80,7 @@ events: interface: xyz.openbmc_project.Inventory.Item.Dimm property: MemoryConfiguredSpeedInMhz paths: - - /system/board/dimm0 + - /system/chassis/motherboard/dimm0 value: type: uint16 value: 2600 @@ -89,7 +89,7 @@ events: interface: xyz.openbmc_project.Inventory.Item.Dimm property: CASLatencies paths: - - /system/board/dimm0 + - /system/chassis/motherboard/dimm0 value: type: uint16 value: 21 @@ -98,7 +98,7 @@ events: interface: xyz.openbmc_project.Inventory.Item.Dimm property: RevisionCode paths: - - /system/board/dimm0 + - /system/chassis/motherboard/dimm0 value: type: uint16 value: 5 @@ -107,7 +107,7 @@ events: interface: xyz.openbmc_project.Inventory.Item.Dimm property: MemoryTotalWidth paths: - - /system/board/dimm0 + - /system/chassis/motherboard/dimm0 value: type: uint16 value: 255 @@ -116,7 +116,7 @@ events: interface: xyz.openbmc_project.Inventory.Item.Dimm property: MemoryAttributes paths: - - /system/board/dimm0 + - /system/chassis/motherboard/dimm0 value: type: byte value: 0x10 diff --git a/meta-ibs/meta-cp2-5422/recipes-phosphor/inventory/phosphor-inventory-manager-fans/fans.yaml b/meta-ibs/meta-cp2-5422/recipes-phosphor/inventory/phosphor-inventory-manager-fans/fans.yaml index de749598fa..1992b6e6f8 100644 --- a/meta-ibs/meta-cp2-5422/recipes-phosphor/inventory/phosphor-inventory-manager-fans/fans.yaml +++ b/meta-ibs/meta-cp2-5422/recipes-phosphor/inventory/phosphor-inventory-manager-fans/fans.yaml @@ -6,13 +6,13 @@ events: actions: - name: createObjects objs: - /system/board/fan0: + /system/chassis/motherboard/fan0: xyz.openbmc_project.Inventory.Item.Fan: - /system/board/fan1: + /system/chassis/motherboard/fan1: xyz.openbmc_project.Inventory.Item.Fan: - /system/board/fan2: + /system/chassis/motherboard/fan2: xyz.openbmc_project.Inventory.Item.Fan: - /system/board/fan3: + /system/chassis/motherboard/fan3: xyz.openbmc_project.Inventory.Item.Fan: - /system/board/fan4: + /system/chassis/motherboard/fan4: xyz.openbmc_project.Inventory.Item.Fan: diff --git a/meta-ibs/meta-cp2-5422/recipes-phosphor/inventory/phosphor-inventory-manager-motherboard.bb b/meta-ibs/meta-cp2-5422/recipes-phosphor/inventory/phosphor-inventory-manager-motherboard.bb new file mode 100644 index 0000000000..18817f5b13 --- /dev/null +++ b/meta-ibs/meta-cp2-5422/recipes-phosphor/inventory/phosphor-inventory-manager-motherboard.bb @@ -0,0 +1,18 @@ +SUMMARY = "Add Dimm interface for inventory manager" +PR = "r1" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" + +inherit allarch +inherit phosphor-inventory-manager + +PROVIDES += "virtual/phosphor-inventory-manager-motherboard" +S = "${WORKDIR}" + +SRC_URI = "file://motherboard.yaml" + +do_install() { + install -D motherboard.yaml ${D}${base_datadir}/events.d/motherboard.yaml +} + +FILES:${PN} += "${base_datadir}/events.d/motherboard.yaml" diff --git a/meta-ibs/meta-cp2-5422/recipes-phosphor/inventory/phosphor-inventory-manager-motherboard/motherboard.yaml b/meta-ibs/meta-cp2-5422/recipes-phosphor/inventory/phosphor-inventory-manager-motherboard/motherboard.yaml new file mode 100644 index 0000000000..57d6085144 --- /dev/null +++ b/meta-ibs/meta-cp2-5422/recipes-phosphor/inventory/phosphor-inventory-manager-motherboard/motherboard.yaml @@ -0,0 +1,44 @@ +events: + - name: Add Chassis interface + description: > + Add the chassis interface on the chassis inventory path + type: startup + actions: + - name: createObjects + objs: + /system/chassis/motherboard: + xyz.openbmc_project.Inventory.Item.Board.Motherboard: + + - name: createObjects + objs: + /system/chassis/motherboard: + xyz.openbmc_project.Inventory.Decorator.Asset: + Manufacturer: + value: "Manufacturer" + type: string + PartNumber: + value: "PartNumber" + type: string + SerialNumber: + value: "SerialNumber" + type: string + BuildDate: + value: "BuildDate" + type: string + Model: + value: "Model" + type: string + SubModel: + value: "SubModel" + type: string + SparePartNumber: + value: "SparePartNumber" + type: string + + - name: createObjects + objs: + /system/chassis/motherboard: + xyz.openbmc_project.Inventory.Decorator.AssetTag: + AssetTag: + value: "AssetTag" + type: string diff --git a/meta-ibs/meta-cp2-5422/recipes-phosphor/inventory/phosphor-inventory-manager_%.bbappend b/meta-ibs/meta-cp2-5422/recipes-phosphor/inventory/phosphor-inventory-manager_%.bbappend index 3410c0c1c3..2ac4350e7d 100644 --- a/meta-ibs/meta-cp2-5422/recipes-phosphor/inventory/phosphor-inventory-manager_%.bbappend +++ b/meta-ibs/meta-cp2-5422/recipes-phosphor/inventory/phosphor-inventory-manager_%.bbappend @@ -3,6 +3,7 @@ PACKAGECONFIG:append = " associations" SRC_URI += " file://associations.json" DEPENDS += " phosphor-inventory-manager-chassis" +DEPENDS += " phosphor-inventory-manager-motherboard" DEPENDS += " phosphor-inventory-manager-cpu" DEPENDS += " phosphor-inventory-manager-dimm" DEPENDS += " phosphor-inventory-manager-fans" -- cgit v1.2.3