From f6212f040dcf82e1dc1d8001db91dda235acce97 Mon Sep 17 00:00:00 2001 From: George Liu Date: Tue, 4 Aug 2020 16:18:15 +0800 Subject: fp5280g2: Fix FRU property interfaces MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit For the Cpu and Dimm's interface(xyz.openbmc_project.Inventory.Item.Cpu and xyz.openbmc_project.Inventory.Item.Dimm), should be defined in the fp5280g2-ipmi-fru.yaml instead of the fp5280g2-ipmi-fru-properties.yaml file. Tested: busctl --no-pager introspect xyz.openbmc_project.Inventory.Manager /xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0 NAME TYPE SIGNATURE RESULT/VALUE FLAGS org.freedesktop.DBus.Introspectable interface - - - .Introspect method - s - org.freedesktop.DBus.Peer interface - - - .GetMachineId method - s - .Ping method - - - org.freedesktop.DBus.Properties interface - - - .Get method ss v - .GetAll method s a{sv} - .Set method ssv - - .PropertiesChanged signal sa{sv}as - - xyz.openbmc_project.Inventory.Decorator.Asset interface - - - .BuildDate property s "1996-01-01 - 00:00:00" emits-change writable .Manufacturer property s "IBM" emits-change writable .Model property s "" emits-change writable .PartNumber property s "02CY415" emits-change writable .SerialNumber property s "YA1934319126" emits-change writable xyz.openbmc_project.Inventory.Decorator.Cacheable interface - - - .Cached property b true emits-change writable xyz.openbmc_project.Inventory.Decorator.Replaceable interface - - - .FieldReplaceable property b true emits-change writable xyz.openbmc_project.Inventory.Decorator.Revision interface - - - .Version property s "22" emits-change writable xyz.openbmc_project.Inventory.Item interface - - - .Present property b true emits-change writable .PrettyName property s "PROCESSOR MODULE" emits-change writable xyz.openbmc_project.Inventory.Item.Cpu interface - - - xyz.openbmc_project.State.Decorator.OperationalStatus interface - - - .Functional property b true emits-change writable busctl --no-pager introspect xyz.openbmc_project.Inventory.Manager /xyz/openbmc_project/inventory/system/chassis/motherboard/dimm0 NAME TYPE SIGNATURE RESULT/VALUE FLAGS org.freedesktop.DBus.Introspectable interface - - - .Introspect method - s - org.freedesktop.DBus.Peer interface - - - .GetMachineId method - s - .Ping method - - - org.freedesktop.DBus.Properties interface - - - .Get method ss v - .GetAll method s a{sv} - .Set method ssv - - .PropertiesChanged signal sa{sv}as - - xyz.openbmc_project.Inventory.Decorator.Asset interface - - - .BuildDate property s "" emits-change writable .Manufacturer property s "SK Hynix" emits-change writable .Model property s "HMA84GR7JJR4N-WM " emits-change writable .PartNumber property s "" emits-change writable .SerialNumber property s "0x537f68b1" emits-change writable xyz.openbmc_project.Inventory.Decorator.Cacheable interface - - - .Cached property b true emits-change writable xyz.openbmc_project.Inventory.Decorator.Replaceable interface - - - .FieldReplaceable property b true emits-change writable xyz.openbmc_project.Inventory.Decorator.Revision interface - - - .Version property s "" emits-change writable xyz.openbmc_project.Inventory.Item interface - - - .Present property b true emits-change writable .PrettyName property s "DDR4-2666 32GiB 64-bit ECC RDIMM" emits-change writable xyz.openbmc_project.Inventory.Item.Dimm interface - - - .AllowedSpeedsMT property aq 0 emits-change writable .CASLatencies property q 0 emits-change writable .ECC property s "xyz.openbmc_project.Inventory.Item.Dim… emits-change writable .FormFactor property s "xyz.openbmc_project.Inventory.Item.Dim… emits-change writable .MaxMemorySpeedInMhz property q 0 emits-change writable .MemoryAttributes property y 0 emits-change writable .MemoryConfiguredSpeedInMhz property q 0 emits-change writable .MemoryDataWidth property q 0 emits-change writable .MemoryDeviceLocator property s "" emits-change writable .MemorySizeInKB property u 0 emits-change writable .MemoryTotalWidth property q 0 emits-change writable .MemoryType property s "xyz.openbmc_project.Inventory.Item.Dim… emits-change writable .MemoryTypeDetail property s "" emits-change writable .RevisionCode property q 0 emits-change writable xyz.openbmc_project.State.Decorator.OperationalStatus interface - - - .Functional property b true emits-change writable (From meta-inspur rev: 323e5dd3bb9ad6dd87ea6bb59f27b2562fcf4a7d) Signed-off-by: George Liu Change-Id: I23ffd5fea6ab9f9057e0b72b87c1e6cd6ff5f430 Signed-off-by: Andrew Geissler --- .../fp5280g2-ipmi-fru-properties.yaml | 36 ++++++++++---------- .../fp5280g2-yaml-config/fp5280g2-ipmi-fru.yaml | 39 ++++++++++++++++++++-- 2 files changed, 55 insertions(+), 20 deletions(-) (limited to 'meta-inspur/meta-fp5280g2') diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/configuration/fp5280g2-yaml-config/fp5280g2-ipmi-fru-properties.yaml b/meta-inspur/meta-fp5280g2/recipes-phosphor/configuration/fp5280g2-yaml-config/fp5280g2-ipmi-fru-properties.yaml index c444504604..a4eab8a6db 100644 --- a/meta-inspur/meta-fp5280g2/recipes-phosphor/configuration/fp5280g2-yaml-config/fp5280g2-ipmi-fru-properties.yaml +++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/configuration/fp5280g2-yaml-config/fp5280g2-ipmi-fru-properties.yaml @@ -17,124 +17,124 @@ Cached: 'true' xyz.openbmc_project.Inventory.Decorator.Replaceable: FieldReplaceable: 'true' - xyz.openbmc_project.Inventory.Item.Cpu: + xyz.openbmc_project.Inventory.Item: Present: 'true' /system/chassis/motherboard/cpu1: xyz.openbmc_project.Inventory.Decorator.Cacheable: Cached: 'true' xyz.openbmc_project.Inventory.Decorator.Replaceable: FieldReplaceable: 'true' - xyz.openbmc_project.Inventory.Item.Cpu: + xyz.openbmc_project.Inventory.Item: Present: 'true' /system/chassis/motherboard/dimm0: xyz.openbmc_project.Inventory.Decorator.Cacheable: Cached: 'true' xyz.openbmc_project.Inventory.Decorator.Replaceable: FieldReplaceable: 'true' - xyz.openbmc_project.Inventory.Item.Dimm: + xyz.openbmc_project.Inventory.Item: Present: 'true' /system/chassis/motherboard/dimm1: xyz.openbmc_project.Inventory.Decorator.Cacheable: Cached: 'true' xyz.openbmc_project.Inventory.Decorator.Replaceable: FieldReplaceable: 'true' - xyz.openbmc_project.Inventory.Item.Dimm: + xyz.openbmc_project.Inventory.Item: Present: 'true' /system/chassis/motherboard/dimm10: xyz.openbmc_project.Inventory.Decorator.Cacheable: Cached: 'true' xyz.openbmc_project.Inventory.Decorator.Replaceable: FieldReplaceable: 'true' - xyz.openbmc_project.Inventory.Item.Dimm: + xyz.openbmc_project.Inventory.Item: Present: 'true' /system/chassis/motherboard/dimm11: xyz.openbmc_project.Inventory.Decorator.Cacheable: Cached: 'true' xyz.openbmc_project.Inventory.Decorator.Replaceable: FieldReplaceable: 'true' - xyz.openbmc_project.Inventory.Item.Dimm: + xyz.openbmc_project.Inventory.Item: Present: 'true' /system/chassis/motherboard/dimm12: xyz.openbmc_project.Inventory.Decorator.Cacheable: Cached: 'true' xyz.openbmc_project.Inventory.Decorator.Replaceable: FieldReplaceable: 'true' - xyz.openbmc_project.Inventory.Item.Dimm: + xyz.openbmc_project.Inventory.Item: Present: 'true' /system/chassis/motherboard/dimm13: xyz.openbmc_project.Inventory.Decorator.Cacheable: Cached: 'true' xyz.openbmc_project.Inventory.Decorator.Replaceable: FieldReplaceable: 'true' - xyz.openbmc_project.Inventory.Item.Dimm: + xyz.openbmc_project.Inventory.Item: Present: 'true' /system/chassis/motherboard/dimm14: xyz.openbmc_project.Inventory.Decorator.Cacheable: Cached: 'true' xyz.openbmc_project.Inventory.Decorator.Replaceable: FieldReplaceable: 'true' - xyz.openbmc_project.Inventory.Item.Dimm: + xyz.openbmc_project.Inventory.Item: Present: 'true' /system/chassis/motherboard/dimm15: xyz.openbmc_project.Inventory.Decorator.Cacheable: Cached: 'true' xyz.openbmc_project.Inventory.Decorator.Replaceable: FieldReplaceable: 'true' - xyz.openbmc_project.Inventory.Item.Dimm: + xyz.openbmc_project.Inventory.Item: Present: 'true' /system/chassis/motherboard/dimm2: xyz.openbmc_project.Inventory.Decorator.Cacheable: Cached: 'true' xyz.openbmc_project.Inventory.Decorator.Replaceable: FieldReplaceable: 'true' - xyz.openbmc_project.Inventory.Item.Dimm: + xyz.openbmc_project.Inventory.Item: Present: 'true' /system/chassis/motherboard/dimm3: xyz.openbmc_project.Inventory.Decorator.Cacheable: Cached: 'true' xyz.openbmc_project.Inventory.Decorator.Replaceable: FieldReplaceable: 'true' - xyz.openbmc_project.Inventory.Item.Dimm: + xyz.openbmc_project.Inventory.Item: Present: 'true' /system/chassis/motherboard/dimm4: xyz.openbmc_project.Inventory.Decorator.Cacheable: Cached: 'true' xyz.openbmc_project.Inventory.Decorator.Replaceable: FieldReplaceable: 'true' - xyz.openbmc_project.Inventory.Item.Dimm: + xyz.openbmc_project.Inventory.Item: Present: 'true' /system/chassis/motherboard/dimm5: xyz.openbmc_project.Inventory.Decorator.Cacheable: Cached: 'true' xyz.openbmc_project.Inventory.Decorator.Replaceable: FieldReplaceable: 'true' - xyz.openbmc_project.Inventory.Item.Dimm: + xyz.openbmc_project.Inventory.Item: Present: 'true' /system/chassis/motherboard/dimm6: xyz.openbmc_project.Inventory.Decorator.Cacheable: Cached: 'true' xyz.openbmc_project.Inventory.Decorator.Replaceable: FieldReplaceable: 'true' - xyz.openbmc_project.Inventory.Item.Dimm: + xyz.openbmc_project.Inventory.Item: Present: 'true' /system/chassis/motherboard/dimm7: xyz.openbmc_project.Inventory.Decorator.Cacheable: Cached: 'true' xyz.openbmc_project.Inventory.Decorator.Replaceable: FieldReplaceable: 'true' - xyz.openbmc_project.Inventory.Item.Dimm: + xyz.openbmc_project.Inventory.Item: Present: 'true' /system/chassis/motherboard/dimm8: xyz.openbmc_project.Inventory.Decorator.Cacheable: Cached: 'true' xyz.openbmc_project.Inventory.Decorator.Replaceable: FieldReplaceable: 'true' - xyz.openbmc_project.Inventory.Item.Dimm: + xyz.openbmc_project.Inventory.Item: Present: 'true' /system/chassis/motherboard/dimm9: xyz.openbmc_project.Inventory.Decorator.Cacheable: Cached: 'true' xyz.openbmc_project.Inventory.Decorator.Replaceable: FieldReplaceable: 'true' - xyz.openbmc_project.Inventory.Item.Dimm: + xyz.openbmc_project.Inventory.Item: Present: 'true' diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/configuration/fp5280g2-yaml-config/fp5280g2-ipmi-fru.yaml b/meta-inspur/meta-fp5280g2/recipes-phosphor/configuration/fp5280g2-yaml-config/fp5280g2-ipmi-fru.yaml index 19859fb2f0..7fc2d157f8 100644 --- a/meta-inspur/meta-fp5280g2/recipes-phosphor/configuration/fp5280g2-yaml-config/fp5280g2-ipmi-fru.yaml +++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/configuration/fp5280g2-yaml-config/fp5280g2-ipmi-fru.yaml @@ -25,6 +25,7 @@ PrettyName: IPMIFruProperty: Name IPMIFruSection: Board + xyz.openbmc_project.Inventory.Item.Cpu: 2: /system/chassis/motherboard/cpu1: entityID: 3 @@ -53,18 +54,36 @@ IPMIFruProperty: Name IPMIFruSection: Board Value: false + xyz.openbmc_project.Inventory.Item.Cpu: 3: /system: entityID: 6 entityInstance: 1 interfaces: xyz.openbmc_project.Inventory.Decorator.Asset: + BuildDate: + IPMIFruProperty: Mfg Date + IPMIFruSection: Product + Manufacturer: + IPMIFruProperty: Manufacturer + IPMIFruSection: Product Model: + IPMIFruProperty: Model Number + IPMIFruSection: Product + PartNumber: IPMIFruProperty: Part Number - IPMIFruSection: Chassis + IPMIFruSection: Product SerialNumber: IPMIFruProperty: Serial Number - IPMIFruSection: Chassis + IPMIFruSection: Product + xyz.openbmc_project.Inventory.Decorator.Revision: + Version: + IPMIFruProperty: Version + xyz.openbmc_project.Inventory.Item: + PrettyName: + IPMIFruProperty: Name + IPMIFruSection: Product + xyz.openbmc_project.Inventory.Item.System: /system/chassis/motherboard/bmc: entityID: 7 entityInstance: 1 @@ -114,6 +133,7 @@ PrettyName: IPMIFruProperty: Name IPMIFruSection: Product + xyz.openbmc_project.Inventory.Item.Dimm: 5: /system/chassis/motherboard/dimm1: entityID: 32 @@ -142,6 +162,7 @@ PrettyName: IPMIFruProperty: Name IPMIFruSection: Product + xyz.openbmc_project.Inventory.Item.Dimm: 6: /system/chassis/motherboard/dimm2: entityID: 32 @@ -170,6 +191,7 @@ PrettyName: IPMIFruProperty: Name IPMIFruSection: Product + xyz.openbmc_project.Inventory.Item.Dimm: 7: /system/chassis/motherboard/dimm3: entityID: 32 @@ -198,6 +220,7 @@ PrettyName: IPMIFruProperty: Name IPMIFruSection: Product + xyz.openbmc_project.Inventory.Item.Dimm: 8: /system/chassis/motherboard/dimm4: entityID: 32 @@ -226,6 +249,7 @@ PrettyName: IPMIFruProperty: Name IPMIFruSection: Product + xyz.openbmc_project.Inventory.Item.Dimm: 9: /system/chassis/motherboard/dimm5: entityID: 32 @@ -254,6 +278,7 @@ PrettyName: IPMIFruProperty: Name IPMIFruSection: Product + xyz.openbmc_project.Inventory.Item.Dimm: 10: /system/chassis/motherboard/dimm6: entityID: 32 @@ -282,6 +307,7 @@ PrettyName: IPMIFruProperty: Name IPMIFruSection: Product + xyz.openbmc_project.Inventory.Item.Dimm: 11: /system/chassis/motherboard/dimm7: entityID: 32 @@ -310,6 +336,7 @@ PrettyName: IPMIFruProperty: Name IPMIFruSection: Product + xyz.openbmc_project.Inventory.Item.Dimm: 12: /system/chassis/motherboard/dimm8: entityID: 32 @@ -338,6 +365,7 @@ PrettyName: IPMIFruProperty: Name IPMIFruSection: Product + xyz.openbmc_project.Inventory.Item.Dimm: 13: /system/chassis/motherboard/dimm9: entityID: 32 @@ -366,6 +394,7 @@ PrettyName: IPMIFruProperty: Name IPMIFruSection: Product + xyz.openbmc_project.Inventory.Item.Dimm: 14: /system/chassis/motherboard/dimm10: entityID: 32 @@ -394,6 +423,7 @@ PrettyName: IPMIFruProperty: Name IPMIFruSection: Product + xyz.openbmc_project.Inventory.Item.Dimm: 15: /system/chassis/motherboard/dimm11: entityID: 32 @@ -422,6 +452,7 @@ PrettyName: IPMIFruProperty: Name IPMIFruSection: Product + xyz.openbmc_project.Inventory.Item.Dimm: 16: /system/chassis/motherboard/dimm12: entityID: 32 @@ -450,6 +481,7 @@ PrettyName: IPMIFruProperty: Name IPMIFruSection: Product + xyz.openbmc_project.Inventory.Item.Dimm: 17: /system/chassis/motherboard/dimm13: entityID: 32 @@ -478,6 +510,7 @@ PrettyName: IPMIFruProperty: Name IPMIFruSection: Product + xyz.openbmc_project.Inventory.Item.Dimm: 18: /system/chassis/motherboard/dimm14: entityID: 32 @@ -506,6 +539,7 @@ PrettyName: IPMIFruProperty: Name IPMIFruSection: Product + xyz.openbmc_project.Inventory.Item.Dimm: 19: /system/chassis/motherboard/dimm15: entityID: 32 @@ -534,6 +568,7 @@ PrettyName: IPMIFruProperty: Name IPMIFruSection: Product + xyz.openbmc_project.Inventory.Item.Dimm: 20: /system/chassis/motherboard/bmc/ethernet: entityID: 7 -- cgit v1.2.3