diff options
Diffstat (limited to 'meta-ibm/meta-witherspoon')
27 files changed, 305 insertions, 41 deletions
diff --git a/meta-ibm/meta-witherspoon/conf/distro/openbmc-witherspoon.conf b/meta-ibm/meta-witherspoon/conf/distro/openbmc-witherspoon.conf index 76be4aef7..1ccdeb3f5 100644 --- a/meta-ibm/meta-witherspoon/conf/distro/openbmc-witherspoon.conf +++ b/meta-ibm/meta-witherspoon/conf/distro/openbmc-witherspoon.conf @@ -3,4 +3,3 @@ require conf/distro/include/phosphor-ubi.inc require conf/distro/include/phosphor-tiny.inc require conf/distro/include/openpower-mrw.inc require conf/distro/include/openpower-ubi.inc -require conf/distro/include/phosphor-isolation.inc diff --git a/meta-ibm/meta-witherspoon/conf/layer.conf b/meta-ibm/meta-witherspoon/conf/layer.conf index 7dd1f0b0f..0ff811e1c 100644 --- a/meta-ibm/meta-witherspoon/conf/layer.conf +++ b/meta-ibm/meta-witherspoon/conf/layer.conf @@ -7,4 +7,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "witherspoon-layer" BBFILE_PATTERN_witherspoon-layer = "" -LAYERSERIES_COMPAT_witherspoon-layer = "thud" +LAYERSERIES_COMPAT_witherspoon-layer = "thud warrior" diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/obmc-mgr-inventory%.bbappend b/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/obmc-mgr-inventory%.bbappend index c1d50e6ff..0165929a6 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/obmc-mgr-inventory%.bbappend +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/obmc-mgr-inventory%.bbappend @@ -9,7 +9,7 @@ ENV_FILES = "obmc/sync_inventory_item/{0}" SYSTEMD_ENVIRONMENT_FILE_${PN} += "${@compose_list(d, 'ENV_FILES', 'ITEMS')}" TMPL = "obmc-sync-inventory-item@.service" -TGT = "${SYSTEMD_DEFAULT_TARGET}" +TGT = "multi-user.target" ETH_SVC = "system-chassis-motherboard-bmc-ethernet.service" UUID_SVC = "system-chassis-motherboard-uuid.service" 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/ir35221-unbind-bind.sh index 160cc5d27..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/ir35221-unbind-bind.sh @@ -6,7 +6,7 @@ status=0 max_retries=3 driver_path="/sys/bus/i2c/drivers/ir35221/" -platform_path="/sys/devices/platform/ahb/ahb:apb/ahb:apb:i2c@1e78a000/" +platform_path="/sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/" unbind_driver () { echo $1 > $driver_path/unbind diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-presence-config-native/config.yaml b/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-presence-config-native/config.yaml index c5be29c1e..1c26fc21f 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-presence-config-native/config.yaml +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-presence-config-native/config.yaml @@ -3,7 +3,7 @@ methods: - type: gpio key: 4 - physpath: /sys/devices/platform/ahb/ahb:apb/ahb:apb:i2c@1e78a000/1e78a100.i2c-bus/i2c-3/3-0060 + 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: @@ -17,7 +17,7 @@ methods: - type: gpio key: 5 - physpath: /sys/devices/platform/ahb/ahb:apb/ahb:apb:i2c@1e78a000/1e78a100.i2c-bus/i2c-3/3-0060 + 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: @@ -31,7 +31,7 @@ methods: - type: gpio key: 6 - physpath: /sys/devices/platform/ahb/ahb:apb/ahb:apb:i2c@1e78a000/1e78a100.i2c-bus/i2c-3/3-0060 + 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: @@ -45,7 +45,7 @@ methods: - type: gpio key: 7 - physpath: /sys/devices/platform/ahb/ahb:apb/ahb:apb:i2c@1e78a000/1e78a100.i2c-bus/i2c-3/3-0060 + 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: diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan/phosphor-cooling-type@.service b/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan/phosphor-cooling-type@.service index 9086efb77..c1f5ae293 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan/phosphor-cooling-type@.service +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan/phosphor-cooling-type@.service @@ -12,4 +12,4 @@ ExecStart=/usr/bin/env phosphor-cooling-type ${{OBJPATH}} ${{AIR}} ${{WATER}} ${ SyslogIdentifier=phosphor-cooling-type [Install] -RequiredBy={SYSTEMD_DEFAULT_TARGET} +RequiredBy=multi-user.target 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 8cc310e7c..7467d36ec 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan_%.bbappend +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan_%.bbappend @@ -7,11 +7,9 @@ FAN_PACKAGES += " \ PACKAGECONFIG += "cooling-type" -RDEPENDS_phosphor-cooling-type += "libevdev" - TMPL_COOLING = "phosphor-cooling-type@.service" INSTFMT_COOLING = "phosphor-cooling-type@{0}.service" -COOLING_TGT = "${SYSTEMD_DEFAULT_TARGET}" +COOLING_TGT = "multi-user.target" FMT_COOLING = "../${TMPL_COOLING}:${COOLING_TGT}.requires/${INSTFMT_COOLING}" FILES_phosphor-cooling-type = "${sbindir}/phosphor-cooling-type" 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 b60a64b10..0fa11050b 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 @@ -2,7 +2,7 @@ FILESEXTRAPATHS_append := "${THISDIR}/${PN}:" TMPL_POWERSUPPLY = "phosphor-gpio-presence@.service" INSTFMT_POWERSUPPLY = "phosphor-gpio-presence@{0}.service" -POWERSUPPLY_TGT = "${SYSTEMD_DEFAULT_TARGET}" +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')}" diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/logging/ibm-logging/policyTable.json b/meta-ibm/meta-witherspoon/recipes-phosphor/logging/ibm-logging/policyTable.json index c7ba602de..80bfbcfd9 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/logging/ibm-logging/policyTable.json +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/logging/ibm-logging/policyTable.json @@ -9917,7 +9917,7 @@ "AffectedSubsystem": "Systems Management - Core / Virtual Appliance", "BMCMessageID": "xyz.openbmc_project.Common.Callout.Error.GPIO", "CallHomeCandidate": false, - "CommonEventID": "FQPSPCR0039F", + "CommonEventID": "FQPSPCR0077F", "ComponentInstance": null, "DateAdded": null, "DateReviewed": null, @@ -9975,6 +9975,69 @@ "UserAction": null, "VMMigrationFlag": null }, + "xyz.openbmc_project.Common.Device.Error.ReadFailure||/sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a100.i2c-bus/i2c-11/11-0064": { + "AffectedLEDs": null, + "AffectedSubsystem": "Systems Management - Core / Virtual Appliance", + "BMCMessageID": "xyz.openbmc_project.Common.Device.Error.ReadFailure", + "CallHomeCandidate": false, + "CommonEventID": "FQPSPCR0059F", + "ComponentInstance": null, + "DateAdded": null, + "DateReviewed": null, + "EventType": "Communication Failure/Timeout", + "Internal": false, + "LengthyDescription": null, + "LogSource": "BMC", + "Message": "Failed to read from the power sequencer chip on the system backplane", + "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard", + "RelatedEventIDs": {}, + "Serviceable": false, + "Severity": "Warning", + "UserAction": null, + "VMMigrationFlag": null + }, + "xyz.openbmc_project.Common.Device.Error.ReadFailure||/sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a100.i2c-bus/i2c-3/3-0068": { + "AffectedLEDs": null, + "AffectedSubsystem": "Systems Management - Core / Virtual Appliance", + "BMCMessageID": "xyz.openbmc_project.Common.Device.Error.ReadFailure", + "CallHomeCandidate": false, + "CommonEventID": "FQPSPCR0060F", + "ComponentInstance": 1, + "DateAdded": null, + "DateReviewed": null, + "EventType": "Communication Failure/Timeout", + "Internal": false, + "LengthyDescription": null, + "LogSource": "BMC", + "Message": "Failed to read from power supply 1", + "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/powersupply1", + "RelatedEventIDs": {}, + "Serviceable": false, + "Severity": "Warning", + "UserAction": null, + "VMMigrationFlag": null + }, + "xyz.openbmc_project.Common.Device.Error.ReadFailure||/sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a100.i2c-bus/i2c-3/3-0069": { + "AffectedLEDs": null, + "AffectedSubsystem": "Systems Management - Core / Virtual Appliance", + "BMCMessageID": "xyz.openbmc_project.Common.Device.Error.ReadFailure", + "CallHomeCandidate": false, + "CommonEventID": "FQPSPCR0060F", + "ComponentInstance": 0, + "DateAdded": null, + "DateReviewed": null, + "EventType": "Communication Failure/Timeout", + "Internal": false, + "LengthyDescription": null, + "LogSource": "BMC", + "Message": "Failed to read from power supply 0", + "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/powersupply0", + "RelatedEventIDs": {}, + "Serviceable": false, + "Severity": "Warning", + "UserAction": null, + "VMMigrationFlag": null + }, "xyz.openbmc_project.Common.Device.Error.ReadFailure||/sys/devices/platform/ahb/ahb:apb/ahb:apb:i2c@1e78a000/1e78a100.i2c-bus/i2c-11/11-0064": { "AffectedLEDs": null, "AffectedSubsystem": "Systems Management - Core / Virtual Appliance", @@ -17010,6 +17073,195 @@ "UserAction": null, "VMMigrationFlag": null }, + "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a100.i2c-bus/i2c-3/3-0052": { + "AffectedLEDs": null, + "AffectedSubsystem": "Systems Management - Core / Virtual Appliance", + "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure", + "CallHomeCandidate": false, + "CommonEventID": "FQPSPCR0057F", + "ComponentInstance": null, + "DateAdded": null, + "DateReviewed": null, + "EventType": "Communication Failure/Timeout", + "Internal": false, + "LengthyDescription": null, + "LogSource": "BMC", + "Message": "Failed to read from the fan control device on the system backplane", + "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard", + "RelatedEventIDs": {}, + "Serviceable": false, + "Severity": "Warning", + "UserAction": null, + "VMMigrationFlag": null + }, + "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a100.i2c-bus/i2c-3/3-0068": { + "AffectedLEDs": null, + "AffectedSubsystem": "Systems Management - Core / Virtual Appliance", + "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure", + "CallHomeCandidate": false, + "CommonEventID": "FQPSPCR0060F", + "ComponentInstance": 1, + "DateAdded": null, + "DateReviewed": null, + "EventType": "Communication Failure/Timeout", + "Internal": false, + "LengthyDescription": null, + "LogSource": "BMC", + "Message": "Failed to read from power supply 1", + "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/powersupply1", + "RelatedEventIDs": {}, + "Serviceable": false, + "Severity": "Warning", + "UserAction": null, + "VMMigrationFlag": null + }, + "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a100.i2c-bus/i2c-3/3-0069": { + "AffectedLEDs": null, + "AffectedSubsystem": "Systems Management - Core / Virtual Appliance", + "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure", + "CallHomeCandidate": false, + "CommonEventID": "FQPSPCR0060F", + "ComponentInstance": 0, + "DateAdded": null, + "DateReviewed": null, + "EventType": "Communication Failure/Timeout", + "Internal": false, + "LengthyDescription": null, + "LogSource": "BMC", + "Message": "Failed to read from power supply 0", + "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/powersupply0", + "RelatedEventIDs": {}, + "Serviceable": false, + "Severity": "Warning", + "UserAction": null, + "VMMigrationFlag": null + }, + "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a100.i2c-bus/i2c-3/3-0076": { + "AffectedLEDs": null, + "AffectedSubsystem": "Systems Management - Core / Virtual Appliance", + "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure", + "CallHomeCandidate": false, + "CommonEventID": "FQPSPCR0053F", + "ComponentInstance": null, + "DateAdded": null, + "DateReviewed": null, + "EventType": "Communication Failure/Timeout", + "Internal": false, + "LengthyDescription": null, + "LogSource": "BMC", + "Message": "Failed to read from the ambient temperature sensor on the system backplane", + "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard", + "RelatedEventIDs": {}, + "Serviceable": false, + "Severity": "Warning", + "UserAction": null, + "VMMigrationFlag": null + }, + "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a100.i2c-bus/i2c-3/3-0077": { + "AffectedLEDs": null, + "AffectedSubsystem": "Systems Management - Core / Virtual Appliance", + "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure", + "CallHomeCandidate": false, + "CommonEventID": "FQPSPCR0052F", + "ComponentInstance": null, + "DateAdded": null, + "DateReviewed": null, + "EventType": "Communication Failure/Timeout", + "Internal": false, + "LengthyDescription": null, + "LogSource": "BMC", + "Message": "Failed to read from the ambient temperature sensor on the system backplane", + "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard", + "RelatedEventIDs": {}, + "Serviceable": false, + "Severity": "Warning", + "UserAction": null, + "VMMigrationFlag": null + }, + "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a100.i2c-bus/i2c-4/4-0070": { + "AffectedLEDs": null, + "AffectedSubsystem": "Systems Management - Core / Virtual Appliance", + "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure", + "CallHomeCandidate": false, + "CommonEventID": "FQPSPCR0054F", + "ComponentInstance": 0, + "DateAdded": null, + "DateReviewed": null, + "EventType": "Communication Failure/Timeout", + "Internal": false, + "LengthyDescription": null, + "LogSource": "BMC", + "Message": "Failed to read from the CPU 0 VDD/VCS VRM on the system backplane", + "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard", + "RelatedEventIDs": {}, + "Serviceable": false, + "Severity": "Warning", + "UserAction": null, + "VMMigrationFlag": null + }, + "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a100.i2c-bus/i2c-4/4-0071": { + "AffectedLEDs": null, + "AffectedSubsystem": "Systems Management - Core / Virtual Appliance", + "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure", + "CallHomeCandidate": false, + "CommonEventID": "FQPSPCR0055F", + "ComponentInstance": 1, + "DateAdded": null, + "DateReviewed": null, + "EventType": "Communication Failure/Timeout", + "Internal": false, + "LengthyDescription": null, + "LogSource": "BMC", + "Message": "Failed to read from the CPU 1 VDN/VDDR VRM on the system backplane", + "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard", + "RelatedEventIDs": {}, + "Serviceable": false, + "Severity": "Warning", + "UserAction": null, + "VMMigrationFlag": null + }, + "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a100.i2c-bus/i2c-5/5-0070": { + "AffectedLEDs": null, + "AffectedSubsystem": "Systems Management - Core / Virtual Appliance", + "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure", + "CallHomeCandidate": false, + "CommonEventID": "FQPSPCR0054F", + "ComponentInstance": 1, + "DateAdded": null, + "DateReviewed": null, + "EventType": "Communication Failure/Timeout", + "Internal": false, + "LengthyDescription": null, + "LogSource": "BMC", + "Message": "Failed to read from the CPU 1 VDD/VCS VRM on the system backplane", + "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard", + "RelatedEventIDs": {}, + "Serviceable": false, + "Severity": "Warning", + "UserAction": null, + "VMMigrationFlag": null + }, + "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a100.i2c-bus/i2c-9/9-004a": { + "AffectedLEDs": null, + "AffectedSubsystem": "Systems Management - Core / Virtual Appliance", + "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure", + "CallHomeCandidate": false, + "CommonEventID": "FQPSPCR0056F", + "ComponentInstance": null, + "DateAdded": null, + "DateReviewed": null, + "EventType": "Communication Failure/Timeout", + "Internal": false, + "LengthyDescription": null, + "LogSource": "BMC", + "Message": "Failed to read from the PCIE temperature sensor on the system backplane", + "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard", + "RelatedEventIDs": {}, + "Serviceable": false, + "Severity": "Warning", + "UserAction": null, + "VMMigrationFlag": null + }, "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/sys/devices/platform/ahb/ahb:apb/ahb:apb:i2c@1e78a000/1e78a100.i2c-bus/i2c-3/3-0052": { "AffectedLEDs": null, "AffectedSubsystem": "Systems Management - Core / Virtual Appliance", @@ -19257,6 +19509,27 @@ "UserAction": null, "VMMigrationFlag": null }, + "xyz.openbmc_project.Sensor.Device.Error.WriteFailure||/sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a100.i2c-bus/i2c-3/3-0052": { + "AffectedLEDs": null, + "AffectedSubsystem": "Systems Management - Core / Virtual Appliance", + "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.WriteFailure", + "CallHomeCandidate": false, + "CommonEventID": "FQPSPCR0058F", + "ComponentInstance": null, + "DateAdded": null, + "DateReviewed": null, + "EventType": "Communication Failure/Timeout", + "Internal": false, + "LengthyDescription": null, + "LogSource": "BMC", + "Message": "Failed to write to the fan control device on the system backplane", + "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard", + "RelatedEventIDs": {}, + "Serviceable": false, + "Severity": "Warning", + "UserAction": null, + "VMMigrationFlag": null + }, "xyz.openbmc_project.Sensor.Device.Error.WriteFailure||/sys/devices/platform/ahb/ahb:apb/ahb:apb:i2c@1e78a000/1e78a100.i2c-bus/i2c-3/3-0052": { "AffectedLEDs": null, "AffectedSubsystem": "Systems Management - Core / Virtual Appliance", @@ -21912,7 +22185,7 @@ "ComponentInstance": null, "DateAdded": null, "DateReviewed": null, - "EventType": "Monitoring Agent", + "EventType": "Firmware/Software Failure", "Internal": false, "LengthyDescription": null, "LogSource": "BMC", @@ -22158,7 +22431,7 @@ }, "fileInfo": { "Entity": "IBM OpenBMC", - "Version": "1.8.1", + "Version": "1.8.3", "language": "English" } -}
\ No newline at end of file +} diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/network/network/ncsi-netlink.service b/meta-ibm/meta-witherspoon/recipes-phosphor/network/network/ncsi-netlink.service index f49114dcb..44b34195e 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/network/network/ncsi-netlink.service +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/network/network/ncsi-netlink.service @@ -10,4 +10,4 @@ SyslogIdentifier=ncsi-netlink Type=oneshot [Install] -WantedBy={SYSTEMD_DEFAULT_TARGET} +WantedBy=multi-user.target diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/network/network_%.bbappend b/meta-ibm/meta-witherspoon/recipes-phosphor/network/phosphor-network_%.bbappend index 40a056726..5137f4e00 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/network/network_%.bbappend +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/network/phosphor-network_%.bbappend @@ -1,4 +1,4 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS_prepend := "${THISDIR}/network:" SRC_URI += "file://ncsi-netlink.service" SYSTEMD_SERVICE_${PN} += "ncsi-netlink.service" 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 cdf6d8f9b..be1ebd4ba 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 = "61a041938115d402dbd17b6b970aed690f8f1e5c" +SRCREV = "57bee329bbf1b67dd159f103b634be2fede08822" diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis/witherspoon-power-supply-monitor@.service b/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis/witherspoon-power-supply-monitor@.service index ba4e368e4..56e2d218a 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis/witherspoon-power-supply-monitor@.service +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis/witherspoon-power-supply-monitor@.service @@ -12,4 +12,4 @@ ExecStart=/usr/bin/env witherspoon-psu-monitor --path=${{DEVPATH}} --instance=${ SyslogIdentifier=witherspoon-psu-monitor [Install] -RequiredBy={SYSTEMD_DEFAULT_TARGET} +RequiredBy=multi-user.target diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis_git.bb b/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis_git.bb index c0de3e6f9..c50765795 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis_git.bb +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis_git.bb @@ -20,12 +20,6 @@ DEPENDS += " \ sdeventplus \ " -RDEPENDS_${PN} += " \ - phosphor-logging \ - phosphor-dbus-interfaces \ - sdbusplus \ - " - CHASSIS_ON_TGT = "obmc-chassis-poweron@0.target" SEQ_MONITOR_SVC = "witherspoon-pseq-monitor.service" SEQ_MONITOR_FMT = "../${SEQ_MONITOR_SVC}:${CHASSIS_ON_TGT}.wants/${SEQ_MONITOR_SVC}" @@ -38,7 +32,7 @@ SYSTEMD_LINK_${PN} += "${SEQ_MONITOR_FMT} ${SEQ_PGOOD_FMT}" PSU_MONITOR_TMPL = "witherspoon-power-supply-monitor@.service" PSU_MONITOR_INSTFMT = "witherspoon-power-supply-monitor@{0}.service" -PSU_MONITOR_TGT = "${SYSTEMD_DEFAULT_TARGET}" +PSU_MONITOR_TGT = "multi-user.target" PSU_MONITOR_FMT = "../${PSU_MONITOR_TMPL}:${PSU_MONITOR_TGT}.requires/${PSU_MONITOR_INSTFMT}" FILES_witherspoon-psu-monitor = "${sbindir}/witherspoon-psu-monitor" diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@100/bmp280@77.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/bmp280@77.conf index cdf8b4726..cdf8b4726 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@100/bmp280@77.conf +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/bmp280@77.conf diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@100/dps310@76.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/dps310@76.conf index cdf8b4726..cdf8b4726 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@100/dps310@76.conf +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/dps310@76.conf diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@100/max31785@52_air.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/max31785@52_air.conf index 0aafc9b14..0aafc9b14 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@100/max31785@52_air.conf +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/max31785@52_air.conf diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@100/max31785@52_water.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/max31785@52_water.conf index 5c0efe420..5c0efe420 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@100/max31785@52_water.conf +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/max31785@52_water.conf diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@100/power-supply@68.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/power-supply@68.conf index e463b517c..e463b517c 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@100/power-supply@68.conf +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/power-supply@68.conf diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@100/power-supply@69.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/power-supply@69.conf index 2fadbdec0..2fadbdec0 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@100/power-supply@69.conf +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/power-supply@69.conf diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@140/ir35221@70.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@140/ir35221@70.conf index 9ae1f1ef1..9ae1f1ef1 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@140/ir35221@70.conf +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@140/ir35221@70.conf diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@140/ir35221@71.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@140/ir35221@71.conf index 723a68d66..723a68d66 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@140/ir35221@71.conf +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@140/ir35221@71.conf diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@180/ir35221@70.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@180/ir35221@70.conf index 1fa7b5a5c..1fa7b5a5c 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@180/ir35221@70.conf +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@180/ir35221@70.conf diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@180/ir35221@71.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@180/ir35221@71.conf index d4e9326b2..d4e9326b2 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@180/ir35221@71.conf +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@180/ir35221@71.conf diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@380/tmp275@4a.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@380/tmp275@4a.conf index 3af092867..3af092867 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@380/tmp275@4a.conf +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@380/tmp275@4a.conf 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 584418c06..e9ddccd97 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend @@ -7,17 +7,17 @@ SRC_URI += " \ " WSPOON_CHIPS = " \ - i2c@1e78a000/i2c-bus@100/bmp280@77 \ - i2c@1e78a000/i2c-bus@100/dps310@76 \ - i2c@1e78a000/i2c-bus@100/max31785@52_air \ - i2c@1e78a000/i2c-bus@100/max31785@52_water \ - i2c@1e78a000/i2c-bus@100/power-supply@68 \ - i2c@1e78a000/i2c-bus@100/power-supply@69 \ - i2c@1e78a000/i2c-bus@140/ir35221@70 \ - i2c@1e78a000/i2c-bus@140/ir35221@71 \ - i2c@1e78a000/i2c-bus@180/ir35221@70 \ - i2c@1e78a000/i2c-bus@180/ir35221@71 \ - i2c@1e78a000/i2c-bus@380/tmp275@4a \ + bus@1e78a000/i2c-bus@100/bmp280@77 \ + bus@1e78a000/i2c-bus@100/dps310@76 \ + bus@1e78a000/i2c-bus@100/max31785@52_air \ + bus@1e78a000/i2c-bus@100/max31785@52_water \ + bus@1e78a000/i2c-bus@100/power-supply@68 \ + bus@1e78a000/i2c-bus@100/power-supply@69 \ + bus@1e78a000/i2c-bus@140/ir35221@70 \ + bus@1e78a000/i2c-bus@140/ir35221@71 \ + bus@1e78a000/i2c-bus@180/ir35221@70 \ + bus@1e78a000/i2c-bus@180/ir35221@71 \ + bus@1e78a000/i2c-bus@380/tmp275@4a \ " WSPOON_ITEMSFMT = "ahb/apb/{0}.conf" WSPOON_ITEMS = "${@compose_list(d, 'WSPOON_ITEMSFMT', 'WSPOON_CHIPS')}" @@ -34,7 +34,7 @@ SYSTEMD_ENVIRONMENT_FILE_${PN} += "${@compose_list(d, 'ENVS', 'WSPOON_ITEMS')}" SYSTEMD_ENVIRONMENT_FILE_${PN} += "${@compose_list(d, 'ENVS', 'WSPOON_OCCITEMS')}" SYSTEMD_ENVIRONMENT_FILE_max31785-msl += "obmc/hwmon-max31785/wspoon.conf" -SYSTEMD_LINK_max31785-msl += "../phosphor-max31785-msl@.service:${SYSTEMD_DEFAULT_TARGET}.wants/phosphor-max31785-msl@wspoon.service" +SYSTEMD_LINK_max31785-msl += "../phosphor-max31785-msl@.service:multi-user.target.wants/phosphor-max31785-msl@wspoon.service" SYSTEMD_SERVICE_${PN} += "max31785-hwmon-helper@.service" diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/vpd/openpower-fru-vpd_%.bbappend b/meta-ibm/meta-witherspoon/recipes-phosphor/vpd/openpower-fru-vpd_%.bbappend index 6a00acf79..fe36dc413 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/vpd/openpower-fru-vpd_%.bbappend +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/vpd/openpower-fru-vpd_%.bbappend @@ -1,4 +1,4 @@ do_install_append() { DEST=${D}${inventory_envdir} - printf "\nEEPROM=/sys/devices/platform/ahb/ahb:apb/ahb:apb:i2c@1e78a000/1e78a400.i2c-bus/i2c-11/11-0051/eeprom" >> ${DEST}/inventory + printf "\nEEPROM=/sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a400.i2c-bus/i2c-11/11-0051/eeprom" >> ${DEST}/inventory } |