diff options
| author | Ed Tanous <ed.tanous@intel.com> | 2019-07-31 20:59:18 +0300 |
|---|---|---|
| committer | Ed Tanous <ed.tanous@intel.com> | 2019-07-31 20:59:18 +0300 |
| commit | b4f66bacb1b8e661d794fa7a189e2f66f5092e2e (patch) | |
| tree | 5a8302cd349fdb68dadca003483c61917d4a6add /meta-ibm | |
| parent | 43a183cc0926da36e3a218efa02ab4838ace316f (diff) | |
| parent | dd755025e33af27b059ea7ef3afbe850e4880b08 (diff) | |
| download | openbmc-b4f66bacb1b8e661d794fa7a189e2f66f5092e2e.tar.xz | |
Merge branch 'master' of ssh://git-amr-1.devtools.intel.com:29418/openbmc-openbmc into intel
Diffstat (limited to 'meta-ibm')
121 files changed, 3931 insertions, 7529 deletions
diff --git a/meta-ibm/meta-palmetto/conf/machine/palmetto.conf b/meta-ibm/meta-palmetto/conf/machine/palmetto.conf index 66be1e2cb..9e1c123ae 100644 --- a/meta-ibm/meta-palmetto/conf/machine/palmetto.conf +++ b/meta-ibm/meta-palmetto/conf/machine/palmetto.conf @@ -17,6 +17,5 @@ PHOSPHOR_MRW_LIC_FILES_CHKSUM = "file://LICENSE;md5=d2794c0df5b907fdace235a619d8 PHOSPHOR_MRW_URI = "git://github.com/open-power/palmetto-xml" PHOSPHOR_MRW_REV = "82818682f2c2009c30d700df6d5f8897a3096e4f" -PREFERRED_PROVIDER_virtual/phosphor-ipmi-fru-inventory = "palmetto-ipmi-inventory-map-native" PREFERRED_PROVIDER_virtual/phosphor-led-manager-config-native = "palmetto-led-manager-config-native" PREFERRED_PROVIDER_virtual/openpower-occ-control-config-native = "palmetto-occ-control-config-native" diff --git a/meta-ibm/meta-palmetto/recipes-phosphor/ipmi/palmetto-ipmi-inventory-map-native.bb b/meta-ibm/meta-palmetto/recipes-phosphor/ipmi/palmetto-ipmi-inventory-map-native.bb deleted file mode 100644 index 8e328d846..000000000 --- a/meta-ibm/meta-palmetto/recipes-phosphor/ipmi/palmetto-ipmi-inventory-map-native.bb +++ /dev/null @@ -1,24 +0,0 @@ -SUMMARY = "Palmetto IPMI to DBus Inventory mapping." -PR = "r1" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${IBMBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" - -inherit native -inherit phosphor-ipmi-fru - -SRC_URI += "file://config.yaml" - -PROVIDES += "virtual/phosphor-ipmi-fru-inventory" - -S = "${WORKDIR}" - -do_install() { - # TODO: install this to inventory_datadir - # after ipmi-fru-parser untangles the host - # firmware config from the machine inventory. - DEST=${D}${config_datadir} - - install -d ${DEST} - install config.yaml ${DEST} -} - diff --git a/meta-ibm/meta-palmetto/recipes-phosphor/ipmi/palmetto-ipmi-inventory-map/config.yaml b/meta-ibm/meta-palmetto/recipes-phosphor/ipmi/palmetto-ipmi-inventory-map/config.yaml deleted file mode 100644 index cade45ec8..000000000 --- a/meta-ibm/meta-palmetto/recipes-phosphor/ipmi/palmetto-ipmi-inventory-map/config.yaml +++ /dev/null @@ -1,220 +0,0 @@ -1: - /system/chassis/motherboard/cpu0: - entityID: 3 - entityInstance: 1 - interfaces: - xyz.openbmc_project.Inventory.Decorator.Revision: - Version: - IPMIFruProperty: Custom Field 2 - IPMIFruSection: Board - IPMIFruValueDelimiter: 58 - xyz.openbmc_project.Inventory.Decorator.Asset: - BuildDate: - IPMIFruProperty: Mfg Date - IPMIFruSection: Board - PartNumber: - IPMIFruProperty: Part Number - IPMIFruSection: Board - Manufacturer: - IPMIFruProperty: Manufacturer - IPMIFruSection: Board - SerialNumber: - IPMIFruProperty: Serial Number - IPMIFruSection: Board - xyz.openbmc_project.Inventory.Item: - PrettyName: - IPMIFruProperty: Name - IPMIFruSection: Board -2: - /system/chassis: - entityID: 23 - entityInstance: 1 - interfaces: - xyz.openbmc_project.Inventory.Decorator.Asset: - SerialNumber: - IPMIFruProperty: Serial Number - IPMIFruSection: Chassis - Model: - IPMIFruProperty: Part Number - IPMIFruSection: Chassis - - /system/chassis/motherboard/membuf: - entityID: 23 - entityInstance: 1 - interfaces: - xyz.openbmc_project.Inventory.Decorator.Asset: - BuildDate: - IPMIFruProperty: Mfg Date - IPMIFruSection: Board - PartNumber: - IPMIFruProperty: Part Number - IPMIFruSection: Board - Manufacturer: - IPMIFruProperty: Manufacturer - IPMIFruSection: Board - SerialNumber: - IPMIFruProperty: Serial Number - IPMIFruSection: Board - xyz.openbmc_project.Inventory.Item: - PrettyName: - IPMIFruProperty: Name - IPMIFruSection: Board -3: - /system/chassis/motherboard/dimm0: - entityID: 32 - entityInstance: 1 - interfaces: - xyz.openbmc_project.Inventory.Item: - PrettyName: - IPMIFruProperty: Name - IPMIFruSection: Product - xyz.openbmc_project.Inventory.Decorator.Asset: - SerialNumber: - IPMIFruProperty: Serial Number - IPMIFruSection: Product - Manufacturer: - IPMIFruProperty: Manufacturer - IPMIFruSection: Product - PartNumber: - IPMIFruProperty: Part Number - IPMIFruSection: Product - BuildDate: - IPMIFruProperty: Mfg Date - IPMIFruSection: Product - Model: - IPMIFruProperty: Model Number - IPMIFruSection: Product - xyz.openbmc_project.Inventory.Decorator.Revision: - Version: - IPMIFruProperty: Version -4: - /system/chassis/motherboard/dimm1: - entityID: 32 - entityInstance: 2 - interfaces: - xyz.openbmc_project.Inventory.Item: - PrettyName: - IPMIFruProperty: Name - IPMIFruSection: Product - xyz.openbmc_project.Inventory.Decorator.Asset: - SerialNumber: - IPMIFruProperty: Serial Number - IPMIFruSection: Product - Manufacturer: - IPMIFruProperty: Manufacturer - IPMIFruSection: Product - PartNumber: - IPMIFruProperty: Part Number - IPMIFruSection: Product - BuildDate: - IPMIFruProperty: Mfg Date - IPMIFruSection: Product - Model: - IPMIFruProperty: Model Number - IPMIFruSection: Product - xyz.openbmc_project.Inventory.Decorator.Revision: - Version: - IPMIFruProperty: Version -5: - /system/chassis/motherboard/dimm2: - entityID: 32 - entityInstance: 3 - interfaces: - xyz.openbmc_project.Inventory.Item: - PrettyName: - IPMIFruProperty: Name - IPMIFruSection: Product - xyz.openbmc_project.Inventory.Decorator.Asset: - SerialNumber: - IPMIFruProperty: Serial Number - IPMIFruSection: Product - Manufacturer: - IPMIFruProperty: Manufacturer - IPMIFruSection: Product - PartNumber: - IPMIFruProperty: Part Number - IPMIFruSection: Product - BuildDate: - IPMIFruProperty: Mfg Date - IPMIFruSection: Product - Model: - IPMIFruProperty: Model Number - IPMIFruSection: Product - xyz.openbmc_project.Inventory.Decorator.Revision: - Version: - IPMIFruProperty: Version -6: - /system/chassis/motherboard/dimm3: - entityID: 32 - entityInstance: 4 - interfaces: - xyz.openbmc_project.Inventory.Item: - PrettyName: - IPMIFruProperty: Name - IPMIFruSection: Product - xyz.openbmc_project.Inventory.Decorator.Asset: - SerialNumber: - IPMIFruProperty: Serial Number - IPMIFruSection: Product - Manufacturer: - IPMIFruProperty: Manufacturer - IPMIFruSection: Product - PartNumber: - IPMIFruProperty: Part Number - IPMIFruSection: Product - BuildDate: - IPMIFruProperty: Mfg Date - IPMIFruSection: Product - Model: - IPMIFruProperty: Model Number - IPMIFruSection: Product - xyz.openbmc_project.Inventory.Decorator.Revision: - Version: - IPMIFruProperty: Version -14: - /system/chassis/motherboard: - entityID: 7 - entityInstance: 1 - interfaces: - xyz.openbmc_project.Inventory.Decorator.Asset: - BuildDate: - IPMIFruProperty: Mfg Date - IPMIFruSection: Board - PartNumber: - IPMIFruProperty: Part Number - IPMIFruSection: Board - Manufacturer: - IPMIFruProperty: Manufacturer - IPMIFruSection: Board - SerialNumber: - IPMIFruProperty: Serial Number - IPMIFruSection: Board - xyz.openbmc_project.Inventory.Item: - PrettyName: - IPMIFruProperty: Name - IPMIFruSection: Board -15: - /system: - entityID: 25 - entityInstance: 1 - interfaces: - xyz.openbmc_project.Inventory.Item: - PrettyName: - IPMIFruProperty: Name - IPMIFruSection: Board - xyz.openbmc_project.Inventory.Decorator.Asset: - BuildDate: - IPMIFruProperty: Mfg Date - IPMIFruSection: Board - PartNumber: - IPMIFruProperty: Part Number - IPMIFruSection: Board - Manufacturer: - IPMIFruProperty: Manufacturer - IPMIFruSection: Board - SerialNumber: - IPMIFruProperty: Serial Number - IPMIFruSection: Board - xyz.openbmc_project.Inventory.Decorator.Revision: - Version: - IPMIFruProperty: Version diff --git a/meta-ibm/meta-palmetto/recipes-phosphor/ipmi/phosphor-ipmi-fru-properties-native.bbappend b/meta-ibm/meta-palmetto/recipes-phosphor/ipmi/phosphor-ipmi-fru-properties-native.bbappend deleted file mode 100644 index 2d3355993..000000000 --- a/meta-ibm/meta-palmetto/recipes-phosphor/ipmi/phosphor-ipmi-fru-properties-native.bbappend +++ /dev/null @@ -1 +0,0 @@ -FILESEXTRAPATHS_prepend_palmetto := "${THISDIR}/${PN}:" diff --git a/meta-ibm/meta-palmetto/recipes-phosphor/ipmi/phosphor-ipmi-fru-properties-native/extra-properties.yaml b/meta-ibm/meta-palmetto/recipes-phosphor/ipmi/phosphor-ipmi-fru-properties-native/extra-properties.yaml deleted file mode 100644 index 5caabf114..000000000 --- a/meta-ibm/meta-palmetto/recipes-phosphor/ipmi/phosphor-ipmi-fru-properties-native/extra-properties.yaml +++ /dev/null @@ -1,73 +0,0 @@ -/system/chassis/motherboard/cpu0: - xyz.openbmc_project.Inventory.Decorator.Replaceable: - FieldReplaceable: 'true' - xyz.openbmc_project.Inventory.Decorator.Cacheable: - Cached: 'true' - xyz.openbmc_project.Inventory.Item: - Present: 'true' - -/system/chassis/motherboard: - xyz.openbmc_project.Inventory.Decorator.Replaceable: - FieldReplaceable: 'true' - xyz.openbmc_project.Inventory.Decorator.Cacheable: - Cached: 'true' - xyz.openbmc_project.Inventory.Item: - Present: 'true' - -/system/chassis: - xyz.openbmc_project.Inventory.Decorator.Replaceable: - FieldReplaceable: 'true' - xyz.openbmc_project.Inventory.Decorator.Cacheable: - Cached: 'true' - xyz.openbmc_project.Inventory.Item: - Present: 'true' - -/system: - xyz.openbmc_project.Inventory.Decorator.Replaceable: - FieldReplaceable: 'true' - xyz.openbmc_project.Inventory.Decorator.Cacheable: - Cached: 'true' - xyz.openbmc_project.Inventory.Item: - Present: 'true' - -/system/chassis/motherboard/membuf0: - xyz.openbmc_project.Inventory.Decorator.Replaceable: - FieldReplaceable: 'true' - xyz.openbmc_project.Inventory.Decorator.Cacheable: - Cached: 'true' - xyz.openbmc_project.Inventory.Item: - Present: 'true' - -/system/chassis/motherboard/dimm0: - xyz.openbmc_project.Inventory.Decorator.Replaceable: - FieldReplaceable: 'true' - xyz.openbmc_project.Inventory.Decorator.Cacheable: - Cached: 'true' - xyz.openbmc_project.Inventory.Item: - Present: 'true' - - -/system/chassis/motherboard/dimm1: - xyz.openbmc_project.Inventory.Decorator.Replaceable: - FieldReplaceable: 'true' - xyz.openbmc_project.Inventory.Decorator.Cacheable: - Cached: 'true' - xyz.openbmc_project.Inventory.Item: - Present: 'true' - -/system/chassis/motherboard/dimm2: - xyz.openbmc_project.Inventory.Decorator.Replaceable: - FieldReplaceable: 'true' - xyz.openbmc_project.Inventory.Decorator.Cacheable: - Cached: 'true' - xyz.openbmc_project.Inventory.Item: - Present: 'true' - -/system/chassis/motherboard/dimm3: - xyz.openbmc_project.Inventory.Decorator.Replaceable: - FieldReplaceable: 'true' - xyz.openbmc_project.Inventory.Decorator.Cacheable: - Cached: 'true' - xyz.openbmc_project.Inventory.Item: - Present: 'true' - diff --git a/meta-ibm/meta-palmetto/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend b/meta-ibm/meta-palmetto/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend new file mode 100644 index 000000000..b69c6e109 --- /dev/null +++ b/meta-ibm/meta-palmetto/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend @@ -0,0 +1,6 @@ +DEPENDS_append_palmetto = " palmetto-yaml-config" + +EXTRA_OECONF_palmetto = " \ + YAML_GEN=${STAGING_DIR_HOST}${datadir}/palmetto-yaml-config/ipmi-fru-read.yaml \ + PROP_YAML=${STAGING_DIR_HOST}${datadir}/palmetto-yaml-config/ipmi-extra-properties.yaml \ + " diff --git a/meta-ibm/meta-palmetto/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend b/meta-ibm/meta-palmetto/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend new file mode 100644 index 000000000..db33e2886 --- /dev/null +++ b/meta-ibm/meta-palmetto/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend @@ -0,0 +1,6 @@ +DEPENDS_append_palmetto = " palmetto-yaml-config" + +EXTRA_OECONF_palmetto = " \ + SENSOR_YAML_GEN=${STAGING_DIR_HOST}${datadir}/palmetto-yaml-config/ipmi-sensors.yaml \ + FRU_YAML_GEN=${STAGING_DIR_HOST}${datadir}/palmetto-yaml-config/ipmi-fru-read.yaml \ + " diff --git a/meta-ibm/meta-palmetto/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory-native.bbappend b/meta-ibm/meta-palmetto/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory-native.bbappend deleted file mode 100644 index 2d3355993..000000000 --- a/meta-ibm/meta-palmetto/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory-native.bbappend +++ /dev/null @@ -1 +0,0 @@ -FILESEXTRAPATHS_prepend_palmetto := "${THISDIR}/${PN}:" diff --git a/meta-ibm/meta-palmetto/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory-native/config.yaml b/meta-ibm/meta-palmetto/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory-native/config.yaml deleted file mode 100755 index cc78ed2ca..000000000 --- a/meta-ibm/meta-palmetto/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory-native/config.yaml +++ /dev/null @@ -1,1082 +0,0 @@ -5: - entityID: 34 - entityInstance: 1 - interfaces: - xyz.openbmc_project.State.Boot.Progress: - BootProgress: - Offsets: - 0: - set: xyz.openbmc_project.State.Boot.Progress.ProgressStages.Unspecified - type: string - 1: - set: xyz.openbmc_project.State.Boot.Progress.ProgressStages.MemoryInit - type: string - 3: - set: xyz.openbmc_project.State.Boot.Progress.ProgressStages.SecondaryProcInit - type: string - 7: - set: xyz.openbmc_project.State.Boot.Progress.ProgressStages.PCIInit - type: string - 19: - set: xyz.openbmc_project.State.Boot.Progress.ProgressStages.OSStart - type: string - 20: - set: xyz.openbmc_project.State.Boot.Progress.ProgressStages.MotherboardInit - type: string - mutability: Mutability::Write|Mutability::Read - path: /xyz/openbmc_project/state/host0 - readingType: eventdata2 - sensorNamePattern: nameProperty - sensorReadingType: 111 - sensorType: 15 - serviceInterface: org.freedesktop.DBus.Properties -8: - entityID: 210 - entityInstance: 1 - interfaces: - org.open_power.OCC.Status: - OccActive: - Offsets: - 0: - assert: false - deassert: true - type: bool - 1: - assert: true - deassert: false - type: bool - mutability: Mutability::Write|Mutability::Read - path: /org/open_power/control/occ0 - readingType: assertion - sensorNamePattern: nameLeaf - sensorReadingType: 9 - sensorType: 7 - serviceInterface: org.freedesktop.DBus.Properties -9: - entityID: 34 - entityInstance: 2 - interfaces: - xyz.openbmc_project.Control.Boot.RebootAttempts: - AttemptsLeft: - Offsets: - 255: - type: uint32_t - mutability: Mutability::Write|Mutability::Read - path: /xyz/openbmc_project/state/host0 - readingType: readingAssertion - sensorNamePattern: nameProperty - sensorReadingType: 111 - sensorType: 195 - serviceInterface: org.freedesktop.DBus.Properties -30: - entityID: 32 - entityInstance: 1 - interfaces: - xyz.openbmc_project.Inventory.Item: - Present: - Offsets: - 6: - assert: true - deassert: false - type: bool - xyz.openbmc_project.State.Decorator.OperationalStatus: - Functional: - Offsets: - 4: - assert: false - deassert: true - type: bool - Prereqs: - 6: - assert: true - deassert: false - type: bool - mutability: Mutability::Write|Mutability::Read - path: /system/chassis/motherboard/dimm0 - readingType: assertion - sensorNamePattern: nameLeaf - sensorReadingType: 111 - sensorType: 12 - serviceInterface: xyz.openbmc_project.Inventory.Manager -31: - entityID: 32 - entityInstance: 2 - interfaces: - xyz.openbmc_project.Inventory.Item: - Present: - Offsets: - 6: - assert: true - deassert: false - type: bool - xyz.openbmc_project.State.Decorator.OperationalStatus: - Functional: - Offsets: - 4: - assert: false - deassert: true - type: bool - Prereqs: - 6: - assert: true - deassert: false - type: bool - mutability: Mutability::Write|Mutability::Read - path: /system/chassis/motherboard/dimm1 - readingType: assertion - sensorNamePattern: nameLeaf - sensorReadingType: 111 - sensorType: 12 - serviceInterface: xyz.openbmc_project.Inventory.Manager -32: - entityID: 32 - entityInstance: 3 - interfaces: - xyz.openbmc_project.Inventory.Item: - Present: - Offsets: - 6: - assert: true - deassert: false - type: bool - xyz.openbmc_project.State.Decorator.OperationalStatus: - Functional: - Offsets: - 4: - assert: false - deassert: true - type: bool - Prereqs: - 6: - assert: true - deassert: false - type: bool - mutability: Mutability::Write|Mutability::Read - path: /system/chassis/motherboard/dimm2 - readingType: assertion - sensorNamePattern: nameLeaf - sensorReadingType: 111 - sensorType: 12 - serviceInterface: xyz.openbmc_project.Inventory.Manager -33: - entityID: 32 - entityInstance: 4 - interfaces: - xyz.openbmc_project.Inventory.Item: - Present: - Offsets: - 6: - assert: true - deassert: false - type: bool - xyz.openbmc_project.State.Decorator.OperationalStatus: - Functional: - Offsets: - 4: - assert: false - deassert: true - type: bool - Prereqs: - 6: - assert: true - deassert: false - type: bool - mutability: Mutability::Write|Mutability::Read - path: /system/chassis/motherboard/dimm3 - readingType: assertion - sensorNamePattern: nameLeaf - sensorReadingType: 111 - sensorType: 12 - serviceInterface: xyz.openbmc_project.Inventory.Manager -34: - entityID: 208 - entityInstance: 1 - interfaces: - xyz.openbmc_project.Inventory.Item: - Present: - Offsets: - 7: - assert: true - deassert: false - skipOn: deassert - type: bool - xyz.openbmc_project.State.Decorator.OperationalStatus: - Functional: - Offsets: - 8: - assert: false - deassert: true - type: bool - Prereqs: - 7: - assert: true - deassert: false - type: bool - mutability: Mutability::Write|Mutability::Read - path: /system/chassis/motherboard/cpu0/core0 - readingType: assertion - sensorNamePattern: nameParentLeaf - sensorReadingType: 111 - sensorType: 7 - serviceInterface: xyz.openbmc_project.Inventory.Manager -35: - entityID: 208 - entityInstance: 2 - interfaces: - xyz.openbmc_project.Inventory.Item: - Present: - Offsets: - 7: - assert: true - deassert: false - skipOn: deassert - type: bool - xyz.openbmc_project.State.Decorator.OperationalStatus: - Functional: - Offsets: - 8: - assert: false - deassert: true - type: bool - Prereqs: - 7: - assert: true - deassert: false - type: bool - mutability: Mutability::Write|Mutability::Read - path: /system/chassis/motherboard/cpu0/core1 - readingType: assertion - sensorNamePattern: nameParentLeaf - sensorReadingType: 111 - sensorType: 7 - serviceInterface: xyz.openbmc_project.Inventory.Manager -36: - entityID: 208 - entityInstance: 3 - interfaces: - xyz.openbmc_project.Inventory.Item: - Present: - Offsets: - 7: - assert: true - deassert: false - skipOn: deassert - type: bool - xyz.openbmc_project.State.Decorator.OperationalStatus: - Functional: - Offsets: - 8: - assert: false - deassert: true - type: bool - Prereqs: - 7: - assert: true - deassert: false - type: bool - mutability: Mutability::Write|Mutability::Read - path: /system/chassis/motherboard/cpu0/core2 - readingType: assertion - sensorNamePattern: nameParentLeaf - sensorReadingType: 111 - sensorType: 7 - serviceInterface: xyz.openbmc_project.Inventory.Manager -37: - entityID: 208 - entityInstance: 4 - interfaces: - xyz.openbmc_project.Inventory.Item: - Present: - Offsets: - 7: - assert: true - deassert: false - skipOn: deassert - type: bool - xyz.openbmc_project.State.Decorator.OperationalStatus: - Functional: - Offsets: - 8: - assert: false - deassert: true - type: bool - Prereqs: - 7: - assert: true - deassert: false - type: bool - mutability: Mutability::Write|Mutability::Read - path: /system/chassis/motherboard/cpu0/core3 - readingType: assertion - sensorNamePattern: nameParentLeaf - sensorReadingType: 111 - sensorType: 7 - serviceInterface: xyz.openbmc_project.Inventory.Manager -38: - entityID: 208 - entityInstance: 5 - interfaces: - xyz.openbmc_project.Inventory.Item: - Present: - Offsets: - 7: - assert: true - deassert: false - skipOn: deassert - type: bool - xyz.openbmc_project.State.Decorator.OperationalStatus: - Functional: - Offsets: - 8: - assert: false - deassert: true - type: bool - Prereqs: - 7: - assert: true - deassert: false - type: bool - mutability: Mutability::Write|Mutability::Read - path: /system/chassis/motherboard/cpu0/core4 - readingType: assertion - sensorNamePattern: nameParentLeaf - sensorReadingType: 111 - sensorType: 7 - serviceInterface: xyz.openbmc_project.Inventory.Manager -39: - entityID: 208 - entityInstance: 6 - interfaces: - xyz.openbmc_project.Inventory.Item: - Present: - Offsets: - 7: - assert: true - deassert: false - skipOn: deassert - type: bool - xyz.openbmc_project.State.Decorator.OperationalStatus: - Functional: - Offsets: - 8: - assert: false - deassert: true - type: bool - Prereqs: - 7: - assert: true - deassert: false - type: bool - mutability: Mutability::Write|Mutability::Read - path: /system/chassis/motherboard/cpu0/core5 - readingType: assertion - sensorNamePattern: nameParentLeaf - sensorReadingType: 111 - sensorType: 7 - serviceInterface: xyz.openbmc_project.Inventory.Manager -40: - entityID: 208 - entityInstance: 7 - interfaces: - xyz.openbmc_project.Inventory.Item: - Present: - Offsets: - 7: - assert: true - deassert: false - skipOn: deassert - type: bool - xyz.openbmc_project.State.Decorator.OperationalStatus: - Functional: - Offsets: - 8: - assert: false - deassert: true - type: bool - Prereqs: - 7: - assert: true - deassert: false - type: bool - mutability: Mutability::Write|Mutability::Read - path: /system/chassis/motherboard/cpu0/core6 - readingType: assertion - sensorNamePattern: nameParentLeaf - sensorReadingType: 111 - sensorType: 7 - serviceInterface: xyz.openbmc_project.Inventory.Manager -41: - entityID: 208 - entityInstance: 8 - interfaces: - xyz.openbmc_project.Inventory.Item: - Present: - Offsets: - 7: - assert: true - deassert: false - skipOn: deassert - type: bool - xyz.openbmc_project.State.Decorator.OperationalStatus: - Functional: - Offsets: - 8: - assert: false - deassert: true - type: bool - Prereqs: - 7: - assert: true - deassert: false - type: bool - mutability: Mutability::Write|Mutability::Read - path: /system/chassis/motherboard/cpu0/core7 - readingType: assertion - sensorNamePattern: nameParentLeaf - sensorReadingType: 111 - sensorType: 7 - serviceInterface: xyz.openbmc_project.Inventory.Manager -42: - entityID: 208 - entityInstance: 9 - interfaces: - xyz.openbmc_project.Inventory.Item: - Present: - Offsets: - 7: - assert: true - deassert: false - skipOn: deassert - type: bool - xyz.openbmc_project.State.Decorator.OperationalStatus: - Functional: - Offsets: - 8: - assert: false - deassert: true - type: bool - Prereqs: - 7: - assert: true - deassert: false - type: bool - mutability: Mutability::Write|Mutability::Read - path: /system/chassis/motherboard/cpu0/core8 - readingType: assertion - sensorNamePattern: nameParentLeaf - sensorReadingType: 111 - sensorType: 7 - serviceInterface: xyz.openbmc_project.Inventory.Manager -43: - entityID: 208 - entityInstance: 10 - interfaces: - xyz.openbmc_project.Inventory.Item: - Present: - Offsets: - 7: - assert: true - deassert: false - skipOn: deassert - type: bool - xyz.openbmc_project.State.Decorator.OperationalStatus: - Functional: - Offsets: - 8: - assert: false - deassert: true - type: bool - Prereqs: - 7: - assert: true - deassert: false - type: bool - mutability: Mutability::Write|Mutability::Read - path: /system/chassis/motherboard/cpu0/core9 - readingType: assertion - sensorNamePattern: nameParentLeaf - sensorReadingType: 111 - sensorType: 7 - serviceInterface: xyz.openbmc_project.Inventory.Manager -44: - entityID: 208 - entityInstance: 11 - interfaces: - xyz.openbmc_project.Inventory.Item: - Present: - Offsets: - 7: - assert: true - deassert: false - skipOn: deassert - type: bool - xyz.openbmc_project.State.Decorator.OperationalStatus: - Functional: - Offsets: - 8: - assert: false - deassert: true - type: bool - Prereqs: - 7: - assert: true - deassert: false - type: bool - mutability: Mutability::Write|Mutability::Read - path: /system/chassis/motherboard/cpu0/core10 - readingType: assertion - sensorNamePattern: nameParentLeaf - sensorReadingType: 111 - sensorType: 7 - serviceInterface: xyz.openbmc_project.Inventory.Manager -45: - entityID: 208 - entityInstance: 12 - interfaces: - xyz.openbmc_project.Inventory.Item: - Present: - Offsets: - 7: - assert: true - deassert: false - skipOn: deassert - type: bool - xyz.openbmc_project.State.Decorator.OperationalStatus: - Functional: - Offsets: - 8: - assert: false - deassert: true - type: bool - Prereqs: - 7: - assert: true - deassert: false - type: bool - mutability: Mutability::Write|Mutability::Read - path: /system/chassis/motherboard/cpu0/core11 - readingType: assertion - sensorNamePattern: nameParentLeaf - sensorReadingType: 111 - sensorType: 7 - serviceInterface: xyz.openbmc_project.Inventory.Manager -47: - entityID: 3 - entityInstance: 1 - interfaces: - xyz.openbmc_project.Inventory.Item: - Present: - Offsets: - 7: - assert: true - deassert: false - type: bool - xyz.openbmc_project.State.Decorator.OperationalStatus: - Functional: - Offsets: - 8: - assert: false - deassert: true - type: bool - Prereqs: - 7: - assert: true - deassert: false - type: bool - mutability: Mutability::Write|Mutability::Read - path: /system/chassis/motherboard/cpu - readingType: assertion - sensorNamePattern: nameLeaf - sensorReadingType: 111 - sensorType: 7 - serviceInterface: xyz.openbmc_project.Inventory.Manager -50: - entityID: 35 - entityInstance: 1 - interfaces: - xyz.openbmc_project.State.OperatingSystem.Status: - OperatingSystemState: - Offsets: - 1: - assert: xyz.openbmc_project.State.OperatingSystem.Status.OSStatus.CBoot - type: string - 2: - assert: xyz.openbmc_project.State.OperatingSystem.Status.OSStatus.PXEBoot - type: string - 3: - assert: xyz.openbmc_project.State.OperatingSystem.Status.OSStatus.DiagBoot - type: string - 4: - assert: xyz.openbmc_project.State.OperatingSystem.Status.OSStatus.CDROMBoot - type: string - 5: - assert: xyz.openbmc_project.State.OperatingSystem.Status.OSStatus.ROMBoot - type: string - 6: - assert: xyz.openbmc_project.State.OperatingSystem.Status.OSStatus.BootComplete - type: string - mutability: Mutability::Write|Mutability::Read - path: /xyz/openbmc_project/state/host0 - readingType: assertion - sensorNamePattern: nameProperty - sensorReadingType: 111 - sensorType: 31 - serviceInterface: org.freedesktop.DBus.Properties -101: - bExp: 0 - entityID: 209 - entityInstance: 1 - interfaces: - xyz.openbmc_project.Sensor.Value: - Value: - Offsets: - 255: - type: int64_t - multiplierM: 1 - mutability: Mutability::Write|Mutability::Read - offsetB: -127 - path: /xyz/openbmc_project/sensors/temperature/centaur0_temp - rExp: 0 - readingType: readingData - scale: -3 - sensorNamePattern: nameLeaf - sensorReadingType: 1 - sensorType: 1 - serviceInterface: org.freedesktop.DBus.Properties - unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC -102: - bExp: 0 - entityID: 32 - entityInstance: 5 - interfaces: - xyz.openbmc_project.Sensor.Value: - Value: - Offsets: - 255: - type: int64_t - multiplierM: 1 - mutability: Mutability::Write|Mutability::Read - offsetB: -127 - path: /xyz/openbmc_project/sensors/temperature/dimm0_temp - rExp: 0 - readingType: readingData - scale: -3 - sensorNamePattern: nameLeaf - sensorReadingType: 1 - sensorType: 1 - serviceInterface: org.freedesktop.DBus.Properties - unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC -103: - bExp: 0 - entityID: 32 - entityInstance: 6 - interfaces: - xyz.openbmc_project.Sensor.Value: - Value: - Offsets: - 255: - type: int64_t - multiplierM: 1 - mutability: Mutability::Write|Mutability::Read - offsetB: -127 - path: /xyz/openbmc_project/sensors/temperature/dimm1_temp - rExp: 0 - readingType: readingData - scale: -3 - sensorNamePattern: nameLeaf - sensorReadingType: 1 - sensorType: 1 - serviceInterface: org.freedesktop.DBus.Properties - unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC -104: - bExp: 0 - entityID: 32 - entityInstance: 7 - interfaces: - xyz.openbmc_project.Sensor.Value: - Value: - Offsets: - 255: - type: int64_t - multiplierM: 1 - mutability: Mutability::Write|Mutability::Read - offsetB: -127 - path: /xyz/openbmc_project/sensors/temperature/dimm2_temp - rExp: 0 - readingType: readingData - scale: -3 - sensorNamePattern: nameLeaf - sensorReadingType: 1 - sensorType: 1 - serviceInterface: org.freedesktop.DBus.Properties - unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC -105: - bExp: 0 - entityID: 32 - entityInstance: 8 - interfaces: - xyz.openbmc_project.Sensor.Value: - Value: - Offsets: - 255: - type: int64_t - multiplierM: 1 - mutability: Mutability::Write|Mutability::Read - offsetB: -127 - path: /xyz/openbmc_project/sensors/temperature/dimm3_temp - rExp: 0 - readingType: readingData - scale: -3 - sensorNamePattern: nameLeaf - sensorReadingType: 1 - sensorType: 1 - serviceInterface: org.freedesktop.DBus.Properties - unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC -106: - bExp: 0 - entityID: 208 - entityInstance: 13 - interfaces: - xyz.openbmc_project.Sensor.Value: - Value: - Offsets: - 255: - type: int64_t - multiplierM: 1 - mutability: Mutability::Write|Mutability::Read - offsetB: -127 - path: /xyz/openbmc_project/sensors/temperature/core0_temp - rExp: 0 - readingType: readingData - scale: -3 - sensorNamePattern: nameLeaf - sensorReadingType: 1 - sensorType: 1 - serviceInterface: org.freedesktop.DBus.Properties - unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC -107: - bExp: 0 - entityID: 208 - entityInstance: 19 - interfaces: - xyz.openbmc_project.Sensor.Value: - Value: - Offsets: - 255: - type: int64_t - multiplierM: 1 - mutability: Mutability::Write|Mutability::Read - offsetB: -127 - path: /xyz/openbmc_project/sensors/temperature/core1_temp - rExp: 0 - readingType: readingData - scale: -3 - sensorNamePattern: nameLeaf - sensorReadingType: 1 - sensorType: 1 - serviceInterface: org.freedesktop.DBus.Properties - unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC -108: - bExp: 0 - entityID: 208 - entityInstance: 20 - interfaces: - xyz.openbmc_project.Sensor.Value: - Value: - Offsets: - 255: - type: int64_t - multiplierM: 1 - mutability: Mutability::Write|Mutability::Read - offsetB: -127 - path: /xyz/openbmc_project/sensors/temperature/core2_temp - rExp: 0 - readingType: readingData - scale: -3 - sensorNamePattern: nameLeaf - sensorReadingType: 1 - sensorType: 1 - serviceInterface: org.freedesktop.DBus.Properties - unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC -109: - bExp: 0 - entityID: 208 - entityInstance: 21 - interfaces: - xyz.openbmc_project.Sensor.Value: - Value: - Offsets: - 255: - type: int64_t - multiplierM: 1 - mutability: Mutability::Write|Mutability::Read - offsetB: -127 - path: /xyz/openbmc_project/sensors/temperature/core3_temp - rExp: 0 - readingType: readingData - scale: -3 - sensorNamePattern: nameLeaf - sensorReadingType: 1 - sensorType: 1 - serviceInterface: org.freedesktop.DBus.Properties - unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC -110: - bExp: 0 - entityID: 208 - entityInstance: 22 - interfaces: - xyz.openbmc_project.Sensor.Value: - Value: - Offsets: - 255: - type: int64_t - multiplierM: 1 - mutability: Mutability::Write|Mutability::Read - offsetB: -127 - path: /xyz/openbmc_project/sensors/temperature/core4_temp - rExp: 0 - readingType: readingData - scale: -3 - sensorNamePattern: nameLeaf - sensorReadingType: 1 - sensorType: 1 - serviceInterface: org.freedesktop.DBus.Properties - unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC -111: - bExp: 0 - entityID: 208 - entityInstance: 23 - interfaces: - xyz.openbmc_project.Sensor.Value: - Value: - Offsets: - 255: - type: int64_t - multiplierM: 1 - mutability: Mutability::Write|Mutability::Read - offsetB: -127 - path: /xyz/openbmc_project/sensors/temperature/core5_temp - rExp: 0 - readingType: readingData - scale: -3 - sensorNamePattern: nameLeaf - sensorReadingType: 1 - sensorType: 1 - serviceInterface: org.freedesktop.DBus.Properties - unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC -112: - bExp: 0 - entityID: 208 - entityInstance: 24 - interfaces: - xyz.openbmc_project.Sensor.Value: - Value: - Offsets: - 255: - type: int64_t - multiplierM: 1 - mutability: Mutability::Write|Mutability::Read - offsetB: -127 - path: /xyz/openbmc_project/sensors/temperature/core6_temp - rExp: 0 - readingType: readingData - scale: -3 - sensorNamePattern: nameLeaf - sensorReadingType: 1 - sensorType: 1 - serviceInterface: org.freedesktop.DBus.Properties - unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC -113: - bExp: 0 - entityID: 208 - entityInstance: 14 - interfaces: - xyz.openbmc_project.Sensor.Value: - Value: - Offsets: - 255: - type: int64_t - multiplierM: 1 - mutability: Mutability::Write|Mutability::Read - offsetB: -127 - path: /xyz/openbmc_project/sensors/temperature/core7_temp - rExp: 0 - readingType: readingData - scale: -3 - sensorNamePattern: nameLeaf - sensorReadingType: 1 - sensorType: 1 - serviceInterface: org.freedesktop.DBus.Properties - unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC -114: - bExp: 0 - entityID: 208 - entityInstance: 15 - interfaces: - xyz.openbmc_project.Sensor.Value: - Value: - Offsets: - 255: - type: int64_t - multiplierM: 1 - mutability: Mutability::Write|Mutability::Read - offsetB: -127 - path: /xyz/openbmc_project/sensors/temperature/core8_temp - rExp: 0 - readingType: readingData - scale: -3 - sensorNamePattern: nameLeaf - sensorReadingType: 1 - sensorType: 1 - serviceInterface: org.freedesktop.DBus.Properties - unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC -115: - bExp: 0 - entityID: 208 - entityInstance: 16 - interfaces: - xyz.openbmc_project.Sensor.Value: - Value: - Offsets: - 255: - type: int64_t - multiplierM: 1 - mutability: Mutability::Write|Mutability::Read - offsetB: -127 - path: /xyz/openbmc_project/sensors/temperature/core9_temp - rExp: 0 - readingType: readingData - scale: -3 - sensorNamePattern: nameLeaf - sensorReadingType: 1 - sensorType: 1 - serviceInterface: org.freedesktop.DBus.Properties - unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC -116: - bExp: 0 - entityID: 208 - entityInstance: 17 - interfaces: - xyz.openbmc_project.Sensor.Value: - Value: - Offsets: - 255: - type: int64_t - multiplierM: 1 - mutability: Mutability::Write|Mutability::Read - offsetB: -127 - path: /xyz/openbmc_project/sensors/temperature/core10_temp - rExp: 0 - readingType: readingData - scale: -3 - sensorNamePattern: nameLeaf - sensorReadingType: 1 - sensorType: 1 - serviceInterface: org.freedesktop.DBus.Properties - unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC -117: - bExp: 0 - entityID: 208 - entityInstance: 18 - interfaces: - xyz.openbmc_project.Sensor.Value: - Value: - Offsets: - 255: - type: int64_t - multiplierM: 1 - mutability: Mutability::Write|Mutability::Read - offsetB: -127 - path: /xyz/openbmc_project/sensors/temperature/core11_temp - rExp: 0 - readingType: readingData - scale: -3 - sensorNamePattern: nameLeaf - sensorReadingType: 1 - sensorType: 1 - serviceInterface: org.freedesktop.DBus.Properties - unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC -131: - bExp: 0 - entityID: 10 - entityInstance: 2 - interfaces: - xyz.openbmc_project.Sensor.Value: - Value: - Offsets: - 255: - type: int64_t - multiplierM: 2 - offsetB: 0 - path: /xyz/openbmc_project/sensors/power/p0_power - rExp: 0 - readingType: readingData - scale: -6 - sensorNamePattern: nameLeaf - sensorReadingType: 1 - sensorType: 8 - serviceInterface: org.freedesktop.DBus.Properties - unit: xyz.openbmc_project.Sensor.Value.Unit.Watts -132: - bExp: 0 - entityID: 10 - entityInstance: 3 - interfaces: - xyz.openbmc_project.Sensor.Value: - Value: - Offsets: - 255: - type: int64_t - multiplierM: 2 - offsetB: 0 - path: /xyz/openbmc_project/sensors/power/p0_pcie_power - rExp: 0 - readingType: readingData - scale: -6 - sensorNamePattern: nameLeaf - sensorReadingType: 1 - sensorType: 8 - serviceInterface: org.freedesktop.DBus.Properties - unit: xyz.openbmc_project.Sensor.Value.Unit.Watts -133: - bExp: 0 - entityID: 10 - entityInstance: 4 - interfaces: - xyz.openbmc_project.Sensor.Value: - Value: - Offsets: - 255: - type: int64_t - multiplierM: 2 - offsetB: 0 - path: /xyz/openbmc_project/sensors/power/p0_io_power - rExp: 0 - readingType: readingData - scale: -6 - sensorNamePattern: nameLeaf - sensorReadingType: 1 - sensorType: 8 - serviceInterface: org.freedesktop.DBus.Properties - unit: xyz.openbmc_project.Sensor.Value.Unit.Watts -135: - bExp: 0 - entityID: 10 - entityInstance: 1 - interfaces: - xyz.openbmc_project.Sensor.Value: - Value: - Offsets: - 255: - type: int64_t - multiplierM: 2 - offsetB: 0 - path: /xyz/openbmc_project/sensors/power/centaur0_power - rExp: 0 - readingType: readingData - scale: -6 - sensorNamePattern: nameLeaf - sensorReadingType: 1 - sensorType: 8 - serviceInterface: org.freedesktop.DBus.Properties - unit: xyz.openbmc_project.Sensor.Value.Unit.Watts diff --git a/meta-ibm/meta-palmetto/recipes-phosphor/leds/palmetto-led-manager-config/led.yaml b/meta-ibm/meta-palmetto/recipes-phosphor/leds/palmetto-led-manager-config/led.yaml index 3b7d40456..3b7d40456 100755..100644 --- a/meta-ibm/meta-palmetto/recipes-phosphor/leds/palmetto-led-manager-config/led.yaml +++ b/meta-ibm/meta-palmetto/recipes-phosphor/leds/palmetto-led-manager-config/led.yaml diff --git a/meta-ibm/meta-romulus/conf/machine/romulus.conf b/meta-ibm/meta-romulus/conf/machine/romulus.conf index 3927cc534..87ac99536 100644 --- a/meta-ibm/meta-romulus/conf/machine/romulus.conf +++ b/meta-ibm/meta-romulus/conf/machine/romulus.conf @@ -15,11 +15,5 @@ PHOSPHOR_MRW_URI = "git://github.com/open-power/romulus-xml" PHOSPHOR_MRW_REV = "14b471fbf37f5fb60261de001df83caf5f96d81f" PREFERRED_PROVIDER_virtual/openpower-occ-control-config-native = "romulus-occ-control-config-native" -PREFERRED_PROVIDER_virtual/phosphor-ipmi-fru-inventory = "romulus-ipmi-inventory-map-native" -PREFERRED_PROVIDER_virtual/phosphor-ipmi-fru-properties = "romulus-ipmi-fru-properties-native" -PREFERRED_PROVIDER_virtual/phosphor-ipmi-fru-read-bmc-inventory = "romulus-ipmi-fru-read-bmc-inventory-native" -PREFERRED_PROVIDER_virtual/phosphor-ipmi-fru-read-inventory = "romulus-ipmi-fru-read-inventory-native" -PREFERRED_PROVIDER_virtual/phosphor-ipmi-inventory-sel = "romulus-ipmi-inventory-sel-native" -PREFERRED_PROVIDER_virtual/phosphor-ipmi-sensor-inventory = "romulus-ipmi-sensor-inventory-native" PREFERRED_PROVIDER_virtual/phosphor-led-manager-config-native = "romulus-led-manager-config-native" PREFERRED_PROVIDER_virtual/phosphor-logging-callouts = "romulus-phosphor-logging-callouts-native" diff --git a/meta-ibm/meta-romulus/recipes-phosphor/fans/phosphor-fan-control-events-config/events.yaml b/meta-ibm/meta-romulus/recipes-phosphor/fans/phosphor-fan-control-events-config/events.yaml index ddf1556d2..20d2a8814 100644 --- a/meta-ibm/meta-romulus/recipes-phosphor/fans/phosphor-fan-control-events-config/events.yaml +++ b/meta-ibm/meta-romulus/recipes-phosphor/fans/phosphor-fan-control-events-config/events.yaml @@ -96,52 +96,53 @@ groups: matches: - name: propertiesChanged - description: > - A property changed match parameters: - object - interface - signal: propertySignal - name: interfacesAdded - description: > - An interfaces added match parameters: - object - signal: objectSignal - name: nameOwnerChanged - description: > - A name owner changed match parameters: - object - interface - signal: ownerSignal signals: - - name: propertySignal + - name: propertiesChanged description: > - Handle property signals + A property changed match parameters: - type - object - interface - property - handler: setProperty - - name: objectSignal + match: propertiesChanged + - name: interfacesAdded description: > - Handle object signals + An interfaces added match parameters: - type - object - interface - property - handler: setProperty - - name: ownerSignal + match: interfacesAdded + - name: nameOwnerChanged description: > - Handle owner signals + A name owner changed match + parameters: + match: nameOwnerChanged + +methods: + - name: getProperties + description: > + Get the property values of the given group members + by performing a `GetProperty` method call on each + parameters: + - type + - name: nameHasOwner + description: > + A NameHasOwner method call to be performed on all event group members parameters: - - object - - interface - handler: setService handlers: - name: setProperty @@ -149,12 +150,9 @@ handlers: Sets a value for the given object/interface/property parameters: - type - - object - - interface - - property - name: setService description: > - Sets the service name(s) for the given group + Sets the service name and ownership status for the given group parameters: - group @@ -165,6 +163,11 @@ preconditions: enable a set speed event otherwise fan speeds are set to full parameters: - groups + - name: services_missing_owner + description: > + Any services missing an owner enable the events given otherwise + the events are removed/disabled + parameters: actions: - name: call_actions_based_on_timer @@ -222,86 +225,83 @@ actions: events: - name: default_fan_floor_on_service_fail - groups: - - name: zone0_ambient - interface: xyz.openbmc_project.Sensor.Value - property: - name: Value - type: int64_t - matches: - - name: nameOwnerChanged - actions: - - name: call_actions_based_on_timer - timer: - delay: 5 - type: oneshot - actions: - - name: default_floor_on_missing_owner - - name: high_speed_on_occ0_service_fail + precondition: + name: services_missing_owner + groups: + - name: zone0_ambient + interface: xyz.openbmc_project.Sensor.Value + property: + name: Value + type: int64_t + triggers: + - name: init + method: nameHasOwner + handler: setService + - name: signal + signal: nameOwnerChanged + handler: setService + events: + - name: default_fan_floor + groups: + - name: zone0_ambient + interface: xyz.openbmc_project.Sensor.Value + property: + name: Value + type: int64_t + triggers: + - name: timer + interval: 5000000 + type: oneshot + actions: + - name: default_floor_on_missing_owner + - name: high_speed_on_occ_service_fail groups: - name: occ0_object interface: org.open_power.OCC.Status property: name: OccActive type: bool - matches: - - name: nameOwnerChanged - actions: - - name: call_actions_based_on_timer - timer: - delay: 5 - type: oneshot - actions: - - name: set_speed_on_missing_owner - speed: - value: 255 - type: uint64_t - - name: high_speed_on_occ1_service_fail - groups: - name: occ1_object interface: org.open_power.OCC.Status property: name: OccActive type: bool - matches: - - name: nameOwnerChanged + triggers: + - name: init + method: nameHasOwner + handler: setService + - name: signal + signal: nameOwnerChanged + handler: setService actions: - name: call_actions_based_on_timer timer: - delay: 5 + interval: 5000000 type: oneshot actions: - name: set_speed_on_missing_owner speed: value: 255 type: uint64_t - - name: missing_before_high_speed_air + - name: missing_or_fails_before_high_speed_air groups: - name: air_cooled_zone0_fans interface: xyz.openbmc_project.Inventory.Item property: name: Present type: bool - matches: - - name: propertiesChanged - actions: - - name: count_state_before_speed - count: 1 - property: - value: false - type: bool - speed: - value: 255 - type: uint64_t - - name: fails_before_high_speed_air - groups: - name: air_cooled_zone0_fans interface: xyz.openbmc_project.State.Decorator.OperationalStatus property: name: Functional type: bool - matches: - - name: propertiesChanged + triggers: + - name: init + method: getProperties + handler: setProperty + - name: signal + signal: propertiesChanged + handler: setProperty actions: - name: count_state_before_speed count: 1 @@ -318,8 +318,13 @@ events: property: name: Value type: int64_t - matches: - - name: propertiesChanged + triggers: + - name: init + method: getProperties + handler: setProperty + - name: signal + signal: propertiesChanged + handler: setProperty actions: - name: set_floor_from_average_sensor_value map: @@ -351,22 +356,53 @@ events: name: OccActive type: bool value: true - matches: - - name: interfacesAdded - - name: propertiesChanged + triggers: + - name: init + method: getProperties + handler: setProperty + - name: signal + signal: interfacesAdded + handler: setProperty + - name: signal + signal: propertiesChanged + handler: setProperty events: - - name: speed_changes_based_on_core_temps + - name: speed_control_sensors groups: - name: zone0_cores interface: xyz.openbmc_project.Sensor.Value property: name: Value type: int64_t - matches: - - name: interfacesAdded - - name: propertiesChanged + - name: zone0_dimms + interface: xyz.openbmc_project.Sensor.Value + property: + name: Value + type: int64_t + triggers: + - name: init + method: getProperties + handler: setProperty + - name: signal + signal: interfacesAdded + handler: setProperty + - name: signal + signal: propertiesChanged + handler: setProperty + - name: 1sec_speed_change_request_sampling + triggers: + - name: timer + interval: 1000000 + type: repeating actions: + # Speed changes based on core temps - name: set_net_increase_speed + groups: + - name: zone0_cores + interface: xyz.openbmc_project.Sensor.Value + property: + name: Value + type: int64_t property: value: 73000 type: int64_t @@ -377,6 +413,12 @@ events: value: 11 type: uint64_t - name: set_net_decrease_speed + groups: + - name: zone0_cores + interface: xyz.openbmc_project.Sensor.Value + property: + name: Value + type: int64_t property: value: 70000 type: int64_t @@ -386,20 +428,14 @@ events: delta: value: 11 type: uint64_t - timer: - interval: 5 - - name: speed_changes_based_on_dimm_temps - groups: - - name: zone0_dimms - interface: xyz.openbmc_project.Sensor.Value - property: - name: Value - type: int64_t - matches: - - name: interfacesAdded - - name: propertiesChanged - actions: + # Speed changes based on dimm temps - name: set_net_increase_speed + groups: + - name: zone0_dimms + interface: xyz.openbmc_project.Sensor.Value + property: + name: Value + type: int64_t property: value: 64000 type: int64_t @@ -410,6 +446,12 @@ events: value: 6 type: uint64_t - name: set_net_decrease_speed + groups: + - name: zone0_dimms + interface: xyz.openbmc_project.Sensor.Value + property: + name: Value + type: int64_t property: value: 61000 type: int64_t @@ -419,5 +461,3 @@ events: delta: value: 6 type: uint64_t - timer: - interval: 5 diff --git a/meta-ibm/meta-romulus/recipes-phosphor/fans/phosphor-fan_%.bbappend b/meta-ibm/meta-romulus/recipes-phosphor/fans/phosphor-fan_%.bbappend index af5e1e629..3ec031946 100644 --- a/meta-ibm/meta-romulus/recipes-phosphor/fans/phosphor-fan_%.bbappend +++ b/meta-ibm/meta-romulus/recipes-phosphor/fans/phosphor-fan_%.bbappend @@ -19,4 +19,3 @@ SYSTEMD_LINK_phosphor-cooling-type += "${@compose_list(d, 'FMT_COOLING', 'OBMC_C COOLING_ENV_FMT = "obmc/phosphor-fan/phosphor-cooling-type-{0}.conf" SYSTEMD_ENVIRONMENT_FILE_phosphor-cooling-type_append_romulus = " ${@compose_list(d, 'COOLING_ENV_FMT', 'OBMC_CHASSIS_INSTANCES')}" - diff --git a/meta-ibm/meta-romulus/recipes-phosphor/ipmi/files/config.yaml b/meta-ibm/meta-romulus/recipes-phosphor/ipmi/files/config.yaml deleted file mode 100644 index de2e81474..000000000 --- a/meta-ibm/meta-romulus/recipes-phosphor/ipmi/files/config.yaml +++ /dev/null @@ -1,538 +0,0 @@ -1: - /system/chassis/motherboard/cpu0: - entityID: 3 - entityInstance: 1 - interfaces: - xyz.openbmc_project.Inventory.Decorator.Revision: - Version: - IPMIFruProperty: Custom Field 2 - IPMIFruSection: Board - IPMIFruValueDelimiter: 58 - xyz.openbmc_project.Inventory.Decorator.Asset: - BuildDate: - IPMIFruProperty: Mfg Date - IPMIFruSection: Board - PartNumber: - IPMIFruProperty: Part Number - IPMIFruSection: Board - Manufacturer: - IPMIFruProperty: Manufacturer - IPMIFruSection: Board - SerialNumber: - IPMIFruProperty: Serial Number - IPMIFruSection: Board - xyz.openbmc_project.Inventory.Item: - PrettyName: - IPMIFruProperty: Name - IPMIFruSection: Board -2: - /system/chassis/motherboard/cpu1: - entityID: 3 - entityInstance: 2 - interfaces: - xyz.openbmc_project.Inventory.Decorator.Revision: - Version: - IPMIFruProperty: Custom Field 2 - IPMIFruSection: Board - IPMIFruValueDelimiter: 58 - xyz.openbmc_project.Inventory.Decorator.Asset: - BuildDate: - IPMIFruProperty: Mfg Date - IPMIFruSection: Board - PartNumber: - IPMIFruProperty: Part Number - IPMIFruSection: Board - Manufacturer: - IPMIFruProperty: Manufacturer - IPMIFruSection: Board - SerialNumber: - IPMIFruProperty: Serial Number - IPMIFruSection: Board - xyz.openbmc_project.Inventory.Item: - PrettyName: - IPMIFruProperty: Name - IPMIFruSection: Board - Value: False -3: - /system/chassis/motherboard: - entityID: 7 - entityInstance: 1 - interfaces: - xyz.openbmc_project.Inventory.Decorator.Asset: - BuildDate: - IPMIFruProperty: Mfg Date - IPMIFruSection: Board - PartNumber: - IPMIFruProperty: Part Number - IPMIFruSection: Board - Manufacturer: - IPMIFruProperty: Manufacturer - IPMIFruSection: Board - SerialNumber: - IPMIFruProperty: Serial Number - IPMIFruSection: Board - xyz.openbmc_project.Inventory.Item: - PrettyName: - IPMIFruProperty: Name - IPMIFruSection: Board - /system: - entityID: 7 - entityInstance: 1 - interfaces: - xyz.openbmc_project.Inventory.Decorator.Asset: - SerialNumber: - IPMIFruProperty: Serial Number - IPMIFruSection: Chassis - Model: - IPMIFruProperty: Part Number - IPMIFruSection: Chassis - - -4: - /system/chassis/motherboard/dimm0: - entityID: 32 - entityInstance: 1 - interfaces: - xyz.openbmc_project.Inventory.Item: - PrettyName: - IPMIFruProperty: Name - IPMIFruSection: Product - xyz.openbmc_project.Inventory.Decorator.Asset: - SerialNumber: - IPMIFruProperty: Serial Number - IPMIFruSection: Product - Manufacturer: - IPMIFruProperty: Manufacturer - IPMIFruSection: Product - PartNumber: - IPMIFruProperty: Part Number - IPMIFruSection: Product - BuildDate: - IPMIFruProperty: Mfg Date - IPMIFruSection: Product - Model: - IPMIFruProperty: Model Number - IPMIFruSection: Product - xyz.openbmc_project.Inventory.Decorator.Revision: - Version: - IPMIFruProperty: Version -5: - /system/chassis/motherboard/dimm1: - entityID: 32 - entityInstance: 2 - interfaces: - xyz.openbmc_project.Inventory.Item: - PrettyName: - IPMIFruProperty: Name - IPMIFruSection: Product - xyz.openbmc_project.Inventory.Decorator.Asset: - SerialNumber: - IPMIFruProperty: Serial Number - IPMIFruSection: Product - Manufacturer: - IPMIFruProperty: Manufacturer - IPMIFruSection: Product - PartNumber: - IPMIFruProperty: Part Number - IPMIFruSection: Product - BuildDate: - IPMIFruProperty: Mfg Date - IPMIFruSection: Product - Model: - IPMIFruProperty: Model Number - IPMIFruSection: Product - xyz.openbmc_project.Inventory.Decorator.Revision: - Version: - IPMIFruProperty: Version -6: - /system/chassis/motherboard/dimm2: - entityID: 32 - entityInstance: 3 - interfaces: - xyz.openbmc_project.Inventory.Item: - PrettyName: - IPMIFruProperty: Name - IPMIFruSection: Product - xyz.openbmc_project.Inventory.Decorator.Asset: - SerialNumber: - IPMIFruProperty: Serial Number - IPMIFruSection: Product - Manufacturer: - IPMIFruProperty: Manufacturer - IPMIFruSection: Product - PartNumber: - IPMIFruProperty: Part Number - IPMIFruSection: Product - BuildDate: - IPMIFruProperty: Mfg Date - IPMIFruSection: Product - Model: - IPMIFruProperty: Model Number - IPMIFruSection: Product - xyz.openbmc_project.Inventory.Decorator.Revision: - Version: - IPMIFruProperty: Version -7: - /system/chassis/motherboard/dimm3: - entityID: 32 - entityInstance: 4 - interfaces: - xyz.openbmc_project.Inventory.Item: - PrettyName: - IPMIFruProperty: Name - IPMIFruSection: Product - xyz.openbmc_project.Inventory.Decorator.Asset: - SerialNumber: - IPMIFruProperty: Serial Number - IPMIFruSection: Product - Manufacturer: - IPMIFruProperty: Manufacturer - IPMIFruSection: Product - PartNumber: - IPMIFruProperty: Part Number - IPMIFruSection: Product - BuildDate: - IPMIFruProperty: Mfg Date - IPMIFruSection: Product - Model: - IPMIFruProperty: Model Number - IPMIFruSection: Product - xyz.openbmc_project.Inventory.Decorator.Revision: - Version: - IPMIFruProperty: Version -8: - /system/chassis/motherboard/dimm4: - entityID: 32 - entityInstance: 5 - interfaces: - xyz.openbmc_project.Inventory.Item: - PrettyName: - IPMIFruProperty: Name - IPMIFruSection: Product - xyz.openbmc_project.Inventory.Decorator.Asset: - SerialNumber: - IPMIFruProperty: Serial Number - IPMIFruSection: Product - Manufacturer: - IPMIFruProperty: Manufacturer - IPMIFruSection: Product - PartNumber: - IPMIFruProperty: Part Number - IPMIFruSection: Product - BuildDate: - IPMIFruProperty: Mfg Date - IPMIFruSection: Product - Model: - IPMIFruProperty: Model Number - IPMIFruSection: Product - xyz.openbmc_project.Inventory.Decorator.Revision: - Version: - IPMIFruProperty: Version -9: - /system/chassis/motherboard/dimm5: - entityID: 32 - entityInstance: 6 - interfaces: - xyz.openbmc_project.Inventory.Item: - PrettyName: - IPMIFruProperty: Name - IPMIFruSection: Product - xyz.openbmc_project.Inventory.Decorator.Asset: - SerialNumber: - IPMIFruProperty: Serial Number - IPMIFruSection: Product - Manufacturer: - IPMIFruProperty: Manufacturer - IPMIFruSection: Product - PartNumber: - IPMIFruProperty: Part Number - IPMIFruSection: Product - BuildDate: - IPMIFruProperty: Mfg Date - IPMIFruSection: Product - Model: - IPMIFruProperty: Model Number - IPMIFruSection: Product - xyz.openbmc_project.Inventory.Decorator.Revision: - Version: - IPMIFruProperty: Version -10: - /system/chassis/motherboard/dimm6: - entityID: 32 - entityInstance: 7 - interfaces: - xyz.openbmc_project.Inventory.Item: - PrettyName: - IPMIFruProperty: Name - IPMIFruSection: Product - xyz.openbmc_project.Inventory.Decorator.Asset: - SerialNumber: - IPMIFruProperty: Serial Number - IPMIFruSection: Product - Manufacturer: - IPMIFruProperty: Manufacturer - IPMIFruSection: Product - PartNumber: - IPMIFruProperty: Part Number - IPMIFruSection: Product - BuildDate: - IPMIFruProperty: Mfg Date - IPMIFruSection: Product - Model: - IPMIFruProperty: Model Number - IPMIFruSection: Product - xyz.openbmc_project.Inventory.Decorator.Revision: - Version: - IPMIFruProperty: Version -11: - /system/chassis/motherboard/dimm7: - entityID: 32 - entityInstance: 8 - interfaces: - xyz.openbmc_project.Inventory.Item: - PrettyName: - IPMIFruProperty: Name - IPMIFruSection: Product - xyz.openbmc_project.Inventory.Decorator.Asset: - SerialNumber: - IPMIFruProperty: Serial Number - IPMIFruSection: Product - Manufacturer: - IPMIFruProperty: Manufacturer - IPMIFruSection: Product - PartNumber: - IPMIFruProperty: Part Number - IPMIFruSection: Product - BuildDate: - IPMIFruProperty: Mfg Date - IPMIFruSection: Product - Model: - IPMIFruProperty: Model Number - IPMIFruSection: Product - xyz.openbmc_project.Inventory.Decorator.Revision: - Version: - IPMIFruProperty: Version -12: - /system/chassis/motherboard/dimm8: - entityID: 32 - entityInstance: 9 - interfaces: - xyz.openbmc_project.Inventory.Item: - PrettyName: - IPMIFruProperty: Name - IPMIFruSection: Product - xyz.openbmc_project.Inventory.Decorator.Asset: - SerialNumber: - IPMIFruProperty: Serial Number - IPMIFruSection: Product - Manufacturer: - IPMIFruProperty: Manufacturer - IPMIFruSection: Product - PartNumber: - IPMIFruProperty: Part Number - IPMIFruSection: Product - BuildDate: - IPMIFruProperty: Mfg Date - IPMIFruSection: Product - Model: - IPMIFruProperty: Model Number - IPMIFruSection: Product - xyz.openbmc_project.Inventory.Decorator.Revision: - Version: - IPMIFruProperty: Version -13: - /system/chassis/motherboard/dimm9: - entityID: 32 - entityInstance: 10 - interfaces: - xyz.openbmc_project.Inventory.Item: - PrettyName: - IPMIFruProperty: Name - IPMIFruSection: Product - xyz.openbmc_project.Inventory.Decorator.Asset: - SerialNumber: - IPMIFruProperty: Serial Number - IPMIFruSection: Product - Manufacturer: - IPMIFruProperty: Manufacturer - IPMIFruSection: Product - PartNumber: - IPMIFruProperty: Part Number - IPMIFruSection: Product - BuildDate: - IPMIFruProperty: Mfg Date - IPMIFruSection: Product - Model: - IPMIFruProperty: Model Number - IPMIFruSection: Product - xyz.openbmc_project.Inventory.Decorator.Revision: - Version: - IPMIFruProperty: Version -14: - /system/chassis/motherboard/dimm10: - entityID: 32 - entityInstance: 11 - interfaces: - xyz.openbmc_project.Inventory.Item: - PrettyName: - IPMIFruProperty: Name - IPMIFruSection: Product - xyz.openbmc_project.Inventory.Decorator.Asset: - SerialNumber: - IPMIFruProperty: Serial Number - IPMIFruSection: Product - Manufacturer: - IPMIFruProperty: Manufacturer - IPMIFruSection: Product - PartNumber: - IPMIFruProperty: Part Number - IPMIFruSection: Product - BuildDate: - IPMIFruProperty: Mfg Date - IPMIFruSection: Product - Model: - IPMIFruProperty: Model Number - IPMIFruSection: Product - xyz.openbmc_project.Inventory.Decorator.Revision: - Version: - IPMIFruProperty: Version -15: - /system/chassis/motherboard/dimm11: - entityID: 32 - entityInstance: 12 - interfaces: - xyz.openbmc_project.Inventory.Item: - PrettyName: - IPMIFruProperty: Name - IPMIFruSection: Product - xyz.openbmc_project.Inventory.Decorator.Asset: - SerialNumber: - IPMIFruProperty: Serial Number - IPMIFruSection: Product - Manufacturer: - IPMIFruProperty: Manufacturer - IPMIFruSection: Product - PartNumber: - IPMIFruProperty: Part Number - IPMIFruSection: Product - BuildDate: - IPMIFruProperty: Mfg Date - IPMIFruSection: Product - Model: - IPMIFruProperty: Model Number - IPMIFruSection: Product - xyz.openbmc_project.Inventory.Decorator.Revision: - Version: - IPMIFruProperty: Version -16: - /system/chassis/motherboard/dimm12: - entityID: 32 - entityInstance: 13 - interfaces: - xyz.openbmc_project.Inventory.Item: - PrettyName: - IPMIFruProperty: Name - IPMIFruSection: Product - xyz.openbmc_project.Inventory.Decorator.Asset: - SerialNumber: - IPMIFruProperty: Serial Number - IPMIFruSection: Product - Manufacturer: - IPMIFruProperty: Manufacturer - IPMIFruSection: Product - PartNumber: - IPMIFruProperty: Part Number - IPMIFruSection: Product - BuildDate: - IPMIFruProperty: Mfg Date - IPMIFruSection: Product - Model: - IPMIFruProperty: Model Number - IPMIFruSection: Product - xyz.openbmc_project.Inventory.Decorator.Revision: - Version: - IPMIFruProperty: Version -17: - /system/chassis/motherboard/dimm13: - entityID: 32 - entityInstance: 14 - interfaces: - xyz.openbmc_project.Inventory.Item: - PrettyName: - IPMIFruProperty: Name - IPMIFruSection: Product - xyz.openbmc_project.Inventory.Decorator.Asset: - SerialNumber: - IPMIFruProperty: Serial Number - IPMIFruSection: Product - Manufacturer: - IPMIFruProperty: Manufacturer - IPMIFruSection: Product - PartNumber: - IPMIFruProperty: Part Number - IPMIFruSection: Product - BuildDate: - IPMIFruProperty: Mfg Date - IPMIFruSection: Product - Model: - IPMIFruProperty: Model Number - IPMIFruSection: Product - xyz.openbmc_project.Inventory.Decorator.Revision: - Version: - IPMIFruProperty: Version -18: - /system/chassis/motherboard/dimm14: - entityID: 32 - entityInstance: 15 - interfaces: - xyz.openbmc_project.Inventory.Item: - PrettyName: - IPMIFruProperty: Name - IPMIFruSection: Product - xyz.openbmc_project.Inventory.Decorator.Asset: - SerialNumber: - IPMIFruProperty: Serial Number - IPMIFruSection: Product - Manufacturer: - IPMIFruProperty: Manufacturer - IPMIFruSection: Product - PartNumber: - IPMIFruProperty: Part Number - IPMIFruSection: Product - BuildDate: - IPMIFruProperty: Mfg Date - IPMIFruSection: Product - Model: - IPMIFruProperty: Model Number - IPMIFruSection: Product - xyz.openbmc_project.Inventory.Decorator.Revision: - Version: - IPMIFruProperty: Version -19: - /system/chassis/motherboard/dimm15: - entityID: 32 - entityInstance: 16 - interfaces: - xyz.openbmc_project.Inventory.Item: - PrettyName: - IPMIFruProperty: Name - IPMIFruSection: Product - xyz.openbmc_project.Inventory.Decorator.Asset: - SerialNumber: - IPMIFruProperty: Serial Number - IPMIFruSection: Product - Manufacturer: - IPMIFruProperty: Manufacturer - IPMIFruSection: Product - PartNumber: - IPMIFruProperty: Part Number - IPMIFruSection: Product - BuildDate: - IPMIFruProperty: Mfg Date - IPMIFruSection: Product - Model: - IPMIFruProperty: Model Number - IPMIFruSection: Product - xyz.openbmc_project.Inventory.Decorator.Revision: - Version: - IPMIFruProperty: Version diff --git a/meta-ibm/meta-romulus/recipes-phosphor/ipmi/files/sel-config.yaml b/meta-ibm/meta-romulus/recipes-phosphor/ipmi/files/sel-config.yaml deleted file mode 100755 index 9a5189a6e..000000000 --- a/meta-ibm/meta-romulus/recipes-phosphor/ipmi/files/sel-config.yaml +++ /dev/null @@ -1,340 +0,0 @@ -/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm0: - sensorID: 0x0B - sensorType: 0x0C - eventReadingType: 0x6F - offset: 0x04 -/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm1: - sensorID: 0x0C - sensorType: 0x0C - eventReadingType: 0x6F - offset: 0x04 -/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm10: - sensorID: 0x15 - sensorType: 0x0C - eventReadingType: 0x6F - offset: 0x04 -/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm11: - sensorID: 0x16 - sensorType: 0x0C - eventReadingType: 0x6F - offset: 0x04 -/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm12: - sensorID: 0x17 - sensorType: 0x0C - eventReadingType: 0x6F - offset: 0x04 -/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm13: - sensorID: 0x18 - sensorType: 0x0C - eventReadingType: 0x6F - offset: 0x04 -/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm14: - sensorID: 0x19 - sensorType: 0x0C - eventReadingType: 0x6F - offset: 0x04 -/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm15: - sensorID: 0x1A - sensorType: 0x0C - eventReadingType: 0x6F - offset: 0x04 -/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm2: - sensorID: 0x0D - sensorType: 0x0C - eventReadingType: 0x6F - offset: 0x04 -/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm3: - sensorID: 0x0E - sensorType: 0x0C - eventReadingType: 0x6F - offset: 0x04 -/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm4: - sensorID: 0x0F - sensorType: 0x0C - eventReadingType: 0x6F - offset: 0x04 -/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm5: - sensorID: 0x10 - sensorType: 0x0C - eventReadingType: 0x6F - offset: 0x04 -/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm6: - sensorID: 0x11 - sensorType: 0x0C - eventReadingType: 0x6F - offset: 0x04 -/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm7: - sensorID: 0x12 - sensorType: 0x0C - eventReadingType: 0x6F - offset: 0x04 -/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm8: - sensorID: 0x13 - sensorType: 0x0C - eventReadingType: 0x6F - offset: 0x04 -/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm9: - sensorID: 0x14 - sensorType: 0x0C - eventReadingType: 0x6F - offset: 0x04 -/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0: - sensorID: 0x08 - sensorType: 0x07 - eventReadingType: 0x6F - offset: 0x08 -/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core0: - sensorID: 0x2B - sensorType: 0x07 - eventReadingType: 0x6F - offset: 0x08 -/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core1: - sensorID: 0x2C - sensorType: 0x07 - eventReadingType: 0x6F - offset: 0x08 -/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core2: - sensorID: 0x2D - sensorType: 0x07 - eventReadingType: 0x6F - offset: 0x08 -/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core3: - sensorID: 0x2E - sensorType: 0x07 - eventReadingType: 0x6F - offset: 0x08 -/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core4: - sensorID: 0x2F - sensorType: 0x07 - eventReadingType: 0x6F - offset: 0x08 -/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core5: - sensorID: 0x30 - sensorType: 0x07 - eventReadingType: 0x6F - offset: 0x08 -/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core6: - sensorID: 0x31 - sensorType: 0x07 - eventReadingType: 0x6F - offset: 0x08 -/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core7: - sensorID: 0x32 - sensorType: 0x07 - eventReadingType: 0x6F - offset: 0x08 -/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core8: - sensorID: 0x33 - sensorType: 0x07 - eventReadingType: 0x6F - offset: 0x08 -/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core9: - sensorID: 0x34 - sensorType: 0x07 - eventReadingType: 0x6F - offset: 0x08 -/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core10: - sensorID: 0x35 - sensorType: 0x07 - eventReadingType: 0x6F - offset: 0x08 -/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core11: - sensorID: 0x36 - sensorType: 0x07 - eventReadingType: 0x6F - offset: 0x08 -/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core12: - sensorID: 0x37 - sensorType: 0x07 - eventReadingType: 0x6F - offset: 0x08 -/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core13: - sensorID: 0x38 - sensorType: 0x07 - eventReadingType: 0x6F - offset: 0x08 -/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core14: - sensorID: 0x39 - sensorType: 0x07 - eventReadingType: 0x6F - offset: 0x08 -/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core15: - sensorID: 0x3A - sensorType: 0x07 - eventReadingType: 0x6F - offset: 0x08 -/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core16: - sensorID: 0x3B - sensorType: 0x07 - eventReadingType: 0x6F - offset: 0x08 -/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core17: - sensorID: 0x3C - sensorType: 0x07 - eventReadingType: 0x6F - offset: 0x08 -/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core18: - sensorID: 0x3D - sensorType: 0x07 - eventReadingType: 0x6F - offset: 0x08 -/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core19: - sensorID: 0x3E - sensorType: 0x07 - eventReadingType: 0x6F - offset: 0x08 -/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core20: - sensorID: 0x3F - sensorType: 0x07 - eventReadingType: 0x6F - offset: 0x08 -/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core21: - sensorID: 0x40 - sensorType: 0x07 - eventReadingType: 0x6F - offset: 0x08 -/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core22: - sensorID: 0x41 - sensorType: 0x07 - eventReadingType: 0x6F - offset: 0x08 -/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core23: - sensorID: 0x42 - sensorType: 0x07 - eventReadingType: 0x6F - offset: 0x08 -/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1: - sensorID: 0x09 - sensorType: 0x07 - eventReadingType: 0x6F - offset: 0x08 -/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core0: - sensorID: 0x43 - sensorType: 0x07 - eventReadingType: 0x6F - offset: 0x08 -/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core1: - sensorID: 0x44 - sensorType: 0x07 - eventReadingType: 0x6F - offset: 0x08 -/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core2: - sensorID: 0x45 - sensorType: 0x07 - eventReadingType: 0x6F - offset: 0x08 -/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core3: - sensorID: 0x46 - sensorType: 0x07 - eventReadingType: 0x6F - offset: 0x08 -/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core4: - sensorID: 0x47 - sensorType: 0x07 - eventReadingType: 0x6F - offset: 0x08 -/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core5: - sensorID: 0x48 - sensorType: 0x07 - eventReadingType: 0x6F - offset: 0x08 -/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core6: - sensorID: 0x49 - sensorType: 0x07 - eventReadingType: 0x6F - offset: 0x08 -/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core7: - sensorID: 0x4A - sensorType: 0x07 - eventReadingType: 0x6F - offset: 0x08 -/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core8: - sensorID: 0x4B - sensorType: 0x07 - eventReadingType: 0x6F - offset: 0x08 -/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core9: - sensorID: 0x4C - sensorType: 0x07 - eventReadingType: 0x6F - offset: 0x08 -/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core10: - sensorID: 0x4D - sensorType: 0x07 - eventReadingType: 0x6F - offset: 0x08 -/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core11: - sensorID: 0x4E - sensorType: 0x07 - eventReadingType: 0x6F - offset: 0x08 -/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core12: - sensorID: 0x4F - sensorType: 0x07 - eventReadingType: 0x6F - offset: 0x08 -/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core13: - sensorID: 0x50 - sensorType: 0x07 - eventReadingType: 0x6F - offset: 0x08 -/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core14: - sensorID: 0x51 - sensorType: 0x07 - eventReadingType: 0x6F - offset: 0x08 -/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core15: - sensorID: 0x52 - sensorType: 0x07 - eventReadingType: 0x6F - offset: 0x08 -/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core16: - sensorID: 0x53 - sensorType: 0x07 - eventReadingType: 0x6F - offset: 0x08 -/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core17: - sensorID: 0x54 - sensorType: 0x07 - eventReadingType: 0x6F - offset: 0x08 -/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core18: - sensorID: 0x55 - sensorType: 0x07 - eventReadingType: 0x6F - offset: 0x08 -/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core19: - sensorID: 0x56 - sensorType: 0x07 - eventReadingType: 0x6F - offset: 0x08 -/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core20: - sensorID: 0x57 - sensorType: 0x07 - eventReadingType: 0x6F - offset: 0x08 -/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core21: - sensorID: 0x58 - sensorType: 0x07 - eventReadingType: 0x6F - offset: 0x08 -/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core22: - sensorID: 0x59 - sensorType: 0x07 - eventReadingType: 0x6F - offset: 0x08 -/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core23: - sensorID: 0x5A - sensorType: 0x07 - eventReadingType: 0x6F - offset: 0x08 -/xyz/openbmc_project/inventory/system/chassis/motherboard: - sensorID: 0x8C - sensorType: 0xC7 - eventReadingType: 0x03 - offset: 0x00 -/xyz/openbmc_project/inventory/system: - sensorID: 0x90 - sensorType: 0x12 - eventReadingType: 0x6F - offset: 0x02 diff --git a/meta-ibm/meta-romulus/recipes-phosphor/ipmi/openpower-ipmi-oem_%.bbappend b/meta-ibm/meta-romulus/recipes-phosphor/ipmi/openpower-ipmi-oem_%.bbappend new file mode 100644 index 000000000..73c50cf25 --- /dev/null +++ b/meta-ibm/meta-romulus/recipes-phosphor/ipmi/openpower-ipmi-oem_%.bbappend @@ -0,0 +1,5 @@ +DEPENDS_append_romulus = " romulus-yaml-config" + +EXTRA_OECONF_romulus = " \ + INVSENSOR_YAML_GEN=${STAGING_DIR_HOST}${datadir}/romulus-yaml-config/ipmi-inventory-sensors.yaml \ + " diff --git a/meta-ibm/meta-romulus/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend b/meta-ibm/meta-romulus/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend new file mode 100644 index 000000000..79df7f399 --- /dev/null +++ b/meta-ibm/meta-romulus/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend @@ -0,0 +1,6 @@ +DEPENDS_append_romulus = " romulus-yaml-config" + +EXTRA_OECONF_romulus = " \ + YAML_GEN=${STAGING_DIR_HOST}${datadir}/romulus-yaml-config/ipmi-fru-read.yaml \ + PROP_YAML=${STAGING_DIR_HOST}${datadir}/romulus-yaml-config/ipmi-extra-properties.yaml \ + " diff --git a/meta-ibm/meta-romulus/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend b/meta-ibm/meta-romulus/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend new file mode 100644 index 000000000..25130a586 --- /dev/null +++ b/meta-ibm/meta-romulus/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend @@ -0,0 +1,7 @@ +DEPENDS_append_romulus = " romulus-yaml-config" + +EXTRA_OECONF_romulus = " \ + SENSOR_YAML_GEN=${STAGING_DIR_HOST}${datadir}/romulus-yaml-config/ipmi-sensors.yaml \ + INVSENSOR_YAML_GEN=${STAGING_DIR_HOST}${datadir}/romulus-yaml-config/ipmi-inventory-sensors.yaml \ + FRU_YAML_GEN=${STAGING_DIR_HOST}${datadir}/romulus-yaml-config/ipmi-fru-read.yaml \ + " diff --git a/meta-ibm/meta-romulus/recipes-phosphor/ipmi/romulus-ipmi-fru-properties-native.bb b/meta-ibm/meta-romulus/recipes-phosphor/ipmi/romulus-ipmi-fru-properties-native.bb deleted file mode 100644 index 57d7e7c16..000000000 --- a/meta-ibm/meta-romulus/recipes-phosphor/ipmi/romulus-ipmi-fru-properties-native.bb +++ /dev/null @@ -1,20 +0,0 @@ -SUMMARY = "Romulus FRU properties config for ipmi-fru-parser" -PR = "r1" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${IBMBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" - -inherit native -inherit phosphor-ipmi-fru - -SRC_URI += "file://extra-properties.yaml" - -PROVIDES += "virtual/phosphor-ipmi-fru-properties" - -S = "${WORKDIR}" - -do_install() { - DEST=${D}${properties_datadir} - install -d ${DEST} - install extra-properties.yaml ${DEST} -} - diff --git a/meta-ibm/meta-romulus/recipes-phosphor/ipmi/romulus-ipmi-fru-properties/extra-properties.yaml b/meta-ibm/meta-romulus/recipes-phosphor/ipmi/romulus-ipmi-fru-properties/extra-properties.yaml deleted file mode 100644 index ae626ed05..000000000 --- a/meta-ibm/meta-romulus/recipes-phosphor/ipmi/romulus-ipmi-fru-properties/extra-properties.yaml +++ /dev/null @@ -1,159 +0,0 @@ -/system/chassis/motherboard/cpu0: - xyz.openbmc_project.Inventory.Decorator.Replaceable: - FieldReplaceable: 'true' - xyz.openbmc_project.Inventory.Decorator.Cacheable: - Cached: 'true' - xyz.openbmc_project.Inventory.Item: - Present: 'true' - -/system/chassis/motherboard/cpu1: - xyz.openbmc_project.Inventory.Decorator.Replaceable: - FieldReplaceable: 'true' - xyz.openbmc_project.Inventory.Decorator.Cacheable: - Cached: 'true' - xyz.openbmc_project.Inventory.Item: - Present: 'true' - -/system/chassis/motherboard: - xyz.openbmc_project.Inventory.Decorator.Replaceable: - FieldReplaceable: 'true' - xyz.openbmc_project.Inventory.Decorator.Cacheable: - Cached: 'true' - xyz.openbmc_project.Inventory.Item: - Present: 'true' - -/system: - xyz.openbmc_project.Inventory.Decorator.Replaceable: - FieldReplaceable: 'true' - xyz.openbmc_project.Inventory.Decorator.Cacheable: - Cached: 'true' - xyz.openbmc_project.Inventory.Item: - Present: 'true' - -/system/chassis/motherboard/dimm0: - xyz.openbmc_project.Inventory.Decorator.Replaceable: - FieldReplaceable: 'true' - xyz.openbmc_project.Inventory.Decorator.Cacheable: - Cached: 'true' - xyz.openbmc_project.Inventory.Item: - Present: 'true' - -/system/chassis/motherboard/dimm1: - xyz.openbmc_project.Inventory.Decorator.Replaceable: - FieldReplaceable: 'true' - xyz.openbmc_project.Inventory.Decorator.Cacheable: - Cached: 'true' - xyz.openbmc_project.Inventory.Item: - Present: 'true' - -/system/chassis/motherboard/dimm2: - xyz.openbmc_project.Inventory.Decorator.Replaceable: - FieldReplaceable: 'true' - xyz.openbmc_project.Inventory.Decorator.Cacheable: - Cached: 'true' - xyz.openbmc_project.Inventory.Item: - Present: 'true' - -/system/chassis/motherboard/dimm3: - xyz.openbmc_project.Inventory.Decorator.Replaceable: - FieldReplaceable: 'true' - xyz.openbmc_project.Inventory.Decorator.Cacheable: - Cached: 'true' - xyz.openbmc_project.Inventory.Item: - Present: 'true' - -/system/chassis/motherboard/dimm4: - xyz.openbmc_project.Inventory.Decorator.Replaceable: - FieldReplaceable: 'true' - xyz.openbmc_project.Inventory.Decorator.Cacheable: - Cached: 'true' - xyz.openbmc_project.Inventory.Item: - Present: 'true' - -/system/chassis/motherboard/dimm5: - xyz.openbmc_project.Inventory.Decorator.Replaceable: - FieldReplaceable: 'true' - xyz.openbmc_project.Inventory.Decorator.Cacheable: - Cached: 'true' - xyz.openbmc_project.Inventory.Item: - Present: 'true' - -/system/chassis/motherboard/dimm6: - xyz.openbmc_project.Inventory.Decorator.Replaceable: - FieldReplaceable: 'true' - xyz.openbmc_project.Inventory.Decorator.Cacheable: - Cached: 'true' - xyz.openbmc_project.Inventory.Item: - Present: 'true' - -/system/chassis/motherboard/dimm7: - xyz.openbmc_project.Inventory.Decorator.Replaceable: - FieldReplaceable: 'true' - xyz.openbmc_project.Inventory.Decorator.Cacheable: - Cached: 'true' - xyz.openbmc_project.Inventory.Item: - Present: 'true' - -/system/chassis/motherboard/dimm8: - xyz.openbmc_project.Inventory.Decorator.Replaceable: - FieldReplaceable: 'true' - xyz.openbmc_project.Inventory.Decorator.Cacheable: - Cached: 'true' - xyz.openbmc_project.Inventory.Item: - Present: 'true' - -/system/chassis/motherboard/dimm9: - xyz.openbmc_project.Inventory.Decorator.Replaceable: - FieldReplaceable: 'true' - xyz.openbmc_project.Inventory.Decorator.Cacheable: - Cached: 'true' - xyz.openbmc_project.Inventory.Item: - Present: 'true' - -/system/chassis/motherboard/dimm10: - xyz.openbmc_project.Inventory.Decorator.Replaceable: - FieldReplaceable: 'true' - xyz.openbmc_project.Inventory.Decorator.Cacheable: - Cached: 'true' - xyz.openbmc_project.Inventory.Item: - Present: 'true' - -/system/chassis/motherboard/dimm11: - xyz.openbmc_project.Inventory.Decorator.Replaceable: - FieldReplaceable: 'true' - xyz.openbmc_project.Inventory.Decorator.Cacheable: - Cached: 'true' - xyz.openbmc_project.Inventory.Item: - Present: 'true' - -/system/chassis/motherboard/dimm12: - xyz.openbmc_project.Inventory.Decorator.Replaceable: - FieldReplaceable: 'true' - xyz.openbmc_project.Inventory.Decorator.Cacheable: - Cached: 'true' - xyz.openbmc_project.Inventory.Item: - Present: 'true' - -/system/chassis/motherboard/dimm13: - xyz.openbmc_project.Inventory.Decorator.Replaceable: - FieldReplaceable: 'true' - xyz.openbmc_project.Inventory.Decorator.Cacheable: - Cached: 'true' - xyz.openbmc_project.Inventory.Item: - Present: 'true' - -/system/chassis/motherboard/dimm14: - xyz.openbmc_project.Inventory.Decorator.Replaceable: - FieldReplaceable: 'true' - xyz.openbmc_project.Inventory.Decorator.Cacheable: - Cached: 'true' - xyz.openbmc_project.Inventory.Item: - Present: 'true' - -/system/chassis/motherboard/dimm15: - xyz.openbmc_project.Inventory.Decorator.Replaceable: - FieldReplaceable: 'true' - xyz.openbmc_project.Inventory.Decorator.Cacheable: - Cached: 'true' - xyz.openbmc_project.Inventory.Item: - Present: 'true' diff --git a/meta-ibm/meta-romulus/recipes-phosphor/ipmi/romulus-ipmi-fru-read-bmc-inventory-native.bb b/meta-ibm/meta-romulus/recipes-phosphor/ipmi/romulus-ipmi-fru-read-bmc-inventory-native.bb deleted file mode 100644 index 71b23d938..000000000 --- a/meta-ibm/meta-romulus/recipes-phosphor/ipmi/romulus-ipmi-fru-read-bmc-inventory-native.bb +++ /dev/null @@ -1,19 +0,0 @@ -SUMMARY = "Romulus BMC accesible FRU inventory map for phosphor-ipmi-host" -PR = "r1" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${IBMBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" - -inherit native -inherit phosphor-ipmi-host - -SRC_URI += "file://bmc-fru-config.yaml" - -S = "${WORKDIR}" - -PROVIDES += "virtual/phosphor-ipmi-fru-read-bmc-inventory" - -do_install_append() { - DEST=${D}${config_datadir} - install -d ${DEST} - install bmc-fru-config.yaml ${DEST}/bmc-fru-config.yaml -} diff --git a/meta-ibm/meta-romulus/recipes-phosphor/ipmi/romulus-ipmi-fru-read-bmc-inventory/bmc-fru-config.yaml b/meta-ibm/meta-romulus/recipes-phosphor/ipmi/romulus-ipmi-fru-read-bmc-inventory/bmc-fru-config.yaml deleted file mode 100644 index 597368950..000000000 --- a/meta-ibm/meta-romulus/recipes-phosphor/ipmi/romulus-ipmi-fru-read-bmc-inventory/bmc-fru-config.yaml +++ /dev/null @@ -1,27 +0,0 @@ -50: - /system/chassis/motherboard/fan0: - entityID: 29 - entityInstance: 1 - interfaces: - xyz.openbmc_project.Inventory.Item: - PrettyName: - IPMIFruProperty: Product Name - IPMIFruSection: Product -51: - /system/chassis/motherboard/fan1: - entityID: 29 - entityInstance: 2 - interfaces: - xyz.openbmc_project.Inventory.Item: - PrettyName: - IPMIFruProperty: Product Name - IPMIFruSection: Product -52: - /system/chassis/motherboard/fan2: - entityID: 29 - entityInstance: 3 - interfaces: - xyz.openbmc_project.Inventory.Item: - PrettyName: - IPMIFruProperty: Product Name - IPMIFruSection: Product diff --git a/meta-ibm/meta-romulus/recipes-phosphor/ipmi/romulus-ipmi-fru-read-inventory-native.bb b/meta-ibm/meta-romulus/recipes-phosphor/ipmi/romulus-ipmi-fru-read-inventory-native.bb deleted file mode 100644 index 6f416c1a7..000000000 --- a/meta-ibm/meta-romulus/recipes-phosphor/ipmi/romulus-ipmi-fru-read-inventory-native.bb +++ /dev/null @@ -1,19 +0,0 @@ -SUMMARY = "Romulus inventory map for phosphor-ipmi-host" -PR = "r1" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${IBMBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" - -inherit native -inherit phosphor-ipmi-host - -SRC_URI += "file://config.yaml" - -PROVIDES += "virtual/phosphor-ipmi-fru-read-inventory" - -S = "${WORKDIR}" - -do_install() { - DEST=${D}${config_datadir} - install -d ${DEST} - install config.yaml ${DEST} -} diff --git a/meta-ibm/meta-romulus/recipes-phosphor/ipmi/romulus-ipmi-inventory-map-native.bb b/meta-ibm/meta-romulus/recipes-phosphor/ipmi/romulus-ipmi-inventory-map-native.bb deleted file mode 100644 index c0620ff5d..000000000 --- a/meta-ibm/meta-romulus/recipes-phosphor/ipmi/romulus-ipmi-inventory-map-native.bb +++ /dev/null @@ -1,24 +0,0 @@ -SUMMARY = "Romulus IPMI to DBus Inventory mapping." -PR = "r1" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${IBMBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" - -inherit native -inherit phosphor-ipmi-fru - -SRC_URI += "file://config.yaml" - -PROVIDES += "virtual/phosphor-ipmi-fru-inventory" - -S = "${WORKDIR}" - -do_install() { - # TODO: install this to inventory_datadir - # after ipmi-fru-parser untangles the host - # firmware config from the machine inventory. - DEST=${D}${config_datadir} - - install -d ${DEST} - install config.yaml ${DEST} -} - diff --git a/meta-ibm/meta-romulus/recipes-phosphor/ipmi/romulus-ipmi-inventory-sel-native.bb b/meta-ibm/meta-romulus/recipes-phosphor/ipmi/romulus-ipmi-inventory-sel-native.bb deleted file mode 100644 index 60904656f..000000000 --- a/meta-ibm/meta-romulus/recipes-phosphor/ipmi/romulus-ipmi-inventory-sel-native.bb +++ /dev/null @@ -1,19 +0,0 @@ -SUMMARY = "Inventory to Sensor config for Romulus" -PR = "r1" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${IBMBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" - -inherit native -inherit phosphor-ipmi-host - -PROVIDES += "virtual/phosphor-ipmi-inventory-sel" - -SRC_URI += "file://sel-config.yaml" - -S = "${WORKDIR}" - -do_install() { - DEST=${D}${sensor_datadir} - install -d ${DEST} - install sel-config.yaml ${DEST}/invsensor.yaml -} diff --git a/meta-ibm/meta-romulus/recipes-phosphor/ipmi/romulus-ipmi-sensor-inventory-native.bb b/meta-ibm/meta-romulus/recipes-phosphor/ipmi/romulus-ipmi-sensor-inventory-native.bb deleted file mode 100644 index 97fee4d37..000000000 --- a/meta-ibm/meta-romulus/recipes-phosphor/ipmi/romulus-ipmi-sensor-inventory-native.bb +++ /dev/null @@ -1,20 +0,0 @@ -SUMMARY = "Romulus sensor config for phosphor-host-ipmi" -PR = "r1" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${IBMBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" - -inherit native -inherit phosphor-ipmi-host - -PROVIDES += "virtual/phosphor-ipmi-sensor-inventory" - -SRC_URI += "file://config.yaml" - -S = "${WORKDIR}" - -do_install() { - DEST=${D}${sensor_datadir} - install -d ${DEST} - install config.yaml ${DEST}/sensor.yaml -} - diff --git a/meta-ibm/meta-romulus/recipes-phosphor/ipmi/romulus-ipmi-sensor-inventory/config.yaml b/meta-ibm/meta-romulus/recipes-phosphor/ipmi/romulus-ipmi-sensor-inventory/config.yaml deleted file mode 100755 index 1938135e3..000000000 --- a/meta-ibm/meta-romulus/recipes-phosphor/ipmi/romulus-ipmi-sensor-inventory/config.yaml +++ /dev/null @@ -1,3560 +0,0 @@ -2: - entityID: 34 - entityInstance: 1 - interfaces: - xyz.openbmc_project.State.Boot.Progress: - BootProgress: - Offsets: - 0: - set: xyz.openbmc_project.State.Boot.Progress.ProgressStages.Unspecified - type: string - 1: - set: xyz.openbmc_project.State.Boot.Progress.ProgressStages.MemoryInit - type: string - 3: - set: xyz.openbmc_project.State.Boot.Progress.ProgressStages.SecondaryProcInit - type: string - 7: - set: xyz.openbmc_project.State.Boot.Progress.ProgressStages.PCIInit - type: string - 19: - set: xyz.openbmc_project.State.Boot.Progress.ProgressStages.OSStart - type: string - 20: - set: xyz.openbmc_project.State.Boot.Progress.ProgressStages.MotherboardInit - type: string - mutability: Mutability::Write|Mutability::Read - path: /xyz/openbmc_project/state/host0 - readingType: eventdata2 - sensorNamePattern: nameProperty - sensorReadingType: 111 - sensorType: 15 - serviceInterface: org.freedesktop.DBus.Properties -3: - entityID: 210 - entityInstance: 1 - interfaces: - org.open_power.OCC.Status: - OccActive: - Offsets: - 0: - assert: false - deassert: true - type: bool - 1: - assert: true - deassert: false - type: bool - mutability: Mutability::Write|Mutability::Read - path: /org/open_power/control/occ0 - readingType: assertion - sensorNamePattern: nameLeaf - sensorReadingType: 9 - sensorType: 7 - serviceInterface: org.freedesktop.DBus.Properties -4: - entityID: 210 - entityInstance: 2 - interfaces: - org.open_power.OCC.Status: - OccActive: - Offsets: - 0: - assert: false - deassert: true - type: bool - 1: - assert: true - deassert: false - type: bool - mutability: Mutability::Write|Mutability::Read - path: /org/open_power/control/occ1 - readingType: assertion - sensorNamePattern: nameLeaf - sensorReadingType: 9 - sensorType: 7 - serviceInterface: org.freedesktop.DBus.Properties -8: - entityID: 3 - entityInstance: 1 - interfaces: - xyz.openbmc_project.Inventory.Item: - Present: - Offsets: - 7: - assert: true - deassert: false - type: bool - xyz.openbmc_project.State.Decorator.OperationalStatus: - Functional: - Offsets: - 8: - assert: false - deassert: true - type: bool - Prereqs: - 7: - assert: true - deassert: false - type: bool - mutability: Mutability::Write|Mutability::Read - path: /system/chassis/motherboard/cpu0 - readingType: assertion - sensorNamePattern: nameLeaf - sensorReadingType: 111 - sensorType: 7 - serviceInterface: xyz.openbmc_project.Inventory.Manager -9: - entityID: 3 - entityInstance: 2 - interfaces: - xyz.openbmc_project.Inventory.Item: - Present: - Offsets: - 7: - assert: true - deassert: false - type: bool - xyz.openbmc_project.State.Decorator.OperationalStatus: - Functional: - Offsets: - 8: - assert: false - deassert: true - type: bool - Prereqs: - 7: - assert: true - deassert: false - type: bool - mutability: Mutability::Write|Mutability::Read - path: /system/chassis/motherboard/cpu1 - readingType: assertion - sensorNamePattern: nameLeaf - sensorReadingType: 111 - sensorType: 7 - serviceInterface: xyz.openbmc_project.Inventory.Manager -11: - entityID: 32 - entityInstance: 1 - interfaces: - xyz.openbmc_project.Inventory.Item: - Present: - Offsets: - 6: - assert: true - deassert: false - type: bool - xyz.openbmc_project.State.Decorator.OperationalStatus: - Functional: - Offsets: - 4: - assert: false - deassert: true - type: bool - Prereqs: - 6: - assert: true - deassert: false - type: bool - mutability: Mutability::Write|Mutability::Read - path: /system/chassis/motherboard/dimm0 - readingType: assertion - sensorNamePattern: nameLeaf - sensorReadingType: 111 - sensorType: 12 - serviceInterface: xyz.openbmc_project.Inventory.Manager -12: - entityID: 32 - entityInstance: 2 - interfaces: - xyz.openbmc_project.Inventory.Item: - Present: - Offsets: - 6: - assert: true - deassert: false - type: bool - xyz.openbmc_project.State.Decorator.OperationalStatus: - Functional: - Offsets: - 4: - assert: false - deassert: true - type: bool - Prereqs: - 6: - assert: true - deassert: false - type: bool - mutability: Mutability::Write|Mutability::Read - path: /system/chassis/motherboard/dimm1 - readingType: assertion - sensorNamePattern: nameLeaf - sensorReadingType: 111 - sensorType: 12 - serviceInterface: xyz.openbmc_project.Inventory.Manager -13: - entityID: 32 - entityInstance: 3 - interfaces: - xyz.openbmc_project.Inventory.Item: - Present: - Offsets: - 6: - assert: true - deassert: false - type: bool - xyz.openbmc_project.State.Decorator.OperationalStatus: - Functional: - Offsets: - 4: - assert: false - deassert: true - type: bool - Prereqs: - 6: - assert: true - deassert: false - type: bool - mutability: Mutability::Write|Mutability::Read - path: /system/chassis/motherboard/dimm2 - readingType: assertion - sensorNamePattern: nameLeaf - sensorReadingType: 111 - sensorType: 12 - serviceInterface: xyz.openbmc_project.Inventory.Manager -14: - entityID: 32 - entityInstance: 4 - interfaces: - xyz.openbmc_project.Inventory.Item: - Present: - Offsets: - 6: - assert: true - deassert: false - type: bool - xyz.openbmc_project.State.Decorator.OperationalStatus: - Functional: - Offsets: - 4: - assert: false - deassert: true - type: bool - Prereqs: - 6: - assert: true - deassert: false - type: bool - mutability: Mutability::Write|Mutability::Read - path: /system/chassis/motherboard/dimm3 - readingType: assertion - sensorNamePattern: nameLeaf - sensorReadingType: 111 - sensorType: 12 - serviceInterface: xyz.openbmc_project.Inventory.Manager -15: - entityID: 32 - entityInstance: 5 - interfaces: - xyz.openbmc_project.Inventory.Item: - Present: - Offsets: - 6: - assert: true - deassert: false - type: bool - xyz.openbmc_project.State.Decorator.OperationalStatus: - Functional: - Offsets: - 4: - assert: false - deassert: true - type: bool - Prereqs: - 6: - assert: true - deassert: false - type: bool - mutability: Mutability::Write|Mutability::Read - path: /system/chassis/motherboard/dimm4 - readingType: assertion - sensorNamePattern: nameLeaf - sensorReadingType: 111 - sensorType: 12 - serviceInterface: xyz.openbmc_project.Inventory.Manager -16: - entityID: 32 - entityInstance: 6 - interfaces: - xyz.openbmc_project.Inventory.Item: - Present: - Offsets: - 6: - assert: true - deassert: false - type: bool - xyz.openbmc_project.State.Decorator.OperationalStatus: - Functional: - Offsets: - 4: - assert: false - deassert: true - type: bool - Prereqs: - 6: - assert: true - deassert: false - type: bool - mutability: Mutability::Write|Mutability::Read - path: /system/chassis/motherboard/dimm5 - readingType: assertion - sensorNamePattern: nameLeaf - sensorReadingType: 111 - sensorType: 12 - serviceInterface: xyz.openbmc_project.Inventory.Manager -17: - entityID: 32 - entityInstance: 7 - interfaces: - xyz.openbmc_project.Inventory.Item: - Present: - Offsets: - 6: - assert: true - deassert: false - type: bool - xyz.openbmc_project.State.Decorator.OperationalStatus: - Functional: - Offsets: - 4: - assert: false - deassert: true - type: bool - Prereqs: - 6: - assert: true - deassert: false - type: bool - mutability: Mutability::Write|Mutability::Read - path: /system/chassis/motherboard/dimm6 - readingType: assertion - sensorNamePattern: nameLeaf - sensorReadingType: 111 - sensorType: 12 - serviceInterface: xyz.openbmc_project.Inventory.Manager -18: - entityID: 32 - entityInstance: 8 - interfaces: - xyz.openbmc_project.Inventory.Item: - Present: - Offsets: - 6: - assert: true - deassert: false - type: bool - xyz.openbmc_project.State.Decorator.OperationalStatus: - Functional: - Offsets: - 4: - assert: false - deassert: true - type: bool - Prereqs: - 6: - assert: true - deassert: false - type: bool - mutability: Mutability::Write|Mutability::Read - path: /system/chassis/motherboard/dimm7 - readingType: assertion - sensorNamePattern: nameLeaf - sensorReadingType: 111 - sensorType: 12 - serviceInterface: xyz.openbmc_project.Inventory.Manager -19: - entityID: 32 - entityInstance: 9 - interfaces: - xyz.openbmc_project.Inventory.Item: - Present: - Offsets: - 6: - assert: true - deassert: false - type: bool - xyz.openbmc_project.State.Decorator.OperationalStatus: - Functional: - Offsets: - 4: - assert: false - deassert: true - type: bool - Prereqs: - 6: - assert: true - deassert: false - type: bool - mutability: Mutability::Write|Mutability::Read - path: /system/chassis/motherboard/dimm8 - readingType: assertion - sensorNamePattern: nameLeaf - sensorReadingType: 111 - sensorType: 12 - serviceInterface: xyz.openbmc_project.Inventory.Manager -20: - entityID: 32 - entityInstance: 10 - interfaces: - xyz.openbmc_project.Inventory.Item: - Present: - Offsets: - 6: - assert: true - deassert: false - type: bool - xyz.openbmc_project.State.Decorator.OperationalStatus: - Functional: - Offsets: - 4: - assert: false - deassert: true - type: bool - Prereqs: - 6: - assert: true - deassert: false - type: bool - mutability: Mutability::Write|Mutability::Read - path: /system/chassis/motherboard/dimm9 - readingType: assertion - sensorNamePattern: nameLeaf - sensorReadingType: 111 - sensorType: 12 - serviceInterface: xyz.openbmc_project.Inventory.Manager -21: - entityID: 32 - entityInstance: 11 - interfaces: - xyz.openbmc_project.Inventory.Item: - Present: - Offsets: - 6: - assert: true - deassert: false - type: bool - xyz.openbmc_project.State.Decorator.OperationalStatus: - Functional: - Offsets: - 4: - assert: false - deassert: true - type: bool - Prereqs: - 6: - assert: true - deassert: false - type: bool - mutability: Mutability::Write|Mutability::Read - path: /system/chassis/motherboard/dimm10 - readingType: assertion - sensorNamePattern: nameLeaf - sensorReadingType: 111 - sensorType: 12 - serviceInterface: xyz.openbmc_project.Inventory.Manager -22: - entityID: 32 - entityInstance: 12 - interfaces: - xyz.openbmc_project.Inventory.Item: - Present: - Offsets: - 6: - assert: true - deassert: false - type: bool - xyz.openbmc_project.State.Decorator.OperationalStatus: - Functional: - Offsets: - 4: - assert: false - deassert: true - type: bool - Prereqs: - 6: - assert: true - deassert: false - type: bool - mutability: Mutability::Write|Mutability::Read - path: /system/chassis/motherboard/dimm11 - readingType: assertion - sensorNamePattern: nameLeaf - sensorReadingType: 111 - sensorType: 12 - serviceInterface: xyz.openbmc_project.Inventory.Manager -23: - entityID: 32 - entityInstance: 13 - interfaces: - xyz.openbmc_project.Inventory.Item: - Present: - Offsets: - 6: - assert: true - deassert: false - type: bool - xyz.openbmc_project.State.Decorator.OperationalStatus: - Functional: - Offsets: - 4: - assert: false - deassert: true - type: bool - Prereqs: - 6: - assert: true - deassert: false - type: bool - mutability: Mutability::Write|Mutability::Read - path: /system/chassis/motherboard/dimm12 - readingType: assertion - sensorNamePattern: nameLeaf - sensorReadingType: 111 - sensorType: 12 - serviceInterface: xyz.openbmc_project.Inventory.Manager -24: - entityID: 32 - entityInstance: 14 - interfaces: - xyz.openbmc_project.Inventory.Item: - Present: - Offsets: - 6: - assert: true - deassert: false - type: bool - xyz.openbmc_project.State.Decorator.OperationalStatus: - Functional: - Offsets: - 4: - assert: false - deassert: true - type: bool - Prereqs: - 6: - assert: true - deassert: false - type: bool - mutability: Mutability::Write|Mutability::Read - path: /system/chassis/motherboard/dimm13 - readingType: assertion - sensorNamePattern: nameLeaf - sensorReadingType: 111 - sensorType: 12 - serviceInterface: xyz.openbmc_project.Inventory.Manager -25: - entityID: 32 - entityInstance: 15 - interfaces: - xyz.openbmc_project.Inventory.Item: - Present: - Offsets: - 6: - assert: true - deassert: false - type: bool - xyz.openbmc_project.State.Decorator.OperationalStatus: - Functional: - Offsets: - 4: - assert: false - deassert: true - type: bool - Prereqs: - 6: - assert: true - deassert: false - type: bool - mutability: Mutability::Write|Mutability::Read - path: /system/chassis/motherboard/dimm14 - readingType: assertion - sensorNamePattern: nameLeaf - sensorReadingType: 111 - sensorType: 12 - serviceInterface: xyz.openbmc_project.Inventory.Manager -26: - entityID: 32 - entityInstance: 16 - interfaces: - xyz.openbmc_project.Inventory.Item: - Present: - Offsets: - 6: - assert: true - deassert: false - type: bool - xyz.openbmc_project.State.Decorator.OperationalStatus: - Functional: - Offsets: - 4: - assert: false - deassert: true - type: bool - Prereqs: - 6: - assert: true - deassert: false - type: bool - mutability: Mutability::Write|Mutability::Read - path: /system/chassis/motherboard/dimm15 - readingType: assertion - sensorNamePattern: nameLeaf - sensorReadingType: 111 - sensorType: 12 - serviceInterface: xyz.openbmc_project.Inventory.Manager -27: - bExp: 0 - entityID: 32 - entityInstance: 17 - interfaces: - xyz.openbmc_project.Sensor.Value: - Value: - Offsets: - 255: - type: int64_t - multiplierM: 1 - mutability: Mutability::Write|Mutability::Read - offsetB: -127 - path: /xyz/openbmc_project/sensors/temperature/dimm0_temp - rExp: 0 - readingType: readingData - scale: -3 - sensorNamePattern: nameLeaf - sensorReadingType: 1 - sensorType: 1 - serviceInterface: org.freedesktop.DBus.Properties - unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC -28: - bExp: 0 - entityID: 32 - entityInstance: 18 - interfaces: - xyz.openbmc_project.Sensor.Value: - Value: - Offsets: - 255: - type: int64_t - multiplierM: 1 - mutability: Mutability::Write|Mutability::Read - offsetB: -127 - path: /xyz/openbmc_project/sensors/temperature/dimm1_temp - rExp: 0 - readingType: readingData - scale: -3 - sensorNamePattern: nameLeaf - sensorReadingType: 1 - sensorType: 1 - serviceInterface: org.freedesktop.DBus.Properties - unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC -29: - bExp: 0 - entityID: 32 - entityInstance: 25 - interfaces: - xyz.openbmc_project.Sensor.Value: - Value: - Offsets: - 255: - type: int64_t - multiplierM: 1 - mutability: Mutability::Write|Mutability::Read - offsetB: -127 - path: /xyz/openbmc_project/sensors/temperature/dimm2_temp - rExp: 0 - readingType: readingData - scale: -3 - sensorNamePattern: nameLeaf - sensorReadingType: 1 - sensorType: 1 - serviceInterface: org.freedesktop.DBus.Properties - unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC -30: - bExp: 0 - entityID: 32 - entityInstance: 26 - interfaces: - xyz.openbmc_project.Sensor.Value: - Value: - Offsets: - 255: - type: int64_t - multiplierM: 1 - mutability: Mutability::Write|Mutability::Read - offsetB: -127 - path: /xyz/openbmc_project/sensors/temperature/dimm3_temp - rExp: 0 - readingType: readingData - scale: -3 - sensorNamePattern: nameLeaf - sensorReadingType: 1 - sensorType: 1 - serviceInterface: org.freedesktop.DBus.Properties - unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC -31: - bExp: 0 - entityID: 32 - entityInstance: 27 - interfaces: - xyz.openbmc_project.Sensor.Value: - Value: - Offsets: - 255: - type: int64_t - multiplierM: 1 - mutability: Mutability::Write|Mutability::Read - offsetB: -127 - path: /xyz/openbmc_project/sensors/temperature/dimm4_temp - rExp: 0 - readingType: readingData - scale: -3 - sensorNamePattern: nameLeaf - sensorReadingType: 1 - sensorType: 1 - serviceInterface: org.freedesktop.DBus.Properties - unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC -32: - bExp: 0 - entityID: 32 - entityInstance: 28 - interfaces: - xyz.openbmc_project.Sensor.Value: - Value: - Offsets: - 255: - type: int64_t - multiplierM: 1 - mutability: Mutability::Write|Mutability::Read - offsetB: -127 - path: /xyz/openbmc_project/sensors/temperature/dimm5_temp - rExp: 0 - readingType: readingData - scale: -3 - sensorNamePattern: nameLeaf - sensorReadingType: 1 - sensorType: 1 - serviceInterface: org.freedesktop.DBus.Properties - unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC -33: - bExp: 0 - entityID: 32 - entityInstance: 29 - interfaces: - xyz.openbmc_project.Sensor.Value: - Value: - Offsets: - 255: - type: int64_t - multiplierM: 1 - mutability: Mutability::Write|Mutability::Read - offsetB: -127 - path: /xyz/openbmc_project/sensors/temperature/dimm6_temp - rExp: 0 - readingType: readingData - scale: -3 - sensorNamePattern: nameLeaf - sensorReadingType: 1 - sensorType: 1 - serviceInterface: org.freedesktop.DBus.Properties - unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC -34: - bExp: 0 - entityID: 32 - entityInstance: 30 - interfaces: - xyz.openbmc_project.Sensor.Value: - Value: - Offsets: - 255: - type: int64_t - multiplierM: 1 - mutability: Mutability::Write|Mutability::Read - offsetB: -127 - path: /xyz/openbmc_project/sensors/temperature/dimm7_temp - rExp: 0 - readingType: readingData - scale: -3 - sensorNamePattern: nameLeaf - sensorReadingType: 1 - sensorType: 1 - serviceInterface: org.freedesktop.DBus.Properties - unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC -35: - bExp: 0 - entityID: 32 - entityInstance: 31 - interfaces: - xyz.openbmc_project.Sensor.Value: - Value: - Offsets: - 255: - type: int64_t - multiplierM: 1 - mutability: Mutability::Write|Mutability::Read - offsetB: -127 - path: /xyz/openbmc_project/sensors/temperature/dimm8_temp - rExp: 0 - readingType: readingData - scale: -3 - sensorNamePattern: nameLeaf - sensorReadingType: 1 - sensorType: 1 - serviceInterface: org.freedesktop.DBus.Properties - unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC -36: - bExp: 0 - entityID: 32 - entityInstance: 32 - interfaces: - xyz.openbmc_project.Sensor.Value: - Value: - Offsets: - 255: - type: int64_t - multiplierM: 1 - mutability: Mutability::Write|Mutability::Read - offsetB: -127 - path: /xyz/openbmc_project/sensors/temperature/dimm9_temp - rExp: 0 - readingType: readingData - scale: -3 - sensorNamePattern: nameLeaf - sensorReadingType: 1 - sensorType: 1 - serviceInterface: org.freedesktop.DBus.Properties - unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC -37: - bExp: 0 - entityID: 32 - entityInstance: 19 - interfaces: - xyz.openbmc_project.Sensor.Value: - Value: - Offsets: - 255: - type: int64_t - multiplierM: 1 - mutability: Mutability::Write|Mutability::Read - offsetB: -127 - path: /xyz/openbmc_project/sensors/temperature/dimm10_temp - rExp: 0 - readingType: readingData - scale: -3 - sensorNamePattern: nameLeaf - sensorReadingType: 1 - sensorType: 1 - serviceInterface: org.freedesktop.DBus.Properties - unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC -38: - bExp: 0 - entityID: 32 - entityInstance: 20 - interfaces: - xyz.openbmc_project.Sensor.Value: - Value: - Offsets: - 255: - type: int64_t - multiplierM: 1 - mutability: Mutability::Write|Mutability::Read - offsetB: -127 - path: /xyz/openbmc_project/sensors/temperature/dimm11_temp - rExp: 0 - readingType: readingData - scale: -3 - sensorNamePattern: nameLeaf - sensorReadingType: 1 - sensorType: 1 - serviceInterface: org.freedesktop.DBus.Properties - unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC -39: - bExp: 0 - entityID: 32 - entityInstance: 21 - interfaces: - xyz.openbmc_project.Sensor.Value: - Value: - Offsets: - 255: - type: int64_t - multiplierM: 1 - mutability: Mutability::Write|Mutability::Read - offsetB: -127 - path: /xyz/openbmc_project/sensors/temperature/dimm12_temp - rExp: 0 - readingType: readingData - scale: -3 - sensorNamePattern: nameLeaf - sensorReadingType: 1 - sensorType: 1 - serviceInterface: org.freedesktop.DBus.Properties - unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC -40: - bExp: 0 - entityID: 32 - entityInstance: 22 - interfaces: - xyz.openbmc_project.Sensor.Value: - Value: - Offsets: - 255: - type: int64_t - multiplierM: 1 - mutability: Mutability::Write|Mutability::Read - offsetB: -127 - path: /xyz/openbmc_project/sensors/temperature/dimm13_temp - rExp: 0 - readingType: readingData - scale: -3 - sensorNamePattern: nameLeaf - sensorReadingType: 1 - sensorType: 1 - serviceInterface: org.freedesktop.DBus.Properties - unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC -41: - bExp: 0 - entityID: 32 - entityInstance: 23 - interfaces: - xyz.openbmc_project.Sensor.Value: - Value: - Offsets: - 255: - type: int64_t - multiplierM: 1 - mutability: Mutability::Write|Mutability::Read - offsetB: -127 - path: /xyz/openbmc_project/sensors/temperature/dimm14_temp - rExp: 0 - readingType: readingData - scale: -3 - sensorNamePattern: nameLeaf - sensorReadingType: 1 - sensorType: 1 - serviceInterface: org.freedesktop.DBus.Properties - unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC -42: - bExp: 0 - entityID: 32 - entityInstance: 24 - interfaces: - xyz.openbmc_project.Sensor.Value: - Value: - Offsets: - 255: - type: int64_t - multiplierM: 1 - mutability: Mutability::Write|Mutability::Read - offsetB: -127 - path: /xyz/openbmc_project/sensors/temperature/dimm15_temp - rExp: 0 - readingType: readingData - scale: -3 - sensorNamePattern: nameLeaf - sensorReadingType: 1 - sensorType: 1 - serviceInterface: org.freedesktop.DBus.Properties - unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC -43: - entityID: 208 - entityInstance: 1 - interfaces: - xyz.openbmc_project.Inventory.Item: - Present: - Offsets: - 7: - assert: true - deassert: false - skipOn: deassert - type: bool - xyz.openbmc_project.State.Decorator.OperationalStatus: - Functional: - Offsets: - 8: - assert: false - deassert: true - type: bool - Prereqs: - 7: - assert: true - deassert: false - type: bool - mutability: Mutability::Write|Mutability::Read - path: /system/chassis/motherboard/cpu0/core0 - readingType: assertion - sensorNamePattern: nameParentLeaf - sensorReadingType: 111 - sensorType: 7 - serviceInterface: xyz.openbmc_project.Inventory.Manager -44: - entityID: 208 - entityInstance: 2 - interfaces: - xyz.openbmc_project.Inventory.Item: - Present: - Offsets: - 7: - assert: true - deassert: false - skipOn: deassert - type: bool - xyz.openbmc_project.State.Decorator.OperationalStatus: - Functional: - Offsets: - 8: - assert: false - deassert: true - type: bool - Prereqs: - 7: - assert: true - deassert: false - type: bool - mutability: Mutability::Write|Mutability::Read - path: /system/chassis/motherboard/cpu0/core1 - readingType: assertion - sensorNamePattern: nameParentLeaf - sensorReadingType: 111 - sensorType: 7 - serviceInterface: xyz.openbmc_project.Inventory.Manager -45: - entityID: 208 - entityInstance: 3 - interfaces: - xyz.openbmc_project.Inventory.Item: - Present: - Offsets: - 7: - assert: true - deassert: false - skipOn: deassert - type: bool - xyz.openbmc_project.State.Decorator.OperationalStatus: - Functional: - Offsets: - 8: - assert: false - deassert: true - type: bool - Prereqs: - 7: - assert: true - deassert: false - type: bool - mutability: Mutability::Write|Mutability::Read - path: /system/chassis/motherboard/cpu0/core2 - readingType: assertion - sensorNamePattern: nameParentLeaf - sensorReadingType: 111 - sensorType: 7 - serviceInterface: xyz.openbmc_project.Inventory.Manager -46: - entityID: 208 - entityInstance: 4 - interfaces: - xyz.openbmc_project.Inventory.Item: - Present: - Offsets: - 7: - assert: true - deassert: false - skipOn: deassert - type: bool - xyz.openbmc_project.State.Decorator.OperationalStatus: - Functional: - Offsets: - 8: - assert: false - deassert: true - type: bool - Prereqs: - 7: - assert: true - deassert: false - type: bool - mutability: Mutability::Write|Mutability::Read - path: /system/chassis/motherboard/cpu0/core3 - readingType: assertion - sensorNamePattern: nameParentLeaf - sensorReadingType: 111 - sensorType: 7 - serviceInterface: xyz.openbmc_project.Inventory.Manager -47: - entityID: 208 - entityInstance: 5 - interfaces: - xyz.openbmc_project.Inventory.Item: - Present: - Offsets: - 7: - assert: true - deassert: false - skipOn: deassert - type: bool - xyz.openbmc_project.State.Decorator.OperationalStatus: - Functional: - Offsets: - 8: - assert: false - deassert: true - type: bool - Prereqs: - 7: - assert: true - deassert: false - type: bool - mutability: Mutability::Write|Mutability::Read - path: /system/chassis/motherboard/cpu0/core4 - readingType: assertion - sensorNamePattern: nameParentLeaf - sensorReadingType: 111 - sensorType: 7 - serviceInterface: xyz.openbmc_project.Inventory.Manager -48: - entityID: 208 - entityInstance: 6 - interfaces: - xyz.openbmc_project.Inventory.Item: - Present: - Offsets: - 7: - assert: true - deassert: false - skipOn: deassert - type: bool - xyz.openbmc_project.State.Decorator.OperationalStatus: - Functional: - Offsets: - 8: - assert: false - deassert: true - type: bool - Prereqs: - 7: - assert: true - deassert: false - type: bool - mutability: Mutability::Write|Mutability::Read - path: /system/chassis/motherboard/cpu0/core5 - readingType: assertion - sensorNamePattern: nameParentLeaf - sensorReadingType: 111 - sensorType: 7 - serviceInterface: xyz.openbmc_project.Inventory.Manager -49: - entityID: 208 - entityInstance: 7 - interfaces: - xyz.openbmc_project.Inventory.Item: - Present: - Offsets: - 7: - assert: true - deassert: false - skipOn: deassert - type: bool - xyz.openbmc_project.State.Decorator.OperationalStatus: - Functional: - Offsets: - 8: - assert: false - deassert: true - type: bool - Prereqs: - 7: - assert: true - deassert: false - type: bool - mutability: Mutability::Write|Mutability::Read - path: /system/chassis/motherboard/cpu0/core6 - readingType: assertion - sensorNamePattern: nameParentLeaf - sensorReadingType: 111 - sensorType: 7 - serviceInterface: xyz.openbmc_project.Inventory.Manager -50: - entityID: 208 - entityInstance: 8 - interfaces: - xyz.openbmc_project.Inventory.Item: - Present: - Offsets: - 7: - assert: true - deassert: false - skipOn: deassert - type: bool - xyz.openbmc_project.State.Decorator.OperationalStatus: - Functional: - Offsets: - 8: - assert: false - deassert: true - type: bool - Prereqs: - 7: - assert: true - deassert: false - type: bool - mutability: Mutability::Write|Mutability::Read - path: /system/chassis/motherboard/cpu0/core7 - readingType: assertion - sensorNamePattern: nameParentLeaf - sensorReadingType: 111 - sensorType: 7 - serviceInterface: xyz.openbmc_project.Inventory.Manager -51: - entityID: 208 - entityInstance: 9 - interfaces: - xyz.openbmc_project.Inventory.Item: - Present: - Offsets: - 7: - assert: true - deassert: false - skipOn: deassert - type: bool - xyz.openbmc_project.State.Decorator.OperationalStatus: - Functional: - Offsets: - 8: - assert: false - deassert: true - type: bool - Prereqs: - 7: - assert: true - deassert: false - type: bool - mutability: Mutability::Write|Mutability::Read - path: /system/chassis/motherboard/cpu0/core8 - readingType: assertion - sensorNamePattern: nameParentLeaf - sensorReadingType: 111 - sensorType: 7 - serviceInterface: xyz.openbmc_project.Inventory.Manager -52: - entityID: 208 - entityInstance: 10 - interfaces: - xyz.openbmc_project.Inventory.Item: - Present: - Offsets: - 7: - assert: true - deassert: false - skipOn: deassert - type: bool - xyz.openbmc_project.State.Decorator.OperationalStatus: - Functional: - Offsets: - 8: - assert: false - deassert: true - type: bool - Prereqs: - 7: - assert: true - deassert: false - type: bool - mutability: Mutability::Write|Mutability::Read - path: /system/chassis/motherboard/cpu0/core9 - readingType: assertion - sensorNamePattern: nameParentLeaf - sensorReadingType: 111 - sensorType: 7 - serviceInterface: xyz.openbmc_project.Inventory.Manager -53: - entityID: 208 - entityInstance: 11 - interfaces: - xyz.openbmc_project.Inventory.Item: - Present: - Offsets: - 7: - assert: true - deassert: false - skipOn: deassert - type: bool - xyz.openbmc_project.State.Decorator.OperationalStatus: - Functional: - Offsets: - 8: - assert: false - deassert: true - type: bool - Prereqs: - 7: - assert: true - deassert: false - type: bool - mutability: Mutability::Write|Mutability::Read - path: /system/chassis/motherboard/cpu0/core10 - readingType: assertion - sensorNamePattern: nameParentLeaf - sensorReadingType: 111 - sensorType: 7 - serviceInterface: xyz.openbmc_project.Inventory.Manager -54: - entityID: 208 - entityInstance: 12 - interfaces: - xyz.openbmc_project.Inventory.Item: - Present: - Offsets: - 7: - assert: true - deassert: false - skipOn: deassert - type: bool - xyz.openbmc_project.State.Decorator.OperationalStatus: - Functional: - Offsets: - 8: - assert: false - deassert: true - type: bool - Prereqs: - 7: - assert: true - deassert: false - type: bool - mutability: Mutability::Write|Mutability::Read - path: /system/chassis/motherboard/cpu0/core11 - readingType: assertion - sensorNamePattern: nameParentLeaf - sensorReadingType: 111 - sensorType: 7 - serviceInterface: xyz.openbmc_project.Inventory.Manager -55: - entityID: 208 - entityInstance: 13 - interfaces: - xyz.openbmc_project.Inventory.Item: - Present: - Offsets: - 7: - assert: true - deassert: false - skipOn: deassert - type: bool - xyz.openbmc_project.State.Decorator.OperationalStatus: - Functional: - Offsets: - 8: - assert: false - deassert: true - type: bool - Prereqs: - 7: - assert: true - deassert: false - type: bool - mutability: Mutability::Write|Mutability::Read - path: /system/chassis/motherboard/cpu0/core12 - readingType: assertion - sensorNamePattern: nameParentLeaf - sensorReadingType: 111 - sensorType: 7 - serviceInterface: xyz.openbmc_project.Inventory.Manager -56: - entityID: 208 - entityInstance: 14 - interfaces: - xyz.openbmc_project.Inventory.Item: - Present: - Offsets: - 7: - assert: true - deassert: false - skipOn: deassert - type: bool - xyz.openbmc_project.State.Decorator.OperationalStatus: - Functional: - Offsets: - 8: - assert: false - deassert: true - type: bool - Prereqs: - 7: - assert: true - deassert: false - type: bool - mutability: Mutability::Write|Mutability::Read - path: /system/chassis/motherboard/cpu0/core13 - readingType: assertion - sensorNamePattern: nameParentLeaf - sensorReadingType: 111 - sensorType: 7 - serviceInterface: xyz.openbmc_project.Inventory.Manager -57: - entityID: 208 - entityInstance: 15 - interfaces: - xyz.openbmc_project.Inventory.Item: - Present: - Offsets: - 7: - assert: true - deassert: false - skipOn: deassert - type: bool - xyz.openbmc_project.State.Decorator.OperationalStatus: - Functional: - Offsets: - 8: - assert: false - deassert: true - type: bool - Prereqs: - 7: - assert: true - deassert: false - type: bool - mutability: Mutability::Write|Mutability::Read - path: /system/chassis/motherboard/cpu0/core14 - readingType: assertion - sensorNamePattern: nameParentLeaf - sensorReadingType: 111 - sensorType: 7 - serviceInterface: xyz.openbmc_project.Inventory.Manager -58: - entityID: 208 - entityInstance: 16 - interfaces: - xyz.openbmc_project.Inventory.Item: - Present: - Offsets: - 7: - assert: true - deassert: false - skipOn: deassert - type: bool - xyz.openbmc_project.State.Decorator.OperationalStatus: - Functional: - Offsets: - 8: - assert: false - deassert: true - type: bool - Prereqs: - 7: - assert: true - deassert: false - type: bool - mutability: Mutability::Write|Mutability::Read - path: /system/chassis/motherboard/cpu0/core15 - readingType: assertion - sensorNamePattern: nameParentLeaf - sensorReadingType: 111 - sensorType: 7 - serviceInterface: xyz.openbmc_project.Inventory.Manager -59: - entityID: 208 - entityInstance: 17 - interfaces: - xyz.openbmc_project.Inventory.Item: - Present: - Offsets: - 7: - assert: true - deassert: false - skipOn: deassert - type: bool - xyz.openbmc_project.State.Decorator.OperationalStatus: - Functional: - Offsets: - 8: - assert: false - deassert: true - type: bool - Prereqs: - 7: - assert: true - deassert: false - type: bool - mutability: Mutability::Write|Mutability::Read - path: /system/chassis/motherboard/cpu0/core16 - readingType: assertion - sensorNamePattern: nameParentLeaf - sensorReadingType: 111 - sensorType: 7 - serviceInterface: xyz.openbmc_project.Inventory.Manager -60: - entityID: 208 - entityInstance: 18 - interfaces: - xyz.openbmc_project.Inventory.Item: - Present: - Offsets: - 7: - assert: true - deassert: false - skipOn: deassert - type: bool - xyz.openbmc_project.State.Decorator.OperationalStatus: - Functional: - Offsets: - 8: - assert: false - deassert: true - type: bool - Prereqs: - 7: - assert: true - deassert: false - type: bool - mutability: Mutability::Write|Mutability::Read - path: /system/chassis/motherboard/cpu0/core17 - readingType: assertion - sensorNamePattern: nameParentLeaf - sensorReadingType: 111 - sensorType: 7 - serviceInterface: xyz.openbmc_project.Inventory.Manager -61: - entityID: 208 - entityInstance: 19 - interfaces: - xyz.openbmc_project.Inventory.Item: - Present: - Offsets: - 7: - assert: true - deassert: false - skipOn: deassert - type: bool - xyz.openbmc_project.State.Decorator.OperationalStatus: - Functional: - Offsets: - 8: - assert: false - deassert: true - type: bool - Prereqs: - 7: - assert: true - deassert: false - type: bool - mutability: Mutability::Write|Mutability::Read - path: /system/chassis/motherboard/cpu0/core18 - readingType: assertion - sensorNamePattern: nameParentLeaf - sensorReadingType: 111 - sensorType: 7 - serviceInterface: xyz.openbmc_project.Inventory.Manager -62: - entityID: 208 - entityInstance: 20 - interfaces: - xyz.openbmc_project.Inventory.Item: - Present: - Offsets: - 7: - assert: true - deassert: false - skipOn: deassert - type: bool - xyz.openbmc_project.State.Decorator.OperationalStatus: - Functional: - Offsets: - 8: - assert: false - deassert: true - type: bool - Prereqs: - 7: - assert: true - deassert: false - type: bool - mutability: Mutability::Write|Mutability::Read - path: /system/chassis/motherboard/cpu0/core19 - readingType: assertion - sensorNamePattern: nameParentLeaf - sensorReadingType: 111 - sensorType: 7 - serviceInterface: xyz.openbmc_project.Inventory.Manager -63: - entityID: 208 - entityInstance: 21 - interfaces: - xyz.openbmc_project.Inventory.Item: - Present: - Offsets: - 7: - assert: true - deassert: false - skipOn: deassert - type: bool - xyz.openbmc_project.State.Decorator.OperationalStatus: - Functional: - Offsets: - 8: - assert: false - deassert: true - type: bool - Prereqs: - 7: - assert: true - deassert: false - type: bool - mutability: Mutability::Write|Mutability::Read - path: /system/chassis/motherboard/cpu0/core20 - readingType: assertion - sensorNamePattern: nameParentLeaf - sensorReadingType: 111 - sensorType: 7 - serviceInterface: xyz.openbmc_project.Inventory.Manager -64: - entityID: 208 - entityInstance: 22 - interfaces: - xyz.openbmc_project.Inventory.Item: - Present: - Offsets: - 7: - assert: true - deassert: false - skipOn: deassert - type: bool - xyz.openbmc_project.State.Decorator.OperationalStatus: - Functional: - Offsets: - 8: - assert: false - deassert: true - type: bool - Prereqs: - 7: - assert: true - deassert: false - type: bool - mutability: Mutability::Write|Mutability::Read - path: /system/chassis/motherboard/cpu0/core21 - readingType: assertion - sensorNamePattern: nameParentLeaf - sensorReadingType: 111 - sensorType: 7 - serviceInterface: xyz.openbmc_project.Inventory.Manager -65: - entityID: 208 - entityInstance: 23 - interfaces: - xyz.openbmc_project.Inventory.Item: - Present: - Offsets: - 7: - assert: true - deassert: false - skipOn: deassert - type: bool - xyz.openbmc_project.State.Decorator.OperationalStatus: - Functional: - Offsets: - 8: - assert: false - deassert: true - type: bool - Prereqs: - 7: - assert: true - deassert: false - type: bool - mutability: Mutability::Write|Mutability::Read - path: /system/chassis/motherboard/cpu0/core22 - readingType: assertion - sensorNamePattern: nameParentLeaf - sensorReadingType: 111 - sensorType: 7 - serviceInterface: xyz.openbmc_project.Inventory.Manager -66: - entityID: 208 - entityInstance: 24 - interfaces: - xyz.openbmc_project.Inventory.Item: - Present: - Offsets: - 7: - assert: true - deassert: false - skipOn: deassert - type: bool - xyz.openbmc_project.State.Decorator.OperationalStatus: - Functional: - Offsets: - 8: - assert: false - deassert: true - type: bool - Prereqs: - 7: - assert: true - deassert: false - type: bool - mutability: Mutability::Write|Mutability::Read - path: /system/chassis/motherboard/cpu0/core23 - readingType: assertion - sensorNamePattern: nameParentLeaf - sensorReadingType: 111 - sensorType: 7 - serviceInterface: xyz.openbmc_project.Inventory.Manager -67: - entityID: 208 - entityInstance: 25 - interfaces: - xyz.openbmc_project.Inventory.Item: - Present: - Offsets: - 7: - assert: true - deassert: false - skipOn: deassert - type: bool - xyz.openbmc_project.State.Decorator.OperationalStatus: - Functional: - Offsets: - 8: - assert: false - deassert: true - type: bool - Prereqs: - 7: - assert: true - deassert: false - type: bool - mutability: Mutability::Write|Mutability::Read - path: /system/chassis/motherboard/cpu1/core0 - readingType: assertion - sensorNamePattern: nameParentLeaf - sensorReadingType: 111 - sensorType: 7 - serviceInterface: xyz.openbmc_project.Inventory.Manager -68: - entityID: 208 - entityInstance: 26 - interfaces: - xyz.openbmc_project.Inventory.Item: - Present: - Offsets: - 7: - assert: true - deassert: false - skipOn: deassert - type: bool - xyz.openbmc_project.State.Decorator.OperationalStatus: - Functional: - Offsets: - 8: - assert: false - deassert: true - type: bool - Prereqs: - 7: - assert: true - deassert: false - type: bool - mutability: Mutability::Write|Mutability::Read - path: /system/chassis/motherboard/cpu1/core1 - readingType: assertion - sensorNamePattern: nameParentLeaf - sensorReadingType: 111 - sensorType: 7 - serviceInterface: xyz.openbmc_project.Inventory.Manager -69: - entityID: 208 - entityInstance: 27 - interfaces: - xyz.openbmc_project.Inventory.Item: - Present: - Offsets: - 7: - assert: true - deassert: false - skipOn: deassert - type: bool - xyz.openbmc_project.State.Decorator.OperationalStatus: - Functional: - Offsets: - 8: - assert: false - deassert: true - type: bool - Prereqs: - 7: - assert: true - deassert: false - type: bool - mutability: Mutability::Write|Mutability::Read - path: /system/chassis/motherboard/cpu1/core2 - readingType: assertion - sensorNamePattern: nameParentLeaf - sensorReadingType: 111 - sensorType: 7 - serviceInterface: xyz.openbmc_project.Inventory.Manager -70: - entityID: 208 - entityInstance: 28 - interfaces: - xyz.openbmc_project.Inventory.Item: - Present: - Offsets: - 7: - assert: true - deassert: false - skipOn: deassert - type: bool - xyz.openbmc_project.State.Decorator.OperationalStatus: - Functional: - Offsets: - 8: - assert: false - deassert: true - type: bool - Prereqs: - 7: - assert: true - deassert: false - type: bool - mutability: Mutability::Write|Mutability::Read - path: /system/chassis/motherboard/cpu1/core3 - readingType: assertion - sensorNamePattern: nameParentLeaf - sensorReadingType: 111 - sensorType: 7 - serviceInterface: xyz.openbmc_project.Inventory.Manager -71: - entityID: 208 - entityInstance: 29 - interfaces: - xyz.openbmc_project.Inventory.Item: - Present: - Offsets: - 7: - assert: true - deassert: false - skipOn: deassert - type: bool - xyz.openbmc_project.State.Decorator.OperationalStatus: - Functional: - Offsets: - 8: - assert: false - deassert: true - type: bool - Prereqs: - 7: - assert: true - deassert: false - type: bool - mutability: Mutability::Write|Mutability::Read - path: /system/chassis/motherboard/cpu1/core4 - readingType: assertion - sensorNamePattern: nameParentLeaf - sensorReadingType: 111 - sensorType: 7 - serviceInterface: xyz.openbmc_project.Inventory.Manager -72: - entityID: 208 - entityInstance: 30 - interfaces: - xyz.openbmc_project.Inventory.Item: - Present: - Offsets: - 7: - assert: true - deassert: false - skipOn: deassert - type: bool - xyz.openbmc_project.State.Decorator.OperationalStatus: - Functional: - Offsets: - 8: - assert: false - deassert: true - type: bool - Prereqs: - 7: - assert: true - deassert: false - type: bool - mutability: Mutability::Write|Mutability::Read - path: /system/chassis/motherboard/cpu1/core5 - readingType: assertion - sensorNamePattern: nameParentLeaf - sensorReadingType: 111 - sensorType: 7 - serviceInterface: xyz.openbmc_project.Inventory.Manager -73: - entityID: 208 - entityInstance: 31 - interfaces: - xyz.openbmc_project.Inventory.Item: - Present: - Offsets: - 7: - assert: true - deassert: false - skipOn: deassert - type: bool - xyz.openbmc_project.State.Decorator.OperationalStatus: - Functional: - Offsets: - 8: - assert: false - deassert: true - type: bool - Prereqs: - 7: - assert: true - deassert: false - type: bool - mutability: Mutability::Write|Mutability::Read - path: /system/chassis/motherboard/cpu1/core6 - readingType: assertion - sensorNamePattern: nameParentLeaf - sensorReadingType: 111 - sensorType: 7 - serviceInterface: xyz.openbmc_project.Inventory.Manager -74: - entityID: 208 - entityInstance: 32 - interfaces: - xyz.openbmc_project.Inventory.Item: - Present: - Offsets: - 7: - assert: true - deassert: false - skipOn: deassert - type: bool - xyz.openbmc_project.State.Decorator.OperationalStatus: - Functional: - Offsets: - 8: - assert: false - deassert: true - type: bool - Prereqs: - 7: - assert: true - deassert: false - type: bool - mutability: Mutability::Write|Mutability::Read - path: /system/chassis/motherboard/cpu1/core7 - readingType: assertion - sensorNamePattern: nameParentLeaf - sensorReadingType: 111 - sensorType: 7 - serviceInterface: xyz.openbmc_project.Inventory.Manager -75: - entityID: 208 - entityInstance: 33 - interfaces: - xyz.openbmc_project.Inventory.Item: - Present: - Offsets: - 7: - assert: true - deassert: false - skipOn: deassert - type: bool - xyz.openbmc_project.State.Decorator.OperationalStatus: - Functional: - Offsets: - 8: - assert: false - deassert: true - type: bool - Prereqs: - 7: - assert: true - deassert: false - type: bool - mutability: Mutability::Write|Mutability::Read - path: /system/chassis/motherboard/cpu1/core8 - readingType: assertion - sensorNamePattern: nameParentLeaf - sensorReadingType: 111 - sensorType: 7 - serviceInterface: xyz.openbmc_project.Inventory.Manager -76: - entityID: 208 - entityInstance: 34 - interfaces: - xyz.openbmc_project.Inventory.Item: - Present: - Offsets: - 7: - assert: true - deassert: false - skipOn: deassert - type: bool - xyz.openbmc_project.State.Decorator.OperationalStatus: - Functional: - Offsets: - 8: - assert: false - deassert: true - type: bool - Prereqs: - 7: - assert: true - deassert: false - type: bool - mutability: Mutability::Write|Mutability::Read - path: /system/chassis/motherboard/cpu1/core9 - readingType: assertion - sensorNamePattern: nameParentLeaf - sensorReadingType: 111 - sensorType: 7 - serviceInterface: xyz.openbmc_project.Inventory.Manager -77: - entityID: 208 - entityInstance: 35 - interfaces: - xyz.openbmc_project.Inventory.Item: - Present: - Offsets: - 7: - assert: true - deassert: false - skipOn: deassert - type: bool - xyz.openbmc_project.State.Decorator.OperationalStatus: - Functional: - Offsets: - 8: - assert: false - deassert: true - type: bool - Prereqs: - 7: - assert: true - deassert: false - type: bool - mutability: Mutability::Write|Mutability::Read - path: /system/chassis/motherboard/cpu1/core10 - readingType: assertion - sensorNamePattern: nameParentLeaf - sensorReadingType: 111 - sensorType: 7 - serviceInterface: xyz.openbmc_project.Inventory.Manager -78: - entityID: 208 - entityInstance: 36 - interfaces: - xyz.openbmc_project.Inventory.Item: - Present: - Offsets: - 7: - assert: true - deassert: false - skipOn: deassert - type: bool - xyz.openbmc_project.State.Decorator.OperationalStatus: - Functional: - Offsets: - 8: - assert: false - deassert: true - type: bool - Prereqs: - 7: - assert: true - deassert: false - type: bool - mutability: Mutability::Write|Mutability::Read - path: /system/chassis/motherboard/cpu1/core11 - readingType: assertion - sensorNamePattern: nameParentLeaf - sensorReadingType: 111 - sensorType: 7 - serviceInterface: xyz.openbmc_project.Inventory.Manager -79: - entityID: 208 - entityInstance: 37 - interfaces: - xyz.openbmc_project.Inventory.Item: - Present: - Offsets: - 7: - assert: true - deassert: false - skipOn: deassert - type: bool - xyz.openbmc_project.State.Decorator.OperationalStatus: - Functional: - Offsets: - 8: - assert: false - deassert: true - type: bool - Prereqs: - 7: - assert: true - deassert: false - type: bool - mutability: Mutability::Write|Mutability::Read - path: /system/chassis/motherboard/cpu1/core12 - readingType: assertion - sensorNamePattern: nameParentLeaf - sensorReadingType: 111 - sensorType: 7 - serviceInterface: xyz.openbmc_project.Inventory.Manager -80: - entityID: 208 - entityInstance: 38 - interfaces: - xyz.openbmc_project.Inventory.Item: - Present: - Offsets: - 7: - assert: true - deassert: false - skipOn: deassert - type: bool - xyz.openbmc_project.State.Decorator.OperationalStatus: - Functional: - Offsets: - 8: - assert: false - deassert: true - type: bool - Prereqs: - 7: - assert: true - deassert: false - type: bool - mutability: Mutability::Write|Mutability::Read - path: /system/chassis/motherboard/cpu1/core13 - readingType: assertion - sensorNamePattern: nameParentLeaf - sensorReadingType: 111 - sensorType: 7 - serviceInterface: xyz.openbmc_project.Inventory.Manager -81: - entityID: 208 - entityInstance: 39 - interfaces: - xyz.openbmc_project.Inventory.Item: - Present: - Offsets: - 7: - assert: true - deassert: false - skipOn: deassert - type: bool - xyz.openbmc_project.State.Decorator.OperationalStatus: - Functional: - Offsets: - 8: - assert: false - deassert: true - type: bool - Prereqs: - 7: - assert: true - deassert: false - type: bool - mutability: Mutability::Write|Mutability::Read - path: /system/chassis/motherboard/cpu1/core14 - readingType: assertion - sensorNamePattern: nameParentLeaf - sensorReadingType: 111 - sensorType: 7 - serviceInterface: xyz.openbmc_project.Inventory.Manager -82: - entityID: 208 - entityInstance: 40 - interfaces: - xyz.openbmc_project.Inventory.Item: - Present: - Offsets: - 7: - assert: true - deassert: false - skipOn: deassert - type: bool - xyz.openbmc_project.State.Decorator.OperationalStatus: - Functional: - Offsets: - 8: - assert: false - deassert: true - type: bool - Prereqs: - 7: - assert: true - deassert: false - type: bool - mutability: Mutability::Write|Mutability::Read - path: /system/chassis/motherboard/cpu1/core15 - readingType: assertion - sensorNamePattern: nameParentLeaf - sensorReadingType: 111 - sensorType: 7 - serviceInterface: xyz.openbmc_project.Inventory.Manager -83: - entityID: 208 - entityInstance: 41 - interfaces: - xyz.openbmc_project.Inventory.Item: - Present: - Offsets: - 7: - assert: true - deassert: false - skipOn: deassert - type: bool - xyz.openbmc_project.State.Decorator.OperationalStatus: - Functional: - Offsets: - 8: - assert: false - deassert: true - type: bool - Prereqs: - 7: - assert: true - deassert: false - type: bool - mutability: Mutability::Write|Mutability::Read - path: /system/chassis/motherboard/cpu1/core16 - readingType: assertion - sensorNamePattern: nameParentLeaf - sensorReadingType: 111 - sensorType: 7 - serviceInterface: xyz.openbmc_project.Inventory.Manager -84: - entityID: 208 - entityInstance: 42 - interfaces: - xyz.openbmc_project.Inventory.Item: - Present: - Offsets: - 7: - assert: true - deassert: false - skipOn: deassert - type: bool - xyz.openbmc_project.State.Decorator.OperationalStatus: - Functional: - Offsets: - 8: - assert: false - deassert: true - type: bool - Prereqs: - 7: - assert: true - deassert: false - type: bool - mutability: Mutability::Write|Mutability::Read - path: /system/chassis/motherboard/cpu1/core17 - readingType: assertion - sensorNamePattern: nameParentLeaf - sensorReadingType: 111 - sensorType: 7 - serviceInterface: xyz.openbmc_project.Inventory.Manager -85: - entityID: 208 - entityInstance: 43 - interfaces: - xyz.openbmc_project.Inventory.Item: - Present: - Offsets: - 7: - assert: true - deassert: false - skipOn: deassert - type: bool - xyz.openbmc_project.State.Decorator.OperationalStatus: - Functional: - Offsets: - 8: - assert: false - deassert: true - type: bool - Prereqs: - 7: - assert: true - deassert: false - type: bool - mutability: Mutability::Write|Mutability::Read - path: /system/chassis/motherboard/cpu1/core18 - readingType: assertion - sensorNamePattern: nameParentLeaf - sensorReadingType: 111 - sensorType: 7 - serviceInterface: xyz.openbmc_project.Inventory.Manager -86: - entityID: 208 - entityInstance: 44 - interfaces: - xyz.openbmc_project.Inventory.Item: - Present: - Offsets: - 7: - assert: true - deassert: false - skipOn: deassert - type: bool - xyz.openbmc_project.State.Decorator.OperationalStatus: - Functional: - Offsets: - 8: - assert: false - deassert: true - type: bool - Prereqs: - 7: - assert: true - deassert: false - type: bool - mutability: Mutability::Write|Mutability::Read - path: /system/chassis/motherboard/cpu1/core19 - readingType: assertion - sensorNamePattern: nameParentLeaf - sensorReadingType: 111 - sensorType: 7 - serviceInterface: xyz.openbmc_project.Inventory.Manager -87: - entityID: 208 - entityInstance: 45 - interfaces: - xyz.openbmc_project.Inventory.Item: - Present: - Offsets: - 7: - assert: true - deassert: false - skipOn: deassert - type: bool - xyz.openbmc_project.State.Decorator.OperationalStatus: - Functional: - Offsets: - 8: - assert: false - deassert: true - type: bool - Prereqs: - 7: - assert: true - deassert: false - type: bool - mutability: Mutability::Write|Mutability::Read - path: /system/chassis/motherboard/cpu1/core20 - readingType: assertion - sensorNamePattern: nameParentLeaf - sensorReadingType: 111 - sensorType: 7 - serviceInterface: xyz.openbmc_project.Inventory.Manager -88: - entityID: 208 - entityInstance: 46 - interfaces: - xyz.openbmc_project.Inventory.Item: - Present: - Offsets: - 7: - assert: true - deassert: false - skipOn: deassert - type: bool - xyz.openbmc_project.State.Decorator.OperationalStatus: - Functional: - Offsets: - 8: - assert: false - deassert: true - type: bool - Prereqs: - 7: - assert: true - deassert: false - type: bool - mutability: Mutability::Write|Mutability::Read - path: /system/chassis/motherboard/cpu1/core21 - readingType: assertion - sensorNamePattern: nameParentLeaf - sensorReadingType: 111 - sensorType: 7 - serviceInterface: xyz.openbmc_project.Inventory.Manager -89: - entityID: 208 - entityInstance: 47 - interfaces: - xyz.openbmc_project.Inventory.Item: - Present: - Offsets: - 7: - assert: true - deassert: false - skipOn: deassert - type: bool - xyz.openbmc_project.State.Decorator.OperationalStatus: - Functional: - Offsets: - 8: - assert: false - deassert: true - type: bool - Prereqs: - 7: - assert: true - deassert: false - type: bool - mutability: Mutability::Write|Mutability::Read - path: /system/chassis/motherboard/cpu1/core22 - readingType: assertion - sensorNamePattern: nameParentLeaf - sensorReadingType: 111 - sensorType: 7 - serviceInterface: xyz.openbmc_project.Inventory.Manager -90: - entityID: 208 - entityInstance: 48 - interfaces: - xyz.openbmc_project.Inventory.Item: - Present: - Offsets: - 7: - assert: true - deassert: false - skipOn: deassert - type: bool - xyz.openbmc_project.State.Decorator.OperationalStatus: - Functional: - Offsets: - 8: - assert: false - deassert: true - type: bool - Prereqs: - 7: - assert: true - deassert: false - type: bool - mutability: Mutability::Write|Mutability::Read - path: /system/chassis/motherboard/cpu1/core23 - readingType: assertion - sensorNamePattern: nameParentLeaf - sensorReadingType: 111 - sensorType: 7 - serviceInterface: xyz.openbmc_project.Inventory.Manager -91: - bExp: 0 - entityID: 208 - entityInstance: 49 - interfaces: - xyz.openbmc_project.Sensor.Value: - Value: - Offsets: - 255: - type: int64_t - multiplierM: 1 - mutability: Mutability::Write|Mutability::Read - offsetB: -127 - path: /xyz/openbmc_project/sensors/temperature/p0_core0_temp - rExp: 0 - readingType: readingData - scale: -3 - sensorNamePattern: nameLeaf - sensorReadingType: 1 - sensorType: 1 - serviceInterface: org.freedesktop.DBus.Properties - unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC -92: - bExp: 0 - entityID: 208 - entityInstance: 50 - interfaces: - xyz.openbmc_project.Sensor.Value: - Value: - Offsets: - 255: - type: int64_t - multiplierM: 1 - mutability: Mutability::Write|Mutability::Read - offsetB: -127 - path: /xyz/openbmc_project/sensors/temperature/p0_core1_temp - rExp: 0 - readingType: readingData - scale: -3 - sensorNamePattern: nameLeaf - sensorReadingType: 1 - sensorType: 1 - serviceInterface: org.freedesktop.DBus.Properties - unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC -93: - bExp: 0 - entityID: 208 - entityInstance: 51 - interfaces: - xyz.openbmc_project.Sensor.Value: - Value: - Offsets: - 255: - type: int64_t - multiplierM: 1 - mutability: Mutability::Write|Mutability::Read - offsetB: -127 - path: /xyz/openbmc_project/sensors/temperature/p0_core2_temp - rExp: 0 - readingType: readingData - scale: -3 - sensorNamePattern: nameLeaf - sensorReadingType: 1 - sensorType: 1 - serviceInterface: org.freedesktop.DBus.Properties - unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC -94: - bExp: 0 - entityID: 208 - entityInstance: 52 - interfaces: - xyz.openbmc_project.Sensor.Value: - Value: - Offsets: - 255: - type: int64_t - multiplierM: 1 - mutability: Mutability::Write|Mutability::Read - offsetB: -127 - path: /xyz/openbmc_project/sensors/temperature/p0_core3_temp - rExp: 0 - readingType: readingData - scale: -3 - sensorNamePattern: nameLeaf - sensorReadingType: 1 - sensorType: 1 - serviceInterface: org.freedesktop.DBus.Properties - unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC -95: - bExp: 0 - entityID: 208 - entityInstance: 53 - interfaces: - xyz.openbmc_project.Sensor.Value: - Value: - Offsets: - 255: - type: int64_t - multiplierM: 1 - mutability: Mutability::Write|Mutability::Read - offsetB: -127 - path: /xyz/openbmc_project/sensors/temperature/p0_core4_temp - rExp: 0 - readingType: readingData - scale: -3 - sensorNamePattern: nameLeaf - sensorReadingType: 1 - sensorType: 1 - serviceInterface: org.freedesktop.DBus.Properties - unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC -96: - bExp: 0 - entityID: 208 - entityInstance: 54 - interfaces: - xyz.openbmc_project.Sensor.Value: - Value: - Offsets: - 255: - type: int64_t - multiplierM: 1 - mutability: Mutability::Write|Mutability::Read - offsetB: -127 - path: /xyz/openbmc_project/sensors/temperature/p0_core5_temp - rExp: 0 - readingType: readingData - scale: -3 - sensorNamePattern: nameLeaf - sensorReadingType: 1 - sensorType: 1 - serviceInterface: org.freedesktop.DBus.Properties - unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC -97: - bExp: 0 - entityID: 208 - entityInstance: 55 - interfaces: - xyz.openbmc_project.Sensor.Value: - Value: - Offsets: - 255: - type: int64_t - multiplierM: 1 - mutability: Mutability::Write|Mutability::Read - offsetB: -127 - path: /xyz/openbmc_project/sensors/temperature/p0_core6_temp - rExp: 0 - readingType: readingData - scale: -3 - sensorNamePattern: nameLeaf - sensorReadingType: 1 - sensorType: 1 - serviceInterface: org.freedesktop.DBus.Properties - unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC -98: - bExp: 0 - entityID: 208 - entityInstance: 56 - interfaces: - xyz.openbmc_project.Sensor.Value: - Value: - Offsets: - 255: - type: int64_t - multiplierM: 1 - mutability: Mutability::Write|Mutability::Read - offsetB: -127 - path: /xyz/openbmc_project/sensors/temperature/p0_core7_temp - rExp: 0 - readingType: readingData - scale: -3 - sensorNamePattern: nameLeaf - sensorReadingType: 1 - sensorType: 1 - serviceInterface: org.freedesktop.DBus.Properties - unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC -99: - bExp: 0 - entityID: 208 - entityInstance: 57 - interfaces: - xyz.openbmc_project.Sensor.Value: - Value: - Offsets: - 255: - type: int64_t - multiplierM: 1 - mutability: Mutability::Write|Mutability::Read - offsetB: -127 - path: /xyz/openbmc_project/sensors/temperature/p0_core8_temp - rExp: 0 - readingType: readingData - scale: -3 - sensorNamePattern: nameLeaf - sensorReadingType: 1 - sensorType: 1 - serviceInterface: org.freedesktop.DBus.Properties - unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC -100: - bExp: 0 - entityID: 208 - entityInstance: 58 - interfaces: - xyz.openbmc_project.Sensor.Value: - Value: - Offsets: - 255: - type: int64_t - multiplierM: 1 - mutability: Mutability::Write|Mutability::Read - offsetB: -127 - path: /xyz/openbmc_project/sensors/temperature/p0_core9_temp - rExp: 0 - readingType: readingData - scale: -3 - sensorNamePattern: nameLeaf - sensorReadingType: 1 - sensorType: 1 - serviceInterface: org.freedesktop.DBus.Properties - unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC -101: - bExp: 0 - entityID: 208 - entityInstance: 59 - interfaces: - xyz.openbmc_project.Sensor.Value: - Value: - Offsets: - 255: - type: int64_t - multiplierM: 1 - mutability: Mutability::Write|Mutability::Read - offsetB: -127 - path: /xyz/openbmc_project/sensors/temperature/p0_core10_temp - rExp: 0 - readingType: readingData - scale: -3 - sensorNamePattern: nameLeaf - sensorReadingType: 1 - sensorType: 1 - serviceInterface: org.freedesktop.DBus.Properties - unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC -102: - bExp: 0 - entityID: 208 - entityInstance: 60 - interfaces: - xyz.openbmc_project.Sensor.Value: - Value: - Offsets: - 255: - type: int64_t - multiplierM: 1 - mutability: Mutability::Write|Mutability::Read - offsetB: -127 - path: /xyz/openbmc_project/sensors/temperature/p0_core11_temp - rExp: 0 - readingType: readingData - scale: -3 - sensorNamePattern: nameLeaf - sensorReadingType: 1 - sensorType: 1 - serviceInterface: org.freedesktop.DBus.Properties - unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC -103: - bExp: 0 - entityID: 208 - entityInstance: 61 - interfaces: - xyz.openbmc_project.Sensor.Value: - Value: - Offsets: - 255: - type: int64_t - multiplierM: 1 - mutability: Mutability::Write|Mutability::Read - offsetB: -127 - path: /xyz/openbmc_project/sensors/temperature/p0_core12_temp - rExp: 0 - readingType: readingData - scale: -3 - sensorNamePattern: nameLeaf - sensorReadingType: 1 - sensorType: 1 - serviceInterface: org.freedesktop.DBus.Properties - unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC -104: - bExp: 0 - entityID: 208 - entityInstance: 62 - interfaces: - xyz.openbmc_project.Sensor.Value: - Value: - Offsets: - 255: - type: int64_t - multiplierM: 1 - mutability: Mutability::Write|Mutability::Read - offsetB: -127 - path: /xyz/openbmc_project/sensors/temperature/p0_core13_temp - rExp: 0 - readingType: readingData - scale: -3 - sensorNamePattern: nameLeaf - sensorReadingType: 1 - sensorType: 1 - serviceInterface: org.freedesktop.DBus.Properties - unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC -105: - bExp: 0 - entityID: 208 - entityInstance: 63 - interfaces: - xyz.openbmc_project.Sensor.Value: - Value: - Offsets: - 255: - type: int64_t - multiplierM: 1 - mutability: Mutability::Write|Mutability::Read - offsetB: -127 - path: /xyz/openbmc_project/sensors/temperature/p0_core14_temp - rExp: 0 - readingType: readingData - scale: -3 - sensorNamePattern: nameLeaf - sensorReadingType: 1 - sensorType: 1 - serviceInterface: org.freedesktop.DBus.Properties - unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC -106: - bExp: 0 - entityID: 208 - entityInstance: 64 - interfaces: - xyz.openbmc_project.Sensor.Value: - Value: - Offsets: - 255: - type: int64_t - multiplierM: 1 - mutability: Mutability::Write|Mutability::Read - offsetB: -127 - path: /xyz/openbmc_project/sensors/temperature/p0_core15_temp - rExp: 0 - readingType: readingData - scale: -3 - sensorNamePattern: nameLeaf - sensorReadingType: 1 - sensorType: 1 - serviceInterface: org.freedesktop.DBus.Properties - unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC -107: - bExp: 0 - entityID: 208 - entityInstance: 65 - interfaces: - xyz.openbmc_project.Sensor.Value: - Value: - Offsets: - 255: - type: int64_t - multiplierM: 1 - mutability: Mutability::Write|Mutability::Read - offsetB: -127 - path: /xyz/openbmc_project/sensors/temperature/p0_core16_temp - rExp: 0 - readingType: readingData - scale: -3 - sensorNamePattern: nameLeaf - sensorReadingType: 1 - sensorType: 1 - serviceInterface: org.freedesktop.DBus.Properties - unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC -108: - bExp: 0 - entityID: 208 - entityInstance: 66 - interfaces: - xyz.openbmc_project.Sensor.Value: - Value: - Offsets: - 255: - type: int64_t - multiplierM: 1 - mutability: Mutability::Write|Mutability::Read - offsetB: -127 - path: /xyz/openbmc_project/sensors/temperature/p0_core17_temp - rExp: 0 - readingType: readingData - scale: -3 - sensorNamePattern: nameLeaf - sensorReadingType: 1 - sensorType: 1 - serviceInterface: org.freedesktop.DBus.Properties - unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC -109: - bExp: 0 - entityID: 208 - entityInstance: 67 - interfaces: - xyz.openbmc_project.Sensor.Value: - Value: - Offsets: - 255: - type: int64_t - multiplierM: 1 - mutability: Mutability::Write|Mutability::Read - offsetB: -127 - path: /xyz/openbmc_project/sensors/temperature/p0_core18_temp - rExp: 0 - readingType: readingData - scale: -3 - sensorNamePattern: nameLeaf - sensorReadingType: 1 - sensorType: 1 - serviceInterface: org.freedesktop.DBus.Properties - unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC -110: - bExp: 0 - entityID: 208 - entityInstance: 68 - interfaces: - xyz.openbmc_project.Sensor.Value: - Value: - Offsets: - 255: - type: int64_t - multiplierM: 1 - mutability: Mutability::Write|Mutability::Read - offsetB: -127 - path: /xyz/openbmc_project/sensors/temperature/p0_core19_temp - rExp: 0 - readingType: readingData - scale: -3 - sensorNamePattern: nameLeaf - sensorReadingType: 1 - sensorType: 1 - serviceInterface: org.freedesktop.DBus.Properties - unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC -111: - bExp: 0 - entityID: 208 - entityInstance: 69 - interfaces: - xyz.openbmc_project.Sensor.Value: - Value: - Offsets: - 255: - type: int64_t - multiplierM: 1 - mutability: Mutability::Write|Mutability::Read - offsetB: -127 - path: /xyz/openbmc_project/sensors/temperature/p0_core20_temp - rExp: 0 - readingType: readingData - scale: -3 - sensorNamePattern: nameLeaf - sensorReadingType: 1 - sensorType: 1 - serviceInterface: org.freedesktop.DBus.Properties - unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC -112: - bExp: 0 - entityID: 208 - entityInstance: 70 - interfaces: - xyz.openbmc_project.Sensor.Value: - Value: - Offsets: - 255: - type: int64_t - multiplierM: 1 - mutability: Mutability::Write|Mutability::Read - offsetB: -127 - path: /xyz/openbmc_project/sensors/temperature/p0_core21_temp - rExp: 0 - readingType: readingData - scale: -3 - sensorNamePattern: nameLeaf - sensorReadingType: 1 - sensorType: 1 - serviceInterface: org.freedesktop.DBus.Properties - unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC -113: - bExp: 0 - entityID: 208 - entityInstance: 71 - interfaces: - xyz.openbmc_project.Sensor.Value: - Value: - Offsets: - 255: - type: int64_t - multiplierM: 1 - mutability: Mutability::Write|Mutability::Read - offsetB: -127 - path: /xyz/openbmc_project/sensors/temperature/p0_core22_temp - rExp: 0 - readingType: readingData - scale: -3 - sensorNamePattern: nameLeaf - sensorReadingType: 1 - sensorType: 1 - serviceInterface: org.freedesktop.DBus.Properties - unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC -114: - bExp: 0 - entityID: 208 - entityInstance: 72 - interfaces: - xyz.openbmc_project.Sensor.Value: - Value: - Offsets: - 255: - type: int64_t - multiplierM: 1 - mutability: Mutability::Write|Mutability::Read - offsetB: -127 - path: /xyz/openbmc_project/sensors/temperature/p0_core23_temp - rExp: 0 - readingType: readingData - scale: -3 - sensorNamePattern: nameLeaf - sensorReadingType: 1 - sensorType: 1 - serviceInterface: org.freedesktop.DBus.Properties - unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC -115: - bExp: 0 - entityID: 208 - entityInstance: 73 - interfaces: - xyz.openbmc_project.Sensor.Value: - Value: - Offsets: - 255: - type: int64_t - multiplierM: 1 - mutability: Mutability::Write|Mutability::Read - offsetB: -127 - path: /xyz/openbmc_project/sensors/temperature/p1_core0_temp - rExp: 0 - readingType: readingData - scale: -3 - sensorNamePattern: nameLeaf - sensorReadingType: 1 - sensorType: 1 - serviceInterface: org.freedesktop.DBus.Properties - unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC -116: - bExp: 0 - entityID: 208 - entityInstance: 74 - interfaces: - xyz.openbmc_project.Sensor.Value: - Value: - Offsets: - 255: - type: int64_t - multiplierM: 1 - mutability: Mutability::Write|Mutability::Read - offsetB: -127 - path: /xyz/openbmc_project/sensors/temperature/p1_core1_temp - rExp: 0 - readingType: readingData - scale: -3 - sensorNamePattern: nameLeaf - sensorReadingType: 1 - sensorType: 1 - serviceInterface: org.freedesktop.DBus.Properties - unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC -117: - bExp: 0 - entityID: 208 - entityInstance: 75 - interfaces: - xyz.openbmc_project.Sensor.Value: - Value: - Offsets: - 255: - type: int64_t - multiplierM: 1 - mutability: Mutability::Write|Mutability::Read - offsetB: -127 - path: /xyz/openbmc_project/sensors/temperature/p1_core2_temp - rExp: 0 - readingType: readingData - scale: -3 - sensorNamePattern: nameLeaf - sensorReadingType: 1 - sensorType: 1 - serviceInterface: org.freedesktop.DBus.Properties - unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC -118: - bExp: 0 - entityID: 208 - entityInstance: 76 - interfaces: - xyz.openbmc_project.Sensor.Value: - Value: - Offsets: - 255: - type: int64_t - multiplierM: 1 - mutability: Mutability::Write|Mutability::Read - offsetB: -127 - path: /xyz/openbmc_project/sensors/temperature/p1_core3_temp - rExp: 0 - readingType: readingData - scale: -3 - sensorNamePattern: nameLeaf - sensorReadingType: 1 - sensorType: 1 - serviceInterface: org.freedesktop.DBus.Properties - unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC -119: - bExp: 0 - entityID: 208 - entityInstance: 77 - interfaces: - xyz.openbmc_project.Sensor.Value: - Value: - Offsets: - 255: - type: int64_t - multiplierM: 1 - mutability: Mutability::Write|Mutability::Read - offsetB: -127 - path: /xyz/openbmc_project/sensors/temperature/p1_core4_temp - rExp: 0 - readingType: readingData - scale: -3 - sensorNamePattern: nameLeaf - sensorReadingType: 1 - sensorType: 1 - serviceInterface: org.freedesktop.DBus.Properties - unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC -120: - bExp: 0 - entityID: 208 - entityInstance: 78 - interfaces: - xyz.openbmc_project.Sensor.Value: - Value: - Offsets: - 255: - type: int64_t - multiplierM: 1 - mutability: Mutability::Write|Mutability::Read - offsetB: -127 - path: /xyz/openbmc_project/sensors/temperature/p1_core5_temp - rExp: 0 - readingType: readingData - scale: -3 - sensorNamePattern: nameLeaf - sensorReadingType: 1 - sensorType: 1 - serviceInterface: org.freedesktop.DBus.Properties - unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC -121: - bExp: 0 - entityID: 208 - entityInstance: 79 - interfaces: - xyz.openbmc_project.Sensor.Value: - Value: - Offsets: - 255: - type: int64_t - multiplierM: 1 - mutability: Mutability::Write|Mutability::Read - offsetB: -127 - path: /xyz/openbmc_project/sensors/temperature/p1_core6_temp - rExp: 0 - readingType: readingData - scale: -3 - sensorNamePattern: nameLeaf - sensorReadingType: 1 - sensorType: 1 - serviceInterface: org.freedesktop.DBus.Properties - unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC -122: - bExp: 0 - entityID: 208 - entityInstance: 80 - interfaces: - xyz.openbmc_project.Sensor.Value: - Value: - Offsets: - 255: - type: int64_t - multiplierM: 1 - mutability: Mutability::Write|Mutability::Read - offsetB: -127 - path: /xyz/openbmc_project/sensors/temperature/p1_core7_temp - rExp: 0 - readingType: readingData - scale: -3 - sensorNamePattern: nameLeaf - sensorReadingType: 1 - sensorType: 1 - serviceInterface: org.freedesktop.DBus.Properties - unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC -123: - bExp: 0 - entityID: 208 - entityInstance: 81 - interfaces: - xyz.openbmc_project.Sensor.Value: - Value: - Offsets: - 255: - type: int64_t - multiplierM: 1 - mutability: Mutability::Write|Mutability::Read - offsetB: -127 - path: /xyz/openbmc_project/sensors/temperature/p1_core8_temp - rExp: 0 - readingType: readingData - scale: -3 - sensorNamePattern: nameLeaf - sensorReadingType: 1 - sensorType: 1 - serviceInterface: org.freedesktop.DBus.Properties - unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC -124: - bExp: 0 - entityID: 208 - entityInstance: 82 - interfaces: - xyz.openbmc_project.Sensor.Value: - Value: - Offsets: - 255: - type: int64_t - multiplierM: 1 - mutability: Mutability::Write|Mutability::Read - offsetB: -127 - path: /xyz/openbmc_project/sensors/temperature/p1_core9_temp - rExp: 0 - readingType: readingData - scale: -3 - sensorNamePattern: nameLeaf - sensorReadingType: 1 - sensorType: 1 - serviceInterface: org.freedesktop.DBus.Properties - unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC -125: - bExp: 0 - entityID: 208 - entityInstance: 83 - interfaces: - xyz.openbmc_project.Sensor.Value: - Value: - Offsets: - 255: - type: int64_t - multiplierM: 1 - mutability: Mutability::Write|Mutability::Read - offsetB: -127 - path: /xyz/openbmc_project/sensors/temperature/p1_core10_temp - rExp: 0 - readingType: readingData - scale: -3 - sensorNamePattern: nameLeaf - sensorReadingType: 1 - sensorType: 1 - serviceInterface: org.freedesktop.DBus.Properties - unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC -126: - bExp: 0 - entityID: 208 - entityInstance: 84 - interfaces: - xyz.openbmc_project.Sensor.Value: - Value: - Offsets: - 255: - type: int64_t - multiplierM: 1 - mutability: Mutability::Write|Mutability::Read - offsetB: -127 - path: /xyz/openbmc_project/sensors/temperature/p1_core11_temp - rExp: 0 - readingType: readingData - scale: -3 - sensorNamePattern: nameLeaf - sensorReadingType: 1 - sensorType: 1 - serviceInterface: org.freedesktop.DBus.Properties - unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC -127: - bExp: 0 - entityID: 208 - entityInstance: 85 - interfaces: - xyz.openbmc_project.Sensor.Value: - Value: - Offsets: - 255: - type: int64_t - multiplierM: 1 - mutability: Mutability::Write|Mutability::Read - offsetB: -127 - path: /xyz/openbmc_project/sensors/temperature/p1_core12_temp - rExp: 0 - readingType: readingData - scale: -3 - sensorNamePattern: nameLeaf - sensorReadingType: 1 - sensorType: 1 - serviceInterface: org.freedesktop.DBus.Properties - unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC -128: - bExp: 0 - entityID: 208 - entityInstance: 86 - interfaces: - xyz.openbmc_project.Sensor.Value: - Value: - Offsets: - 255: - type: int64_t - multiplierM: 1 - mutability: Mutability::Write|Mutability::Read - offsetB: -127 - path: /xyz/openbmc_project/sensors/temperature/p1_core13_temp - rExp: 0 - readingType: readingData - scale: -3 - sensorNamePattern: nameLeaf - sensorReadingType: 1 - sensorType: 1 - serviceInterface: org.freedesktop.DBus.Properties - unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC -129: - bExp: 0 - entityID: 208 - entityInstance: 87 - interfaces: - xyz.openbmc_project.Sensor.Value: - Value: - Offsets: - 255: - type: int64_t - multiplierM: 1 - mutability: Mutability::Write|Mutability::Read - offsetB: -127 - path: /xyz/openbmc_project/sensors/temperature/p1_core14_temp - rExp: 0 - readingType: readingData - scale: -3 - sensorNamePattern: nameLeaf - sensorReadingType: 1 - sensorType: 1 - serviceInterface: org.freedesktop.DBus.Properties - unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC -130: - bExp: 0 - entityID: 208 - entityInstance: 88 - interfaces: - xyz.openbmc_project.Sensor.Value: - Value: - Offsets: - 255: - type: int64_t - multiplierM: 1 - mutability: Mutability::Write|Mutability::Read - offsetB: -127 - path: /xyz/openbmc_project/sensors/temperature/p1_core15_temp - rExp: 0 - readingType: readingData - scale: -3 - sensorNamePattern: nameLeaf - sensorReadingType: 1 - sensorType: 1 - serviceInterface: org.freedesktop.DBus.Properties - unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC -131: - bExp: 0 - entityID: 208 - entityInstance: 89 - interfaces: - xyz.openbmc_project.Sensor.Value: - Value: - Offsets: - 255: - type: int64_t - multiplierM: 1 - mutability: Mutability::Write|Mutability::Read - offsetB: -127 - path: /xyz/openbmc_project/sensors/temperature/p1_core16_temp - rExp: 0 - readingType: readingData - scale: -3 - sensorNamePattern: nameLeaf - sensorReadingType: 1 - sensorType: 1 - serviceInterface: org.freedesktop.DBus.Properties - unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC -132: - bExp: 0 - entityID: 208 - entityInstance: 90 - interfaces: - xyz.openbmc_project.Sensor.Value: - Value: - Offsets: - 255: - type: int64_t - multiplierM: 1 - mutability: Mutability::Write|Mutability::Read - offsetB: -127 - path: /xyz/openbmc_project/sensors/temperature/p1_core17_temp - rExp: 0 - readingType: readingData - scale: -3 - sensorNamePattern: nameLeaf - sensorReadingType: 1 - sensorType: 1 - serviceInterface: org.freedesktop.DBus.Properties - unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC -133: - bExp: 0 - entityID: 208 - entityInstance: 91 - interfaces: - xyz.openbmc_project.Sensor.Value: - Value: - Offsets: - 255: - type: int64_t - multiplierM: 1 - mutability: Mutability::Write|Mutability::Read - offsetB: -127 - path: /xyz/openbmc_project/sensors/temperature/p1_core18_temp - rExp: 0 - readingType: readingData - scale: -3 - sensorNamePattern: nameLeaf - sensorReadingType: 1 - sensorType: 1 - serviceInterface: org.freedesktop.DBus.Properties - unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC -134: - bExp: 0 - entityID: 208 - entityInstance: 92 - interfaces: - xyz.openbmc_project.Sensor.Value: - Value: - Offsets: - 255: - type: int64_t - multiplierM: 1 - mutability: Mutability::Write|Mutability::Read - offsetB: -127 - path: /xyz/openbmc_project/sensors/temperature/p1_core19_temp - rExp: 0 - readingType: readingData - scale: -3 - sensorNamePattern: nameLeaf - sensorReadingType: 1 - sensorType: 1 - serviceInterface: org.freedesktop.DBus.Properties - unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC -135: - bExp: 0 - entityID: 208 - entityInstance: 93 - interfaces: - xyz.openbmc_project.Sensor.Value: - Value: - Offsets: - 255: - type: int64_t - multiplierM: 1 - mutability: Mutability::Write|Mutability::Read - offsetB: -127 - path: /xyz/openbmc_project/sensors/temperature/p1_core20_temp - rExp: 0 - readingType: readingData - scale: -3 - sensorNamePattern: nameLeaf - sensorReadingType: 1 - sensorType: 1 - serviceInterface: org.freedesktop.DBus.Properties - unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC -136: - bExp: 0 - entityID: 208 - entityInstance: 94 - interfaces: - xyz.openbmc_project.Sensor.Value: - Value: - Offsets: - 255: - type: int64_t - multiplierM: 1 - mutability: Mutability::Write|Mutability::Read - offsetB: -127 - path: /xyz/openbmc_project/sensors/temperature/p1_core21_temp - rExp: 0 - readingType: readingData - scale: -3 - sensorNamePattern: nameLeaf - sensorReadingType: 1 - sensorType: 1 - serviceInterface: org.freedesktop.DBus.Properties - unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC -137: - bExp: 0 - entityID: 208 - entityInstance: 95 - interfaces: - xyz.openbmc_project.Sensor.Value: - Value: - Offsets: - 255: - type: int64_t - multiplierM: 1 - mutability: Mutability::Write|Mutability::Read - offsetB: -127 - path: /xyz/openbmc_project/sensors/temperature/p1_core22_temp - rExp: 0 - readingType: readingData - scale: -3 - sensorNamePattern: nameLeaf - sensorReadingType: 1 - sensorType: 1 - serviceInterface: org.freedesktop.DBus.Properties - unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC -138: - bExp: 0 - entityID: 208 - entityInstance: 96 - interfaces: - xyz.openbmc_project.Sensor.Value: - Value: - Offsets: - 255: - type: int64_t - multiplierM: 1 - mutability: Mutability::Write|Mutability::Read - offsetB: -127 - path: /xyz/openbmc_project/sensors/temperature/p1_core23_temp - rExp: 0 - readingType: readingData - scale: -3 - sensorNamePattern: nameLeaf - sensorReadingType: 1 - sensorType: 1 - serviceInterface: org.freedesktop.DBus.Properties - unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC -139: - entityID: 34 - entityInstance: 2 - interfaces: - xyz.openbmc_project.Control.Boot.RebootAttempts: - AttemptsLeft: - Offsets: - 255: - type: uint32_t - mutability: Mutability::Write|Mutability::Read - path: /xyz/openbmc_project/state/host0 - readingType: readingAssertion - sensorNamePattern: nameProperty - sensorReadingType: 111 - sensorType: 195 - serviceInterface: org.freedesktop.DBus.Properties -145: - entityID: 35 - entityInstance: 1 - interfaces: - xyz.openbmc_project.State.OperatingSystem.Status: - OperatingSystemState: - Offsets: - 1: - assert: xyz.openbmc_project.State.OperatingSystem.Status.OSStatus.CBoot - type: string - 2: - assert: xyz.openbmc_project.State.OperatingSystem.Status.OSStatus.PXEBoot - type: string - 3: - assert: xyz.openbmc_project.State.OperatingSystem.Status.OSStatus.DiagBoot - type: string - 4: - assert: xyz.openbmc_project.State.OperatingSystem.Status.OSStatus.CDROMBoot - type: string - 5: - assert: xyz.openbmc_project.State.OperatingSystem.Status.OSStatus.ROMBoot - type: string - 6: - assert: xyz.openbmc_project.State.OperatingSystem.Status.OSStatus.BootComplete - type: string - mutability: Mutability::Write|Mutability::Read - path: /xyz/openbmc_project/state/host0 - readingType: assertion - sensorNamePattern: nameProperty - sensorReadingType: 111 - sensorType: 31 - serviceInterface: org.freedesktop.DBus.Properties diff --git a/meta-ibm/meta-romulus/recipes-phosphor/leds/romulus-led-manager-config/led.yaml b/meta-ibm/meta-romulus/recipes-phosphor/leds/romulus-led-manager-config/led.yaml index b2e96c250..b2e96c250 100755..100644 --- a/meta-ibm/meta-romulus/recipes-phosphor/leds/romulus-led-manager-config/led.yaml +++ b/meta-ibm/meta-romulus/recipes-phosphor/leds/romulus-led-manager-config/led.yaml diff --git a/meta-ibm/meta-witherspoon/README.md b/meta-ibm/meta-witherspoon/README.md index 5d2b5c722..7386d29b4 100644 --- a/meta-ibm/meta-witherspoon/README.md +++ b/meta-ibm/meta-witherspoon/README.md @@ -11,11 +11,19 @@ In addition to witherspoon, this layer contains additional machine configurations such as swift. The default machine target is witherspoon, so in order to build a different configuration, or to build witherspoon after building a different one, set the MACHINE environment to the desired -configuration name as follows (this is only needed once): +configuration name (see the conf/machine/ subdirectory for available options): - export MACHINE="<machine_configuration>"; \ - export BB_ENV_EXTRAWHITE="$BB_ENV_EXTRAWHITE MACHINE" + export MACHINE=machine_configuration_name Then build: bitbake obmc-phosphor-image + +Example: + + export MACHINE=swift + bitbake obmc-phosphor-image + bitbake phosphor-logging + + export MACHINE=witherspoon + bitbake obmc-phosphor-image diff --git a/meta-ibm/meta-witherspoon/conf/local.conf.sample b/meta-ibm/meta-witherspoon/conf/local.conf.sample index 8a5c738fc..9dec7743d 100644 --- a/meta-ibm/meta-witherspoon/conf/local.conf.sample +++ b/meta-ibm/meta-witherspoon/conf/local.conf.sample @@ -1,3 +1,5 @@ +#MACHINE ?= "swift" +#MACHINE ?= "witherspoon-128" MACHINE ??= "witherspoon" DISTRO ?= "openbmc-witherspoon" PACKAGE_CLASSES ?= "package_rpm" diff --git a/meta-ibm/meta-witherspoon/conf/machine/swift.conf b/meta-ibm/meta-witherspoon/conf/machine/swift.conf index 077d0b558..3915e2b98 100644 --- a/meta-ibm/meta-witherspoon/conf/machine/swift.conf +++ b/meta-ibm/meta-witherspoon/conf/machine/swift.conf @@ -7,7 +7,7 @@ KERNEL_DEVICETREE = "${KMACHINE}-bmc-opp-${MACHINE}.dtb" PHOSPHOR_MRW_LICENSE = "Apache-2.0" PHOSPHOR_MRW_LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" PHOSPHOR_MRW_URI = "git://git@github.com/open-power/swift-xml;protocol=ssh" -PHOSPHOR_MRW_REV = "7880e778af3fca75f46aa3e94f7e9971a6ddbb1f" +PHOSPHOR_MRW_REV = "2b59e12db44e167a1652777b770674d235ec55ba" # 128MB flash size FLASH_SIZE = "131072" diff --git a/meta-ibm/meta-witherspoon/conf/machine/witherspoon-128.conf b/meta-ibm/meta-witherspoon/conf/machine/witherspoon-128.conf index a3981cc4f..d21b9b22b 100644 --- a/meta-ibm/meta-witherspoon/conf/machine/witherspoon-128.conf +++ b/meta-ibm/meta-witherspoon/conf/machine/witherspoon-128.conf @@ -1,5 +1,5 @@ +MACHINEOVERRIDES =. "witherspoon:" require conf/machine/witherspoon.conf -MACHINEOVERRIDES .= ":witherspoon" KERNEL_DEVICETREE = "${KMACHINE}-bmc-opp-${MACHINE}.dtb" diff --git a/meta-ibm/meta-witherspoon/conf/machine/witherspoon.conf b/meta-ibm/meta-witherspoon/conf/machine/witherspoon.conf index 579b00d14..3f7aedcb9 100644 --- a/meta-ibm/meta-witherspoon/conf/machine/witherspoon.conf +++ b/meta-ibm/meta-witherspoon/conf/machine/witherspoon.conf @@ -8,6 +8,9 @@ OBMC_POWER_SUPPLY_INSTANCES = "0 1" PREFERRED_PROVIDER_virtual/p9-vcs-workaround = '' +# A machine override for common machine configuration for all of IBM's +# "Accelerated Computing" class of systems. +MACHINEOVERRIDES =. "ibm-ac-server:" require conf/machine/include/ast2500.inc require conf/machine/include/obmc-bsp-common.inc require conf/machine/include/openpower.inc diff --git a/meta-ibm/meta-witherspoon/recipes-core/systemd/systemd_%.bbappend b/meta-ibm/meta-witherspoon/recipes-core/systemd/systemd_%.bbappend index 62ea76f79..a40f61873 100644 --- a/meta-ibm/meta-witherspoon/recipes-core/systemd/systemd_%.bbappend +++ b/meta-ibm/meta-witherspoon/recipes-core/systemd/systemd_%.bbappend @@ -1,13 +1,13 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" -SRC_URI += "file://journald-storage-policy.conf" -SRC_URI += "file://systemd-journald-override.conf" -SRC_URI += "file://journald-size-policy.conf" +SRC_URI_append_ibm-ac-server = " file://journald-storage-policy.conf" +SRC_URI_append_ibm-ac-server = " file://systemd-journald-override.conf" +SRC_URI_append_ibm-ac-server = " file://journald-size-policy.conf" -FILES_${PN} += "${systemd_unitdir}/journald.conf.d/journald-storage-policy.conf" -FILES_${PN} += "${systemd_system_unitdir}/systemd-journald.service.d/systemd-journald-override.conf" -FILES_${PN} += "${systemd_unitdir}/journald.conf.d/journald-size-policy.conf" +FILES_${PN}_append_ibm-ac-server = " ${systemd_unitdir}/journald.conf.d/journald-storage-policy.conf" +FILES_${PN}_append_ibm-ac-server = " ${systemd_system_unitdir}/systemd-journald.service.d/systemd-journald-override.conf" +FILES_${PN}_append_ibm-ac-server = " ${systemd_unitdir}/journald.conf.d/journald-size-policy.conf" -do_install_append() { +do_install_append_ibm-ac-server() { install -m 644 -D ${WORKDIR}/journald-storage-policy.conf ${D}${systemd_unitdir}/journald.conf.d/journald-storage-policy.conf install -m 644 -D ${WORKDIR}/systemd-journald-override.conf ${D}${systemd_system_unitdir}/systemd-journald.service.d/systemd-journald-override.conf install -m 644 -D ${WORKDIR}/journald-size-policy.conf ${D}${systemd_unitdir}/journald.conf.d/journald-size-policy.conf diff --git a/meta-ibm/meta-witherspoon/recipes-kernel/linux/linux-aspeed/0001-ARM-dts-Aspeed-Witherspoon-128-Update-BMC-partitioni.patch b/meta-ibm/meta-witherspoon/recipes-kernel/linux/linux-aspeed/0001-ARM-dts-Aspeed-Witherspoon-128-Update-BMC-partitioni.patch index 547d5f098..b0e61ccd4 100644 --- a/meta-ibm/meta-witherspoon/recipes-kernel/linux/linux-aspeed/0001-ARM-dts-Aspeed-Witherspoon-128-Update-BMC-partitioni.patch +++ b/meta-ibm/meta-witherspoon/recipes-kernel/linux/linux-aspeed/0001-ARM-dts-Aspeed-Witherspoon-128-Update-BMC-partitioni.patch @@ -1,4 +1,4 @@ -From a3007793ae0c53b4a39159c6d69502de832a0914 Mon Sep 17 00:00:00 2001 +From 886807887052b408717137acfeb6a8633748a210 Mon Sep 17 00:00:00 2001 From: Adriana Kobylak <anoo@us.ibm.com> Date: Thu, 7 Feb 2019 11:23:00 -0600 Subject: [PATCH] ARM: dts: Aspeed: Witherspoon-128: Update BMC partitioning @@ -9,17 +9,17 @@ BMC flash chips. Signed-off-by: Adriana Kobylak <anoo@us.ibm.com> --- arch/arm/boot/dts/Makefile | 1 + - .../boot/dts/aspeed-bmc-opp-witherspoon-128.dts | 712 +++++++++++++++++++++ - 2 files changed, 713 insertions(+) + .../boot/dts/aspeed-bmc-opp-witherspoon-128.dts | 708 +++++++++++++++++++++ + 2 files changed, 709 insertions(+) create mode 100644 arch/arm/boot/dts/aspeed-bmc-opp-witherspoon-128.dts diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile -index bd40148..2341358 100644 +index eb6de52..833c354 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile -@@ -1245,6 +1245,7 @@ dtb-$(CONFIG_ARCH_ASPEED) += \ - aspeed-bmc-opp-palmetto.dtb \ - aspeed-bmc-opp-romulus.dtb \ +@@ -1280,6 +1280,7 @@ dtb-$(CONFIG_ARCH_ASPEED) += \ + aspeed-bmc-opp-swift.dtb \ + aspeed-bmc-opp-vesnin.dtb \ aspeed-bmc-opp-witherspoon.dtb \ + aspeed-bmc-opp-witherspoon-128.dtb \ aspeed-bmc-opp-zaius.dtb \ @@ -27,10 +27,10 @@ index bd40148..2341358 100644 aspeed-bmc-quanta-q71l.dtb diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon-128.dts b/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon-128.dts new file mode 100644 -index 0000000..db34564 +index 0000000..36b4749 --- /dev/null +++ b/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon-128.dts -@@ -0,0 +1,712 @@ +@@ -0,0 +1,708 @@ +// SPDX-License-Identifier: GPL-2.0+ +/dts-v1/; +#include "aspeed-g5.dtsi" @@ -322,10 +322,6 @@ index 0000000..db34564 + flash = <&spi1>; +}; + -+&mbox { -+ status = "okay"; -+}; -+ +&mac0 { + status = "okay"; + pinctrl-names = "default"; diff --git a/meta-ibm/meta-witherspoon/recipes-kernel/linux/linux-aspeed_%.bbappend b/meta-ibm/meta-witherspoon/recipes-kernel/linux/linux-aspeed_%.bbappend index e41a430c7..fa249c015 100644 --- a/meta-ibm/meta-witherspoon/recipes-kernel/linux/linux-aspeed_%.bbappend +++ b/meta-ibm/meta-witherspoon/recipes-kernel/linux/linux-aspeed_%.bbappend @@ -1,3 +1,3 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" -SRC_URI += "file://witherspoon.cfg" +SRC_URI_append_ibm-ac-server = " file://witherspoon.cfg" SRC_URI_append_witherspoon-128 = " file://0001-ARM-dts-Aspeed-Witherspoon-128-Update-BMC-partitioni.patch" diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control.bb b/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control.bb index 498b622d9..d2804dfca 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control.bb +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control.bb @@ -3,6 +3,7 @@ PR = "r1" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${IBMBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" +inherit allarch inherit obmc-phosphor-systemd RDEPENDS_${PN} += "i2c-tools" @@ -10,30 +11,23 @@ RDEPENDS_${PN} += "i2c-tools" S = "${WORKDIR}" SRC_URI += "file://avsbus-disable.sh \ - file://avsbus-enable.sh \ - file://power-workarounds.sh" + file://avsbus-enable.sh" do_install() { install -d ${D}${bindir} install -m 0755 ${S}/avsbus-disable.sh ${D}${bindir}/avsbus-disable.sh install -m 0755 ${S}/avsbus-enable.sh ${D}${bindir}/avsbus-enable.sh - install -m 0755 ${S}/power-workarounds.sh ${D}${bindir}/power-workarounds.sh } TMPL_EN= "avsbus-enable@.service" TMPL_DIS= "avsbus-disable@.service" -TMPL_WA= "power-workarounds@.service" INSTFMT_EN= "avsbus-enable@{0}.service" INSTFMT_DIS= "avsbus-disable@{0}.service" -INSTFMT_WA= "power-workarounds@{0}.service" TGTFMT = "obmc-chassis-poweron@{0}.target" FMT_EN = "../${TMPL_EN}:${TGTFMT}.requires/${INSTFMT_EN}" FMT_DIS = "../${TMPL_DIS}:${TGTFMT}.requires/${INSTFMT_DIS}" -FMT_WA = "../${TMPL_WA}:${TGTFMT}.requires/${INSTFMT_WA}" SYSTEMD_SERVICE_${PN} += "${TMPL_EN}" SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT_EN', 'OBMC_CHASSIS_INSTANCES')}" SYSTEMD_SERVICE_${PN} += "${TMPL_DIS}" SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT_DIS', 'OBMC_CHASSIS_INSTANCES')}" -SYSTEMD_SERVICE_${PN} += "${TMPL_WA}" -SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT_WA', 'OBMC_CHASSIS_INSTANCES')}" diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/obmc-op-control-power_%/obmc/power_control b/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/obmc-op-control-power_%/ibm-ac-server/obmc/power_control index a93bdd758..a93bdd758 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/obmc-op-control-power_%/obmc/power_control +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/obmc-op-control-power_%/ibm-ac-server/obmc/power_control diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/power-workarounds.bb b/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/power-workarounds.bb new file mode 100644 index 000000000..891620b0c --- /dev/null +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/power-workarounds.bb @@ -0,0 +1,26 @@ +SUMMARY = "Power device Workarounds" +PR = "r1" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://${IBMBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" + +inherit allarch +inherit obmc-phosphor-systemd + +RDEPENDS_${PN} += "i2c-tools" + +S = "${WORKDIR}" + +SRC_URI += "file://power-workarounds.sh" + +do_install() { + install -d ${D}${bindir} + install -m 0755 ${S}/power-workarounds.sh ${D}${bindir}/power-workarounds.sh +} + +TMPL_WA = "power-workarounds@.service" +INSTFMT_WA = "power-workarounds@{0}.service" +TGTFMT = "obmc-chassis-poweron@{0}.target" +FMT_WA = "../${TMPL_WA}:${TGTFMT}.requires/${INSTFMT_WA}" + +SYSTEMD_SERVICE_${PN} += "${TMPL_WA}" +SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT_WA', 'OBMC_CHASSIS_INSTANCES')}" diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/swift/power-workarounds.sh b/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/power-workarounds/swift/power-workarounds.sh index dc1f4803b..dc1f4803b 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/swift/power-workarounds.sh +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/power-workarounds/swift/power-workarounds.sh diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/swift/power-workarounds@.service b/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/power-workarounds/swift/power-workarounds@.service index 0926e033b..0926e033b 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/swift/power-workarounds@.service +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/power-workarounds/swift/power-workarounds@.service diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/witherspoon/power-workarounds.sh b/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/power-workarounds/witherspoon/power-workarounds.sh index d40579731..d40579731 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/witherspoon/power-workarounds.sh +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/power-workarounds/witherspoon/power-workarounds.sh diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/witherspoon/power-workarounds@.service b/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/power-workarounds/witherspoon/power-workarounds@.service index 74d8e4bfc..74d8e4bfc 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/witherspoon/power-workarounds@.service +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/power-workarounds/witherspoon/power-workarounds@.service diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/vrm-control.bb b/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/vrm-control.bb index 36416e949..fe9463441 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/vrm-control.bb +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/vrm-control.bb @@ -4,6 +4,7 @@ PR = "r1" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${IBMBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" +inherit allarch inherit obmc-phosphor-systemd RDEPENDS_${PN} += "i2c-tools bash" diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/vrm-control/ir35221-unbind-bind.sh b/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/vrm-control/ibm-ac-server/ir35221-unbind-bind.sh index 85d77412d..85d77412d 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/vrm-control/ir35221-unbind-bind.sh +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/vrm-control/ibm-ac-server/ir35221-unbind-bind.sh diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/configuration/acx22-yaml-config.bb b/meta-ibm/meta-witherspoon/recipes-phosphor/configuration/acx22-yaml-config.bb new file mode 100644 index 000000000..d0dbd60d8 --- /dev/null +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/configuration/acx22-yaml-config.bb @@ -0,0 +1,82 @@ +SUMMARY = "YAML configuration for ACx22 systems" +PR = "r1" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://${IBMBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" + +inherit allarch +inherit mrw-xml + +SRC_URI = " \ + file://acx22-ipmi-fru-bmc.yaml \ + file://acx22-ipmi-fru-not-sent-by-host.yaml \ + file://acx22-ipmi-hwmon-sensors.yaml \ + file://acx22-ipmi-inventory-sensors.yaml \ + file://acx22-ipmi-occ-sensors.yaml \ + file://acx22-ipmi-sensors-mrw.yaml \ + " + +DEPENDS = " \ + mrw-native \ + mrw-perl-tools-native \ + openpower-yaml-config \ + " + +S = "${WORKDIR}" + +ACx22_IPMI_EXTRA_FRU_READ_YAMLS = " \ + acx22-ipmi-fru-bmc.yaml \ + acx22-ipmi-fru-not-sent-by-host.yaml \ + " +ACx22_IPMI_EXTRA_SENSOR_YAMLS = " \ + acx22-ipmi-hwmon-sensors.yaml \ + acx22-ipmi-occ-sensors.yaml \ + " + +do_install() { + perlbin="${STAGING_DIR_NATIVE}${bindir}/perl-native/perl" + scriptpath=${STAGING_DIR_NATIVE}${bindir} + mrw=${STAGING_DIR_NATIVE}${datadir}/obmc-mrw/${MRW_XML} + op_configpath=${STAGING_DIR_HOST}${datadir}/openpower-yaml-config + + # generate extra-properties.yaml from the MRW for ipmi-fru-parser + $perlbin $scriptpath/gen_fru_properties.pl -m $mrw \ + -c $op_configpath/ipmi-fru-properties-mrw.yaml \ + -o extra-properties.yaml + + # generate fru-read.yaml from the MRW, for ipmid and ipmi-fru-parser + $perlbin $scriptpath/gen_ipmi_fru.pl -i $mrw \ + -m $op_configpath/ipmi-hostboot-fru-mrw.yaml \ + -o fru-read-partial.yaml + cat fru-read-partial.yaml ${ACx22_IPMI_EXTRA_FRU_READ_YAMLS} \ + > fru-read.yaml + + # generate inventory-sensors.yaml from the MRW, for ipmid + $perlbin $scriptpath/gen_ipmi_sel.pl -i $mrw \ + -m acx22-ipmi-inventory-sensors.yaml -o inventory-sensors.yaml + + # generate sensors.yaml from the MRW, for ipmid + cat acx22-ipmi-sensors-mrw.yaml \ + $op_configpath/ipmi-hostboot-volatile-sensor-mrw.yaml \ + $op_configpath/ipmi-occ-active-sensor-mrw.yaml \ + > sensors-mrw.yaml + $perlbin $scriptpath/gen_ipmi_sensor.pl -i $mrw -m sensors-mrw.yaml \ + -o sensors-partial.yaml + cat sensors-partial.yaml ${ACx22_IPMI_EXTRA_SENSOR_YAMLS} \ + > sensors.yaml + + install -m 0644 -D extra-properties.yaml \ + ${D}${datadir}/${BPN}/ipmi-extra-properties.yaml + install -m 0644 -D fru-read.yaml ${D}${datadir}/${BPN}/ipmi-fru-read.yaml + install -m 0644 -D inventory-sensors.yaml \ + ${D}${datadir}/${BPN}/ipmi-inventory-sensors.yaml + install -m 0644 -D sensors.yaml ${D}${datadir}/${BPN}/ipmi-sensors.yaml +} + +FILES_${PN}-dev = " \ + ${datadir}/${BPN}/ipmi-extra-properties.yaml \ + ${datadir}/${BPN}/ipmi-fru-read.yaml \ + ${datadir}/${BPN}/ipmi-inventory-sensors.yaml \ + ${datadir}/${BPN}/ipmi-sensors.yaml \ + " + +ALLOW_EMPTY_${PN} = "1" diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/configuration/acx22-yaml-config/acx22-ipmi-inventory-sensors.yaml b/meta-ibm/meta-witherspoon/recipes-phosphor/configuration/acx22-yaml-config/acx22-ipmi-inventory-sensors.yaml new file mode 100644 index 000000000..6dd17b7ab --- /dev/null +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/configuration/acx22-yaml-config/acx22-ipmi-inventory-sensors.yaml @@ -0,0 +1,18 @@ +1: + Offset: 2 + SensorType: 18 +3: + Offset: 8 + SensorType: 7 +7: + Offset: 0 + SensorType: 199 +32: + Offset: 4 + SensorType: 12 +208: + Offset: 8 + SensorType: 7 +216: + Offset: 8 + SensorType: 23 diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/configuration/acx22-yaml-config/acx22-ipmi-occ-sensors.yaml b/meta-ibm/meta-witherspoon/recipes-phosphor/configuration/acx22-yaml-config/acx22-ipmi-occ-sensors.yaml new file mode 100644 index 000000000..aa69a646c --- /dev/null +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/configuration/acx22-yaml-config/acx22-ipmi-occ-sensors.yaml @@ -0,0 +1,44 @@ +8: + entityID: 210 + entityInstance: 1 + interfaces: + org.open_power.OCC.Status: + OccActive: + Offsets: + 0: + assert: false + deassert: true + type: bool + 1: + assert: true + deassert: false + type: bool + mutability: Mutability::Write|Mutability::Read + path: /org/open_power/control/occ0 + readingType: assertion + sensorNamePattern: nameLeaf + sensorReadingType: 9 + sensorType: 9 + serviceInterface: org.freedesktop.DBus.Properties +9: + entityID: 210 + entityInstance: 2 + interfaces: + org.open_power.OCC.Status: + OccActive: + Offsets: + 0: + assert: false + deassert: true + type: bool + 1: + assert: true + deassert: false + type: bool + mutability: Mutability::Write|Mutability::Read + path: /org/open_power/control/occ1 + readingType: assertion + sensorNamePattern: nameLeaf + sensorReadingType: 9 + sensorType: 9 + serviceInterface: org.freedesktop.DBus.Properties diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/configuration/acx22-yaml-config/acx22-ipmi-sensors-mrw.yaml b/meta-ibm/meta-witherspoon/recipes-phosphor/configuration/acx22-yaml-config/acx22-ipmi-sensors-mrw.yaml new file mode 100644 index 000000000..1c7b6eb82 --- /dev/null +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/configuration/acx22-yaml-config/acx22-ipmi-sensors-mrw.yaml @@ -0,0 +1,339 @@ +boot_count_sensor: + interfaces: + xyz.openbmc_project.Control.Boot.RebootAttempts: + AttemptsLeft: + Offsets: + 255: + type: uint32_t + mutability: Mutability::Write|Mutability::Read + path: /xyz/openbmc_project/state/host0 + readingType: readingAssertion + sensorNamePattern: nameProperty + serviceInterface: org.freedesktop.DBus.Properties +cpu_func_sensor: + interfaces: + xyz.openbmc_project.Inventory.Item: + Present: + Offsets: + 7: + assert: true + deassert: false + type: bool + xyz.openbmc_project.State.Decorator.OperationalStatus: + Functional: + Offsets: + 8: + assert: false + deassert: true + type: bool + Prereqs: + 7: + assert: true + deassert: false + type: bool + mutability: Mutability::Write|Mutability::Read + readingType: assertion + sensorNamePattern: nameLeaf + serviceInterface: xyz.openbmc_project.Inventory.Manager +cpucore_func_sensor: + interfaces: + xyz.openbmc_project.Inventory.Item: + Present: + Offsets: + 7: + assert: true + deassert: false + skipOn: deassert + type: bool + xyz.openbmc_project.State.Decorator.OperationalStatus: + Functional: + Offsets: + 8: + assert: false + deassert: true + type: bool + Prereqs: + 7: + assert: true + deassert: false + type: bool + mutability: Mutability::Write|Mutability::Read + readingType: assertion + sensorNamePattern: nameParentLeaf + serviceInterface: xyz.openbmc_project.Inventory.Manager +cpucore_temp_sensor: + bExp: 0 + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 255: + type: int64_t + multiplierM: 1 + mutability: Mutability::Write|Mutability::Read + offsetB: -127 + rExp: 0 + readingType: readingData + scale: -3 + sensorNamePattern: nameLeaf + serviceInterface: org.freedesktop.DBus.Properties + unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC +dimm_func_sensor: + interfaces: + xyz.openbmc_project.Inventory.Item: + Present: + Offsets: + 6: + assert: true + deassert: false + type: bool + xyz.openbmc_project.State.Decorator.OperationalStatus: + Functional: + Offsets: + 4: + assert: false + deassert: true + type: bool + Prereqs: + 6: + assert: true + deassert: false + type: bool + mutability: Mutability::Write|Mutability::Read + readingType: assertion + sensorNamePattern: nameLeaf + serviceInterface: xyz.openbmc_project.Inventory.Manager +dimm_temp_sensor: + bExp: 0 + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 255: + type: int64_t + multiplierM: 1 + mutability: Mutability::Write|Mutability::Read + offsetB: -127 + rExp: 0 + readingType: readingData + scale: -3 + sensorNamePattern: nameLeaf + serviceInterface: org.freedesktop.DBus.Properties + unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC +fw_boot_sensor: + interfaces: + xyz.openbmc_project.State.Boot.Progress: + BootProgress: + Offsets: + 0: + set: xyz.openbmc_project.State.Boot.Progress.ProgressStages.Unspecified + type: string + 1: + set: xyz.openbmc_project.State.Boot.Progress.ProgressStages.MemoryInit + type: string + 3: + set: xyz.openbmc_project.State.Boot.Progress.ProgressStages.SecondaryProcInit + type: string + 7: + set: xyz.openbmc_project.State.Boot.Progress.ProgressStages.PCIInit + type: string + 19: + set: xyz.openbmc_project.State.Boot.Progress.ProgressStages.OSStart + type: string + 20: + set: xyz.openbmc_project.State.Boot.Progress.ProgressStages.MotherboardInit + type: string + mutability: Mutability::Write|Mutability::Read + path: /xyz/openbmc_project/state/host0 + readingType: eventdata2 + sensorNamePattern: nameProperty + serviceInterface: org.freedesktop.DBus.Properties +gpu_func_sensor: + interfaces: + xyz.openbmc_project.Inventory.Item.Accelerator: + xyz.openbmc_project.Inventory.Decorator.Replaceable: + FieldReplaceable: + Offsets: + 7: + assert: true + deassert: true + type: bool + xyz.openbmc_project.Inventory.Item: + Present: + Offsets: + 7: + assert: true + deassert: false + type: bool + xyz.openbmc_project.State.Decorator.OperationalStatus: + Functional: + Offsets: + 8: + assert: false + deassert: true + type: bool + Prereqs: + 7: + assert: true + deassert: false + type: bool + mutability: Mutability::Write|Mutability::Read + readingType: assertion + sensorNamePattern: nameLeaf + serviceInterface: xyz.openbmc_project.Inventory.Manager +gpu_temp_sensor: + bExp: 0 + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 255: + type: int64_t + multiplierM: 1 + mutability: Mutability::Write|Mutability::Read + offsetB: -127 + rExp: 0 + readingType: readingData + scale: -3 + sensorNamePattern: nameLeaf + serviceInterface: org.freedesktop.DBus.Properties + unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC +host_auto_reboot_control_sensor: + interfaces: + xyz.openbmc_project.Control.Boot.RebootPolicy: + AutoReboot: + Offsets: + 0: + assert: false + type: bool + 1: + assert: true + type: bool + mutability: Mutability::Write|Mutability::Read + path: /xyz/openbmc_project/control/host0/auto_reboot + readingType: assertion + sensorNamePattern: nameLeaf + serviceInterface: org.freedesktop.DBus.Properties +memory_temp_sensor: + bExp: 0 + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 255: + type: int64_t + multiplierM: 1 + mutability: Mutability::Write|Mutability::Read + offsetB: -127 + rExp: 0 + readingType: readingData + scale: -3 + sensorNamePattern: nameLeaf + serviceInterface: org.freedesktop.DBus.Properties + unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC +os_boot_sensor: + interfaces: + xyz.openbmc_project.State.OperatingSystem.Status: + OperatingSystemState: + Offsets: + 1: + assert: xyz.openbmc_project.State.OperatingSystem.Status.OSStatus.CBoot + type: string + 2: + assert: xyz.openbmc_project.State.OperatingSystem.Status.OSStatus.PXEBoot + type: string + 3: + assert: xyz.openbmc_project.State.OperatingSystem.Status.OSStatus.DiagBoot + type: string + 4: + assert: xyz.openbmc_project.State.OperatingSystem.Status.OSStatus.CDROMBoot + type: string + 5: + assert: xyz.openbmc_project.State.OperatingSystem.Status.OSStatus.ROMBoot + type: string + 6: + assert: xyz.openbmc_project.State.OperatingSystem.Status.OSStatus.BootComplete + type: string + mutability: Mutability::Write|Mutability::Read + path: /xyz/openbmc_project/state/host0 + readingType: assertion + sensorNamePattern: nameProperty + serviceInterface: org.freedesktop.DBus.Properties +ps_derating_sensor: + interfaces: + xyz.openbmc_project.Control.PowerSupplyAttributes: + DeratingFactor: + Offsets: + 255: + type: uint32_t + mutability: Mutability::Read + readingType: assertion + sensorNamePattern: nameProperty + serviceInterface: org.freedesktop.DBus.Properties +ps_redundancy_state_sensor: + interfaces: + xyz.openbmc_project.Control.PowerSupplyRedundancy: + PowerSupplyRedundancyEnabled: + Offsets: + 0: + assert: false + type: bool + 1: + assert: true + type: bool + mutability: Mutability::Read + path: /xyz/openbmc_project/control/power_supply_redundancy + readingType: assertion + sensorNamePattern: nameProperty + serviceInterface: org.freedesktop.DBus.Properties +tpm_required_sensor: + interfaces: + xyz.openbmc_project.Control.TPM.Policy: + TPMEnable: + Offsets: + 0: + assert: false + type: bool + 1: + assert: true + type: bool + mutability: Mutability::Write|Mutability::Read + path: /xyz/openbmc_project/control/host0/TPMEnable + readingType: assertion + sensorNamePattern: nameLeaf + serviceInterface: org.freedesktop.DBus.Properties +turbo_allowed_sensor: + interfaces: + xyz.openbmc_project.Control.Host.TurboAllowed: + TurboAllowed: + Offsets: + 0: + assert: false + deassert: true + type: bool + 1: + assert: true + deassert: false + type: bool + mutability: Mutability::Read + path: /xyz/openbmc_project/control/host0/turbo_allowed + readingType: assertion + sensorNamePattern: nameLeaf + serviceInterface: org.freedesktop.DBus.Properties +vrm_vdd_temp_sensor: + bExp: 0 + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 255: + type: int64_t + multiplierM: 1 + mutability: Mutability::Write|Mutability::Read + offsetB: -127 + rExp: 0 + readingType: readingData + scale: -3 + sensorNamePattern: nameLeaf + serviceInterface: org.freedesktop.DBus.Properties + unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-bmc-inventory-native/bmc-fru-config.yaml b/meta-ibm/meta-witherspoon/recipes-phosphor/configuration/acx22-yaml-config/swift/acx22-ipmi-fru-bmc.yaml index 072cc5cd6..6de8be206 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-bmc-inventory-native/bmc-fru-config.yaml +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/configuration/acx22-yaml-config/swift/acx22-ipmi-fru-bmc.yaml @@ -1,4 +1,4 @@ -50: +60: /system/chassis/motherboard/fan0: entityID: 29 entityInstance: 1 @@ -7,7 +7,7 @@ PrettyName: IPMIFruProperty: Product Name IPMIFruSection: Product -51: +61: /system/chassis/motherboard/fan1: entityID: 29 entityInstance: 2 @@ -16,7 +16,7 @@ PrettyName: IPMIFruProperty: Product Name IPMIFruSection: Product -52: +62: /system/chassis/motherboard/fan2: entityID: 29 entityInstance: 3 @@ -25,7 +25,7 @@ PrettyName: IPMIFruProperty: Product Name IPMIFruSection: Product -53: +63: /system/chassis/motherboard/fan3: entityID: 29 entityInstance: 4 @@ -34,8 +34,8 @@ PrettyName: IPMIFruProperty: Product Name IPMIFruSection: Product -60: - /system/chassis/motherboard/boxelder/bmc: +70: + /system/chassis/motherboard/management_card/bmc: entityID: 6 entityInstance: 1 interfaces: @@ -59,8 +59,8 @@ BuildDate: IPMIFruProperty: Mfg Date IPMIFruSection: Board -70: - /system/chassis/motherboard/boxelder/bmc/ethernet: +80: + /system/chassis/motherboard/management_card/bmc/ethernet: entityID: 1 entityInstance: 1 interfaces: @@ -68,7 +68,7 @@ PrettyName: IPMIFruProperty: Product Name IPMIFruSection: Product -75: +85: /system/chassis/motherboard/powersupply0: entityID: 10 entityInstance: 1 @@ -93,7 +93,7 @@ BuildDate: IPMIFruProperty: Mfg Date IPMIFruSection: Board -76: +86: /system/chassis/motherboard/powersupply1: entityID: 10 entityInstance: 2 diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/configuration/acx22-yaml-config/swift/acx22-ipmi-fru-not-sent-by-host.yaml b/meta-ibm/meta-witherspoon/recipes-phosphor/configuration/acx22-yaml-config/swift/acx22-ipmi-fru-not-sent-by-host.yaml new file mode 100644 index 000000000..114360ef9 --- /dev/null +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/configuration/acx22-yaml-config/swift/acx22-ipmi-fru-not-sent-by-host.yaml @@ -0,0 +1,21 @@ +15: + /system/chassis/motherboard/ga100card0: &DEFAULTS + entityInstance: 1 + entityID: 3 + interfaces: + xyz.openbmc_project.Inventory.Item: + PrettyName: + IPMIFruProperty: Board Name + IPMIFruSection: Board +16: + /system/chassis/motherboard/ga100card1: + <<: *DEFAULTS + entityInstance: 2 +17: + /system/chassis/motherboard/ga100card2: + <<: *DEFAULTS + entityInstance: 3 +18: + /system/chassis/motherboard/ga100card3: + <<: *DEFAULTS + entityInstance: 4 diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/configuration/acx22-yaml-config/swift/acx22-ipmi-hwmon-sensors.yaml b/meta-ibm/meta-witherspoon/recipes-phosphor/configuration/acx22-yaml-config/swift/acx22-ipmi-hwmon-sensors.yaml new file mode 100644 index 000000000..38f38355a --- /dev/null +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/configuration/acx22-yaml-config/swift/acx22-ipmi-hwmon-sensors.yaml @@ -0,0 +1,484 @@ +232: + bExp: 0 + entityID: 29 + entityInstance: 1 + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 255: + type: int64_t + multiplierM: 100 + offsetB: 0 + path: /xyz/openbmc_project/sensors/fan_tach/fan0_0 + rExp: 0 + readingType: readingData + scale: 0 + sensorNamePattern: nameLeaf + sensorReadingType: 1 + sensorType: 4 + serviceInterface: org.freedesktop.DBus.Properties + unit: xyz.openbmc_project.Sensor.Value.Unit.RPMS +233: + bExp: 0 + entityID: 29 + entityInstance: 3 + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 255: + type: int64_t + multiplierM: 100 + offsetB: 0 + path: /xyz/openbmc_project/sensors/fan_tach/fan1_0 + rExp: 0 + readingType: readingData + scale: 0 + sensorNamePattern: nameLeaf + sensorReadingType: 1 + sensorType: 4 + serviceInterface: org.freedesktop.DBus.Properties + unit: xyz.openbmc_project.Sensor.Value.Unit.RPMS +234: + bExp: 0 + entityID: 29 + entityInstance: 5 + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 255: + type: int64_t + multiplierM: 100 + offsetB: 0 + path: /xyz/openbmc_project/sensors/fan_tach/fan2_0 + rExp: 0 + readingType: readingData + scale: 0 + sensorNamePattern: nameLeaf + sensorReadingType: 1 + sensorType: 4 + serviceInterface: org.freedesktop.DBus.Properties + unit: xyz.openbmc_project.Sensor.Value.Unit.RPMS +235: + bExp: 0 + entityID: 29 + entityInstance: 7 + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 255: + type: int64_t + multiplierM: 100 + offsetB: 0 + path: /xyz/openbmc_project/sensors/fan_tach/fan3_0 + rExp: 0 + readingType: readingData + scale: 0 + sensorNamePattern: nameLeaf + sensorReadingType: 1 + sensorType: 4 + serviceInterface: org.freedesktop.DBus.Properties + unit: xyz.openbmc_project.Sensor.Value.Unit.RPMS +236: + bExp: 0 + entityID: 10 + entityInstance: 1 + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 255: + type: int64_t + multiplierM: 2 + offsetB: 0 + path: /xyz/openbmc_project/sensors/power/fan_disk_power + rExp: 0 + readingType: readingData + scale: -6 + sensorNamePattern: nameLeaf + sensorReadingType: 1 + sensorType: 8 + serviceInterface: org.freedesktop.DBus.Properties + unit: xyz.openbmc_project.Sensor.Value.Unit.Watts +237: + bExp: 0 + entityID: 10 + entityInstance: 9 + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 255: + type: int64_t + multiplierM: 1 + offsetB: 0 + path: /xyz/openbmc_project/sensors/power/p0_io_power + rExp: 0 + readingType: readingData + scale: -6 + sensorNamePattern: nameLeaf + sensorReadingType: 1 + sensorType: 8 + serviceInterface: org.freedesktop.DBus.Properties + unit: xyz.openbmc_project.Sensor.Value.Unit.Watts +238: + bExp: 0 + entityID: 10 + entityInstance: 10 + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 255: + type: int64_t + multiplierM: 1 + offsetB: 0 + path: /xyz/openbmc_project/sensors/power/p1_io_power + rExp: 0 + readingType: readingData + scale: -6 + sensorNamePattern: nameLeaf + sensorReadingType: 1 + sensorType: 8 + serviceInterface: org.freedesktop.DBus.Properties + unit: xyz.openbmc_project.Sensor.Value.Unit.Watts +239: + bExp: 0 + entityID: 10 + entityInstance: 11 + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 255: + type: int64_t + multiplierM: 2 + offsetB: 0 + path: /xyz/openbmc_project/sensors/power/p0_mem_power + rExp: 0 + readingType: readingData + scale: -6 + sensorNamePattern: nameLeaf + sensorReadingType: 1 + sensorType: 8 + serviceInterface: org.freedesktop.DBus.Properties + unit: xyz.openbmc_project.Sensor.Value.Unit.Watts +240: + bExp: 0 + entityID: 10 + entityInstance: 12 + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 255: + type: int64_t + multiplierM: 2 + offsetB: 0 + path: /xyz/openbmc_project/sensors/power/p1_mem_power + rExp: 0 + readingType: readingData + scale: -6 + sensorNamePattern: nameLeaf + sensorReadingType: 1 + sensorType: 8 + serviceInterface: org.freedesktop.DBus.Properties + unit: xyz.openbmc_project.Sensor.Value.Unit.Watts +241: + bExp: 0 + entityID: 10 + entityInstance: 13 + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 255: + type: int64_t + multiplierM: 2 + offsetB: 0 + path: /xyz/openbmc_project/sensors/power/p0_power + rExp: 0 + readingType: readingData + scale: -6 + sensorNamePattern: nameLeaf + sensorReadingType: 1 + sensorType: 8 + serviceInterface: org.freedesktop.DBus.Properties + unit: xyz.openbmc_project.Sensor.Value.Unit.Watts +242: + bExp: 0 + entityID: 10 + entityInstance: 14 + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 255: + type: int64_t + multiplierM: 2 + offsetB: 0 + path: /xyz/openbmc_project/sensors/power/p1_power + rExp: 0 + readingType: readingData + scale: -6 + sensorNamePattern: nameLeaf + sensorReadingType: 1 + sensorType: 8 + serviceInterface: org.freedesktop.DBus.Properties + unit: xyz.openbmc_project.Sensor.Value.Unit.Watts +243: + bExp: 0 + entityID: 10 + entityInstance: 15 + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 255: + type: int64_t + multiplierM: 10 + offsetB: 0 + path: /xyz/openbmc_project/sensors/power/ps0_input_power + rExp: 0 + readingType: readingData + scale: -6 + sensorNamePattern: nameLeaf + sensorReadingType: 1 + sensorType: 8 + serviceInterface: org.freedesktop.DBus.Properties + unit: xyz.openbmc_project.Sensor.Value.Unit.Watts +244: + bExp: 0 + entityID: 10 + entityInstance: 16 + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 255: + type: int64_t + multiplierM: 10 + offsetB: 0 + path: /xyz/openbmc_project/sensors/power/ps1_input_power + rExp: 0 + readingType: readingData + scale: -6 + sensorNamePattern: nameLeaf + sensorReadingType: 1 + sensorType: 8 + serviceInterface: org.freedesktop.DBus.Properties + unit: xyz.openbmc_project.Sensor.Value.Unit.Watts +245: + bExp: 0 + entityID: 10 + entityInstance: 17 + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 255: + type: int64_t + multiplierM: 20 + offsetB: 0 + path: /xyz/openbmc_project/sensors/power/total_power + rExp: 0 + readingType: readingData + scale: -6 + sensorNamePattern: nameLeaf + sensorReadingType: 1 + sensorType: 8 + serviceInterface: org.freedesktop.DBus.Properties + unit: xyz.openbmc_project.Sensor.Value.Unit.Watts +246: + bExp: 0 + entityID: 10 + entityInstance: 19 + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 255: + type: int64_t + multiplierM: 2 + offsetB: 0 + path: /xyz/openbmc_project/sensors/voltage/ps0_input_voltage + rExp: 0 + readingType: readingData + scale: -3 + sensorNamePattern: nameLeaf + sensorReadingType: 1 + sensorType: 2 + serviceInterface: org.freedesktop.DBus.Properties + unit: xyz.openbmc_project.Sensor.Value.Unit.Volts +247: + bExp: 0 + entityID: 10 + entityInstance: 20 + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 255: + type: int64_t + multiplierM: 2 + offsetB: 0 + path: /xyz/openbmc_project/sensors/voltage/ps1_input_voltage + rExp: 0 + readingType: readingData + scale: -3 + sensorNamePattern: nameLeaf + sensorReadingType: 1 + sensorType: 2 + serviceInterface: org.freedesktop.DBus.Properties + unit: xyz.openbmc_project.Sensor.Value.Unit.Volts +248: + bExp: 0 + entityID: 10 + entityInstance: 21 + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 255: + type: int64_t + multiplierM: 10 + offsetB: 0 + path: /xyz/openbmc_project/sensors/voltage/ps0_output_voltage + rExp: -2 + readingType: readingData + scale: -3 + sensorNamePattern: nameLeaf + sensorReadingType: 1 + sensorType: 2 + serviceInterface: org.freedesktop.DBus.Properties + unit: xyz.openbmc_project.Sensor.Value.Unit.Volts +249: + bExp: 0 + entityID: 10 + entityInstance: 22 + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 255: + type: int64_t + multiplierM: 10 + offsetB: 0 + path: /xyz/openbmc_project/sensors/voltage/ps1_output_voltage + rExp: -2 + readingType: readingData + scale: -3 + sensorNamePattern: nameLeaf + sensorReadingType: 1 + sensorType: 2 + serviceInterface: org.freedesktop.DBus.Properties + unit: xyz.openbmc_project.Sensor.Value.Unit.Volts +250: + bExp: 0 + entityID: 10 + entityInstance: 23 + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 255: + type: int64_t + multiplierM: 1 + offsetB: 0 + path: /xyz/openbmc_project/sensors/current/ps0_output_current + rExp: 0 + readingType: readingData + scale: -3 + sensorNamePattern: nameLeaf + sensorReadingType: 1 + sensorType: 3 + serviceInterface: org.freedesktop.DBus.Properties + unit: xyz.openbmc_project.Sensor.Value.Unit.Amperes +251: + bExp: 0 + entityID: 10 + entityInstance: 24 + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 255: + type: int64_t + multiplierM: 1 + offsetB: 0 + path: /xyz/openbmc_project/sensors/current/ps1_output_current + rExp: 0 + readingType: readingData + scale: -3 + sensorNamePattern: nameLeaf + sensorReadingType: 1 + sensorType: 3 + serviceInterface: org.freedesktop.DBus.Properties + unit: xyz.openbmc_project.Sensor.Value.Unit.Amperes +252: + bExp: 0 + entityID: 35 + entityInstance: 1 + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 255: + type: int64_t + multiplierM: 30 + offsetB: 0 + path: /xyz/openbmc_project/sensors/temperature/pcie0_1 + rExp: -2 + readingType: readingData + scale: -3 + sensorNamePattern: nameLeaf + sensorReadingType: 1 + sensorType: 1 + serviceInterface: org.freedesktop.DBus.Properties + unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC +253: + bExp: 0 + entityID: 35 + entityInstance: 2 + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 255: + type: int64_t + multiplierM: 30 + offsetB: 0 + path: /xyz/openbmc_project/sensors/temperature/pcie2_3 + rExp: -2 + readingType: readingData + scale: -3 + sensorNamePattern: nameLeaf + sensorReadingType: 1 + sensorType: 1 + serviceInterface: org.freedesktop.DBus.Properties + unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC +254: + bExp: 0 + entityID: 64 + entityInstance: 1 + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 255: + type: int64_t + multiplierM: 20 + offsetB: 0 + path: /xyz/openbmc_project/sensors/temperature/ambient0 + rExp: -2 + readingType: readingData + scale: -3 + sensorNamePattern: nameLeaf + sensorReadingType: 1 + sensorType: 1 + serviceInterface: org.freedesktop.DBus.Properties + unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC + diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/configuration/acx22-yaml-config/witherspoon/acx22-ipmi-fru-bmc.yaml b/meta-ibm/meta-witherspoon/recipes-phosphor/configuration/acx22-yaml-config/witherspoon/acx22-ipmi-fru-bmc.yaml new file mode 100644 index 000000000..a5ce2e841 --- /dev/null +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/configuration/acx22-yaml-config/witherspoon/acx22-ipmi-fru-bmc.yaml @@ -0,0 +1,120 @@ +50: + /system/chassis/motherboard/fan0: + entityID: 29 + entityInstance: 1 + interfaces: + xyz.openbmc_project.Inventory.Item: + PrettyName: + IPMIFruProperty: Product Name + IPMIFruSection: Product +51: + /system/chassis/motherboard/fan1: + entityID: 29 + entityInstance: 2 + interfaces: + xyz.openbmc_project.Inventory.Item: + PrettyName: + IPMIFruProperty: Product Name + IPMIFruSection: Product +52: + /system/chassis/motherboard/fan2: + entityID: 29 + entityInstance: 3 + interfaces: + xyz.openbmc_project.Inventory.Item: + PrettyName: + IPMIFruProperty: Product Name + IPMIFruSection: Product +53: + /system/chassis/motherboard/fan3: + entityID: 29 + entityInstance: 4 + interfaces: + xyz.openbmc_project.Inventory.Item: + PrettyName: + IPMIFruProperty: Product Name + IPMIFruSection: Product +60: + /system/chassis/motherboard/boxelder/bmc: + entityID: 6 + entityInstance: 1 + interfaces: + xyz.openbmc_project.Inventory.Decorator.Asset: + BuildDate: + IPMIFruProperty: Mfg Date + IPMIFruSection: Board + Manufacturer: + IPMIFruProperty: Manufacturer + IPMIFruSection: Board + Model: + IPMIFruProperty: Model Number + IPMIFruSection: Board + PartNumber: + IPMIFruProperty: Part Number + IPMIFruSection: Board + SerialNumber: + IPMIFruProperty: Serial Number + IPMIFruSection: Board + xyz.openbmc_project.Inventory.Item: + PrettyName: + IPMIFruProperty: Board Name + IPMIFruSection: Board +70: + /system/chassis/motherboard/boxelder/bmc/ethernet: + entityID: 1 + entityInstance: 1 + interfaces: + xyz.openbmc_project.Inventory.Item: + PrettyName: + IPMIFruProperty: Product Name + IPMIFruSection: Product +75: + /system/chassis/motherboard/powersupply0: + entityID: 10 + entityInstance: 1 + interfaces: + xyz.openbmc_project.Inventory.Decorator.Asset: + BuildDate: + IPMIFruProperty: Mfg Date + IPMIFruSection: Board + Manufacturer: + IPMIFruProperty: Manufacturer + IPMIFruSection: Board + Model: + IPMIFruProperty: Model Number + IPMIFruSection: Board + PartNumber: + IPMIFruProperty: Part Number + IPMIFruSection: Board + SerialNumber: + IPMIFruProperty: Serial Number + IPMIFruSection: Board + xyz.openbmc_project.Inventory.Item: + PrettyName: + IPMIFruProperty: Board Name + IPMIFruSection: Board +76: + /system/chassis/motherboard/powersupply1: + entityID: 10 + entityInstance: 2 + interfaces: + xyz.openbmc_project.Inventory.Decorator.Asset: + BuildDate: + IPMIFruProperty: Mfg Date + IPMIFruSection: Board + Manufacturer: + IPMIFruProperty: Manufacturer + IPMIFruSection: Board + Model: + IPMIFruProperty: Model Number + IPMIFruSection: Board + PartNumber: + IPMIFruProperty: Part Number + IPMIFruSection: Board + SerialNumber: + IPMIFruProperty: Serial Number + IPMIFruSection: Board + xyz.openbmc_project.Inventory.Item: + PrettyName: + IPMIFruProperty: Board Name + IPMIFruSection: Board diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/configuration/acx22-yaml-config/witherspoon/acx22-ipmi-fru-not-sent-by-host.yaml b/meta-ibm/meta-witherspoon/recipes-phosphor/configuration/acx22-yaml-config/witherspoon/acx22-ipmi-fru-not-sent-by-host.yaml new file mode 100644 index 000000000..a4c34b4fc --- /dev/null +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/configuration/acx22-yaml-config/witherspoon/acx22-ipmi-fru-not-sent-by-host.yaml @@ -0,0 +1,54 @@ +20: + /system/chassis/motherboard/gv100card0: + entityID: 3 + entityInstance: 1 + interfaces: + xyz.openbmc_project.Inventory.Item: + PrettyName: + IPMIFruProperty: Board Name + IPMIFruSection: Board +21: + /system/chassis/motherboard/gv100card1: + entityID: 3 + entityInstance: 2 + interfaces: + xyz.openbmc_project.Inventory.Item: + PrettyName: + IPMIFruProperty: Board Name + IPMIFruSection: Board +22: + /system/chassis/motherboard/gv100card2: + entityID: 3 + entityInstance: 3 + interfaces: + xyz.openbmc_project.Inventory.Item: + PrettyName: + IPMIFruProperty: Board Name + IPMIFruSection: Board +23: + /system/chassis/motherboard/gv100card3: + entityID: 3 + entityInstance: 4 + interfaces: + xyz.openbmc_project.Inventory.Item: + PrettyName: + IPMIFruProperty: Board Name + IPMIFruSection: Board +24: + /system/chassis/motherboard/gv100card4: + entityID: 3 + entityInstance: 5 + interfaces: + xyz.openbmc_project.Inventory.Item: + PrettyName: + IPMIFruProperty: Board Name + IPMIFruSection: Board +25: + /system/chassis/motherboard/gv100card5: + entityID: 3 + entityInstance: 6 + interfaces: + xyz.openbmc_project.Inventory.Item: + PrettyName: + IPMIFruProperty: Board Name + IPMIFruSection: Board diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/configuration/acx22-yaml-config/witherspoon/acx22-ipmi-hwmon-sensors.yaml b/meta-ibm/meta-witherspoon/recipes-phosphor/configuration/acx22-yaml-config/witherspoon/acx22-ipmi-hwmon-sensors.yaml new file mode 100644 index 000000000..803ed77ad --- /dev/null +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/configuration/acx22-yaml-config/witherspoon/acx22-ipmi-hwmon-sensors.yaml @@ -0,0 +1,546 @@ +221: + bExp: 0 + entityID: 29 + entityInstance: 1 + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 255: + type: int64_t + multiplierM: 100 + offsetB: 0 + path: /xyz/openbmc_project/sensors/fan_tach/fan0_0 + rExp: 0 + readingType: readingData + scale: 0 + sensorNamePattern: nameLeaf + sensorReadingType: 1 + sensorType: 4 + serviceInterface: org.freedesktop.DBus.Properties + unit: xyz.openbmc_project.Sensor.Value.Unit.RPMS +223: + bExp: 0 + entityID: 29 + entityInstance: 3 + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 255: + type: int64_t + multiplierM: 100 + offsetB: 0 + path: /xyz/openbmc_project/sensors/fan_tach/fan1_0 + rExp: 0 + readingType: readingData + scale: 0 + sensorNamePattern: nameLeaf + sensorReadingType: 1 + sensorType: 4 + serviceInterface: org.freedesktop.DBus.Properties + unit: xyz.openbmc_project.Sensor.Value.Unit.RPMS +227: + bExp: 0 + entityID: 29 + entityInstance: 5 + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 255: + type: int64_t + multiplierM: 100 + offsetB: 0 + path: /xyz/openbmc_project/sensors/fan_tach/fan2_0 + rExp: 0 + readingType: readingData + scale: 0 + sensorNamePattern: nameLeaf + sensorReadingType: 1 + sensorType: 4 + serviceInterface: org.freedesktop.DBus.Properties + unit: xyz.openbmc_project.Sensor.Value.Unit.RPMS +229: + bExp: 0 + entityID: 29 + entityInstance: 7 + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 255: + type: int64_t + multiplierM: 100 + offsetB: 0 + path: /xyz/openbmc_project/sensors/fan_tach/fan3_0 + rExp: 0 + readingType: readingData + scale: 0 + sensorNamePattern: nameLeaf + sensorReadingType: 1 + sensorType: 4 + serviceInterface: org.freedesktop.DBus.Properties + unit: xyz.openbmc_project.Sensor.Value.Unit.RPMS +231: + bExp: 0 + entityID: 10 + entityInstance: 1 + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 255: + type: int64_t + multiplierM: 2 + offsetB: 0 + path: /xyz/openbmc_project/sensors/power/fan_disk_power + rExp: 0 + readingType: readingData + scale: -6 + sensorNamePattern: nameLeaf + sensorReadingType: 1 + sensorType: 8 + serviceInterface: org.freedesktop.DBus.Properties + unit: xyz.openbmc_project.Sensor.Value.Unit.Watts +238: + bExp: 0 + entityID: 10 + entityInstance: 9 + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 255: + type: int64_t + multiplierM: 1 + offsetB: 0 + path: /xyz/openbmc_project/sensors/power/p0_io_power + rExp: 0 + readingType: readingData + scale: -6 + sensorNamePattern: nameLeaf + sensorReadingType: 1 + sensorType: 8 + serviceInterface: org.freedesktop.DBus.Properties + unit: xyz.openbmc_project.Sensor.Value.Unit.Watts +239: + bExp: 0 + entityID: 10 + entityInstance: 10 + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 255: + type: int64_t + multiplierM: 1 + offsetB: 0 + path: /xyz/openbmc_project/sensors/power/p1_io_power + rExp: 0 + readingType: readingData + scale: -6 + sensorNamePattern: nameLeaf + sensorReadingType: 1 + sensorType: 8 + serviceInterface: org.freedesktop.DBus.Properties + unit: xyz.openbmc_project.Sensor.Value.Unit.Watts +240: + bExp: 0 + entityID: 10 + entityInstance: 11 + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 255: + type: int64_t + multiplierM: 2 + offsetB: 0 + path: /xyz/openbmc_project/sensors/power/p0_mem_power + rExp: 0 + readingType: readingData + scale: -6 + sensorNamePattern: nameLeaf + sensorReadingType: 1 + sensorType: 8 + serviceInterface: org.freedesktop.DBus.Properties + unit: xyz.openbmc_project.Sensor.Value.Unit.Watts +241: + bExp: 0 + entityID: 10 + entityInstance: 12 + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 255: + type: int64_t + multiplierM: 2 + offsetB: 0 + path: /xyz/openbmc_project/sensors/power/p1_mem_power + rExp: 0 + readingType: readingData + scale: -6 + sensorNamePattern: nameLeaf + sensorReadingType: 1 + sensorType: 8 + serviceInterface: org.freedesktop.DBus.Properties + unit: xyz.openbmc_project.Sensor.Value.Unit.Watts +242: + bExp: 0 + entityID: 10 + entityInstance: 13 + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 255: + type: int64_t + multiplierM: 2 + offsetB: 0 + path: /xyz/openbmc_project/sensors/power/p0_power + rExp: 0 + readingType: readingData + scale: -6 + sensorNamePattern: nameLeaf + sensorReadingType: 1 + sensorType: 8 + serviceInterface: org.freedesktop.DBus.Properties + unit: xyz.openbmc_project.Sensor.Value.Unit.Watts +243: + bExp: 0 + entityID: 10 + entityInstance: 14 + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 255: + type: int64_t + multiplierM: 2 + offsetB: 0 + path: /xyz/openbmc_project/sensors/power/p1_power + rExp: 0 + readingType: readingData + scale: -6 + sensorNamePattern: nameLeaf + sensorReadingType: 1 + sensorType: 8 + serviceInterface: org.freedesktop.DBus.Properties + unit: xyz.openbmc_project.Sensor.Value.Unit.Watts +244: + bExp: 0 + entityID: 10 + entityInstance: 15 + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 255: + type: int64_t + multiplierM: 10 + offsetB: 0 + path: /xyz/openbmc_project/sensors/power/ps0_input_power + rExp: 0 + readingType: readingData + scale: -6 + sensorNamePattern: nameLeaf + sensorReadingType: 1 + sensorType: 8 + serviceInterface: org.freedesktop.DBus.Properties + unit: xyz.openbmc_project.Sensor.Value.Unit.Watts +245: + bExp: 0 + entityID: 10 + entityInstance: 16 + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 255: + type: int64_t + multiplierM: 10 + offsetB: 0 + path: /xyz/openbmc_project/sensors/power/ps1_input_power + rExp: 0 + readingType: readingData + scale: -6 + sensorNamePattern: nameLeaf + sensorReadingType: 1 + sensorType: 8 + serviceInterface: org.freedesktop.DBus.Properties + unit: xyz.openbmc_project.Sensor.Value.Unit.Watts +246: + bExp: 0 + entityID: 10 + entityInstance: 17 + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 255: + type: int64_t + multiplierM: 20 + offsetB: 0 + path: /xyz/openbmc_project/sensors/power/total_power + rExp: 0 + readingType: readingData + scale: -6 + sensorNamePattern: nameLeaf + sensorReadingType: 1 + sensorType: 8 + serviceInterface: org.freedesktop.DBus.Properties + unit: xyz.openbmc_project.Sensor.Value.Unit.Watts +247: + bExp: 0 + entityID: 10 + entityInstance: 19 + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 255: + type: int64_t + multiplierM: 2 + offsetB: 0 + path: /xyz/openbmc_project/sensors/voltage/ps0_input_voltage + rExp: 0 + readingType: readingData + scale: -3 + sensorNamePattern: nameLeaf + sensorReadingType: 1 + sensorType: 2 + serviceInterface: org.freedesktop.DBus.Properties + unit: xyz.openbmc_project.Sensor.Value.Unit.Volts +248: + bExp: 0 + entityID: 10 + entityInstance: 20 + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 255: + type: int64_t + multiplierM: 2 + offsetB: 0 + path: /xyz/openbmc_project/sensors/voltage/ps1_input_voltage + rExp: 0 + readingType: readingData + scale: -3 + sensorNamePattern: nameLeaf + sensorReadingType: 1 + sensorType: 2 + serviceInterface: org.freedesktop.DBus.Properties + unit: xyz.openbmc_project.Sensor.Value.Unit.Volts +249: + bExp: 0 + entityID: 10 + entityInstance: 21 + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 255: + type: int64_t + multiplierM: 10 + offsetB: 0 + path: /xyz/openbmc_project/sensors/voltage/ps0_output_voltage + rExp: -2 + readingType: readingData + scale: -3 + sensorNamePattern: nameLeaf + sensorReadingType: 1 + sensorType: 2 + serviceInterface: org.freedesktop.DBus.Properties + unit: xyz.openbmc_project.Sensor.Value.Unit.Volts +250: + bExp: 0 + entityID: 10 + entityInstance: 22 + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 255: + type: int64_t + multiplierM: 10 + offsetB: 0 + path: /xyz/openbmc_project/sensors/voltage/ps1_output_voltage + rExp: -2 + readingType: readingData + scale: -3 + sensorNamePattern: nameLeaf + sensorReadingType: 1 + sensorType: 2 + serviceInterface: org.freedesktop.DBus.Properties + unit: xyz.openbmc_project.Sensor.Value.Unit.Volts +251: + bExp: 0 + entityID: 10 + entityInstance: 23 + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 255: + type: int64_t + multiplierM: 1 + offsetB: 0 + path: /xyz/openbmc_project/sensors/current/ps0_output_current + rExp: 0 + readingType: readingData + scale: -3 + sensorNamePattern: nameLeaf + sensorReadingType: 1 + sensorType: 3 + serviceInterface: org.freedesktop.DBus.Properties + unit: xyz.openbmc_project.Sensor.Value.Unit.Amperes +252: + bExp: 0 + entityID: 10 + entityInstance: 24 + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 255: + type: int64_t + multiplierM: 1 + offsetB: 0 + path: /xyz/openbmc_project/sensors/current/ps1_output_current + rExp: 0 + readingType: readingData + scale: -3 + sensorNamePattern: nameLeaf + sensorReadingType: 1 + sensorType: 3 + serviceInterface: org.freedesktop.DBus.Properties + unit: xyz.openbmc_project.Sensor.Value.Unit.Amperes +253: + bExp: 0 + entityID: 35 + entityInstance: 1 + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 255: + type: int64_t + multiplierM: 30 + offsetB: 0 + path: /xyz/openbmc_project/sensors/temperature/pcie + rExp: -2 + readingType: readingData + scale: -3 + sensorNamePattern: nameLeaf + sensorReadingType: 1 + sensorType: 1 + serviceInterface: org.freedesktop.DBus.Properties + unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC +254: + bExp: 0 + entityID: 64 + entityInstance: 1 + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 255: + type: int64_t + multiplierM: 20 + offsetB: 0 + path: /xyz/openbmc_project/sensors/temperature/ambient + rExp: -2 + readingType: readingData + scale: -3 + sensorNamePattern: nameLeaf + sensorReadingType: 1 + sensorType: 1 + serviceInterface: org.freedesktop.DBus.Properties + unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC +222: + bExp: 0 + entityID: 29 + entityInstance: 2 + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 255: + type: int64_t + multiplierM: 100 + offsetB: 0 + path: /xyz/openbmc_project/sensors/fan_tach/fan0_1 + rExp: 0 + readingType: readingData + scale: 0 + sensorNamePattern: nameLeaf + sensorReadingType: 1 + sensorType: 4 + serviceInterface: org.freedesktop.DBus.Properties + unit: xyz.openbmc_project.Sensor.Value.Unit.RPMS +226: + bExp: 0 + entityID: 29 + entityInstance: 4 + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 255: + type: int64_t + multiplierM: 100 + offsetB: 0 + path: /xyz/openbmc_project/sensors/fan_tach/fan1_1 + rExp: 0 + readingType: readingData + scale: 0 + sensorNamePattern: nameLeaf + sensorReadingType: 1 + sensorType: 4 + serviceInterface: org.freedesktop.DBus.Properties + unit: xyz.openbmc_project.Sensor.Value.Unit.RPMS +228: + bExp: 0 + entityID: 29 + entityInstance: 6 + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 255: + type: int64_t + multiplierM: 100 + offsetB: 0 + path: /xyz/openbmc_project/sensors/fan_tach/fan2_1 + rExp: 0 + readingType: readingData + scale: 0 + sensorNamePattern: nameLeaf + sensorReadingType: 1 + sensorType: 4 + serviceInterface: org.freedesktop.DBus.Properties + unit: xyz.openbmc_project.Sensor.Value.Unit.RPMS +230: + bExp: 0 + entityID: 29 + entityInstance: 8 + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 255: + type: int64_t + multiplierM: 100 + offsetB: 0 + path: /xyz/openbmc_project/sensors/fan_tach/fan3_1 + rExp: 0 + readingType: readingData + scale: 0 + sensorNamePattern: nameLeaf + sensorReadingType: 1 + sensorType: 4 + serviceInterface: org.freedesktop.DBus.Properties + unit: xyz.openbmc_project.Sensor.Value.Unit.RPMS diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/console/obmc-console/obmc-console.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/console/obmc-console/ibm-ac-server/obmc-console.conf index 638ae7e5d..638ae7e5d 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/console/obmc-console/obmc-console.conf +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/console/obmc-console/ibm-ac-server/obmc-console.conf diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/events/witherspoon-events-policy-native.bb b/meta-ibm/meta-witherspoon/recipes-phosphor/dbus/events-policy.bb index e855754c5..f456e4287 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/events/witherspoon-events-policy-native.bb +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/dbus/events-policy.bb @@ -1,14 +1,17 @@ -SUMMARY = "Event policy for Witherspoon" +SUMMARY = "Event policy configuration for meta-witherspoon machines" PR = "r1" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${IBMBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" -inherit native +inherit allarch inherit phosphor-dbus-monitor +FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:" + SRC_URI += "file://config.yaml" do_install() { install -D ${WORKDIR}/config.yaml ${D}${config_dir}/config.yaml } +FILES_${PN} += "${config_dir}/config.yaml" diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/events/witherspoon-events-policy/config.yaml b/meta-ibm/meta-witherspoon/recipes-phosphor/dbus/events-policy/config.yaml index 5c62d45a3..5c62d45a3 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/events/witherspoon-events-policy/config.yaml +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/dbus/events-policy/config.yaml diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/witherspoon-fan-policy-native.bb b/meta-ibm/meta-witherspoon/recipes-phosphor/dbus/fan-policy.bb index 070fceeec..12194640d 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/witherspoon-fan-policy-native.bb +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/dbus/fan-policy.bb @@ -1,11 +1,13 @@ -SUMMARY = "Fan policy for Witherspoon" +SUMMARY = "Fan policy configurations for meta-witherspoon machines" PR = "r1" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${IBMBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" -inherit native +inherit allarch inherit phosphor-dbus-monitor +FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:" + SRC_URI += "file://air-cooled.yaml" SRC_URI += "file://water-cooled.yaml" SRC_URI += "file://fan-errors.yaml" @@ -15,3 +17,7 @@ do_install() { install -D ${WORKDIR}/water-cooled.yaml ${D}${config_dir}/water-cooled.yaml install -D ${WORKDIR}/fan-errors.yaml ${D}${config_dir}/fan-errors.yaml } + +FILES_${PN} += "${config_dir}/air-cooled.yaml" +FILES_${PN} += "${config_dir}/water-cooled.yaml" +FILES_${PN} += "${config_dir}/fan-errors.yaml" diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/dbus/fan-policy/swift/air-cooled.yaml b/meta-ibm/meta-witherspoon/recipes-phosphor/dbus/fan-policy/swift/air-cooled.yaml new file mode 100644 index 000000000..bfdcd1bb6 --- /dev/null +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/dbus/fan-policy/swift/air-cooled.yaml @@ -0,0 +1,274 @@ +# Air cooled Swift fan policy for PDM. +# +# An air cooled Swift requires a minimum of three functional fan enclosures. +# If the number of functional fan enclosures is below three, soft poweroff +# the system. + +- name: fan enclosures + description: > + 'An air cooled Swift has four fan enclosures to monitor.' + class: group + group: path + members: + - meta: FAN + path: /xyz/openbmc_project/inventory/system/chassis/motherboard/fan0 + - meta: FAN + path: /xyz/openbmc_project/inventory/system/chassis/motherboard/fan1 + - meta: FAN + path: /xyz/openbmc_project/inventory/system/chassis/motherboard/fan2 + - meta: FAN + path: /xyz/openbmc_project/inventory/system/chassis/motherboard/fan3 + +- name: chassis state + description: > + 'Swift has a single chassis to monitor.' + class: group + group: path + members: + - meta: CHASSISSTATE + path: /xyz/openbmc_project/state/chassis0 + +- name: chassis + description: > + 'Swift has a single chassis to monitor.' + class: group + group: path + members: + - meta: CHASSIS + path: /xyz/openbmc_project/inventory/system/chassis + +- name: fan present + description: > + 'Monitor the presence state of each fan.' + class: group + group: property + type: boolean + members: + - interface: xyz.openbmc_project.Inventory.Item + meta: PRESENT + property: Present + +- name: fan functional + description: > + 'Monitor the functional state of each fan.' + class: group + group: property + type: boolean + members: + - interface: xyz.openbmc_project.State.Decorator.OperationalStatus + meta: FUNCTIONAL + property: Functional + +- name: chassis powered + description: > + 'Monitor the chassis power state.' + class: group + group: property + type: string + members: + - interface: xyz.openbmc_project.State.Chassis + meta: CHASSIS_STATE + property: CurrentPowerState + +- name: chassis air cooled + description: > + 'Monitor the chassis cooling type.' + class: group + group: property + type: boolean + members: + - interface: xyz.openbmc_project.Inventory.Decorator.CoolingType + meta: COOLING_TYPE + property: WaterCooled + +- name: watch fan present + description: > + 'Trigger logic on fan enclosure presence state changes.' + class: watch + watch: property + paths: fan enclosures + properties: fan present + callback: check cooling type + +- name: watch fan functional + description: > + 'Trigger logic on fan enclosure functional state changes.' + class: watch + watch: property + paths: fan enclosures + properties: fan functional + callback: check cooling type + +- name: watch chassis state + description: > + 'Trigger logic on chassis power state changes.' + class: watch + watch: property + paths: chassis state + properties: chassis powered + callback: check cooling type + +- name: watch cooling type + description: > + 'Maintain a cache of the chassis cooling type.' + class: watch + watch: property + paths: chassis + properties: chassis air cooled + +- name: check cooling type + description: > + 'If this condition passes the chassis is air cooled.' + class: condition + condition: count + paths: chassis + properties: chassis air cooled + callback: check power + countop: '==' + countbound: 0 + op: '==' + bound: true + +- name: check power + description: > + 'If the chassis has power, check fans.' + class: condition + condition: count + paths: chassis state + properties: chassis powered + callback: check fans + countop: '>' + countbound: 0 + op: '==' + bound: xyz.openbmc_project.State.Chassis.PowerState.On + +- name: check fans + description: > + 'Verify there are at least three functional fan enclosures, + power off if not.' + class: callback + callback: group + members: + - check group presence + - check group functional enclosures + +- name: check group presence + description: > + 'If this condition passes more than one fan has been unplugged + for more than 25 seconds. Shut the system down. Count present + fans rather than non-present fans since the latter would pass + if the fan has not been created for some reason. + + For a more detailed definition of unplugged, consult the documentation + of xyz.openbmc_project.Inventory.Item and/or the documentation + of the fan inventory object implementation.' + class: condition + condition: count + paths: fan enclosures + properties: fan present + defer: 25000000us + callback: log and shutdown + countop: '<' + countbound: 3 + op: '==' + bound: true + +- name: check group functional enclosures + description: > + 'If this condition passes more than one fan enclosure in the group has been + marked as nonfunctional for five seconds. Shut the system down. + + For a more detailed definition of nonfunctional, consult the documentation + of xyz.openbmc_project.State.Decorator.OperationalStatus and/or the + documentation of the fan inventory object implementation.' + class: condition + condition: count + paths: fan enclosures + properties: fan functional + defer: 5000000us + callback: log and shutdown + countop: '>' + countbound: 1 + op: '==' + bound: false + +- name: log and poweroff + description: > + 'Immediately poweroff, log an event in the journal, and create an + error log.' + class: callback + callback: group + members: + - hard poweroff + - log hard poweroff + - create shutdown error + +- name: log and shutdown + description: > + 'Shut the system down, log an event in the journal, and create an + error log.' + class: callback + callback: group + members: + - shutdown + - log shutdown + - create shutdown error + +- name: hard poweroff + description: > + 'Immediately power off the system.' + class: callback + callback: method + service: org.freedesktop.systemd1 + path: /org/freedesktop/systemd1 + interface: org.freedesktop.systemd1.Manager + method: StartUnit + args: + - value: obmc-chassis-hard-poweroff@0.target + type: string + - value: replace + type: string + +- name: shutdown + description: > + 'Shut down the system.' + class: callback + callback: method + service: org.freedesktop.systemd1 + path: /org/freedesktop/systemd1 + interface: org.freedesktop.systemd1.Manager + method: StartUnit + args: + - value: obmc-host-shutdown@0.target + type: string + - value: replace + type: string + +- name: log hard poweroff + description: > + 'Log a hard poweroff event to the systemd journal.' + class: callback + callback: journal + paths: chassis state + properties: chassis powered + severity: ERR + message: Immediate poweroff of system. There are not enough functional fans. + +- name: log shutdown + description: > + 'Log a shutdown event to the systemd journal.' + class: callback + callback: journal + paths: chassis state + properties: chassis powered + severity: ERR + message: Request shutdown of system. There are not enough functional fans. + +- name: create shutdown error + description: > + 'Create a Fan Shutdown Error log.' + class: callback + callback: elog + paths: chassis state + properties: chassis powered + error: xyz::openbmc_project::State::Shutdown::Inventory::Error::Fan diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/dbus/fan-policy/swift/fan-errors.yaml b/meta-ibm/meta-witherspoon/recipes-phosphor/dbus/fan-policy/swift/fan-errors.yaml new file mode 100644 index 000000000..794d91f17 --- /dev/null +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/dbus/fan-policy/swift/fan-errors.yaml @@ -0,0 +1,671 @@ +# Swift fan error policy for PDM. +# +# * Create a NotPresent error if fan 0, 1, 2, or 3 is not present for more +# than 20 seconds. +# * Create a Nonfunctional error if fan 0, 1, 2, or 3 is not +# functional for any amount of time. +# +# The system must be powered on in both of these cases. +# Note: An error is created each time the chassis powers on. +# +# * Watch for fans to become both present and functional, and then resolve +# their errors + +- name: fan0 + class: group + group: path + members: + - meta: FAN + path: /xyz/openbmc_project/inventory/system/chassis/motherboard/fan0 + +- name: fan1 + class: group + group: path + members: + - meta: FAN + path: /xyz/openbmc_project/inventory/system/chassis/motherboard/fan1 + +- name: fan2 + class: group + group: path + members: + - meta: FAN + path: /xyz/openbmc_project/inventory/system/chassis/motherboard/fan2 + +- name: fan3 + class: group + group: path + members: + - meta: FAN + path: /xyz/openbmc_project/inventory/system/chassis/motherboard/fan3 + +- name: chassis state + description: > + 'Swift has a single chassis to monitor.' + class: group + group: path + members: + - meta: CHASSISSTATE + path: /xyz/openbmc_project/state/chassis0 + +- name: chassis + description: > + 'Swift has a single chassis to monitor.' + class: group + group: path + members: + - meta: CHASSIS + path: /xyz/openbmc_project/inventory/system/chassis + + +- name: fan present + description: > + 'Monitor the presence state of each fan.' + class: group + group: property + type: boolean + members: + - interface: xyz.openbmc_project.Inventory.Item + meta: PRESENT + property: Present + +- name: fan functional + description: > + 'Monitor the functional state of each fan.' + class: group + group: property + type: boolean + members: + - interface: xyz.openbmc_project.State.Decorator.OperationalStatus + meta: FUNCTIONAL + property: Functional + +- name: fan present and functional + description: > + 'Monitor the present and functional state of each fan.' + class: group + group: property + type: boolean + members: + - interface: xyz.openbmc_project.Inventory.Item + meta: PRESENT + property: Present + - interface: xyz.openbmc_project.State.Decorator.OperationalStatus + meta: FUNCTIONAL + property: Functional + +- name: chassis powered + description: > + 'Monitor the chassis power state.' + class: group + group: property + type: string + members: + - interface: xyz.openbmc_project.State.Chassis + meta: CHASSIS_STATE + property: CurrentPowerState + +- name: chassis air cooled + description: > + 'The chassis cooling type.' + class: group + group: property + type: boolean + members: + - interface: xyz.openbmc_project.Inventory.Decorator.CoolingType + meta: COOLING_TYPE + property: WaterCooled + +- name: watch chassis state + description: > + 'Trigger logic on chassis power state changes.' + class: watch + watch: property + paths: chassis state + properties: chassis powered + callback: check power + +- name: watch fan0 presence + description: > + 'Trigger logic on fan0 presence state changes.' + class: watch + watch: property + paths: fan0 + properties: fan present + callback: check power fan0 presence + +- name: watch fan0 functional + description: > + 'Trigger logic on fan0 functional state changes.' + class: watch + watch: property + paths: fan0 + properties: fan functional + callback: check power fan0 functional + +- name: watch fan1 presence + description: > + 'Trigger logic on fan1 presence state changes.' + class: watch + watch: property + paths: fan1 + properties: fan present + callback: check power fan1 presence + +- name: watch fan1 functional + description: > + 'Trigger logic on fan1 functional state changes.' + class: watch + watch: property + paths: fan1 + properties: fan functional + callback: check power fan1 functional + +- name: watch fan2 presence + description: > + 'Trigger logic on fan2 presence state changes.' + class: watch + watch: property + paths: fan2 + properties: fan present + callback: check power fan2 presence + +- name: watch fan2 functional + description: > + 'Trigger logic on fan2 functional state changes.' + class: watch + watch: property + paths: fan2 + properties: fan functional + callback: check power fan2 functional + +- name: watch fan3 presence + description: > + 'Trigger logic on fan3 presence state changes.' + class: watch + watch: property + paths: fan3 + properties: fan present + callback: check power fan3 presence + +- name: watch fan3 functional + description: > + 'Trigger logic on fan3 functional state changes.' + class: watch + watch: property + paths: fan3 + properties: fan functional + callback: check power fan3 functional + +- name: watch fan0 present and functional for resolving error logs + description: > + 'On fan present or functional state changes, check if errors need to be resolved.' + class: watch + watch: property + paths: fan0 + properties: fan present and functional + callback: resolve fan0 errors if present and functional + +- name: watch fan1 present and functional for resolving error logs + description: > + 'On fan present or functional state changes, check if errors need to be resolved.' + class: watch + watch: property + paths: fan1 + properties: fan present and functional + callback: resolve fan1 errors if present and functional + +- name: watch fan2 present and functional for resolving error logs + description: > + 'On fan present or functional state changes, check if errors need to be resolved.' + class: watch + watch: property + paths: fan2 + properties: fan present and functional + callback: resolve fan2 errors if present and functional + +- name: watch fan3 present and functional for resolving error logs + description: > + 'On fan present or functional state changes, check if errors need to be resolved.' + class: watch + watch: property + paths: fan3 + properties: fan present and functional + callback: resolve fan3 errors if present and functional + +- name: check power + description: > + 'If the chassis has power, check all fans.' + class: condition + condition: count + paths: chassis state + properties: chassis powered + callback: check fans + countop: '>' + countbound: 0 + op: '==' + bound: xyz.openbmc_project.State.Chassis.PowerState.On + +- name: check power fan0 presence + description: > + 'If the chassis has power, check presence of fan0.' + class: condition + condition: count + paths: chassis state + properties: chassis powered + callback: check fan0 presence + countop: '>' + countbound: 0 + op: '==' + bound: xyz.openbmc_project.State.Chassis.PowerState.On + +- name: check power fan0 functional + description: > + 'If the chassis has power, check functional of fan0.' + class: condition + condition: count + paths: chassis state + properties: chassis powered + callback: check fan0 functional + countop: '>' + countbound: 0 + op: '==' + bound: xyz.openbmc_project.State.Chassis.PowerState.On + +- name: check power fan1 presence + description: > + 'If the chassis has power, check presence of fan1.' + class: condition + condition: count + paths: chassis state + properties: chassis powered + callback: check fan1 presence + countop: '>' + countbound: 0 + op: '==' + bound: xyz.openbmc_project.State.Chassis.PowerState.On + +- name: check power fan1 functional + description: > + 'If the chassis has power, check functional of fan1.' + class: condition + condition: count + paths: chassis state + properties: chassis powered + callback: check fan1 functional + countop: '>' + countbound: 0 + op: '==' + bound: xyz.openbmc_project.State.Chassis.PowerState.On + +- name: check power fan2 presence + description: > + 'If the chassis has power, check presence of fan2.' + class: condition + condition: count + paths: chassis state + properties: chassis powered + callback: check fan2 presence + countop: '>' + countbound: 0 + op: '==' + bound: xyz.openbmc_project.State.Chassis.PowerState.On + +- name: check power fan2 functional + description: > + 'If the chassis has power, check functional of fan2.' + class: condition + condition: count + paths: chassis state + properties: chassis powered + callback: check fan2 functional + countop: '>' + countbound: 0 + op: '==' + bound: xyz.openbmc_project.State.Chassis.PowerState.On + +- name: check power fan3 presence + description: > + 'If the chassis has power, check presence of fan3.' + class: condition + condition: count + paths: chassis state + properties: chassis powered + callback: check fan3 presence + countop: '>' + countbound: 0 + op: '==' + bound: xyz.openbmc_project.State.Chassis.PowerState.On + +- name: check power fan3 functional + description: > + 'If the chassis has power, check functional of fan3.' + class: condition + condition: count + paths: chassis state + properties: chassis powered + callback: check fan3 functional + countop: '>' + countbound: 0 + op: '==' + bound: xyz.openbmc_project.State.Chassis.PowerState.On + +- name: check fans + description: > + 'Verify each of the 3 fans are present.' + class: callback + callback: group + members: + - check fan0 presence + - check fan1 presence + - check fan2 presence + - check fan3 presence + - check fan0 functional + - check fan1 functional + - check fan2 functional + - check fan3 functional + +- name: check fan0 presence + description: > + 'If this condition passes fan0 has been unplugged for more than 20 seconds.' + class: condition + condition: count + paths: fan0 + properties: fan present + defer: 20000000us + callback: notpresent fan0 error + countop: '<' + countbound: 1 + op: '==' + bound: true + +- name: check fan0 functional + description: > + 'If this condition passes fan0 has been marked as nonfunctional.' + class: condition + condition: count + paths: fan0 + properties: fan functional + callback: nonfunctional fan0 error + countop: '>' + countbound: 0 + op: '==' + bound: false + +- name: check fan1 presence + description: > + 'If this condition passes fan1 has been unplugged for more than 20 seconds.' + class: condition + condition: count + paths: fan1 + properties: fan present + defer: 20000000us + callback: notpresent fan1 error + countop: '<' + countbound: 1 + op: '==' + bound: true + +- name: check fan1 functional + description: > + 'If this condition passes fan1 has been marked as nonfunctional.' + class: condition + condition: count + paths: fan1 + properties: fan functional + callback: nonfunctional fan1 error + countop: '>' + countbound: 0 + op: '==' + bound: false + +- name: check fan2 presence + description: > + 'If this condition passes fan2 has been unplugged for more than 20 seconds.' + class: condition + condition: count + paths: fan2 + properties: fan present + defer: 20000000us + callback: notpresent fan2 error + countop: '<' + countbound: 1 + op: '==' + bound: true + +- name: check fan2 functional + description: > + 'If this condition passes fan2 has been marked as nonfunctional.' + class: condition + condition: count + paths: fan2 + properties: fan functional + callback: nonfunctional fan2 error + countop: '>' + countbound: 0 + op: '==' + bound: false + +- name: check fan3 presence + description: > + 'If this condition passes fan3 has been unplugged for more than 20 seconds.' + class: condition + condition: count + paths: fan3 + properties: fan present + defer: 20000000us + callback: notpresent fan3 error + countop: '<' + countbound: 1 + op: '==' + bound: true + +- name: check fan3 functional + description: > + 'If this condition passes fan3 has been marked as nonfunctional.' + class: condition + condition: count + paths: fan3 + properties: fan functional + callback: nonfunctional fan3 error + countop: '>' + countbound: 0 + op: '==' + bound: false + +- name: check cooling type nonfunctional error + description: > + 'If this condition passes the chassis is air cooled and will create a + nonfunctional error for fan 1.' + class: condition + condition: count + paths: chassis + properties: chassis air cooled + callback: nonfunctional fan1 error + countop: '==' + countbound: 0 + op: '==' + bound: true + +- name: check cooling type notpresent error + description: > + 'If this condition passes the chassis is air cooled and will create a + notpresent error for fan 1.' + class: condition + condition: count + paths: chassis + properties: chassis air cooled + callback: notpresent fan1 error + countop: '==' + countbound: 0 + op: '==' + bound: true + +- name: notpresent fan0 error + class: callback + callback: elog + paths: fan0 + properties: fan present + error: xyz::openbmc_project::Inventory::Error::NotPresent + metadata: + - name: xyz::openbmc_project::Inventory::NotPresent::CALLOUT_INVENTORY_PATH + value: /xyz/openbmc_project/inventory/system/chassis/motherboard/fan0 + type: string + +- name: nonfunctional fan0 error + class: callback + callback: elog + paths: fan0 + properties: fan functional + error: xyz::openbmc_project::Inventory::Error::Nonfunctional + metadata: + - name: xyz::openbmc_project::Inventory::Nonfunctional::CALLOUT_INVENTORY_PATH + value: /xyz/openbmc_project/inventory/system/chassis/motherboard/fan0 + type: string + +- name: notpresent fan1 error + class: callback + callback: elog + paths: fan1 + properties: fan present + error: xyz::openbmc_project::Inventory::Error::NotPresent + metadata: + - name: xyz::openbmc_project::Inventory::NotPresent::CALLOUT_INVENTORY_PATH + value: /xyz/openbmc_project/inventory/system/chassis/motherboard/fan1 + type: string + +- name: nonfunctional fan1 error + class: callback + callback: elog + paths: fan1 + properties: fan functional + error: xyz::openbmc_project::Inventory::Error::Nonfunctional + metadata: + - name: xyz::openbmc_project::Inventory::Nonfunctional::CALLOUT_INVENTORY_PATH + value: /xyz/openbmc_project/inventory/system/chassis/motherboard/fan1 + type: string + +- name: notpresent fan2 error + class: callback + callback: elog + paths: fan2 + properties: fan present + error: xyz::openbmc_project::Inventory::Error::NotPresent + metadata: + - name: xyz::openbmc_project::Inventory::NotPresent::CALLOUT_INVENTORY_PATH + value: /xyz/openbmc_project/inventory/system/chassis/motherboard/fan2 + type: string + +- name: nonfunctional fan2 error + class: callback + callback: elog + paths: fan2 + properties: fan functional + error: xyz::openbmc_project::Inventory::Error::Nonfunctional + metadata: + - name: xyz::openbmc_project::Inventory::Nonfunctional::CALLOUT_INVENTORY_PATH + value: /xyz/openbmc_project/inventory/system/chassis/motherboard/fan2 + type: string + +- name: notpresent fan3 error + class: callback + callback: elog + paths: fan3 + properties: fan present + error: xyz::openbmc_project::Inventory::Error::NotPresent + metadata: + - name: xyz::openbmc_project::Inventory::NotPresent::CALLOUT_INVENTORY_PATH + value: /xyz/openbmc_project/inventory/system/chassis/motherboard/fan3 + type: string + +- name: nonfunctional fan3 error + class: callback + callback: elog + paths: fan3 + properties: fan functional + error: xyz::openbmc_project::Inventory::Error::Nonfunctional + metadata: + - name: xyz::openbmc_project::Inventory::Nonfunctional::CALLOUT_INVENTORY_PATH + value: /xyz/openbmc_project/inventory/system/chassis/motherboard/fan3 + type: string + +- name: resolve fan0 errors if present and functional + description: > + 'If fan0 is present and functional, call the resolve fan0 errors callback.' + class: condition + condition: count + paths: fan0 + properties: fan present and functional + callback: resolve fan0 errors + countop: '==' + countbound: 2 + op: '==' + bound: true + +#Go ahead and do this on water cooled as well +- name: resolve fan1 errors if present and functional + description: > + 'If fan1 is present and functional, call the resolve fan1 errors callback.' + class: condition + condition: count + paths: fan1 + properties: fan present and functional + callback: resolve fan1 errors + countop: '==' + countbound: 2 + op: '==' + bound: true + +- name: resolve fan2 errors if present and functional + description: > + 'If fan2 is present and functional, call the resolve fan2 errors callback.' + class: condition + condition: count + paths: fan2 + properties: fan present and functional + callback: resolve fan2 errors + countop: '==' + countbound: 2 + op: '==' + bound: true + +- name: resolve fan3 errors if present and functional + description: > + 'If fan3 is present and functional, call the resolve fan3 errors callback.' + class: condition + condition: count + paths: fan3 + properties: fan present and functional + callback: resolve fan3 errors + countop: '==' + countbound: 2 + op: '==' + bound: true + +- name: resolve fan0 errors + class: callback + callback: resolve callout + paths: fan0 + properties: fan present and functional + callout: /xyz/openbmc_project/inventory/system/chassis/motherboard/fan0 + +- name: resolve fan1 errors + class: callback + callback: resolve callout + paths: fan1 + properties: fan present and functional + callout: /xyz/openbmc_project/inventory/system/chassis/motherboard/fan1 + +- name: resolve fan2 errors + class: callback + callback: resolve callout + paths: fan2 + properties: fan present and functional + callout: /xyz/openbmc_project/inventory/system/chassis/motherboard/fan2 + +- name: resolve fan3 errors + class: callback + callback: resolve callout + paths: fan3 + properties: fan present and functional + callout: /xyz/openbmc_project/inventory/system/chassis/motherboard/fan3 diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/dbus/fan-policy/swift/water-cooled.yaml b/meta-ibm/meta-witherspoon/recipes-phosphor/dbus/fan-policy/swift/water-cooled.yaml new file mode 100644 index 000000000..661021a9b --- /dev/null +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/dbus/fan-policy/swift/water-cooled.yaml @@ -0,0 +1,274 @@ +# Water cooled Swift fan policy for PDM. +# +# A water cooled Swift requires a minimum of three functional fan +# enclosures. If the number of functional fan enclosures is below three, +# soft poweroff the system. + +- name: fan enclosures + description: > + 'A water cooled Swift has four fan enclosures to monitor.' + class: group + group: path + members: + - meta: FAN + path: /xyz/openbmc_project/inventory/system/chassis/motherboard/fan0 + - meta: FAN + path: /xyz/openbmc_project/inventory/system/chassis/motherboard/fan1 + - meta: FAN + path: /xyz/openbmc_project/inventory/system/chassis/motherboard/fan2 + - meta: FAN + path: /xyz/openbmc_project/inventory/system/chassis/motherboard/fan3 + +- name: chassis state + description: > + 'Swift has a single chassis to monitor.' + class: group + group: path + members: + - meta: CHASSISSTATE + path: /xyz/openbmc_project/state/chassis0 + +- name: chassis + description: > + 'Swift has a single chassis to monitor.' + class: group + group: path + members: + - meta: CHASSIS + path: /xyz/openbmc_project/inventory/system/chassis + +- name: fan present + description: > + 'Monitor the presence state of each fan.' + class: group + group: property + type: boolean + members: + - interface: xyz.openbmc_project.Inventory.Item + meta: PRESENT + property: Present + +- name: fan functional + description: > + 'Monitor the functional state of each fan.' + class: group + group: property + type: boolean + members: + - interface: xyz.openbmc_project.State.Decorator.OperationalStatus + meta: FUNCTIONAL + property: Functional + +- name: chassis powered + description: > + 'Monitor the chassis power state.' + class: group + group: property + type: string + members: + - interface: xyz.openbmc_project.State.Chassis + meta: CHASSIS_STATE + property: CurrentPowerState + +- name: chassis water cooled + description: > + 'Monitor the chassis cooling type.' + class: group + group: property + type: boolean + members: + - interface: xyz.openbmc_project.Inventory.Decorator.CoolingType + meta: COOLING_TYPE + property: WaterCooled + +- name: watch fan present + description: > + 'Trigger logic on fan enclosure presence state changes.' + class: watch + watch: property + paths: fan enclosures + properties: fan present + callback: check cooling type + +- name: watch fan functional + description: > + 'Trigger logic on fan enclosure functional state changes.' + class: watch + watch: property + paths: fan enclosures + properties: fan functional + callback: check cooling type + +- name: watch chassis state + description: > + 'Trigger logic on chassis power state changes.' + class: watch + watch: property + paths: chassis state + properties: chassis powered + callback: check cooling type + +- name: watch cooling type + description: > + 'Maintain a cache of the chassis cooling type.' + class: watch + watch: property + paths: chassis + properties: chassis water cooled + +- name: check cooling type + description: > + 'If this condition passes the chassis is water cooled.' + class: condition + condition: count + paths: chassis + properties: chassis water cooled + callback: check power + countop: '==' + countbound: 1 + op: '==' + bound: true + +- name: check power + description: > + 'If the chassis has power, check fans.' + class: condition + condition: count + paths: chassis state + properties: chassis powered + callback: check fans + countop: '>' + countbound: 0 + op: '==' + bound: xyz.openbmc_project.State.Chassis.PowerState.On + +- name: check fans + description: > + 'Verify there are at least three functional fan enclosures, + power off if not.' + class: callback + callback: group + members: + - check group presence + - check group functional enclosures + +- name: check group presence + description: > + 'If this condition passes more than one fan has been unplugged + for more than 25 seconds. Shut the system down. Count present + fans rather than non-present fans since the latter would pass + if the fan has not been created for some reason. + + For a more detailed definition of unplugged, consult the documentation + of xyz.openbmc_project.Inventory.Item and/or the documentation + of the fan inventory object implementation.' + class: condition + condition: count + paths: fan enclosures + properties: fan present + defer: 25000000us + callback: log and shutdown + countop: '<' + countbound: 3 + op: '==' + bound: true + +- name: check group functional enclosures + description: > + 'If this condition passes more than one fan enclosure in the group has been + marked as nonfunctional for five seconds. Shut the system down. + + For a more detailed definition of nonfunctional, consult the documentation + of xyz.openbmc_project.State.Decorator.OperationalStatus and/or the + documentation of the fan inventory object implementation.' + class: condition + condition: count + paths: fan enclosures + properties: fan functional + defer: 5000000us + callback: log and shutdown + countop: '>' + countbound: 1 + op: '==' + bound: false + +- name: log and poweroff + description: > + 'Immediately poweroff, log an event in the journal, and create an + error log.' + class: callback + callback: group + members: + - hard poweroff + - log hard poweroff + - create shutdown error + +- name: log and shutdown + description: > + 'Shut the system down, log an event in the journal, and create an + error log.' + class: callback + callback: group + members: + - shutdown + - log shutdown + - create shutdown error + +- name: hard poweroff + description: > + 'Immediately power off the system.' + class: callback + callback: method + service: org.freedesktop.systemd1 + path: /org/freedesktop/systemd1 + interface: org.freedesktop.systemd1.Manager + method: StartUnit + args: + - value: obmc-chassis-hard-poweroff@0.target + type: string + - value: replace + type: string + +- name: shutdown + description: > + 'Shut down the system.' + class: callback + callback: method + service: org.freedesktop.systemd1 + path: /org/freedesktop/systemd1 + interface: org.freedesktop.systemd1.Manager + method: StartUnit + args: + - value: obmc-host-shutdown@0.target + type: string + - value: replace + type: string + +- name: log hard poweroff + description: > + 'Log a hard poweroff event to the systemd journal.' + class: callback + callback: journal + paths: chassis state + properties: chassis powered + severity: ERR + message: Immediate poweroff of system. There are not enough functional fans. + +- name: log shutdown + description: > + 'Log a shutdown event to the systemd journal.' + class: callback + callback: journal + paths: chassis state + properties: chassis powered + severity: ERR + message: Request shutdown of system. There are not enough functional fans. + +- name: create shutdown error + description: > + 'Create a Fan Shutdown Error log.' + class: callback + callback: elog + paths: chassis state + properties: chassis powered + error: xyz::openbmc_project::State::Shutdown::Inventory::Error::Fan diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/witherspoon-fan-policy/air-cooled.yaml b/meta-ibm/meta-witherspoon/recipes-phosphor/dbus/fan-policy/witherspoon/air-cooled.yaml index d60aa9179..d60aa9179 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/witherspoon-fan-policy/air-cooled.yaml +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/dbus/fan-policy/witherspoon/air-cooled.yaml diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/witherspoon-fan-policy/fan-errors.yaml b/meta-ibm/meta-witherspoon/recipes-phosphor/dbus/fan-policy/witherspoon/fan-errors.yaml index 0c14627d2..0c14627d2 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/witherspoon-fan-policy/fan-errors.yaml +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/dbus/fan-policy/witherspoon/fan-errors.yaml diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/witherspoon-fan-policy/water-cooled.yaml b/meta-ibm/meta-witherspoon/recipes-phosphor/dbus/fan-policy/witherspoon/water-cooled.yaml index a279cfefa..a279cfefa 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/witherspoon-fan-policy/water-cooled.yaml +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/dbus/fan-policy/witherspoon/water-cooled.yaml diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/dbus/phosphor-dbus-monitor-config-native.bbappend b/meta-ibm/meta-witherspoon/recipes-phosphor/dbus/phosphor-dbus-monitor-config-native.bbappend deleted file mode 100644 index 2831afe21..000000000 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/dbus/phosphor-dbus-monitor-config-native.bbappend +++ /dev/null @@ -1,4 +0,0 @@ -PHOSPHOR_DBUS_MONITOR_CONFIGS_append = " witherspoon-fan-policy-native" -PHOSPHOR_DBUS_MONITOR_CONFIGS_append = " witherspoon-thermal-policy-native" -PHOSPHOR_DBUS_MONITOR_CONFIGS_append = " witherspoon-power-supply-policy-native" -PHOSPHOR_DBUS_MONITOR_CONFIGS_append = " witherspoon-events-policy-native" diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/dbus/phosphor-dbus-monitor-config.bbappend b/meta-ibm/meta-witherspoon/recipes-phosphor/dbus/phosphor-dbus-monitor-config.bbappend new file mode 100644 index 000000000..185db1033 --- /dev/null +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/dbus/phosphor-dbus-monitor-config.bbappend @@ -0,0 +1,4 @@ +PHOSPHOR_DBUS_MONITOR_CONFIGS_append_ibm-ac-server = " fan-policy" +PHOSPHOR_DBUS_MONITOR_CONFIGS_append_ibm-ac-server = " thermal-policy" +PHOSPHOR_DBUS_MONITOR_CONFIGS_append_ibm-ac-server = " power-supply-policy" +PHOSPHOR_DBUS_MONITOR_CONFIGS_append_ibm-ac-server = " events-policy" diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/dbus/phosphor-dbus-monitor_%.bbappend b/meta-ibm/meta-witherspoon/recipes-phosphor/dbus/phosphor-dbus-monitor_%.bbappend index e80b49902..8e1bf41fa 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/dbus/phosphor-dbus-monitor_%.bbappend +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/dbus/phosphor-dbus-monitor_%.bbappend @@ -1 +1 @@ -SYSTEMD_LINK_phosphor-msl-verify = "../phosphor-msl-verify.service:obmc-chassis-poweron@0.target.requires/phosphor-msl-verify.service" +SYSTEMD_LINK_phosphor-msl-verify_append_ibm-ac-server = " ../phosphor-msl-verify.service:obmc-chassis-poweron@0.target.requires/phosphor-msl-verify.service" diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-power-supply-policy-native.bb b/meta-ibm/meta-witherspoon/recipes-phosphor/dbus/power-supply-policy.bb index 563f80e30..27d60fb34 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-power-supply-policy-native.bb +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/dbus/power-supply-policy.bb @@ -1,13 +1,17 @@ -SUMMARY = "Power supply policy for Witherspoon" +SUMMARY = "Power supply policy configuration for meta-witherspoon machines" PR = "r1" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${IBMBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" -inherit native +inherit allarch inherit phosphor-dbus-monitor +FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:" + SRC_URI += "file://power-supply-policy.yaml" do_install() { install -D ${WORKDIR}/power-supply-policy.yaml ${D}${config_dir}/power-supply-policy.yaml } + +FILES_${PN} += "${config_dir}/power-supply-policy.yaml" diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-power-supply-policy/power-supply-policy.yaml b/meta-ibm/meta-witherspoon/recipes-phosphor/dbus/power-supply-policy/power-supply-policy.yaml index 20141c9c3..e00e747b6 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-power-supply-policy/power-supply-policy.yaml +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/dbus/power-supply-policy/power-supply-policy.yaml @@ -1,4 +1,4 @@ -# Witherspoon power supply policy for PDM. +# Machine power supply policy for PDM. # # Create an error if a power supply is removed while the system is powered on @@ -18,7 +18,7 @@ - name: power supplies description: > - 'A Witherspoon has two power supplies to monitor.' + 'The machine has two power supplies to monitor.' class: group group: path members: @@ -29,7 +29,7 @@ - name: chassis state description: > - 'A Witherspoon has a single chassis to monitor.' + 'The machine has a single chassis to monitor.' class: group group: path members: diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/witherspoon-thermal-policy-native.bb b/meta-ibm/meta-witherspoon/recipes-phosphor/dbus/thermal-policy.bb index d53b4146f..9fb7d252b 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/witherspoon-thermal-policy-native.bb +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/dbus/thermal-policy.bb @@ -1,13 +1,17 @@ -SUMMARY = "Thermal policy for Witherspoon" +SUMMARY = "Thermal policy configuration for meta-witherspoon machines" PR = "r1" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${IBMBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" -inherit native +inherit allarch inherit phosphor-dbus-monitor +FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:" + SRC_URI += "file://thermal-policy.yaml" do_install() { install -D ${WORKDIR}/thermal-policy.yaml ${D}${config_dir}/thermal-policy.yaml } + +FILES_${PN} += "${config_dir}/thermal-policy.yaml" diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/witherspoon-thermal-policy/thermal-policy.yaml b/meta-ibm/meta-witherspoon/recipes-phosphor/dbus/thermal-policy/thermal-policy.yaml index 1dd2306e9..7c48509c5 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/witherspoon-thermal-policy/thermal-policy.yaml +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/dbus/thermal-policy/thermal-policy.yaml @@ -1,12 +1,12 @@ -# Witherspoon thermal policy for PDM. +# Machine thermal policy for PDM. # -# Shut down a Witherspoon system if more than three POWER9 cores +# Shut down the system if more than three cores # have a temperature greater than 115 degrees Celcius. - name: core sensors description: > - 'Witherspoon has two POWER9 chips with 24 cores each.' + 'The machine has two processor chips with 24 cores each.' class: group group: path members: diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-events-config/witherspoon/events.yaml b/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-events-config/witherspoon/events.yaml index 5f6a094ba..74a34e081 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-events-config/witherspoon/events.yaml +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-events-config/witherspoon/events.yaml @@ -141,63 +141,63 @@ groups: matches: - name: propertiesChanged - description: > - A property changed match parameters: - object - interface - signal: propertySignal - name: interfacesAdded - description: > - An interfaces added match parameters: - object - signal: objectSignal - name: interfacesRemoved - description: > - An interfaces removed match parameters: - object - signal: - name: objectSignal - parameters: - - object - - interface - handler: removeInterface - name: nameOwnerChanged - description: > - A name owner changed match parameters: - object - interface - signal: ownerSignal signals: - - name: propertySignal + - name: propertiesChanged description: > - Handle property signals + A property changed match parameters: - type - object - interface - property - handler: setProperty - - name: objectSignal + match: propertiesChanged + - name: interfacesAdded description: > - Handle object signals + An interfaces added match parameters: - type - object - interface - property - handler: setProperty - - name: ownerSignal + match: interfacesAdded + - name: interfacesRemoved description: > - Handle owner signals + An interfaces removed match parameters: - object - interface - handler: setService + match: interfacesRemoved + - name: nameOwnerChanged + description: > + A name owner changed match + parameters: + match: nameOwnerChanged + +methods: + - name: getProperties + description: > + Get the property values of the given group members + by performing a `GetProperty` method call on each + parameters: + - type + - name: nameHasOwner + description: > + A NameHasOwner method call to be performed on all event group members + parameters: handlers: - name: setProperty @@ -205,18 +205,15 @@ handlers: Sets a value for the given object/interface/property parameters: - type - - object - - interface - - property - name: setService description: > - Sets the service name(s) for the given group + Sets the service name and ownership status for the given group parameters: - group - name: removeInterface description: > Removes an interface(and all associated properties) on the - given object from use within actions + given object from use within all event actions parameters: - object - interface @@ -228,6 +225,11 @@ preconditions: enable a set speed event otherwise fan speeds are set to full parameters: - groups + - name: services_missing_owner + description: > + Any services missing an owner enable the events given otherwise + the events are removed/disabled + parameters: actions: - name: call_actions_based_on_timer @@ -293,63 +295,65 @@ actions: events: - name: default_fan_floor_on_service_fail - # No global zone conditions defined == all unless defined on group - groups: - - name: zone0_ambient - interface: xyz.openbmc_project.Sensor.Value - property: - name: Value - type: int64_t - matches: - - name: nameOwnerChanged - actions: - - name: call_actions_based_on_timer - timer: - delay: 5 - type: oneshot - actions: - - name: default_floor_on_missing_owner - - name: high_speed_on_occ0_service_fail - # No global zone conditions defined == all unless defined on group + precondition: + name: services_missing_owner + groups: + - name: zone0_ambient + interface: xyz.openbmc_project.Sensor.Value + property: + name: Value + type: int64_t + triggers: + - name: init + method: nameHasOwner + handler: setService + - name: signal + signal: nameOwnerChanged + handler: setService + events: + - name: default_fan_floor + groups: + - name: zone0_ambient + interface: xyz.openbmc_project.Sensor.Value + property: + name: Value + type: int64_t + triggers: + - name: timer + interval: 5000000 + type: oneshot + actions: + - name: default_floor_on_missing_owner + - name: high_speed_on_occ_service_fails groups: - name: occ0_object interface: org.open_power.OCC.Status property: name: OccActive type: bool - matches: - - name: nameOwnerChanged - actions: - - name: call_actions_based_on_timer - timer: - delay: 5 - type: oneshot - actions: - - name: set_speed_on_missing_owner - speed: - value: 10500 - type: uint64_t - - name: high_speed_on_occ1_service_fail - # No global zone conditions defined == all unless defined on group - groups: - name: occ1_object interface: org.open_power.OCC.Status property: name: OccActive type: bool - matches: - - name: nameOwnerChanged + triggers: + - name: init + method: nameHasOwner + handler: setService + - name: signal + signal: nameOwnerChanged + handler: setService actions: - name: call_actions_based_on_timer timer: - delay: 5 + interval: 5000000 type: oneshot actions: - name: set_speed_on_missing_owner speed: value: 10500 type: uint64_t - - name: missing_before_high_speed_air + - name: missing_or_fails_before_high_speed_air groups: - name: air_cooled_zone0_fans zone_conditions: @@ -360,19 +364,6 @@ events: property: name: Present type: bool - matches: - - name: propertiesChanged - actions: - - name: count_state_before_speed - count: 1 - property: - value: false - type: bool - speed: - value: 10500 - type: uint64_t - - name: fails_before_high_speed_air - groups: - name: air_cooled_zone0_fans zone_conditions: - name: air_cooled_chassis @@ -382,9 +373,13 @@ events: property: name: Functional type: bool - matches: - - name: interfacesAdded - - name: propertiesChanged + triggers: + - name: init + method: getProperties + handler: setProperty + - name: signal + signal: propertiesChanged + handler: setProperty actions: - name: count_state_before_speed count: 1 @@ -394,7 +389,7 @@ events: speed: value: 10500 type: uint64_t - - name: missing_before_high_speed_water_and_air + - name: missing_or_fails_before_high_speed_water_and_air groups: - name: water_and_air_cooled_zone0_fans zone_conditions: @@ -405,19 +400,6 @@ events: property: name: Present type: bool - matches: - - name: propertiesChanged - actions: - - name: count_state_before_speed - count: 1 - property: - value: false - type: bool - speed: - value: 10500 - type: uint64_t - - name: fails_before_high_speed_water_and_air - groups: - name: water_and_air_cooled_zone0_fans zone_conditions: - name: water_and_air_cooled_chassis @@ -427,9 +409,13 @@ events: property: name: Functional type: bool - matches: - - name: interfacesAdded - - name: propertiesChanged + triggers: + - name: init + method: getProperties + handler: setProperty + - name: signal + signal: propertiesChanged + handler: setProperty actions: - name: count_state_before_speed count: 1 @@ -450,8 +436,13 @@ events: property: name: Current type: std::string - matches: - - name: propertiesChanged + triggers: + - name: init + method: getProperties + handler: setProperty + - name: signal + signal: propertiesChanged + handler: setProperty actions: - name: use_alternate_events_on_state property: @@ -469,8 +460,13 @@ events: property: name: Value type: int64_t - matches: - - name: propertiesChanged + triggers: + - name: init + method: getProperties + handler: setProperty + - name: signal + signal: propertiesChanged + handler: setProperty actions: - name: set_floor_from_average_sensor_value map: @@ -498,8 +494,13 @@ events: property: name: Value type: int64_t - matches: - - name: propertiesChanged + triggers: + - name: init + method: getProperties + handler: setProperty + - name: signal + signal: propertiesChanged + handler: setProperty actions: - name: set_floor_from_average_sensor_value map: @@ -526,8 +527,13 @@ events: property: name: Value type: int64_t - matches: - - name: propertiesChanged + triggers: + - name: init + method: getProperties + handler: setProperty + - name: signal + signal: propertiesChanged + handler: setProperty actions: - name: set_floor_from_average_sensor_value map: @@ -543,74 +549,6 @@ events: - 25000: 7200 - 27000: 10500 type: std::map<int64_t, uint64_t> - - name: speed_changes_based_on_regulator_temps - # No global zone conditions defined == all unless defined on group - groups: - - name: zone0_regulators - interface: xyz.openbmc_project.Sensor.Value - property: - name: Value - type: int64_t - matches: - - name: interfacesAdded - - name: propertiesChanged - actions: - - name: set_net_increase_speed - property: - value: 85000 - type: int64_t - factor: - value: 1000 - type: int64_t - delta: - value: 400 - type: uint64_t - - name: set_net_decrease_speed - property: - value: 82000 - type: int64_t - factor: - value: 1000 - type: int64_t - delta: - value: 40 - type: uint64_t - timer: - interval: 5 - - name: speed_changes_based_on_pcie_temps - # No global zone conditions defined == all unless defined on group - groups: - - name: zone0_pcie - interface: xyz.openbmc_project.Sensor.Value - property: - name: Value - type: int64_t - matches: - - name: interfacesAdded - - name: propertiesChanged - actions: - - name: set_net_increase_speed - property: - value: 55000 - type: int64_t - factor: - value: 1000 - type: int64_t - delta: - value: 400 - type: uint64_t - - name: set_net_decrease_speed - property: - value: 52000 - type: int64_t - factor: - value: 1000 - type: int64_t - delta: - value: 40 - type: uint64_t - timer: - interval: 5 - name: occ_active_speed_changes precondition: name: property_states_match @@ -627,202 +565,352 @@ events: name: OccActive type: bool value: true - matches: - - name: interfacesAdded - - name: propertiesChanged + triggers: + - name: init + method: getProperties + handler: setProperty + - name: signal + signal: interfacesAdded + handler: setProperty + - name: signal + signal: propertiesChanged + handler: setProperty events: - - name: fails_before_high_speed_air - groups: - - name: zone0_cores - zone_conditions: - - name: air_cooled_chassis - zones: - - 0 - interface: xyz.openbmc_project.State.Decorator.OperationalStatus - property: - name: Functional - type: bool - - name: zone0_dimms - interface: xyz.openbmc_project.State.Decorator.OperationalStatus - property: - name: Functional - type: bool - - name: zone0_gpu_cores - zone_conditions: - - name: air_cooled_chassis - zones: - - 0 - interface: xyz.openbmc_project.State.Decorator.OperationalStatus - property: - name: Functional - type: bool - - name: zone0_gpu_memory - zone_conditions: - - name: air_cooled_chassis - zones: - - 0 - interface: xyz.openbmc_project.State.Decorator.OperationalStatus - property: - name: Functional - type: bool - matches: - - name: interfacesAdded - - name: propertiesChanged - actions: - - name: count_state_before_speed - count: 1 - property: - value: false - type: bool - speed: - value: 10500 - type: uint64_t - - name: speed_changes_based_on_core_temps - groups: - - name: zone0_cores - zone_conditions: - - name: air_cooled_chassis - zones: - - 0 - interface: xyz.openbmc_project.Sensor.Value - property: - name: Value - type: int64_t - matches: - - name: interfacesAdded - - name: propertiesChanged - - name: interfacesRemoved - actions: - - name: set_net_increase_speed - property: - value: 73000 - type: int64_t - factor: - value: 1000 - type: int64_t - delta: - value: 400 - type: uint64_t - - name: set_net_decrease_speed - property: - value: 70000 - type: int64_t - factor: - value: 1000 - type: int64_t - delta: - value: 40 - type: uint64_t - timer: - interval: 5 - - name: speed_changes_based_on_dimm_temps - # No global zone conditions defined == all unless defined on group - groups: - - name: zone0_dimms - interface: xyz.openbmc_project.Sensor.Value - property: - name: Value - type: int64_t - matches: - - name: interfacesAdded - - name: propertiesChanged - - name: interfacesRemoved - actions: - - name: set_net_increase_speed - property: - value: 64000 - type: int64_t - factor: - value: 1000 - type: int64_t - delta: - value: 200 - type: uint64_t - - name: set_net_decrease_speed - property: - value: 61000 - type: int64_t - factor: - value: 1000 - type: int64_t - delta: - value: 40 - type: uint64_t - timer: - interval: 5 - - name: speed_changes_based_on_gpu_core_temps - groups: - - name: zone0_gpu_cores - zone_conditions: - - name: air_cooled_chassis - zones: - - 0 - interface: xyz.openbmc_project.Sensor.Value - property: - name: Value - type: int64_t - matches: - - name: interfacesAdded - - name: propertiesChanged - - name: interfacesRemoved - actions: - - name: set_net_increase_speed - property: - value: 78000 - type: int64_t - factor: - value: 1000 - type: int64_t - delta: - value: 600 - type: uint64_t - - name: set_net_decrease_speed - property: - value: 75000 - type: int64_t - factor: - value: 1000 - type: int64_t - delta: - value: 40 - type: uint64_t - timer: - interval: 5 - - name: speed_changes_based_on_gpu_memory_temps - groups: - - name: zone0_gpu_memory - zone_conditions: - - name: air_cooled_chassis - zones: - - 0 - interface: xyz.openbmc_project.Sensor.Value - property: - name: Value - type: int64_t - matches: - - name: interfacesAdded - - name: propertiesChanged - - name: interfacesRemoved - actions: - - name: set_net_increase_speed - property: - value: 80000 - type: int64_t - factor: - value: 1000 - type: int64_t - delta: - value: 600 - type: uint64_t - - name: set_net_decrease_speed - property: - value: 77000 - type: int64_t - factor: - value: 1000 - type: int64_t - delta: - value: 40 - type: uint64_t - timer: - interval: 5 + - name: speed_control_sensors + groups: + - name: zone0_regulators + interface: xyz.openbmc_project.Sensor.Value + property: + name: Value + type: int64_t + - name: zone0_pcie + interface: xyz.openbmc_project.Sensor.Value + property: + name: Value + type: int64_t + - name: zone0_cores + zone_conditions: + - name: air_cooled_chassis + zones: + - 0 + interface: xyz.openbmc_project.Sensor.Value + property: + name: Value + type: int64_t + - name: zone0_dimms + interface: xyz.openbmc_project.Sensor.Value + property: + name: Value + type: int64_t + - name: zone0_gpu_cores + zone_conditions: + - name: air_cooled_chassis + zones: + - 0 + interface: xyz.openbmc_project.Sensor.Value + property: + name: Value + type: int64_t + - name: zone0_gpu_memory + zone_conditions: + - name: air_cooled_chassis + zones: + - 0 + interface: xyz.openbmc_project.Sensor.Value + property: + name: Value + type: int64_t + triggers: + - name: init + method: getProperties + handler: setProperty + - name: signal + signal: interfacesAdded + handler: setProperty + - name: signal + signal: propertiesChanged + handler: setProperty + - name: signal + signal: interfacesRemoved + handler: removeInterface + - name: fails_before_high_speed_air + groups: + - name: zone0_cores + zone_conditions: + - name: air_cooled_chassis + zones: + - 0 + interface: xyz.openbmc_project.State.Decorator.OperationalStatus + property: + name: Functional + type: bool + - name: zone0_dimms + interface: xyz.openbmc_project.State.Decorator.OperationalStatus + property: + name: Functional + type: bool + - name: zone0_gpu_cores + zone_conditions: + - name: air_cooled_chassis + zones: + - 0 + interface: xyz.openbmc_project.State.Decorator.OperationalStatus + property: + name: Functional + type: bool + - name: zone0_gpu_memory + zone_conditions: + - name: air_cooled_chassis + zones: + - 0 + interface: xyz.openbmc_project.State.Decorator.OperationalStatus + property: + name: Functional + type: bool + triggers: + - name: init + method: getProperties + handler: setProperty + - name: signal + signal: interfacesAdded + handler: setProperty + - name: signal + signal: propertiesChanged + handler: setProperty + actions: + - name: count_state_before_speed + count: 1 + property: + value: false + type: bool + speed: + value: 10500 + type: uint64_t + - name: 1sec_speed_change_request_sampling + triggers: + - name: timer + interval: 1000000 + type: repeating + actions: + # Speed changes based on regulator temps + - name: set_net_increase_speed + groups: + - name: zone0_regulators + interface: xyz.openbmc_project.Sensor.Value + property: + name: Value + type: int64_t + property: + value: 85000 + type: int64_t + factor: + value: 1000 + type: int64_t + delta: + value: 400 + type: uint64_t + - name: set_net_decrease_speed + groups: + - name: zone0_regulators + interface: xyz.openbmc_project.Sensor.Value + property: + name: Value + type: int64_t + property: + value: 82000 + type: int64_t + factor: + value: 1000 + type: int64_t + delta: + value: 40 + type: uint64_t + # Speed changes based on pcie temps + - name: set_net_increase_speed + groups: + - name: zone0_pcie + interface: xyz.openbmc_project.Sensor.Value + property: + name: Value + type: int64_t + property: + value: 55000 + type: int64_t + factor: + value: 1000 + type: int64_t + delta: + value: 400 + type: uint64_t + - name: set_net_decrease_speed + groups: + - name: zone0_pcie + interface: xyz.openbmc_project.Sensor.Value + property: + name: Value + type: int64_t + property: + value: 52000 + type: int64_t + factor: + value: 1000 + type: int64_t + delta: + value: 40 + type: uint64_t + # Speed changes based on core temps + - name: set_net_increase_speed + groups: + - name: zone0_cores + zone_conditions: + - name: air_cooled_chassis + zones: + - 0 + interface: xyz.openbmc_project.Sensor.Value + property: + name: Value + type: int64_t + property: + value: 73000 + type: int64_t + factor: + value: 1000 + type: int64_t + delta: + value: 400 + type: uint64_t + - name: set_net_decrease_speed + groups: + - name: zone0_cores + zone_conditions: + - name: air_cooled_chassis + zones: + - 0 + interface: xyz.openbmc_project.Sensor.Value + property: + name: Value + type: int64_t + property: + value: 70000 + type: int64_t + factor: + value: 1000 + type: int64_t + delta: + value: 40 + type: uint64_t + # Speed changes based on dimm temps + - name: set_net_increase_speed + groups: + - name: zone0_dimms + interface: xyz.openbmc_project.Sensor.Value + property: + name: Value + type: int64_t + property: + value: 64000 + type: int64_t + factor: + value: 1000 + type: int64_t + delta: + value: 200 + type: uint64_t + - name: set_net_decrease_speed + groups: + - name: zone0_dimms + interface: xyz.openbmc_project.Sensor.Value + property: + name: Value + type: int64_t + property: + value: 61000 + type: int64_t + factor: + value: 1000 + type: int64_t + delta: + value: 40 + type: uint64_t + # Speed changes based on gpu core temps + - name: set_net_increase_speed + groups: + - name: zone0_gpu_cores + zone_conditions: + - name: air_cooled_chassis + zones: + - 0 + interface: xyz.openbmc_project.Sensor.Value + property: + name: Value + type: int64_t + property: + value: 78000 + type: int64_t + factor: + value: 1000 + type: int64_t + delta: + value: 600 + type: uint64_t + - name: set_net_decrease_speed + groups: + - name: zone0_gpu_cores + zone_conditions: + - name: air_cooled_chassis + zones: + - 0 + interface: xyz.openbmc_project.Sensor.Value + property: + name: Value + type: int64_t + property: + value: 75000 + type: int64_t + factor: + value: 1000 + type: int64_t + delta: + value: 40 + type: uint64_t + # Speed changes based on gpu memory temps + - name: set_net_increase_speed + groups: + - name: zone0_gpu_memory + zone_conditions: + - name: air_cooled_chassis + zones: + - 0 + interface: xyz.openbmc_project.Sensor.Value + property: + name: Value + type: int64_t + property: + value: 80000 + type: int64_t + factor: + value: 1000 + type: int64_t + delta: + value: 600 + type: uint64_t + - name: set_net_decrease_speed + groups: + - name: zone0_gpu_memory + zone_conditions: + - name: air_cooled_chassis + zones: + - 0 + interface: xyz.openbmc_project.Sensor.Value + property: + name: Value + type: int64_t + property: + value: 77000 + type: int64_t + factor: + value: 1000 + type: int64_t + delta: + value: 40 + type: uint64_t diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-fan-config/witherspoon/fans.yaml b/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-fan-config/witherspoon/fans.yaml index a70ac85a3..a70ac85a3 100755..100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-fan-config/witherspoon/fans.yaml +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-fan-config/witherspoon/fans.yaml diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-monitor-config/swift/monitor.yaml b/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-monitor-config/swift/monitor.yaml new file mode 100644 index 000000000..2c93e65c8 --- /dev/null +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-monitor-config/swift/monitor.yaml @@ -0,0 +1,36 @@ +fans: + - inventory: /system/chassis/motherboard/fan0 + functional_delay: 5 + allowed_out_of_range_time: 30 + deviation: 15 + num_sensors_nonfunc_for_fan_nonfunc: 1 + sensors: + - name: fan0_0 + has_target: true + + - inventory: /system/chassis/motherboard/fan1 + functional_delay: 5 + allowed_out_of_range_time: 30 + deviation: 15 + num_sensors_nonfunc_for_fan_nonfunc: 1 + sensors: + - name: fan1_0 + has_target: true + + - inventory: /system/chassis/motherboard/fan2 + functional_delay: 5 + allowed_out_of_range_time: 30 + deviation: 15 + num_sensors_nonfunc_for_fan_nonfunc: 1 + sensors: + - name: fan2_0 + has_target: true + + - inventory: /system/chassis/motherboard/fan3 + functional_delay: 5 + allowed_out_of_range_time: 30 + deviation: 15 + num_sensors_nonfunc_for_fan_nonfunc: 1 + sensors: + - name: fan3_0 + has_target: true diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-presence-config/swift/config.yaml b/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-presence-config/swift/config.yaml new file mode 100644 index 000000000..20dc31c40 --- /dev/null +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-presence-config/swift/config.yaml @@ -0,0 +1,62 @@ +- name: fan0 + path: /system/chassis/motherboard/fan0 + methods: + - type: gpio + key: 5 + physpath: /sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a100.i2c-bus/i2c-3/3-0060 + devpath: /dev/input/by-path/platform-gpio-keys-polled-event + - type: tach + sensors: + - fan0_0 + rpolicy: + type: anyof + +- name: fan1 + path: /system/chassis/motherboard/fan1 + methods: + - type: gpio + key: 6 + physpath: /sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a100.i2c-bus/i2c-3/3-0060 + devpath: /dev/input/by-path/platform-gpio-keys-polled-event + - type: tach + sensors: + - fan1_0 + rpolicy: + type: anyof + +- name: fan2 + path: /system/chassis/motherboard/fan2 + methods: + - type: gpio + key: 7 + physpath: /sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a100.i2c-bus/i2c-3/3-0060 + devpath: /dev/input/by-path/platform-gpio-keys-polled-event + - type: tach + sensors: + - fan2_0 + rpolicy: + type: anyof + +- name: fan3 + path: /system/chassis/motherboard/fan3 + methods: + - type: gpio + key: 8 + physpath: /sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a100.i2c-bus/i2c-3/3-0060 + devpath: /dev/input/by-path/platform-gpio-keys-polled-event + - type: tach + sensors: + - fan3_0 + rpolicy: + type: anyof + +# Boost fan presence +- name: fan4 + path: /system/chassis/motherboard/fan4 + methods: + - type: gpio + key: 9 + physpath: /sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a100.i2c-bus/i2c-3/3-0060 + devpath: /dev/input/by-path/platform-gpio-keys-polled-event + rpolicy: + type: anyof diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan_%.bbappend b/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan_%.bbappend index 58c1a5f9d..88c32ffa6 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan_%.bbappend +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan_%.bbappend @@ -1,24 +1,24 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:" # Package configuration -FAN_PACKAGES += " \ +FAN_PACKAGES_append_ibm-ac-server = " \ phosphor-cooling-type \ " -PACKAGECONFIG += "cooling-type" +PACKAGECONFIG_append_ibm-ac-server = " cooling-type" TMPL_COOLING = "phosphor-cooling-type@.service" INSTFMT_COOLING = "phosphor-cooling-type@{0}.service" COOLING_TGT = "multi-user.target" FMT_COOLING = "../${TMPL_COOLING}:${COOLING_TGT}.requires/${INSTFMT_COOLING}" -FILES_phosphor-cooling-type = "${bindir}/phosphor-cooling-type" -SYSTEMD_SERVICE_phosphor-cooling-type += "${TMPL_COOLING}" -SYSTEMD_LINK_phosphor-cooling-type += "${@compose_list(d, 'FMT_COOLING', 'OBMC_CHASSIS_INSTANCES')}" +FILES_phosphor-cooling-type_append_ibm-ac-server = " ${bindir}/phosphor-cooling-type" +SYSTEMD_SERVICE_phosphor-cooling-type_append_ibm-ac-server = " ${TMPL_COOLING}" +SYSTEMD_LINK_phosphor-cooling-type_append_ibm-ac-server = " ${@compose_list(d, 'FMT_COOLING', 'OBMC_CHASSIS_INSTANCES')}" COOLING_ENV_FMT = "obmc/phosphor-fan/phosphor-cooling-type-{0}.conf" -SYSTEMD_ENVIRONMENT_FILE_phosphor-cooling-type += "${@compose_list(d, 'COOLING_ENV_FMT', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_ENVIRONMENT_FILE_phosphor-cooling-type_append_ibm-ac-server = " ${@compose_list(d, 'COOLING_ENV_FMT', 'OBMC_CHASSIS_INSTANCES')}" #These services are protected by the watchdog SYSTEMD_OVERRIDE_phosphor-fan-control_witherspoon += "fan-watchdog-monitor.conf:phosphor-fan-control-init@0.service.d/fan-watchdog-monitor.conf" diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/swift-phosphor-fan-monitor-config/monitor.yaml b/meta-ibm/meta-witherspoon/recipes-phosphor/fans/swift-phosphor-fan-monitor-config/monitor.yaml deleted file mode 100644 index 5b9856c46..000000000 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/swift-phosphor-fan-monitor-config/monitor.yaml +++ /dev/null @@ -1,2 +0,0 @@ -# TODO: Populate with https://github.com/ibm-openbmc/dev/issues/601 -# Placeholder diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/swift-phosphor-fan-presence-config/config.yaml b/meta-ibm/meta-witherspoon/recipes-phosphor/fans/swift-phosphor-fan-presence-config/config.yaml deleted file mode 100644 index 5b9856c46..000000000 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/swift-phosphor-fan-presence-config/config.yaml +++ /dev/null @@ -1,2 +0,0 @@ -# TODO: Populate with https://github.com/ibm-openbmc/dev/issues/601 -# Placeholder diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/flash/openpower-software-manager_%.bbappend b/meta-ibm/meta-witherspoon/recipes-phosphor/flash/openpower-software-manager_%.bbappend index 3dcc25dd7..197e4049c 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/flash/openpower-software-manager_%.bbappend +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/flash/openpower-software-manager_%.bbappend @@ -1 +1 @@ -PACKAGECONFIG_append_df-openpower-ubi-fs = " verify_pnor_signature" +PACKAGECONFIG_append_ibm-ac-server = " verify_pnor_signature" diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/flash/phosphor-software-manager_%.bbappend b/meta-ibm/meta-witherspoon/recipes-phosphor/flash/phosphor-software-manager_%.bbappend index b58fc3b06..e106fac15 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/flash/phosphor-software-manager_%.bbappend +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/flash/phosphor-software-manager_%.bbappend @@ -1,9 +1,9 @@ -BMC_RW_MTD = "bmc" -BMC_RO_MTD = "alt-bmc+bmc" -BMC_KERNEL_MTD = "bmc" +BMC_RW_MTD_ibm-ac-server = "bmc" +BMC_RO_MTD_ibm-ac-server = "alt-bmc+bmc" +BMC_KERNEL_MTD_ibm-ac-server = "bmc" -# Enable signature verification by DISTRO_FEATURE obmc-ubi-fs -PACKAGECONFIG_append_df-obmc-ubi-fs = " verify_signature" +# Enable signature verification +PACKAGECONFIG_append_ibm-ac-server = " verify_signature" # Enable sync of persistent files to the alternate BMC chip -PACKAGECONFIG_append_df-obmc-ubi-fs = " sync_bmc_files" +PACKAGECONFIG_append_ibm-ac-server = " sync_bmc_files" diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend b/meta-ibm/meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend index f5a358200..032056c26 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend @@ -5,8 +5,8 @@ INSTFMT_POWERSUPPLY = "phosphor-gpio-presence@{0}.service" POWERSUPPLY_TGT = "multi-user.target" FMT_POWERSUPPLY = "../${TMPL_POWERSUPPLY}:${POWERSUPPLY_TGT}.requires/${INSTFMT_POWERSUPPLY}" -SYSTEMD_LINK_${PN}-presence += "${@compose_list(d, 'FMT_POWERSUPPLY', 'OBMC_POWER_SUPPLY_INSTANCES')}" +SYSTEMD_LINK_${PN}-presence_append_ibm-ac-server = " ${@compose_list(d, 'FMT_POWERSUPPLY', 'OBMC_POWER_SUPPLY_INSTANCES')}" POWERSUPPLY_ENV_FMT = "obmc/gpio/phosphor-power-supply-{0}.conf" -SYSTEMD_ENVIRONMENT_FILE_${PN}-presence += "${@compose_list(d, 'POWERSUPPLY_ENV_FMT', 'OBMC_POWER_SUPPLY_INSTANCES')}" +SYSTEMD_ENVIRONMENT_FILE_${PN}-presence_append_ibm-ac-server = " ${@compose_list(d, 'POWERSUPPLY_ENV_FMT', 'OBMC_POWER_SUPPLY_INSTANCES')}" diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/host/p9-host-start.bbappend b/meta-ibm/meta-witherspoon/recipes-phosphor/host/p9-host-start.bbappend index 4cac4903f..3ae8bcb96 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/host/p9-host-start.bbappend +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/host/p9-host-start.bbappend @@ -1,3 +1,4 @@ -RDEPENDS_${PN} += 'avsbus-control' -RDEPENDS_${PN} += 'vrm-control' -RDEPENDS_${PN}_remove += "p9-vcs-workaround" +RDEPENDS_${PN}_append_witherspoon = " avsbus-control" +RDEPENDS_${PN}_append_witherspoon = " vrm-control" +RDEPENDS_${PN}_append_ibm-ac-server = " power-workarounds" +RDEPENDS_${PN}_remove_ibm-ac-server = "p9-vcs-workaround" diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/images/obmc-phosphor-image.bbappend b/meta-ibm/meta-witherspoon/recipes-phosphor/images/obmc-phosphor-image.bbappend index aa7e786c0..ab45d557e 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/images/obmc-phosphor-image.bbappend +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/images/obmc-phosphor-image.bbappend @@ -1 +1 @@ -OBMC_IMAGE_EXTRA_INSTALL_append = " mboxd max31785-msl phosphor-msl-verify liberation-fonts uart-render-controller first-boot-set-mac" +OBMC_IMAGE_EXTRA_INSTALL_append_ibm-ac-server = " mboxd max31785-msl phosphor-msl-verify liberation-fonts uart-render-controller first-boot-set-mac first-boot-set-hostname" diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/inventory/phosphor-inventory-manager/associations.json b/meta-ibm/meta-witherspoon/recipes-phosphor/inventory/phosphor-inventory-manager/associations.json index a86a65d5b..bea5269ab 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/inventory/phosphor-inventory-manager/associations.json +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/inventory/phosphor-inventory-manager/associations.json @@ -7,7 +7,7 @@ "types": { "rType": "inventory", - "fType": "child_sensors" + "fType": "sensors" }, "paths": [ @@ -21,7 +21,7 @@ "types": { "rType": "chassis", - "fType": "sensors" + "fType": "all_sensors" }, "paths": [ @@ -52,7 +52,7 @@ "types": { "rType": "inventory", - "fType": "child_sensors" + "fType": "sensors" }, "paths": [ @@ -66,7 +66,7 @@ "types": { "rType": "chassis", - "fType": "sensors" + "fType": "all_sensors" }, "paths": [ @@ -98,7 +98,7 @@ "types": { "rType": "inventory", - "fType": "child_sensors" + "fType": "sensors" }, "paths": [ @@ -127,7 +127,7 @@ "types": { "rType": "inventory", - "fType": "child_sensors" + "fType": "sensors" }, "paths": [ @@ -156,7 +156,7 @@ "types": { "rType": "inventory", - "fType": "child_sensors" + "fType": "sensors" }, "paths": [ @@ -185,7 +185,7 @@ "types": { "rType": "inventory", - "fType": "child_sensors" + "fType": "sensors" }, "paths": [ @@ -214,7 +214,7 @@ "types": { "rType": "inventory", - "fType": "child_sensors" + "fType": "sensors" }, "paths": [ @@ -279,7 +279,7 @@ "types": { "rType": "inventory", - "fType": "child_sensors" + "fType": "sensors" }, "paths": [ @@ -297,7 +297,7 @@ "types": { "rType": "inventory", - "fType": "child_sensors" + "fType": "sensors" }, "paths": [ @@ -315,7 +315,7 @@ "types": { "rType": "inventory", - "fType": "child_sensors" + "fType": "sensors" }, "paths": [ @@ -333,7 +333,7 @@ "types": { "rType": "inventory", - "fType": "child_sensors" + "fType": "sensors" }, "paths": [ @@ -351,7 +351,7 @@ "types": { "rType": "inventory", - "fType": "child_sensors" + "fType": "sensors" }, "paths": [ @@ -369,7 +369,7 @@ "types": { "rType": "inventory", - "fType": "child_sensors" + "fType": "sensors" }, "paths": [ @@ -387,7 +387,7 @@ "types": { "rType": "inventory", - "fType": "child_sensors" + "fType": "sensors" }, "paths": [ @@ -404,7 +404,7 @@ "types": { "rType": "inventory", - "fType": "child_sensors" + "fType": "sensors" }, "paths": [ @@ -421,7 +421,7 @@ "types": { "rType": "inventory", - "fType": "child_sensors" + "fType": "sensors" }, "paths": [ @@ -438,7 +438,7 @@ "types": { "rType": "inventory", - "fType": "child_sensors" + "fType": "sensors" }, "paths": [ @@ -455,7 +455,7 @@ "types": { "rType": "inventory", - "fType": "child_sensors" + "fType": "sensors" }, "paths": [ @@ -472,7 +472,7 @@ "types": { "rType": "inventory", - "fType": "child_sensors" + "fType": "sensors" }, "paths": [ @@ -489,7 +489,7 @@ "types": { "rType": "inventory", - "fType": "child_sensors" + "fType": "sensors" }, "paths": [ @@ -506,7 +506,7 @@ "types": { "rType": "inventory", - "fType": "child_sensors" + "fType": "sensors" }, "paths": [ @@ -523,7 +523,7 @@ "types": { "rType": "inventory", - "fType": "child_sensors" + "fType": "sensors" }, "paths": [ @@ -540,7 +540,7 @@ "types": { "rType": "inventory", - "fType": "child_sensors" + "fType": "sensors" }, "paths": [ @@ -557,7 +557,7 @@ "types": { "rType": "inventory", - "fType": "child_sensors" + "fType": "sensors" }, "paths": [ @@ -574,7 +574,7 @@ "types": { "rType": "inventory", - "fType": "child_sensors" + "fType": "sensors" }, "paths": [ @@ -591,7 +591,7 @@ "types": { "rType": "inventory", - "fType": "child_sensors" + "fType": "sensors" }, "paths": [ @@ -608,7 +608,7 @@ "types": { "rType": "inventory", - "fType": "child_sensors" + "fType": "sensors" }, "paths": [ @@ -625,7 +625,7 @@ "types": { "rType": "inventory", - "fType": "child_sensors" + "fType": "sensors" }, "paths": [ @@ -642,7 +642,7 @@ "types": { "rType": "inventory", - "fType": "child_sensors" + "fType": "sensors" }, "paths": [ @@ -659,7 +659,7 @@ "types": { "rType": "inventory", - "fType": "child_sensors" + "fType": "sensors" }, "paths": [ @@ -676,7 +676,7 @@ "types": { "rType": "inventory", - "fType": "child_sensors" + "fType": "sensors" }, "paths": [ @@ -693,7 +693,7 @@ "types": { "rType": "inventory", - "fType": "child_sensors" + "fType": "sensors" }, "paths": [ @@ -710,7 +710,7 @@ "types": { "rType": "inventory", - "fType": "child_sensors" + "fType": "sensors" }, "paths": [ @@ -727,7 +727,7 @@ "types": { "rType": "inventory", - "fType": "child_sensors" + "fType": "sensors" }, "paths": [ @@ -744,7 +744,7 @@ "types": { "rType": "inventory", - "fType": "child_sensors" + "fType": "sensors" }, "paths": [ @@ -761,7 +761,7 @@ "types": { "rType": "inventory", - "fType": "child_sensors" + "fType": "sensors" }, "paths": [ @@ -778,7 +778,7 @@ "types": { "rType": "inventory", - "fType": "child_sensors" + "fType": "sensors" }, "paths": [ @@ -796,7 +796,7 @@ "types": { "rType": "inventory", - "fType": "child_sensors" + "fType": "sensors" }, "paths": [ @@ -813,7 +813,7 @@ "types": { "rType": "inventory", - "fType": "child_sensors" + "fType": "sensors" }, "paths": [ @@ -830,7 +830,7 @@ "types": { "rType": "inventory", - "fType": "child_sensors" + "fType": "sensors" }, "paths": [ @@ -847,7 +847,7 @@ "types": { "rType": "inventory", - "fType": "child_sensors" + "fType": "sensors" }, "paths": [ @@ -864,7 +864,7 @@ "types": { "rType": "inventory", - "fType": "child_sensors" + "fType": "sensors" }, "paths": [ @@ -881,7 +881,7 @@ "types": { "rType": "inventory", - "fType": "child_sensors" + "fType": "sensors" }, "paths": [ @@ -898,7 +898,7 @@ "types": { "rType": "inventory", - "fType": "child_sensors" + "fType": "sensors" }, "paths": [ @@ -915,7 +915,7 @@ "types": { "rType": "inventory", - "fType": "child_sensors" + "fType": "sensors" }, "paths": [ @@ -932,7 +932,7 @@ "types": { "rType": "inventory", - "fType": "child_sensors" + "fType": "sensors" }, "paths": [ @@ -949,7 +949,7 @@ "types": { "rType": "inventory", - "fType": "child_sensors" + "fType": "sensors" }, "paths": [ @@ -966,7 +966,7 @@ "types": { "rType": "inventory", - "fType": "child_sensors" + "fType": "sensors" }, "paths": [ @@ -983,7 +983,7 @@ "types": { "rType": "inventory", - "fType": "child_sensors" + "fType": "sensors" }, "paths": [ @@ -1000,7 +1000,7 @@ "types": { "rType": "inventory", - "fType": "child_sensors" + "fType": "sensors" }, "paths": [ @@ -1017,7 +1017,7 @@ "types": { "rType": "inventory", - "fType": "child_sensors" + "fType": "sensors" }, "paths": [ @@ -1034,7 +1034,7 @@ "types": { "rType": "inventory", - "fType": "child_sensors" + "fType": "sensors" }, "paths": [ @@ -1051,7 +1051,7 @@ "types": { "rType": "inventory", - "fType": "child_sensors" + "fType": "sensors" }, "paths": [ @@ -1068,7 +1068,7 @@ "types": { "rType": "inventory", - "fType": "child_sensors" + "fType": "sensors" }, "paths": [ @@ -1085,7 +1085,7 @@ "types": { "rType": "inventory", - "fType": "child_sensors" + "fType": "sensors" }, "paths": [ @@ -1102,7 +1102,7 @@ "types": { "rType": "inventory", - "fType": "child_sensors" + "fType": "sensors" }, "paths": [ @@ -1119,7 +1119,7 @@ "types": { "rType": "inventory", - "fType": "child_sensors" + "fType": "sensors" }, "paths": [ @@ -1136,7 +1136,7 @@ "types": { "rType": "inventory", - "fType": "child_sensors" + "fType": "sensors" }, "paths": [ @@ -1153,7 +1153,7 @@ "types": { "rType": "inventory", - "fType": "child_sensors" + "fType": "sensors" }, "paths": [ @@ -1170,7 +1170,7 @@ "types": { "rType": "inventory", - "fType": "child_sensors" + "fType": "sensors" }, "paths": [ @@ -1187,7 +1187,7 @@ "types": { "rType": "inventory", - "fType": "child_sensors" + "fType": "sensors" }, "paths": [ @@ -1205,7 +1205,7 @@ "types": { "rType": "inventory", - "fType": "child_sensors" + "fType": "sensors" }, "paths": [ @@ -1222,7 +1222,7 @@ "types": { "rType": "inventory", - "fType": "child_sensors" + "fType": "sensors" }, "paths": [ @@ -1239,7 +1239,7 @@ "types": { "rType": "inventory", - "fType": "child_sensors" + "fType": "sensors" }, "paths": [ @@ -1256,7 +1256,7 @@ "types": { "rType": "inventory", - "fType": "child_sensors" + "fType": "sensors" }, "paths": [ @@ -1273,7 +1273,7 @@ "types": { "rType": "inventory", - "fType": "child_sensors" + "fType": "sensors" }, "paths": [ @@ -1290,7 +1290,7 @@ "types": { "rType": "inventory", - "fType": "child_sensors" + "fType": "sensors" }, "paths": [ @@ -1307,7 +1307,7 @@ "types": { "rType": "inventory", - "fType": "child_sensors" + "fType": "sensors" }, "paths": [ @@ -1324,7 +1324,7 @@ "types": { "rType": "inventory", - "fType": "child_sensors" + "fType": "sensors" }, "paths": [ @@ -1341,7 +1341,7 @@ "types": { "rType": "inventory", - "fType": "child_sensors" + "fType": "sensors" }, "paths": [ @@ -1358,7 +1358,7 @@ "types": { "rType": "inventory", - "fType": "child_sensors" + "fType": "sensors" }, "paths": [ @@ -1375,7 +1375,7 @@ "types": { "rType": "inventory", - "fType": "child_sensors" + "fType": "sensors" }, "paths": [ @@ -1392,7 +1392,7 @@ "types": { "rType": "inventory", - "fType": "child_sensors" + "fType": "sensors" }, "paths": [ @@ -1409,7 +1409,7 @@ "types": { "rType": "inventory", - "fType": "child_sensors" + "fType": "sensors" }, "paths": [ @@ -1426,7 +1426,7 @@ "types": { "rType": "inventory", - "fType": "child_sensors" + "fType": "sensors" }, "paths": [ @@ -1443,7 +1443,7 @@ "types": { "rType": "inventory", - "fType": "child_sensors" + "fType": "sensors" }, "paths": [ @@ -1460,7 +1460,7 @@ "types": { "rType": "inventory", - "fType": "child_sensors" + "fType": "sensors" }, "paths": [ @@ -1477,7 +1477,7 @@ "types": { "rType": "chassis", - "fType": "sensors" + "fType": "all_sensors" }, "paths": [ @@ -1597,7 +1597,9 @@ "/xyz/openbmc_project/sensors/current/p1_vcs_current", "/xyz/openbmc_project/sensors/current/p1_vddr_current", "/xyz/openbmc_project/sensors/current/p1_vdd_current", - "/xyz/openbmc_project/sensors/current/p1_vdn_current" + "/xyz/openbmc_project/sensors/current/p1_vdn_current", + + "/xyz/openbmc_project/sensors/power/total_power" ] } ] diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/inventory/phosphor-inventory-manager_%.bbappend b/meta-ibm/meta-witherspoon/recipes-phosphor/inventory/phosphor-inventory-manager_%.bbappend index 39f87342e..bdc3912d5 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/inventory/phosphor-inventory-manager_%.bbappend +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/inventory/phosphor-inventory-manager_%.bbappend @@ -1,11 +1,11 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" -PACKAGECONFIG_append = " associations" -SRC_URI += "file://associations.json" +PACKAGECONFIG_append_ibm-ac-server = " associations" +SRC_URI_append_ibm-ac-server = " file://associations.json" -DEPENDS_append = " inventory-cleanup" +DEPENDS_append_ibm-ac-server = " inventory-cleanup" -do_install_append() { +do_install_append_ibm-ac-server() { install -d ${D}${base_datadir} install -m 0755 ${WORKDIR}/associations.json ${D}${base_datadir}/associations.json } diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/openpower-ipmi-oem_%.bbappend b/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/openpower-ipmi-oem_%.bbappend new file mode 100644 index 000000000..ae379af3f --- /dev/null +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/openpower-ipmi-oem_%.bbappend @@ -0,0 +1,5 @@ +DEPENDS_append_ibm-ac-server = " acx22-yaml-config" + +EXTRA_OECONF_ibm-ac-server = " \ + INVSENSOR_YAML_GEN=${STAGING_DIR_HOST}${datadir}/acx22-yaml-config/ipmi-inventory-sensors.yaml \ + " diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend b/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend index 3256e834a..e3e5002bb 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend @@ -16,7 +16,7 @@ inherit image_version unset do_patch[noexec] do_patch[depends] = "os-release:do_populate_sysroot" -python do_patch() { +python do_patch_ibm-ac-server() { import json import re from shutil import copyfile diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-config/dcmi_sensors.json b/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-config/ibm-ac-server/dcmi_sensors.json index 837071398..837071398 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-config/dcmi_sensors.json +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-config/ibm-ac-server/dcmi_sensors.json diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-config/dev_id.json b/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-config/ibm-ac-server/dev_id.json index 6cd9a94b3..6cd9a94b3 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-config/dev_id.json +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-config/ibm-ac-server/dev_id.json diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-config/power_reading.json b/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-config/ibm-ac-server/power_reading.json index 97e8f32b5..97e8f32b5 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-config/power_reading.json +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-config/ibm-ac-server/power_reading.json diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-bmc-inventory-native.bbappend b/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-bmc-inventory-native.bbappend deleted file mode 100644 index 72d991c7e..000000000 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-bmc-inventory-native.bbappend +++ /dev/null @@ -1 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-not-sent-by-host-inventory-native.bbappend b/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-not-sent-by-host-inventory-native.bbappend deleted file mode 100644 index 72d991c7e..000000000 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-not-sent-by-host-inventory-native.bbappend +++ /dev/null @@ -1 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-not-sent-by-host-inventory-native/fru-config-not-sent-by-host.yaml b/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-not-sent-by-host-inventory-native/fru-config-not-sent-by-host.yaml deleted file mode 100644 index 65c02b64b..000000000 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-not-sent-by-host-inventory-native/fru-config-not-sent-by-host.yaml +++ /dev/null @@ -1,29 +0,0 @@ -20: - /system/chassis/motherboard/gv100card0: &DEFAULTS - entityInstance: 1 - entityID: 3 - interfaces: - xyz.openbmc_project.Inventory.Item: - PrettyName: - IPMIFruProperty: Board Name - IPMIFruSection: Board -21: - /system/chassis/motherboard/gv100card1: - <<: *DEFAULTS - entityInstance: 2 -22: - /system/chassis/motherboard/gv100card2: - <<: *DEFAULTS - entityInstance: 3 -23: - /system/chassis/motherboard/gv100card3: - <<: *DEFAULTS - entityInstance: 4 -24: - /system/chassis/motherboard/gv100card4: - <<: *DEFAULTS - entityInstance: 5 -25: - /system/chassis/motherboard/gv100card5: - <<: *DEFAULTS - entityInstance: 6 diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend b/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend new file mode 100644 index 000000000..2da9493df --- /dev/null +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend @@ -0,0 +1,6 @@ +DEPENDS_append_ibm-ac-server = " acx22-yaml-config" + +EXTRA_OECONF_ibm-ac-server = " \ + YAML_GEN=${STAGING_DIR_HOST}${datadir}/acx22-yaml-config/ipmi-fru-read.yaml \ + PROP_YAML=${STAGING_DIR_HOST}${datadir}/acx22-yaml-config/ipmi-extra-properties.yaml \ + " diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-host/hwmon_sensors.hardcoded.yaml b/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-host/hwmon_sensors.hardcoded.yaml deleted file mode 100644 index 8e0634f13..000000000 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-host/hwmon_sensors.hardcoded.yaml +++ /dev/null @@ -1,485 +0,0 @@ -0xdd:
- entityID: 0x1D
- entityInstance: 1
- sensorType: 0x04
- path: /xyz/openbmc_project/sensors/fan_tach/fan0_0
- sensorReadingType: 0x01
- multiplierM: 100
- offsetB: 0
- bExp: 0
- rExp: 0
- unit: xyz.openbmc_project.Sensor.Value.Unit.RPMS
- scale: 0
- serviceInterface: org.freedesktop.DBus.Properties
- readingType: readingData
- sensorNamePattern: nameLeaf
- interfaces:
- xyz.openbmc_project.Sensor.Value:
- Value:
- Offsets:
- 0xFF:
- type: int64_t
-
-0xdf:
- entityID: 0x1D
- entityInstance: 3
- sensorType: 0x04
- path: /xyz/openbmc_project/sensors/fan_tach/fan1_0
- sensorReadingType: 0x01
- multiplierM: 100
- offsetB: 0
- bExp: 0
- rExp: 0
- unit: xyz.openbmc_project.Sensor.Value.Unit.RPMS
- scale: 0
- serviceInterface: org.freedesktop.DBus.Properties
- readingType: readingData
- sensorNamePattern: nameLeaf
- interfaces:
- xyz.openbmc_project.Sensor.Value:
- Value:
- Offsets:
- 0xFF:
- type: int64_t
-
-0xe3:
- entityID: 0x1D
- entityInstance: 5
- sensorType: 0x04
- path: /xyz/openbmc_project/sensors/fan_tach/fan2_0
- sensorReadingType: 0x01
- multiplierM: 100
- offsetB: 0
- bExp: 0
- rExp: 0
- unit: xyz.openbmc_project.Sensor.Value.Unit.RPMS
- scale: 0
- serviceInterface: org.freedesktop.DBus.Properties
- readingType: readingData
- sensorNamePattern: nameLeaf
- interfaces:
- xyz.openbmc_project.Sensor.Value:
- Value:
- Offsets:
- 0xFF:
- type: int64_t
-
-0xe5:
- entityID: 0x1D
- entityInstance: 7
- sensorType: 0x04
- path: /xyz/openbmc_project/sensors/fan_tach/fan3_0
- sensorReadingType: 0x01
- multiplierM: 100
- offsetB: 0
- bExp: 0
- rExp: 0
- unit: xyz.openbmc_project.Sensor.Value.Unit.RPMS
- scale: 0
- serviceInterface: org.freedesktop.DBus.Properties
- readingType: readingData
- sensorNamePattern: nameLeaf
- interfaces:
- xyz.openbmc_project.Sensor.Value:
- Value:
- Offsets:
- 0xFF:
- type: int64_t
-
-0xe7:
- entityID: 0x0A
- entityInstance: 1
- sensorType: 0x08
- path: /xyz/openbmc_project/sensors/power/fan_disk_power
- sensorReadingType: 0x01
- multiplierM: 2
- offsetB: 0
- bExp: 0
- rExp: 0
- unit: xyz.openbmc_project.Sensor.Value.Unit.Watts
- scale: -6
- serviceInterface: org.freedesktop.DBus.Properties
- readingType: readingData
- sensorNamePattern: nameLeaf
- interfaces:
- xyz.openbmc_project.Sensor.Value:
- Value:
- Offsets:
- 0xFF:
- type: int64_t
-
-0xee:
- entityID: 0x0A
- entityInstance: 9
- sensorType: 0x08
- path: /xyz/openbmc_project/sensors/power/p0_io_power
- sensorReadingType: 0x01
- multiplierM: 1
- offsetB: 0
- bExp: 0
- rExp: 0
- unit: xyz.openbmc_project.Sensor.Value.Unit.Watts
- scale: -6
- serviceInterface: org.freedesktop.DBus.Properties
- readingType: readingData
- sensorNamePattern: nameLeaf
- interfaces:
- xyz.openbmc_project.Sensor.Value:
- Value:
- Offsets:
- 0xFF:
- type: int64_t
-
-0xef:
- entityID: 0x0A
- entityInstance: 10
- sensorType: 0x08
- path: /xyz/openbmc_project/sensors/power/p1_io_power
- sensorReadingType: 0x01
- multiplierM: 1
- offsetB: 0
- bExp: 0
- rExp: 0
- unit: xyz.openbmc_project.Sensor.Value.Unit.Watts
- scale: -6
- serviceInterface: org.freedesktop.DBus.Properties
- readingType: readingData
- sensorNamePattern: nameLeaf
- interfaces:
- xyz.openbmc_project.Sensor.Value:
- Value:
- Offsets:
- 0xFF:
- type: int64_t
-
-0xf0:
- entityID: 0x0A
- entityInstance: 11
- sensorType: 0x08
- path: /xyz/openbmc_project/sensors/power/p0_mem_power
- sensorReadingType: 0x01
- multiplierM: 2
- offsetB: 0
- bExp: 0
- rExp: 0
- unit: xyz.openbmc_project.Sensor.Value.Unit.Watts
- scale: -6
- serviceInterface: org.freedesktop.DBus.Properties
- readingType: readingData
- sensorNamePattern: nameLeaf
- interfaces:
- xyz.openbmc_project.Sensor.Value:
- Value:
- Offsets:
- 0xFF:
- type: int64_t
-
-0xf1:
- entityID: 0x0A
- entityInstance: 12
- sensorType: 0x08
- path: /xyz/openbmc_project/sensors/power/p1_mem_power
- sensorReadingType: 0x01
- multiplierM: 2
- offsetB: 0
- bExp: 0
- rExp: 0
- unit: xyz.openbmc_project.Sensor.Value.Unit.Watts
- scale: -6
- serviceInterface: org.freedesktop.DBus.Properties
- readingType: readingData
- sensorNamePattern: nameLeaf
- interfaces:
- xyz.openbmc_project.Sensor.Value:
- Value:
- Offsets:
- 0xFF:
- type: int64_t
-
-0xf2:
- entityID: 0x0A
- entityInstance: 13
- sensorType: 0x08
- path: /xyz/openbmc_project/sensors/power/p0_power
- sensorReadingType: 0x01
- multiplierM: 2
- offsetB: 0
- bExp: 0
- rExp: 0
- unit: xyz.openbmc_project.Sensor.Value.Unit.Watts
- scale: -6
- serviceInterface: org.freedesktop.DBus.Properties
- readingType: readingData
- sensorNamePattern: nameLeaf
- interfaces:
- xyz.openbmc_project.Sensor.Value:
- Value:
- Offsets:
- 0xFF:
- type: int64_t
-
-0xf3:
- entityID: 0x0A
- entityInstance: 14
- sensorType: 0x08
- path: /xyz/openbmc_project/sensors/power/p1_power
- sensorReadingType: 0x01
- multiplierM: 2
- offsetB: 0
- bExp: 0
- rExp: 0
- unit: xyz.openbmc_project.Sensor.Value.Unit.Watts
- scale: -6
- serviceInterface: org.freedesktop.DBus.Properties
- readingType: readingData
- sensorNamePattern: nameLeaf
- interfaces:
- xyz.openbmc_project.Sensor.Value:
- Value:
- Offsets:
- 0xFF:
- type: int64_t
-
-
-0xf4:
- entityID: 0x0A
- entityInstance: 15
- sensorType: 0x08
- path: /xyz/openbmc_project/sensors/power/ps0_input_power
- sensorReadingType: 0x01
- multiplierM: 10
- offsetB: 0
- bExp: 0
- rExp: 0
- unit: xyz.openbmc_project.Sensor.Value.Unit.Watts
- scale: -6
- serviceInterface: org.freedesktop.DBus.Properties
- readingType: readingData
- sensorNamePattern: nameLeaf
- interfaces:
- xyz.openbmc_project.Sensor.Value:
- Value:
- Offsets:
- 0xFF:
- type: int64_t
-
-0xf5:
- entityID: 0x0A
- entityInstance: 16
- sensorType: 0x08
- path: /xyz/openbmc_project/sensors/power/ps1_input_power
- sensorReadingType: 0x01
- multiplierM: 10
- offsetB: 0
- bExp: 0
- rExp: 0
- unit: xyz.openbmc_project.Sensor.Value.Unit.Watts
- scale: -6
- serviceInterface: org.freedesktop.DBus.Properties
- readingType: readingData
- sensorNamePattern: nameLeaf
- interfaces:
- xyz.openbmc_project.Sensor.Value:
- Value:
- Offsets:
- 0xFF:
- type: int64_t
-
-0xf6:
- entityID: 0x0A
- entityInstance: 17
- sensorType: 0x08
- path: /xyz/openbmc_project/sensors/power/total_power
- sensorReadingType: 0x01
- multiplierM: 20
- offsetB: 0
- bExp: 0
- rExp: 0
- unit: xyz.openbmc_project.Sensor.Value.Unit.Watts
- scale: -6
- serviceInterface: org.freedesktop.DBus.Properties
- readingType: readingData
- sensorNamePattern: nameLeaf
- interfaces:
- xyz.openbmc_project.Sensor.Value:
- Value:
- Offsets:
- 0xFF:
- type: int64_t
-
-0xf7:
- entityID: 0x0A
- entityInstance: 19
- sensorType: 0x02
- path: /xyz/openbmc_project/sensors/voltage/ps0_input_voltage
- sensorReadingType: 0x01
- multiplierM: 2
- offsetB: 0
- bExp: 0
- rExp: 0
- unit: xyz.openbmc_project.Sensor.Value.Unit.Volts
- scale: -3
- serviceInterface: org.freedesktop.DBus.Properties
- readingType: readingData
- sensorNamePattern: nameLeaf
- interfaces:
- xyz.openbmc_project.Sensor.Value:
- Value:
- Offsets:
- 0xFF:
- type: int64_t
-
-0xf8:
- entityID: 0x0A
- entityInstance: 20
- sensorType: 0x02
- path: /xyz/openbmc_project/sensors/voltage/ps1_input_voltage
- sensorReadingType: 0x01
- multiplierM: 2
- offsetB: 0
- bExp: 0
- rExp: 0
- unit: xyz.openbmc_project.Sensor.Value.Unit.Volts
- scale: -3
- serviceInterface: org.freedesktop.DBus.Properties
- readingType: readingData
- sensorNamePattern: nameLeaf
- interfaces:
- xyz.openbmc_project.Sensor.Value:
- Value:
- Offsets:
- 0xFF:
- type: int64_t
-
-0xf9:
- entityID: 0x0A
- entityInstance: 21
- sensorType: 0x02
- path: /xyz/openbmc_project/sensors/voltage/ps0_output_voltage
- sensorReadingType: 0x01
- multiplierM: 10
- offsetB: 0
- bExp: 0
- rExp: -2
- unit: xyz.openbmc_project.Sensor.Value.Unit.Volts
- scale: -3
- serviceInterface: org.freedesktop.DBus.Properties
- readingType: readingData
- sensorNamePattern: nameLeaf
- interfaces:
- xyz.openbmc_project.Sensor.Value:
- Value:
- Offsets:
- 0xFF:
- type: int64_t
-
-0xfa:
- entityID: 0x0A
- entityInstance: 22
- sensorType: 0x02
- path: /xyz/openbmc_project/sensors/voltage/ps1_output_voltage
- sensorReadingType: 0x01
- multiplierM: 10
- offsetB: 0
- bExp: 0
- rExp: -2
- unit: xyz.openbmc_project.Sensor.Value.Unit.Volts
- scale: -3
- serviceInterface: org.freedesktop.DBus.Properties
- readingType: readingData
- sensorNamePattern: nameLeaf
- interfaces:
- xyz.openbmc_project.Sensor.Value:
- Value:
- Offsets:
- 0xFF:
- type: int64_t
-
-0xfb:
- entityID: 0x0A
- entityInstance: 23
- sensorType: 0x03
- path: /xyz/openbmc_project/sensors/current/ps0_output_current
- sensorReadingType: 0x01
- multiplierM: 1
- offsetB: 0
- bExp: 0
- rExp: 0
- unit: xyz.openbmc_project.Sensor.Value.Unit.Amperes
- scale: -3
- serviceInterface: org.freedesktop.DBus.Properties
- readingType: readingData
- sensorNamePattern: nameLeaf
- interfaces:
- xyz.openbmc_project.Sensor.Value:
- Value:
- Offsets:
- 0xFF:
- type: int64_t
-
-0xfc:
- entityID: 0x0A
- entityInstance: 24
- sensorType: 0x03
- path: /xyz/openbmc_project/sensors/current/ps1_output_current
- sensorReadingType: 0x01
- multiplierM: 1
- offsetB: 0
- bExp: 0
- rExp: 0
- unit: xyz.openbmc_project.Sensor.Value.Unit.Amperes
- scale: -3
- serviceInterface: org.freedesktop.DBus.Properties
- readingType: readingData
- sensorNamePattern: nameLeaf
- interfaces:
- xyz.openbmc_project.Sensor.Value:
- Value:
- Offsets:
- 0xFF:
- type: int64_t
-
-0xfd:
- entityID: 0x23
- entityInstance: 1
- sensorType: 0x01
- path: /xyz/openbmc_project/sensors/temperature/pcie
- sensorReadingType: 0x01
- multiplierM: 30
- offsetB: 0
- bExp: 0
- rExp: -2
- unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC
- scale: -3
- serviceInterface: org.freedesktop.DBus.Properties
- readingType: readingData
- sensorNamePattern: nameLeaf
- interfaces:
- xyz.openbmc_project.Sensor.Value:
- Value:
- Offsets:
- 0xFF:
- type: int64_t
-
-0xfe:
- entityID: 0x40
- entityInstance: 1
- sensorType: 0x01
- path: /xyz/openbmc_project/sensors/temperature/ambient
- sensorReadingType: 0x01
- multiplierM: 20
- offsetB: 0
- bExp: 0
- rExp: -2
- unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC
- scale: -3
- serviceInterface: org.freedesktop.DBus.Properties
- readingType: readingData
- sensorNamePattern: nameLeaf
- interfaces:
- xyz.openbmc_project.Sensor.Value:
- Value:
- Offsets:
- 0xFF:
- type: int64_t
-
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-host/occ_sensors.hardcoded.yaml b/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-host/occ_sensors.hardcoded.yaml deleted file mode 100644 index a52a8f042..000000000 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-host/occ_sensors.hardcoded.yaml +++ /dev/null @@ -1,44 +0,0 @@ -0x08: - entityID: 0xD2 - entityInstance: 1 - sensorType: 0x09 - path: /org/open_power/control/occ0 - sensorReadingType: 0x09 - serviceInterface: org.freedesktop.DBus.Properties - readingType: assertion - mutability: Mutability::Write|Mutability::Read - sensorNamePattern: nameLeaf - interfaces: - org.open_power.OCC.Status: - OccActive: - Offsets: - 0x00: - assert: false - deassert: true - type: bool - 0x01: - assert: true - deassert: false - type: bool -0x09: - entityID: 0xD2 - entityInstance: 2 - sensorType: 0x09 - path: /org/open_power/control/occ1 - sensorReadingType: 0x09 - serviceInterface: org.freedesktop.DBus.Properties - readingType: assertion - mutability: Mutability::Write|Mutability::Read - sensorNamePattern: nameLeaf - interfaces: - org.open_power.OCC.Status: - OccActive: - Offsets: - 0x00: - assert: false - deassert: true - type: bool - 0x01: - assert: true - deassert: false - type: bool diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-host/witherspoon_hwmon_sensors.hardcoded.yaml b/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-host/witherspoon_hwmon_sensors.hardcoded.yaml deleted file mode 100644 index 69c4ccdfc..000000000 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-host/witherspoon_hwmon_sensors.hardcoded.yaml +++ /dev/null @@ -1,88 +0,0 @@ -0xde:
- entityID: 0x1D
- entityInstance: 2
- sensorType: 0x04
- path: /xyz/openbmc_project/sensors/fan_tach/fan0_1
- sensorReadingType: 0x01
- multiplierM: 100
- offsetB: 0
- bExp: 0
- rExp: 0
- unit: xyz.openbmc_project.Sensor.Value.Unit.RPMS
- scale: 0
- serviceInterface: org.freedesktop.DBus.Properties
- readingType: readingData
- sensorNamePattern: nameLeaf
- interfaces:
- xyz.openbmc_project.Sensor.Value:
- Value:
- Offsets:
- 0xFF:
- type: int64_t
-
-0xe2:
- entityID: 0x1D
- entityInstance: 4
- sensorType: 0x04
- path: /xyz/openbmc_project/sensors/fan_tach/fan1_1
- sensorReadingType: 0x01
- multiplierM: 100
- offsetB: 0
- bExp: 0
- rExp: 0
- unit: xyz.openbmc_project.Sensor.Value.Unit.RPMS
- scale: 0
- serviceInterface: org.freedesktop.DBus.Properties
- readingType: readingData
- sensorNamePattern: nameLeaf
- interfaces:
- xyz.openbmc_project.Sensor.Value:
- Value:
- Offsets:
- 0xFF:
- type: int64_t
-
-0xe4:
- entityID: 0x1D
- entityInstance: 6
- sensorType: 0x04
- path: /xyz/openbmc_project/sensors/fan_tach/fan2_1
- sensorReadingType: 0x01
- multiplierM: 100
- offsetB: 0
- bExp: 0
- rExp: 0
- unit: xyz.openbmc_project.Sensor.Value.Unit.RPMS
- scale: 0
- serviceInterface: org.freedesktop.DBus.Properties
- readingType: readingData
- sensorNamePattern: nameLeaf
- interfaces:
- xyz.openbmc_project.Sensor.Value:
- Value:
- Offsets:
- 0xFF:
- type: int64_t
-
-0xe6:
- entityID: 0x1D
- entityInstance: 8
- sensorType: 0x04
- path: /xyz/openbmc_project/sensors/fan_tach/fan3_1
- sensorReadingType: 0x01
- multiplierM: 100
- offsetB: 0
- bExp: 0
- rExp: 0
- unit: xyz.openbmc_project.Sensor.Value.Unit.RPMS
- scale: 0
- serviceInterface: org.freedesktop.DBus.Properties
- readingType: readingData
- sensorNamePattern: nameLeaf
- interfaces:
- xyz.openbmc_project.Sensor.Value:
- Value:
- Offsets:
- 0xFF:
- type: int64_t
-
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend b/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend index bb28054c6..3fdcada43 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend @@ -1,10 +1,7 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" -SRC_URI_append = " \ - file://occ_sensors.hardcoded.yaml \ - file://hwmon_sensors.hardcoded.yaml \ - " +DEPENDS_append_ibm-ac-server = " acx22-yaml-config" -# System-specific sensors -SRC_URI_append_witherspoon = " \ - file://witherspoon_hwmon_sensors.hardcoded.yaml \ - " +EXTRA_OECONF_ibm-ac-server = " \ + SENSOR_YAML_GEN=${STAGING_DIR_HOST}${datadir}/acx22-yaml-config/ipmi-sensors.yaml \ + INVSENSOR_YAML_GEN=${STAGING_DIR_HOST}${datadir}/acx22-yaml-config/ipmi-inventory-sensors.yaml \ + FRU_YAML_GEN=${STAGING_DIR_HOST}${datadir}/acx22-yaml-config/ipmi-fru-read.yaml \ + " diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/logging/ibm-logging/policyTable.json b/meta-ibm/meta-witherspoon/recipes-phosphor/logging/ibm-logging/ibm-ac-server/policyTable.json index 80bfbcfd9..80bfbcfd9 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/logging/ibm-logging/policyTable.json +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/logging/ibm-logging/ibm-ac-server/policyTable.json diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/logging/ibm-logging_%.bbappend b/meta-ibm/meta-witherspoon/recipes-phosphor/logging/ibm-logging_%.bbappend index 913a0e8bc..9b7806995 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/logging/ibm-logging_%.bbappend +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/logging/ibm-logging_%.bbappend @@ -1,2 +1,2 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" -PACKAGECONFIG += "policy-interface" +PACKAGECONFIG_append_ibm-ac-server = " policy-interface" diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/mboxd/mboxd_%.bbappend b/meta-ibm/meta-witherspoon/recipes-phosphor/mboxd/mboxd_%.bbappend index ac35ae9b4..69c9d1d54 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/mboxd/mboxd_%.bbappend +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/mboxd/mboxd_%.bbappend @@ -1,12 +1,12 @@ -MBOXD_FLASH_SIZE = "64M" +MBOXD_FLASH_SIZE_ibm-ac-server = "64M" FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" -SYSTEMD_SERVICE_${PN} += "check-pnor-format.service" +SYSTEMD_SERVICE_${PN}_append_ibm-ac-server = " check-pnor-format.service" -SRC_URI += "file://check_pnor_format.sh" +SRC_URI_append_ibm-ac-server = " file://check_pnor_format.sh" -do_install_append() { +do_install_append_ibm-ac-server() { install -d ${D}${bindir} install -m 0755 ${WORKDIR}/check_pnor_format.sh ${D}${bindir}/check_pnor_format.sh } diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/network/first-boot-set-mac_%.bbappend b/meta-ibm/meta-witherspoon/recipes-phosphor/network/first-boot-set-mac_%.bbappend index 29d23c8c4..cb167ee3f 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/network/first-boot-set-mac_%.bbappend +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/network/first-boot-set-mac_%.bbappend @@ -1 +1 @@ -SYSTEMD_SERVICE_${PN} += "first-boot-set-mac@eth0.service" +SYSTEMD_SERVICE_${PN}_append_ibm-ac-server = " first-boot-set-mac@eth0.service" diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/network/phosphor-network_%.bbappend b/meta-ibm/meta-witherspoon/recipes-phosphor/network/phosphor-network_%.bbappend index 5137f4e00..ba6e393bb 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/network/phosphor-network_%.bbappend +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/network/phosphor-network_%.bbappend @@ -1,8 +1,8 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/network:" -SRC_URI += "file://ncsi-netlink.service" -SYSTEMD_SERVICE_${PN} += "ncsi-netlink.service" +SRC_URI_append_ibm-ac-server = " file://ncsi-netlink.service" +SYSTEMD_SERVICE_${PN}_append_ibm-ac-server = " ncsi-netlink.service" -do_install_append() { +do_install_append_ibm-ac-server() { install -d ${D}${systemd_system_unitdir} install -m 0644 ${WORKDIR}/ncsi-netlink.service ${D}${systemd_system_unitdir} } diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend b/meta-ibm/meta-witherspoon/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend index 6e0db1e62..386c1e6ec 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend @@ -1,5 +1,5 @@ -RDEPENDS_${PN}-inventory += "openpower-fru-vpd openpower-occ-control phosphor-cooling-type virtual/obmc-gpio-presence" -RDEPENDS_${PN}-fan-control += "witherspoon-fan-watchdog" -RDEPENDS_${PN}-extras += "witherspoon-pfault-analysis witherspoon-power-supply-sync phosphor-webui" +RDEPENDS_${PN}-inventory_append_ibm-ac-server = " openpower-fru-vpd openpower-occ-control phosphor-cooling-type virtual/obmc-gpio-presence" +RDEPENDS_${PN}-fan-control_append_ibm-ac-server = " witherspoon-fan-watchdog" +RDEPENDS_${PN}-extras_append_ibm-ac-server = " witherspoon-pfault-analysis witherspoon-power-supply-sync phosphor-webui" -${PN}-software-extras_df-obmc-ubi-fs += "phosphor-software-manager-sync" +${PN}-software-extras_append_ibm-ac-server = " phosphor-software-manager-sync" diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/power/power-sequencer/swift/ucd90160.yaml b/meta-ibm/meta-witherspoon/recipes-phosphor/power/power-sequencer/swift/ucd90160.yaml index 66f8a92b6..e14640202 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/power/power-sequencer/swift/ucd90160.yaml +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/power/power-sequencer/swift/ucd90160.yaml @@ -52,7 +52,7 @@ GPIOAnalysis: - type: gpuPGOOD # The PCA9xxx chip device path and address (0xC0 8-bit = 0x60 7-bit) - path: /sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a400.i2c-bus/i2c-8/8-0060 + path: /sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a340.i2c-bus/i2c-8/8-0060 gpio_value: low # What GPIO value indicates a fault/problem? error_function: gpuPGOODError # Extra analysis function to call for this type option_flags: none @@ -72,7 +72,7 @@ callout: /system/chassis/motherboard/gv100card3 - type: gpuOverTemp # The PCA9xxx chip device path and address (0xC0 8-bit = 0x60 7-bit) - path: /sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a400.i2c-bus/i2c-8/8-0060 + path: /sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a340.i2c-bus/i2c-8/8-0060 gpio_value: low # What GPIO value indicates a fault/problem? error_function: gpuOverTempError # Extra analysis function to call for this type option_flags: shutdownOnFault @@ -92,7 +92,7 @@ callout: /system/chassis/motherboard/gv100card3 - type: memGOOD0 # The PCA9xxx chip device path and address (0xE8 8-bit = 0x74 7-bit) - path: /sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a400.i2c-bus/i2c-9/9-0074 + path: /sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a380.i2c-bus/i2c-9/9-0074 gpio_value: low # What GPIO value indicates a fault/problem? error_function: memGoodError # Extra analysis function to call for this type option_flags: none @@ -136,7 +136,7 @@ callout: /system/chassis/motherboard/dimm6 - type: memGOOD1 # The PCA9xxx chip device path and address (0xE8 8-bit = 0x74 7-bit) - path: /sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a400.i2c-bus/i2c-10/10-0074 + path: /sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a3c0.i2c-bus/i2c-10/10-0074 gpio_value: low # What GPIO value indicates a fault/problem? error_function: memGoodError # Extra analysis function to call for this type option_flags: none diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis.inc b/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis.inc index db7c16e5d..b73d922d0 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis.inc +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis.inc @@ -2,4 +2,4 @@ HOMEPAGE = "https://github.com/openbmc/witherspoon-pfault-analysis" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI += "git://github.com/openbmc/witherspoon-pfault-analysis" -SRCREV = "03c19db6a8f72d7f5408667a7daf915d82190efc" +SRCREV = "5b2964fa8e57c46d60c0c0d95d5668c9f9a5ce23" diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis/obmc/power-supply-monitor/power-supply-monitor-0.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis/swift/obmc/power-supply-monitor/power-supply-monitor-0.conf index 167e605d0..167e605d0 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis/obmc/power-supply-monitor/power-supply-monitor-0.conf +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis/swift/obmc/power-supply-monitor/power-supply-monitor-0.conf diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis/obmc/power-supply-monitor/power-supply-monitor-1.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis/swift/obmc/power-supply-monitor/power-supply-monitor-1.conf index faa5adec6..faa5adec6 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis/obmc/power-supply-monitor/power-supply-monitor-1.conf +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis/swift/obmc/power-supply-monitor/power-supply-monitor-1.conf diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis/witherspoon/obmc/power-supply-monitor/power-supply-monitor-0.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis/witherspoon/obmc/power-supply-monitor/power-supply-monitor-0.conf new file mode 100644 index 000000000..d6732e6b8 --- /dev/null +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis/witherspoon/obmc/power-supply-monitor/power-supply-monitor-0.conf @@ -0,0 +1,6 @@ +DEVPATH=/sys/bus/i2c/devices/3-0069 +INSTANCE=0 +INVENTORY=/system/chassis/motherboard/powersupply0 +NUM_HISTORY_RECORDS=120 +SYNC_GPIO_PATH=/dev/gpiochip0 +SYNC_GPIO_NUM=105 diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis/witherspoon/obmc/power-supply-monitor/power-supply-monitor-1.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis/witherspoon/obmc/power-supply-monitor/power-supply-monitor-1.conf new file mode 100644 index 000000000..cace335b1 --- /dev/null +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis/witherspoon/obmc/power-supply-monitor/power-supply-monitor-1.conf @@ -0,0 +1,6 @@ +DEVPATH=/sys/bus/i2c/devices/3-0068 +INSTANCE=1 +INVENTORY=/system/chassis/motherboard/powersupply1 +NUM_HISTORY_RECORDS=120 +SYNC_GPIO_PATH=/dev/gpiochip0 +SYNC_GPIO_NUM=105 diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/70-max31785-hwmon.rules b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/70-max31785-hwmon.rules index fd63e0549..fd63e0549 100755..100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/70-max31785-hwmon.rules +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/70-max31785-hwmon.rules diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/70-hwmon.rules b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/ibm-ac-server/70-hwmon.rules index 548b219e7..548b219e7 100755..100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/70-hwmon.rules +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/ibm-ac-server/70-hwmon.rules diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/max31785@52_air.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/max31785@52_air.conf index cddafc1a2..0b97ed559 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/max31785@52_air.conf +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/max31785@52_air.conf @@ -1,17 +1,9 @@ LABEL_fan1 = "fan0_0" -CRITLO_fan1 = "3000" -CRITHI_fan1 = "12000" LABEL_fan2 = "fan1_0" -CRITLO_fan2 = "3000" -CRITHI_fan2 = "12000" LABEL_fan3 = "fan2_0" -CRITLO_fan3 = "3000" -CRITHI_fan3 = "12000" LABEL_fan4 = "fan3_0" -CRITLO_fan4 = "3000" -CRITHI_fan4 = "12000" TARGET_MODE = "RPM" diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/max31785@52_water.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/max31785@52_water.conf index cddafc1a2..0b97ed559 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/max31785@52_water.conf +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/max31785@52_water.conf @@ -1,17 +1,9 @@ LABEL_fan1 = "fan0_0" -CRITLO_fan1 = "3000" -CRITHI_fan1 = "12000" LABEL_fan2 = "fan1_0" -CRITLO_fan2 = "3000" -CRITHI_fan2 = "12000" LABEL_fan3 = "fan2_0" -CRITLO_fan3 = "3000" -CRITHI_fan3 = "12000" LABEL_fan4 = "fan3_0" -CRITLO_fan4 = "3000" -CRITHI_fan4 = "12000" TARGET_MODE = "RPM" diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/max31785@52_air.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/max31785@52_air.conf index 0aafc9b14..d3df21599 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/max31785@52_air.conf +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/max31785@52_air.conf @@ -1,33 +1,17 @@ LABEL_fan1 = "fan0_0" -CRITLO_fan1 = "2974" -CRITHI_fan1 = "12076" LABEL_fan2 = "fan1_0" -CRITLO_fan2 = "2974" -CRITHI_fan2 = "12076" LABEL_fan3 = "fan2_0" -CRITLO_fan3 = "2974" -CRITHI_fan3 = "12076" LABEL_fan4 = "fan3_0" -CRITLO_fan4 = "2974" -CRITHI_fan4 = "12076" LABEL_fan5 = "fan0_1" -CRITLO_fan5 = "2974" -CRITHI_fan5 = "12076" LABEL_fan6 = "fan1_1" -CRITLO_fan6 = "2974" -CRITHI_fan6 = "12076" LABEL_fan7 = "fan2_1" -CRITLO_fan7 = "2974" -CRITHI_fan7 = "12076" LABEL_fan8 = "fan3_1" -CRITLO_fan8 = "2974" -CRITHI_fan8 = "12076" TARGET_MODE = "RPM" diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/max31785@52_water.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/max31785@52_water.conf index 5c0efe420..c96bfa76b 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/max31785@52_water.conf +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/max31785@52_water.conf @@ -1,25 +1,13 @@ LABEL_fan1 = "fan0_0" -CRITLO_fan1 = "2549" -CRITHI_fan1 = "12076" LABEL_fan3 = "fan2_0" -CRITLO_fan3 = "2549" -CRITHI_fan3 = "12076" LABEL_fan4 = "fan3_0" -CRITLO_fan4 = "2549" -CRITHI_fan4 = "12076" LABEL_fan5 = "fan0_1" -CRITLO_fan5 = "2549" -CRITHI_fan5 = "12076" LABEL_fan7 = "fan2_1" -CRITLO_fan7 = "2549" -CRITHI_fan7 = "12076" LABEL_fan8 = "fan3_1" -CRITLO_fan8 = "2549" -CRITHI_fan8 = "12076" TARGET_MODE = "RPM" diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend index 993ca281f..d9d606bd2 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend @@ -1,6 +1,6 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" -SRC_URI += " \ +SRC_URI_append_ibm-ac-server = " \ file://70-hwmon.rules \ file://70-max31785-hwmon.rules \ file://start_max31785_hwmon.sh \ @@ -46,15 +46,15 @@ OCCSFMT = "devices/platform/gpio-fsi/fsi0/slave@00--00/{0}.conf" OCCITEMS = "${@compose_list(d, 'OCCSFMT', 'OCCS')}" ENVS = "obmc/hwmon/{0}" -SYSTEMD_ENVIRONMENT_FILE_${PN} += "${@compose_list(d, 'ENVS', 'ITEMS')}" -SYSTEMD_ENVIRONMENT_FILE_${PN}_append = " ${@compose_list(d, 'ENVS', 'OCCITEMS')}" +SYSTEMD_ENVIRONMENT_FILE_${PN}_append_ibm-ac-server = " ${@compose_list(d, 'ENVS', 'ITEMS')}" +SYSTEMD_ENVIRONMENT_FILE_${PN}_append_ibm-ac-server = " ${@compose_list(d, 'ENVS', 'OCCITEMS')}" -SYSTEMD_ENVIRONMENT_FILE_max31785-msl += "obmc/hwmon-max31785/max31785.conf" -SYSTEMD_LINK_max31785-msl += "../phosphor-max31785-msl@.service:multi-user.target.wants/phosphor-max31785-msl@${MACHINE}.service" +SYSTEMD_ENVIRONMENT_FILE_max31785-msl_append_ibm-ac-server = " obmc/hwmon-max31785/max31785.conf" +SYSTEMD_LINK_max31785-msl_append_ibm-ac-server = " ../phosphor-max31785-msl@.service:multi-user.target.wants/phosphor-max31785-msl@${MACHINE}.service" -SYSTEMD_SERVICE_${PN} += "max31785-hwmon-helper@.service" +SYSTEMD_SERVICE_${PN}_append_ibm-ac-server = " max31785-hwmon-helper@.service" -do_install_append() { +do_install_append_ibm-ac-server() { install -d ${D}/${base_libdir}/udev/rules.d/ install ${WORKDIR}/70-max31785-hwmon.rules ${D}/${base_libdir}/udev/rules.d/ diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend b/meta-ibm/meta-witherspoon/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend index 02c0e94b4..99f7ffdef 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend @@ -1,2 +1,2 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" -SRC_URI_append = " file://TPMEnable-default-true.override.yml" +SRC_URI_append_ibm-ac-server = " file://TPMEnable-default-true.override.yml" diff --git a/meta-ibm/recipes-phosphor/bmcweb/bmcweb_%.bbappend b/meta-ibm/recipes-phosphor/bmcweb/bmcweb_%.bbappend new file mode 100644 index 000000000..44f4f4695 --- /dev/null +++ b/meta-ibm/recipes-phosphor/bmcweb/bmcweb_%.bbappend @@ -0,0 +1,3 @@ +EXTRA_OECMAKE_append = " \ + -DBMCWEB_INSECURE_ENABLE_REDFISH_FW_TFTP_UPDATE=ON \ +" diff --git a/meta-ibm/recipes-phosphor/image/obmc-phosphor-image.bbappend b/meta-ibm/recipes-phosphor/image/obmc-phosphor-image.bbappend deleted file mode 100644 index bda681ede..000000000 --- a/meta-ibm/recipes-phosphor/image/obmc-phosphor-image.bbappend +++ /dev/null @@ -1,4 +0,0 @@ -OBMC_IMAGE_EXTRA_INSTALL_append = "\ - phosphor-nslcd-cert-config \ - phosphor-nslcd-authority-cert-config \ - " |