Merge branch 'master' of ssh://git-amr-1.devtools.intel.com:29418/openbmc-openbmc into update

14 files changed, 1038 insertions, 62 deletions

diff --git a/meta-ibm/meta-witherspoon/conf/machine/witherspoon-tacoma.conf b/meta-ibm/meta-witherspoon/conf/machine/witherspoon-tacoma.conf
index e8a38300b..2184847fd 100644
--- a/meta-ibm/meta-witherspoon/conf/machine/witherspoon-tacoma.conf
+++ b/meta-ibm/meta-witherspoon/conf/machine/witherspoon-tacoma.conf
@@ -1,6 +1,8 @@
 KERNEL_DEVICETREE = "aspeed-bmc-opp-tacoma.dtb"
 UBOOT_MACHINE = "evb-ast2600_defconfig"
 
+OBMC_POWER_SUPPLY_INSTANCES = "0 1"
+
 MACHINEOVERRIDES =. "ibm-ac-server:witherspoon:"
 require conf/machine/include/ast2600.inc
 require conf/machine/include/obmc-bsp-common.inc
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/mihawk/avsbus-disable@.service b/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/mihawk/avsbus-disable@.service
index 7a1df9970..5396948bc 100755..100644
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/mihawk/avsbus-disable@.service
+++ b/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/mihawk/avsbus-disable@.service
@@ -1,7 +1,7 @@
 [Unit]
 Description=Disable the AVS bus on the VRMs
-Wants=op-power-start@.service
-After=op-power-start@.service
+Wants=ir35221-on-unbind@%i.service
+After=ir35221-on-unbind@%i.service
 Before=avsbus-enable@%i.service
 Conflicts=obmc-chassis-poweroff@%i.target
 ConditionPathExists=!/run/openbmc/chassis@%i-on
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/mihawk/avsbus-enable@.service b/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/mihawk/avsbus-enable@.service
index 810c92e23..34d9e4b0f 100755..100644
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/mihawk/avsbus-enable@.service
+++ b/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/mihawk/avsbus-enable@.service
@@ -1,7 +1,7 @@
 [Unit]
 Description=Enable the AVS bus on VRMs
-Wants=avsbus-disable@%i.service
-After=avsbus-disable@%i.service
+Wants=op-power-start@%i.service
+After=op-power-start@%i.service
 Conflicts=obmc-chassis-poweroff@%i.target
 ConditionPathExists=!/run/openbmc/chassis@%i-on
 
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
index 1c7b6eb82..419b9c86f 100644
--- 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
@@ -337,3 +337,15 @@ vrm_vdd_temp_sensor:
     sensorNamePattern: nameLeaf
     serviceInterface: org.freedesktop.DBus.Properties
     unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC
+clear_host_security_keys:
+    interfaces:
+        org.open_power.Control.TPM.SecurityKeys:
+            ClearHostSecurityKeys:
+                Offsets:
+                    255:
+                        type: uint8_t
+    path: /org/open_power/control/host0/ClearHostSecurityKeys
+    readingType: readingData
+    mutability: Mutability::Write|Mutability::Read
+    sensorNamePattern: nameLeaf
+    serviceInterface: org.freedesktop.DBus.Properties
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/dbus/phosphor-dbus-interfaces_%.bbappend b/meta-ibm/meta-witherspoon/recipes-phosphor/dbus/phosphor-dbus-interfaces_%.bbappend
new file mode 100644
index 000000000..bfc789788
--- /dev/null
+++ b/meta-ibm/meta-witherspoon/recipes-phosphor/dbus/phosphor-dbus-interfaces_%.bbappend
@@ -0,0 +1 @@
+EXTRA_OECONF_append_rainier = " --enable-ibm-dbus-interfaces"
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-presence-config.bbappend b/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-presence-config.bbappend
index 8f2097cc1..9442477af 100644
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-presence-config.bbappend
+++ b/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-presence-config.bbappend
@@ -1 +1,11 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:"
+
+SRC_URI_witherspoon = "file://config.json"
+
+do_install_witherspoon() {
+        install -d ${D}/${datadir}/phosphor-fan-presence/presence/
+        install -m 0644 ${WORKDIR}/config.json ${D}/${datadir}/phosphor-fan-presence/presence/
+}
+
+FILES_${PN}_append_witherspoon = " ${datadir}/phosphor-fan-presence/presence/config.json"
+FILES_${PN}_remove_witherspoon = "${presence_datadir}/config.yaml"
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-presence-config/witherspoon/config.json b/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-presence-config/witherspoon/config.json
new file mode 100644
index 000000000..36cdae85b
--- /dev/null
+++ b/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-presence-config/witherspoon/config.json
@@ -0,0 +1,90 @@
+[
+   {
+      "name": "fan0",
+      "path": "/system/chassis/motherboard/fan0",
+      "methods": [
+         {
+            "type": "gpio",
+            "key": 4,
+            "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",
+               "fan0_1"
+            ]
+         }
+      ],
+      "rpolicy": {
+         "type": "anyof"
+      }
+   },
+   {
+      "name": "fan1",
+      "path": "/system/chassis/motherboard/fan1",
+      "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": [
+               "fan1_0",
+               "fan1_1"
+            ]
+         }
+      ],
+      "rpolicy": {
+         "type": "anyof"
+      }
+   },
+   {
+      "name": "fan2",
+      "path": "/system/chassis/motherboard/fan2",
+      "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": [
+               "fan2_0",
+               "fan2_1"
+            ]
+         }
+      ],
+      "rpolicy": {
+         "type": "anyof"
+      }
+   },
+   {
+      "name": "fan3",
+      "path": "/system/chassis/motherboard/fan3",
+      "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": [
+               "fan3_0",
+               "fan3_1"
+            ]
+         }
+      ],
+      "rpolicy": {
+         "type": "anyof"
+      }
+   }
+]
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-presence-config/witherspoon/config.yaml b/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-presence-config/witherspoon/config.yaml
deleted file mode 100644
index 1c26fc21f..000000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-presence-config/witherspoon/config.yaml
+++ /dev/null
@@ -1,55 +0,0 @@
-- name: fan0
-  path: /system/chassis/motherboard/fan0
-  methods:
-    - type: gpio
-      key: 4
-      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
-        - fan0_1
-  rpolicy:
-    type: anyof
-
-- name: fan1
-  path: /system/chassis/motherboard/fan1
-  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:
-        - fan1_0
-        - fan1_1
-  rpolicy:
-    type: anyof
-
-- name: fan2
-  path: /system/chassis/motherboard/fan2
-  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:
-        - fan2_0
-        - fan2_1
-  rpolicy:
-    type: anyof
-
-- name: fan3
-  path: /system/chassis/motherboard/fan3
-  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:
-        - fan3_0
-        - fan3_1
-  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 243a02f1c..70bbc77d4 100644
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan_%.bbappend
+++ b/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan_%.bbappend
@@ -50,3 +50,7 @@ SYSTEMD_LINK_${PN}-control_witherspoon += "${@compose_list(d, 'FMT_CONTROL_STDBY
 # Link fan control service to also start at poweron
 FMT_CONTROL_PWRON_witherspoon = "../${TMPL_CONTROL}:${POWERON_TGT}.requires/${INSTFMT_CONTROL}"
 SYSTEMD_LINK_${PN}-control_witherspoon += "${@compose_list(d, 'FMT_CONTROL_PWRON', 'OBMC_CHASSIS_INSTANCES')}"
+
+# Enable the use of JSON on the fan applications that support it
+EXTRA_OECONF_append_witherspoon = " --enable-json"
+RDEPENDS_${PN}-presence-tach_append_witherspoon = " phosphor-fan-presence-config"
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-config/mihawk/dev_id.json b/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-config/mihawk/dev_id.json
new file mode 100644
index 000000000..3a4571935
--- /dev/null
+++ b/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-config/mihawk/dev_id.json
@@ -0,0 +1,2 @@
+{"id": 0, "revision": 128, "addn_dev_support": 141,
+    "manuf_id": 42817, "prod_id": 1, "aux": 0}
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/logging/ibm-logging/mihawk/policyTable.json b/meta-ibm/meta-witherspoon/recipes-phosphor/logging/ibm-logging/mihawk/policyTable.json
index 80bfbcfd9..9e2701eb6 100755..100644
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/logging/ibm-logging/mihawk/policyTable.json
+++ b/meta-ibm/meta-witherspoon/recipes-phosphor/logging/ibm-logging/mihawk/policyTable.json
@@ -7896,6 +7896,783 @@
             "UserAction": null,
             "VMMigrationFlag": null
         },
+        "org.open_power.Witherspoon.Fault.Error.ErrorCode0": {
+            "AffectedLEDs": null,
+            "AffectedSubsystem": "Power",
+            "BMCMessageID": "org.open_power.Witherspoon.Fault.Error.ErrorCode0",
+            "CallHomeCandidate": true,
+            "CommonEventID": "FQPSPPW0067M",
+            "ComponentInstance": null,
+            "DateAdded": null,
+            "DateReviewed": null,
+            "EventType": "Communication Failure/Timeout",
+            "Internal": false,
+            "LengthyDescription": null,
+            "LogSource": "BMC",
+            "Message": "Failed to read Mihawk's CPLD-register from the power control system.",
+            "ReferencedInventory": null,
+            "RelatedEventIDs": {},
+            "Serviceable": true,
+            "Severity": "Critical",
+            "UserAction": null,
+            "VMMigrationFlag": null
+        },
+        "org.open_power.Witherspoon.Fault.Error.ErrorCode1": {
+            "AffectedLEDs": null,
+            "AffectedSubsystem": "Power",
+            "BMCMessageID": "org.open_power.Witherspoon.Fault.Error.ErrorCode1",
+            "CallHomeCandidate": true,
+            "CommonEventID": "FQPSPPW0068M",
+            "ComponentInstance": 1,
+            "DateAdded": null,
+            "DateReviewed": null,
+            "EventType": "Unrecoverable Hardware Failure",
+            "Internal": false,
+            "LengthyDescription": null,
+            "LogSource": "BMC",
+            "Message": "The system failed to power on or had a power error due to a power good failure on power supply 1.",
+            "ReferencedInventory": null,
+            "RelatedEventIDs": {},
+            "Serviceable": true,
+            "Severity": "Critical",
+            "UserAction": null,
+            "VMMigrationFlag": null
+        },
+        "org.open_power.Witherspoon.Fault.Error.ErrorCode10": {
+            "AffectedLEDs": null,
+            "AffectedSubsystem": "Power",
+            "BMCMessageID": "org.open_power.Witherspoon.Fault.Error.ErrorCode10",
+            "CallHomeCandidate": true,
+            "CommonEventID": "FQPSPPW0077M",
+            "ComponentInstance": null,
+            "DateAdded": null,
+            "DateReviewed": null,
+            "EventType": "Unrecoverable Hardware Failure",
+            "Internal": false,
+            "LengthyDescription": null,
+            "LogSource": "BMC",
+            "Message": "The system failed to power on or had a power error due to a power failure on block_H of 12V rail to PCIE aux power rails.",
+            "ReferencedInventory": null,
+            "RelatedEventIDs": {},
+            "Serviceable": true,
+            "Severity": "Critical",
+            "UserAction": null,
+            "VMMigrationFlag": null
+        },
+        "org.open_power.Witherspoon.Fault.Error.ErrorCode11": {
+            "AffectedLEDs": null,
+            "AffectedSubsystem": "Power",
+            "BMCMessageID": "org.open_power.Witherspoon.Fault.Error.ErrorCode11",
+            "CallHomeCandidate": true,
+            "CommonEventID": "FQPSPPW0078M",
+            "ComponentInstance": null,
+            "DateAdded": null,
+            "DateReviewed": null,
+            "EventType": "Unrecoverable Hardware Failure",
+            "Internal": false,
+            "LengthyDescription": null,
+            "LogSource": "BMC",
+            "Message": "The system failed to power on or had a power error due to a power failure on block_J of 12V rail to JPB1 & JPB2.",
+            "ReferencedInventory": null,
+            "RelatedEventIDs": {},
+            "Serviceable": true,
+            "Severity": "Critical",
+            "UserAction": null,
+            "VMMigrationFlag": null
+        },
+        "org.open_power.Witherspoon.Fault.Error.ErrorCode12": {
+            "AffectedLEDs": null,
+            "AffectedSubsystem": "Power",
+            "BMCMessageID": "org.open_power.Witherspoon.Fault.Error.ErrorCode12",
+            "CallHomeCandidate": true,
+            "CommonEventID": "FQPSPPW0079M",
+            "ComponentInstance": null,
+            "DateAdded": null,
+            "DateReviewed": null,
+            "EventType": "Unrecoverable Hardware Failure",
+            "Internal": false,
+            "LengthyDescription": null,
+            "LogSource": "BMC",
+            "Message": "The system failed to power on or had a power error due to a power failure on block_K of 12V rail to JPB3/JM21/HDD/USB.",
+            "ReferencedInventory": null,
+            "RelatedEventIDs": {},
+            "Serviceable": true,
+            "Severity": "Critical",
+            "UserAction": null,
+            "VMMigrationFlag": null
+        },
+        "org.open_power.Witherspoon.Fault.Error.ErrorCode13": {
+            "AffectedLEDs": null,
+            "AffectedSubsystem": "Power",
+            "BMCMessageID": "org.open_power.Witherspoon.Fault.Error.ErrorCode13",
+            "CallHomeCandidate": true,
+            "CommonEventID": "FQPSPPW0080M",
+            "ComponentInstance": null,
+            "DateAdded": null,
+            "DateReviewed": null,
+            "EventType": "Unrecoverable Hardware Failure",
+            "Internal": false,
+            "LengthyDescription": null,
+            "LogSource": "BMC",
+            "Message": "The system failed to power on or had a power error due to a power failure on block_L of 12V rail to FAN1~FAN6.",
+            "ReferencedInventory": null,
+            "RelatedEventIDs": {},
+            "Serviceable": true,
+            "Severity": "Critical",
+            "UserAction": null,
+            "VMMigrationFlag": null
+        },
+        "org.open_power.Witherspoon.Fault.Error.ErrorCode14": {
+            "AffectedLEDs": null,
+            "AffectedSubsystem": "Power",
+            "BMCMessageID": "org.open_power.Witherspoon.Fault.Error.ErrorCode14",
+            "CallHomeCandidate": true,
+            "CommonEventID": "FQPSPPW0081M",
+            "ComponentInstance": null,
+            "DateAdded": null,
+            "DateReviewed": null,
+            "EventType": "Unrecoverable Hardware Failure",
+            "Internal": false,
+            "LengthyDescription": null,
+            "LogSource": "BMC",
+            "Message": "The system failed to power on or had a power error due to a power good failure on 5V rail.",
+            "ReferencedInventory": null,
+            "RelatedEventIDs": {},
+            "Serviceable": true,
+            "Severity": "Critical",
+            "UserAction": null,
+            "VMMigrationFlag": null
+        },
+        "org.open_power.Witherspoon.Fault.Error.ErrorCode15": {
+            "AffectedLEDs": null,
+            "AffectedSubsystem": "Power",
+            "BMCMessageID": "org.open_power.Witherspoon.Fault.Error.ErrorCode15",
+            "CallHomeCandidate": true,
+            "CommonEventID": "FQPSPPW0082M",
+            "ComponentInstance": null,
+            "DateAdded": null,
+            "DateReviewed": null,
+            "EventType": "Unrecoverable Hardware Failure",
+            "Internal": false,
+            "LengthyDescription": null,
+            "LogSource": "BMC",
+            "Message": "The system failed to power on or had a power error due to a power good failure on 3.3V rail.",
+            "ReferencedInventory": null,
+            "RelatedEventIDs": {},
+            "Serviceable": true,
+            "Severity": "Critical",
+            "UserAction": null,
+            "VMMigrationFlag": null
+        },
+        "org.open_power.Witherspoon.Fault.Error.ErrorCode16": {
+            "AffectedLEDs": null,
+            "AffectedSubsystem": "Power",
+            "BMCMessageID": "org.open_power.Witherspoon.Fault.Error.ErrorCode16",
+            "CallHomeCandidate": true,
+            "CommonEventID": "FQPSPPW0083M",
+            "ComponentInstance": null,
+            "DateAdded": null,
+            "DateReviewed": null,
+            "EventType": "Unrecoverable Hardware Failure",
+            "Internal": false,
+            "LengthyDescription": null,
+            "LogSource": "BMC",
+            "Message": "The system failed to power on or had a power error due to a power good failure on 1.8V rail.",
+            "ReferencedInventory": null,
+            "RelatedEventIDs": {},
+            "Serviceable": true,
+            "Severity": "Critical",
+            "UserAction": null,
+            "VMMigrationFlag": null
+        },
+        "org.open_power.Witherspoon.Fault.Error.ErrorCode17": {
+            "AffectedLEDs": null,
+            "AffectedSubsystem": "Power",
+            "BMCMessageID": "org.open_power.Witherspoon.Fault.Error.ErrorCode17",
+            "CallHomeCandidate": true,
+            "CommonEventID": "FQPSPPW0084M",
+            "ComponentInstance": null,
+            "DateAdded": null,
+            "DateReviewed": null,
+            "EventType": "Unrecoverable Hardware Failure",
+            "Internal": false,
+            "LengthyDescription": null,
+            "LogSource": "BMC",
+            "Message": "The system failed to power on or had a power error due to a power good failure on 1.1V rail.",
+            "ReferencedInventory": null,
+            "RelatedEventIDs": {},
+            "Serviceable": true,
+            "Severity": "Critical",
+            "UserAction": null,
+            "VMMigrationFlag": null
+        },
+        "org.open_power.Witherspoon.Fault.Error.ErrorCode18": {
+            "AffectedLEDs": null,
+            "AffectedSubsystem": "Power",
+            "BMCMessageID": "org.open_power.Witherspoon.Fault.Error.ErrorCode18",
+            "CallHomeCandidate": true,
+            "CommonEventID": "FQPSPPW0085M",
+            "ComponentInstance": null,
+            "DateAdded": null,
+            "DateReviewed": null,
+            "EventType": "Unrecoverable Hardware Failure",
+            "Internal": false,
+            "LengthyDescription": null,
+            "LogSource": "BMC",
+            "Message": "The system failed to power on or had a power error due to a power good failure on 0.9V rail.",
+            "ReferencedInventory": null,
+            "RelatedEventIDs": {},
+            "Serviceable": true,
+            "Severity": "Critical",
+            "UserAction": null,
+            "VMMigrationFlag": null
+        },
+        "org.open_power.Witherspoon.Fault.Error.ErrorCode19": {
+            "AffectedLEDs": null,
+            "AffectedSubsystem": "Power",
+            "BMCMessageID": "org.open_power.Witherspoon.Fault.Error.ErrorCode19",
+            "CallHomeCandidate": true,
+            "CommonEventID": "FQPSPPW0086M",
+            "ComponentInstance": null,
+            "DateAdded": null,
+            "DateReviewed": null,
+            "EventType": "Unrecoverable Hardware Failure",
+            "Internal": false,
+            "LengthyDescription": null,
+            "LogSource": "BMC",
+            "Message": "The system failed to power on or had a power error due to a power good failure on 2.5V rail_A.",
+            "ReferencedInventory": null,
+            "RelatedEventIDs": {},
+            "Serviceable": true,
+            "Severity": "Critical",
+            "UserAction": null,
+            "VMMigrationFlag": null
+        },
+        "org.open_power.Witherspoon.Fault.Error.ErrorCode2": {
+            "AffectedLEDs": null,
+            "AffectedSubsystem": "Power",
+            "BMCMessageID": "org.open_power.Witherspoon.Fault.Error.ErrorCode2",
+            "CallHomeCandidate": true,
+            "CommonEventID": "FQPSPPW0068M",
+            "ComponentInstance": 0,
+            "DateAdded": null,
+            "DateReviewed": null,
+            "EventType": "Unrecoverable Hardware Failure",
+            "Internal": false,
+            "LengthyDescription": null,
+            "LogSource": "BMC",
+            "Message": "The system failed to power on or had a power error due to a power good failure on power supply 0.",
+            "ReferencedInventory": null,
+            "RelatedEventIDs": {},
+            "Serviceable": true,
+            "Severity": "Critical",
+            "UserAction": null,
+            "VMMigrationFlag": null
+        },
+        "org.open_power.Witherspoon.Fault.Error.ErrorCode20": {
+            "AffectedLEDs": null,
+            "AffectedSubsystem": "Power",
+            "BMCMessageID": "org.open_power.Witherspoon.Fault.Error.ErrorCode20",
+            "CallHomeCandidate": true,
+            "CommonEventID": "FQPSPPW0087M",
+            "ComponentInstance": null,
+            "DateAdded": null,
+            "DateReviewed": null,
+            "EventType": "Unrecoverable Hardware Failure",
+            "Internal": false,
+            "LengthyDescription": null,
+            "LogSource": "BMC",
+            "Message": "The system failed to power on or had a power error due to a power good failure on 2.5V rail_B.",
+            "ReferencedInventory": null,
+            "RelatedEventIDs": {},
+            "Serviceable": true,
+            "Severity": "Critical",
+            "UserAction": null,
+            "VMMigrationFlag": null
+        },
+        "org.open_power.Witherspoon.Fault.Error.ErrorCode21": {
+            "AffectedLEDs": null,
+            "AffectedSubsystem": "Power",
+            "BMCMessageID": "org.open_power.Witherspoon.Fault.Error.ErrorCode21",
+            "CallHomeCandidate": true,
+            "CommonEventID": "FQPSPPW0088M",
+            "ComponentInstance": null,
+            "DateAdded": null,
+            "DateReviewed": null,
+            "EventType": "Unrecoverable Hardware Failure",
+            "Internal": false,
+            "LengthyDescription": null,
+            "LogSource": "BMC",
+            "Message": "The system failed to power on or had a power error due to a power good failure on Vdn0 rail.",
+            "ReferencedInventory": null,
+            "RelatedEventIDs": {},
+            "Serviceable": true,
+            "Severity": "Critical",
+            "UserAction": null,
+            "VMMigrationFlag": null
+        },
+        "org.open_power.Witherspoon.Fault.Error.ErrorCode22": {
+            "AffectedLEDs": null,
+            "AffectedSubsystem": "Power",
+            "BMCMessageID": "org.open_power.Witherspoon.Fault.Error.ErrorCode22",
+            "CallHomeCandidate": true,
+            "CommonEventID": "FQPSPPW0089M",
+            "ComponentInstance": null,
+            "DateAdded": null,
+            "DateReviewed": null,
+            "EventType": "Unrecoverable Hardware Failure",
+            "Internal": false,
+            "LengthyDescription": null,
+            "LogSource": "BMC",
+            "Message": "The system failed to power on or had a power error due to a power good failure on Vdn1 rail.",
+            "ReferencedInventory": null,
+            "RelatedEventIDs": {},
+            "Serviceable": true,
+            "Severity": "Critical",
+            "UserAction": null,
+            "VMMigrationFlag": null
+        },
+        "org.open_power.Witherspoon.Fault.Error.ErrorCode23": {
+            "AffectedLEDs": null,
+            "AffectedSubsystem": "Power",
+            "BMCMessageID": "org.open_power.Witherspoon.Fault.Error.ErrorCode23",
+            "CallHomeCandidate": true,
+            "CommonEventID": "FQPSPPW0090M",
+            "ComponentInstance": null,
+            "DateAdded": null,
+            "DateReviewed": null,
+            "EventType": "Unrecoverable Hardware Failure",
+            "Internal": false,
+            "LengthyDescription": null,
+            "LogSource": "BMC",
+            "Message": "The system failed to power on or had a power error due to a power good failure on 1.5V rail.",
+            "ReferencedInventory": null,
+            "RelatedEventIDs": {},
+            "Serviceable": true,
+            "Severity": "Critical",
+            "UserAction": null,
+            "VMMigrationFlag": null
+        },
+        "org.open_power.Witherspoon.Fault.Error.ErrorCode24": {
+            "AffectedLEDs": null,
+            "AffectedSubsystem": "Power",
+            "BMCMessageID": "org.open_power.Witherspoon.Fault.Error.ErrorCode24",
+            "CallHomeCandidate": true,
+            "CommonEventID": "FQPSPPW0091M",
+            "ComponentInstance": null,
+            "DateAdded": null,
+            "DateReviewed": null,
+            "EventType": "Unrecoverable Hardware Failure",
+            "Internal": false,
+            "LengthyDescription": null,
+            "LogSource": "BMC",
+            "Message": "The system failed to power on or had a power error due to a power good failure on Vio0 rail.",
+            "ReferencedInventory": null,
+            "RelatedEventIDs": {},
+            "Serviceable": true,
+            "Severity": "Critical",
+            "UserAction": null,
+            "VMMigrationFlag": null
+        },
+        "org.open_power.Witherspoon.Fault.Error.ErrorCode25": {
+            "AffectedLEDs": null,
+            "AffectedSubsystem": "Power",
+            "BMCMessageID": "org.open_power.Witherspoon.Fault.Error.ErrorCode25",
+            "CallHomeCandidate": true,
+            "CommonEventID": "FQPSPPW0092M",
+            "ComponentInstance": null,
+            "DateAdded": null,
+            "DateReviewed": null,
+            "EventType": "Unrecoverable Hardware Failure",
+            "Internal": false,
+            "LengthyDescription": null,
+            "LogSource": "BMC",
+            "Message": "The system failed to power on or had a power error due to a power good failure on Vio1 rail.",
+            "ReferencedInventory": null,
+            "RelatedEventIDs": {},
+            "Serviceable": true,
+            "Severity": "Critical",
+            "UserAction": null,
+            "VMMigrationFlag": null
+        },
+        "org.open_power.Witherspoon.Fault.Error.ErrorCode26": {
+            "AffectedLEDs": null,
+            "AffectedSubsystem": "Power",
+            "BMCMessageID": "org.open_power.Witherspoon.Fault.Error.ErrorCode26",
+            "CallHomeCandidate": true,
+            "CommonEventID": "FQPSPPW0093M",
+            "ComponentInstance": null,
+            "DateAdded": null,
+            "DateReviewed": null,
+            "EventType": "Unrecoverable Hardware Failure",
+            "Internal": false,
+            "LengthyDescription": null,
+            "LogSource": "BMC",
+            "Message": "The system failed to power on or had a power error due to a power good failure on Vdd0 rail.",
+            "ReferencedInventory": null,
+            "RelatedEventIDs": {},
+            "Serviceable": true,
+            "Severity": "Critical",
+            "UserAction": null,
+            "VMMigrationFlag": null
+        },
+        "org.open_power.Witherspoon.Fault.Error.ErrorCode27": {
+            "AffectedLEDs": null,
+            "AffectedSubsystem": "Power",
+            "BMCMessageID": "org.open_power.Witherspoon.Fault.Error.ErrorCode27",
+            "CallHomeCandidate": true,
+            "CommonEventID": "FQPSPPW0094M",
+            "ComponentInstance": null,
+            "DateAdded": null,
+            "DateReviewed": null,
+            "EventType": "Unrecoverable Hardware Failure",
+            "Internal": false,
+            "LengthyDescription": null,
+            "LogSource": "BMC",
+            "Message": "The system failed to power on or had a power error due to a power good failure on Vcs0 rail.",
+            "ReferencedInventory": null,
+            "RelatedEventIDs": {},
+            "Serviceable": true,
+            "Severity": "Critical",
+            "UserAction": null,
+            "VMMigrationFlag": null
+        },
+        "org.open_power.Witherspoon.Fault.Error.ErrorCode28": {
+            "AffectedLEDs": null,
+            "AffectedSubsystem": "Power",
+            "BMCMessageID": "org.open_power.Witherspoon.Fault.Error.ErrorCode28",
+            "CallHomeCandidate": true,
+            "CommonEventID": "FQPSPPW0095M",
+            "ComponentInstance": null,
+            "DateAdded": null,
+            "DateReviewed": null,
+            "EventType": "Unrecoverable Hardware Failure",
+            "Internal": false,
+            "LengthyDescription": null,
+            "LogSource": "BMC",
+            "Message": "The system failed to power on or had a power error due to a power good failure on Vdd1 rail.",
+            "ReferencedInventory": null,
+            "RelatedEventIDs": {},
+            "Serviceable": true,
+            "Severity": "Critical",
+            "UserAction": null,
+            "VMMigrationFlag": null
+        },
+        "org.open_power.Witherspoon.Fault.Error.ErrorCode29": {
+            "AffectedLEDs": null,
+            "AffectedSubsystem": "Power",
+            "BMCMessageID": "org.open_power.Witherspoon.Fault.Error.ErrorCode29",
+            "CallHomeCandidate": true,
+            "CommonEventID": "FQPSPPW0096M",
+            "ComponentInstance": null,
+            "DateAdded": null,
+            "DateReviewed": null,
+            "EventType": "Unrecoverable Hardware Failure",
+            "Internal": false,
+            "LengthyDescription": null,
+            "LogSource": "BMC",
+            "Message": "The system failed to power on or had a power error due to a power good failure on Vcs1 rail.",
+            "ReferencedInventory": null,
+            "RelatedEventIDs": {},
+            "Serviceable": true,
+            "Severity": "Critical",
+            "UserAction": null,
+            "VMMigrationFlag": null
+        },
+        "org.open_power.Witherspoon.Fault.Error.ErrorCode3": {
+            "AffectedLEDs": null,
+            "AffectedSubsystem": "Power",
+            "BMCMessageID": "org.open_power.Witherspoon.Fault.Error.ErrorCode3",
+            "CallHomeCandidate": true,
+            "CommonEventID": "FQPSPPW0070M",
+            "ComponentInstance": null,
+            "DateAdded": null,
+            "DateReviewed": null,
+            "EventType": "Unrecoverable Hardware Failure",
+            "Internal": false,
+            "LengthyDescription": null,
+            "LogSource": "BMC",
+            "Message": "The system failed to power on or had a power error due to a power failure on block_A of 12V rail to CPU0.",
+            "ReferencedInventory": null,
+            "RelatedEventIDs": {},
+            "Serviceable": true,
+            "Severity": "Critical",
+            "UserAction": null,
+            "VMMigrationFlag": null
+        },
+        "org.open_power.Witherspoon.Fault.Error.ErrorCode30": {
+            "AffectedLEDs": null,
+            "AffectedSubsystem": "Power",
+            "BMCMessageID": "org.open_power.Witherspoon.Fault.Error.ErrorCode30",
+            "CallHomeCandidate": true,
+            "CommonEventID": "FQPSPPW0097M",
+            "ComponentInstance": null,
+            "DateAdded": null,
+            "DateReviewed": null,
+            "EventType": "Unrecoverable Hardware Failure",
+            "Internal": false,
+            "LengthyDescription": null,
+            "LogSource": "BMC",
+            "Message": "The system failed to power on or had a power error due to a power good failure on Vddr0 rail.",
+            "ReferencedInventory": null,
+            "RelatedEventIDs": {},
+            "Serviceable": true,
+            "Severity": "Critical",
+            "UserAction": null,
+            "VMMigrationFlag": null
+        },
+        "org.open_power.Witherspoon.Fault.Error.ErrorCode31": {
+            "AffectedLEDs": null,
+            "AffectedSubsystem": "Power",
+            "BMCMessageID": "org.open_power.Witherspoon.Fault.Error.ErrorCode31",
+            "CallHomeCandidate": true,
+            "CommonEventID": "FQPSPPW0098M",
+            "ComponentInstance": null,
+            "DateAdded": null,
+            "DateReviewed": null,
+            "EventType": "Unrecoverable Hardware Failure",
+            "Internal": false,
+            "LengthyDescription": null,
+            "LogSource": "BMC",
+            "Message": "The system failed to power on or had a power error due to a power good failure on Vtt0 rail.",
+            "ReferencedInventory": null,
+            "RelatedEventIDs": {},
+            "Serviceable": true,
+            "Severity": "Critical",
+            "UserAction": null,
+            "VMMigrationFlag": null
+        },
+        "org.open_power.Witherspoon.Fault.Error.ErrorCode32": {
+            "AffectedLEDs": null,
+            "AffectedSubsystem": "Power",
+            "BMCMessageID": "org.open_power.Witherspoon.Fault.Error.ErrorCode32",
+            "CallHomeCandidate": true,
+            "CommonEventID": "FQPSPPW0099M",
+            "ComponentInstance": null,
+            "DateAdded": null,
+            "DateReviewed": null,
+            "EventType": "Unrecoverable Hardware Failure",
+            "Internal": false,
+            "LengthyDescription": null,
+            "LogSource": "BMC",
+            "Message": "The system failed to power on or had a power error due to a power good failure on Vddr1 rail.",
+            "ReferencedInventory": null,
+            "RelatedEventIDs": {},
+            "Serviceable": true,
+            "Severity": "Critical",
+            "UserAction": null,
+            "VMMigrationFlag": null
+        },
+        "org.open_power.Witherspoon.Fault.Error.ErrorCode33": {
+            "AffectedLEDs": null,
+            "AffectedSubsystem": "Power",
+            "BMCMessageID": "org.open_power.Witherspoon.Fault.Error.ErrorCode33",
+            "CallHomeCandidate": true,
+            "CommonEventID": "FQPSPPW0100M",
+            "ComponentInstance": null,
+            "DateAdded": null,
+            "DateReviewed": null,
+            "EventType": "Unrecoverable Hardware Failure",
+            "Internal": false,
+            "LengthyDescription": null,
+            "LogSource": "BMC",
+            "Message": "The system failed to power on or had a power error due to a power good failure on Vtt1 rail.",
+            "ReferencedInventory": null,
+            "RelatedEventIDs": {},
+            "Serviceable": true,
+            "Severity": "Critical",
+            "UserAction": null,
+            "VMMigrationFlag": null
+        },
+        "org.open_power.Witherspoon.Fault.Error.ErrorCode34": {
+            "AffectedLEDs": null,
+            "AffectedSubsystem": "Power",
+            "BMCMessageID": "org.open_power.Witherspoon.Fault.Error.ErrorCode34",
+            "CallHomeCandidate": true,
+            "CommonEventID": "FQPSPPW0101M",
+            "ComponentInstance": null,
+            "DateAdded": null,
+            "DateReviewed": null,
+            "EventType": "Unrecoverable Hardware Failure",
+            "Internal": false,
+            "LengthyDescription": null,
+            "LogSource": "BMC",
+            "Message": "The system failed to power on or had a power error due to a power good failure on GPU0 rail.",
+            "ReferencedInventory": null,
+            "RelatedEventIDs": {},
+            "Serviceable": true,
+            "Severity": "Critical",
+            "UserAction": null,
+            "VMMigrationFlag": null
+        },
+        "org.open_power.Witherspoon.Fault.Error.ErrorCode35": {
+            "AffectedLEDs": null,
+            "AffectedSubsystem": "Power",
+            "BMCMessageID": "org.open_power.Witherspoon.Fault.Error.ErrorCode35",
+            "CallHomeCandidate": true,
+            "CommonEventID": "FQPSPPW0102M",
+            "ComponentInstance": null,
+            "DateAdded": null,
+            "DateReviewed": null,
+            "EventType": "Unrecoverable Hardware Failure",
+            "Internal": false,
+            "LengthyDescription": null,
+            "LogSource": "BMC",
+            "Message": "The system failed to power on or had a power error due to a power good failure on GPU1 rail.",
+            "ReferencedInventory": null,
+            "RelatedEventIDs": {},
+            "Serviceable": true,
+            "Severity": "Critical",
+            "UserAction": null,
+            "VMMigrationFlag": null
+        },
+        "org.open_power.Witherspoon.Fault.Error.ErrorCode36": {
+            "AffectedLEDs": null,
+            "AffectedSubsystem": "Power",
+            "BMCMessageID": "org.open_power.Witherspoon.Fault.Error.ErrorCode36",
+            "CallHomeCandidate": true,
+            "CommonEventID": "FQPSPPW0103M",
+            "ComponentInstance": null,
+            "DateAdded": null,
+            "DateReviewed": null,
+            "EventType": "Unrecoverable Hardware Failure",
+            "Internal": false,
+            "LengthyDescription": null,
+            "LogSource": "BMC",
+            "Message": "The system failed to power on or had a power error due to a power good failure on both power supplies.",
+            "ReferencedInventory": null,
+            "RelatedEventIDs": {},
+            "Serviceable": true,
+            "Severity": "Critical",
+            "UserAction": null,
+            "VMMigrationFlag": null
+        },
+        "org.open_power.Witherspoon.Fault.Error.ErrorCode4": {
+            "AffectedLEDs": null,
+            "AffectedSubsystem": "Power",
+            "BMCMessageID": "org.open_power.Witherspoon.Fault.Error.ErrorCode4",
+            "CallHomeCandidate": true,
+            "CommonEventID": "FQPSPPW0071M",
+            "ComponentInstance": null,
+            "DateAdded": null,
+            "DateReviewed": null,
+            "EventType": "Unrecoverable Hardware Failure",
+            "Internal": false,
+            "LengthyDescription": null,
+            "LogSource": "BMC",
+            "Message": "The system failed to power on or had a power error due to a power failure on block_B of 12V rail to CPU0_DIMM.",
+            "ReferencedInventory": null,
+            "RelatedEventIDs": {},
+            "Serviceable": true,
+            "Severity": "Critical",
+            "UserAction": null,
+            "VMMigrationFlag": null
+        },
+        "org.open_power.Witherspoon.Fault.Error.ErrorCode5": {
+            "AffectedLEDs": null,
+            "AffectedSubsystem": "Power",
+            "BMCMessageID": "org.open_power.Witherspoon.Fault.Error.ErrorCode5",
+            "CallHomeCandidate": true,
+            "CommonEventID": "FQPSPPW0072M",
+            "ComponentInstance": null,
+            "DateAdded": null,
+            "DateReviewed": null,
+            "EventType": "Unrecoverable Hardware Failure",
+            "Internal": false,
+            "LengthyDescription": null,
+            "LogSource": "BMC",
+            "Message": "The system failed to power on or had a power error due to a power failure on block_C of 12V rail to CPU1.",
+            "ReferencedInventory": null,
+            "RelatedEventIDs": {},
+            "Serviceable": true,
+            "Severity": "Critical",
+            "UserAction": null,
+            "VMMigrationFlag": null
+        },
+        "org.open_power.Witherspoon.Fault.Error.ErrorCode6": {
+            "AffectedLEDs": null,
+            "AffectedSubsystem": "Power",
+            "BMCMessageID": "org.open_power.Witherspoon.Fault.Error.ErrorCode6",
+            "CallHomeCandidate": true,
+            "CommonEventID": "FQPSPPW0073M",
+            "ComponentInstance": null,
+            "DateAdded": null,
+            "DateReviewed": null,
+            "EventType": "Unrecoverable Hardware Failure",
+            "Internal": false,
+            "LengthyDescription": null,
+            "LogSource": "BMC",
+            "Message": "The system failed to power on or had a power error due to a power failure on block_D of 12V rail to CPU1_DIMM.",
+            "ReferencedInventory": null,
+            "RelatedEventIDs": {},
+            "Serviceable": true,
+            "Severity": "Critical",
+            "UserAction": null,
+            "VMMigrationFlag": null
+        },
+        "org.open_power.Witherspoon.Fault.Error.ErrorCode7": {
+            "AffectedLEDs": null,
+            "AffectedSubsystem": "Power",
+            "BMCMessageID": "org.open_power.Witherspoon.Fault.Error.ErrorCode7",
+            "CallHomeCandidate": true,
+            "CommonEventID": "FQPSPPW0074M",
+            "ComponentInstance": null,
+            "DateAdded": null,
+            "DateReviewed": null,
+            "EventType": "Unrecoverable Hardware Failure",
+            "Internal": false,
+            "LengthyDescription": null,
+            "LogSource": "BMC",
+            "Message": "The system failed to power on or had a power error due to a power failure on block_E of 12V rail to PCIE Slot 1~2/PCIE Slot 345/PCIE/MISC/PLX1/PLX2.",
+            "ReferencedInventory": null,
+            "RelatedEventIDs": {},
+            "Serviceable": true,
+            "Severity": "Critical",
+            "UserAction": null,
+            "VMMigrationFlag": null
+        },
+        "org.open_power.Witherspoon.Fault.Error.ErrorCode8": {
+            "AffectedLEDs": null,
+            "AffectedSubsystem": "Power",
+            "BMCMessageID": "org.open_power.Witherspoon.Fault.Error.ErrorCode8",
+            "CallHomeCandidate": true,
+            "CommonEventID": "FQPSPPW0075M",
+            "ComponentInstance": null,
+            "DateAdded": null,
+            "DateReviewed": null,
+            "EventType": "Unrecoverable Hardware Failure",
+            "Internal": false,
+            "LengthyDescription": null,
+            "LogSource": "BMC",
+            "Message": "The system failed to power on or had a power error due to a power failure on block_F of 12V rail to PCIE Slot 6~7/PCIE Slot 8910/TUSB 7340.",
+            "ReferencedInventory": null,
+            "RelatedEventIDs": {},
+            "Serviceable": true,
+            "Severity": "Critical",
+            "UserAction": null,
+            "VMMigrationFlag": null
+        },
+        "org.open_power.Witherspoon.Fault.Error.ErrorCode9": {
+            "AffectedLEDs": null,
+            "AffectedSubsystem": "Power",
+            "BMCMessageID": "org.open_power.Witherspoon.Fault.Error.ErrorCode9",
+            "CallHomeCandidate": true,
+            "CommonEventID": "FQPSPPW0076M",
+            "ComponentInstance": null,
+            "DateAdded": null,
+            "DateReviewed": null,
+            "EventType": "Unrecoverable Hardware Failure",
+            "Internal": false,
+            "LengthyDescription": null,
+            "LogSource": "BMC",
+            "Message": "The system failed to power on or had a power error due to a power failure on block_G of 12V rail to PCIE aux power rails.",
+            "ReferencedInventory": null,
+            "RelatedEventIDs": {},
+            "Serviceable": true,
+            "Severity": "Critical",
+            "UserAction": null,
+            "VMMigrationFlag": null
+        },
         "org.open_power.Witherspoon.Fault.Error.GPUOverTemp||/xyz/openbmc_project/inventory/system/chassis/motherboard/gpu0": {
             "AffectedLEDs": null,
             "AffectedSubsystem": "Cooling",
@@ -9849,6 +10626,27 @@
             "UserAction": null,
             "VMMigrationFlag": null
         },
+        "xyz.openbmc_project.Certs.Error.InvalidCertificate": {
+            "AffectedLEDs": null,
+            "AffectedSubsystem": "Systems Management - Core / Virtual Appliance",
+            "BMCMessageID": "xyz.openbmc_project.Certs.Error.InvalidCertificate",
+            "CallHomeCandidate": false,
+            "CommonEventID": "FQPSPCR0075G",
+            "ComponentInstance": null,
+            "DateAdded": null,
+            "DateReviewed": null,
+            "EventType": "Firmware/Software Failure",
+            "Internal": false,
+            "LengthyDescription": "The provided certificate is not valid. The BMC will continue operating with the old certificate.",
+            "LogSource": "BMC",
+            "Message": "The provided certificate is not valid",
+            "ReferencedInventory": null,
+            "RelatedEventIDs": {},
+            "Serviceable": true,
+            "Severity": "Warning",
+            "UserAction": null,
+            "VMMigrationFlag": null
+        },
         "xyz.openbmc_project.Certs.Install.Error.InvalidCertificate": {
             "AffectedLEDs": null,
             "AffectedSubsystem": "Systems Management - Core / Virtual Appliance",
@@ -13797,6 +14595,48 @@
             "UserAction": null,
             "VMMigrationFlag": null
         },
+        "xyz.openbmc_project.Inventory.Error.Nonfunctional||/xyz/openbmc_project/inventory/system/chassis/motherboard/fan4": {
+            "AffectedLEDs": null,
+            "AffectedSubsystem": "Cooling",
+            "BMCMessageID": "xyz.openbmc_project.Inventory.Error.Nonfunctional",
+            "CallHomeCandidate": true,
+            "CommonEventID": "FQPSPCA0056M",
+            "ComponentInstance": 2,
+            "DateAdded": null,
+            "DateReviewed": null,
+            "EventType": "Uncorrectable Hardware Failure",
+            "Internal": false,
+            "LengthyDescription": null,
+            "LogSource": "BMC",
+            "Message": "Fan 4 is not functional",
+            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/fan4",
+            "RelatedEventIDs": {},
+            "Serviceable": true,
+            "Severity": "Critical",
+            "UserAction": null,
+            "VMMigrationFlag": null
+        },
+        "xyz.openbmc_project.Inventory.Error.Nonfunctional||/xyz/openbmc_project/inventory/system/chassis/motherboard/fan5": {
+            "AffectedLEDs": null,
+            "AffectedSubsystem": "Cooling",
+            "BMCMessageID": "xyz.openbmc_project.Inventory.Error.Nonfunctional",
+            "CallHomeCandidate": true,
+            "CommonEventID": "FQPSPCA0056M",
+            "ComponentInstance": 3,
+            "DateAdded": null,
+            "DateReviewed": null,
+            "EventType": "Uncorrectable Hardware Failure",
+            "Internal": false,
+            "LengthyDescription": null,
+            "LogSource": "BMC",
+            "Message": "Fan 5 is not functional",
+            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/fan5",
+            "RelatedEventIDs": {},
+            "Serviceable": true,
+            "Severity": "Critical",
+            "UserAction": null,
+            "VMMigrationFlag": null
+        },
         "xyz.openbmc_project.Inventory.Error.Nonfunctional||/xyz/openbmc_project/inventory/system/chassis/power_supply0": {
             "AffectedLEDs": null,
             "AffectedSubsystem": "Power",
@@ -17451,6 +18291,48 @@
             "UserAction": null,
             "VMMigrationFlag": null
         },
+        "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/sys/devices/platform/gpio-fsi/fsi-master/fsi0/slave@00:00/00:00:00:06/sbefifo1-dev0/occ-hwmon.1": {
+            "AffectedLEDs": null,
+            "AffectedSubsystem": "Systems Management - Core / Virtual Appliance",
+            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
+            "CallHomeCandidate": false,
+            "CommonEventID": "FQPSPCR0063F",
+            "ComponentInstance": 0,
+            "DateAdded": null,
+            "DateReviewed": null,
+            "EventType": "Communication Failure/Timeout",
+            "Internal": false,
+            "LengthyDescription": null,
+            "LogSource": "BMC",
+            "Message": "Failed to read from the OCC on CPU 0",
+            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0",
+            "RelatedEventIDs": {},
+            "Serviceable": false,
+            "Severity": "Warning",
+            "UserAction": null,
+            "VMMigrationFlag": null
+        },
+        "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/sys/devices/platform/gpio-fsi/fsi-master/fsi0/slave@00:00/00:00:00:0a/fsi-master/fsi1/slave@01:00/01:01:00:06/sbefifo2-dev0/occ-hwmon.2": {
+            "AffectedLEDs": null,
+            "AffectedSubsystem": "Systems Management - Core / Virtual Appliance",
+            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
+            "CallHomeCandidate": false,
+            "CommonEventID": "FQPSPCR0063F",
+            "ComponentInstance": 1,
+            "DateAdded": null,
+            "DateReviewed": null,
+            "EventType": "Communication Failure/Timeout",
+            "Internal": false,
+            "LengthyDescription": null,
+            "LogSource": "BMC",
+            "Message": "Failed to read from the OCC on CPU 1",
+            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1",
+            "RelatedEventIDs": {},
+            "Serviceable": false,
+            "Severity": "Warning",
+            "UserAction": null,
+            "VMMigrationFlag": null
+        },
         "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/sys/devices/platform/gpio-fsi/fsi0/slave@00:00/00:00:00:06/sbefifo1-dev0/occ-hwmon.1": {
             "AffectedLEDs": null,
             "AffectedSubsystem": "Systems Management - Core / Virtual Appliance",
@@ -22218,6 +23100,27 @@
             "UserAction": null,
             "VMMigrationFlag": null
         },
+        "xyz.openbmc_project.State.Shutdown.Power.Error.Blackout": {
+            "AffectedLEDs": null,
+            "AffectedSubsystem": "Power",
+            "BMCMessageID": "xyz.openbmc_project.State.Shutdown.Power.Error.Blackout",
+            "CallHomeCandidate": false,
+            "CommonEventID": "FQPSPPW0065F",
+            "ComponentInstance": null,
+            "DateAdded": "10/29/2019",
+            "DateReviewed": null,
+            "EventType": "Unrecoverable Hardware Failure",
+            "Internal": false,
+            "LengthyDescription": null,
+            "LogSource": "BMC",
+            "Message": "All power input was lost and caused an unexpected shutdown while the host was powered on",
+            "ReferencedInventory": null,
+            "RelatedEventIDs": {},
+            "Serviceable": false,
+            "Severity": "Warning",
+            "UserAction": null,
+            "VMMigrationFlag": null
+        },
         "xyz.openbmc_project.State.Shutdown.Power.Error.Fault": {
             "AffectedLEDs": null,
             "AffectedSubsystem": "Cooling",
@@ -22431,7 +23334,7 @@
     },
     "fileInfo": {
         "Entity": "IBM OpenBMC",
-        "Version": "1.8.3",
+        "Version": "1.8.5",
         "language": "English"
     }
 }
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/settings/phosphor-settings-manager/ClearHostSecurityKeys-default-zero.override.yml b/meta-ibm/meta-witherspoon/recipes-phosphor/settings/phosphor-settings-manager/ClearHostSecurityKeys-default-zero.override.yml
new file mode 100644
index 000000000..71ed6711d
--- /dev/null
+++ b/meta-ibm/meta-witherspoon/recipes-phosphor/settings/phosphor-settings-manager/ClearHostSecurityKeys-default-zero.override.yml
@@ -0,0 +1,6 @@
+---
+/org/open_power/control/host0/ClearHostSecurityKeys:
+    - Interface: org.open_power.Control.TPM.SecurityKeys
+      Properties:
+          ClearHostSecurityKeys:
+             Default: 0
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 45c836cda..36e406e46 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,3 +1,4 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 SRC_URI_append_ibm-ac-server = " file://TPMEnable-default-true.override.yml"
+SRC_URI_append_ibm-ac-server += " file://ClearHostSecurityKeys-default-zero.override.yml"
 SRC_URI_append_mihawk = " file://TPMEnable-default-true.override.yml"
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/vpd/mihawk-openpower-fru-inventory/inventory b/meta-ibm/meta-witherspoon/recipes-phosphor/vpd/mihawk-openpower-fru-inventory/inventory
index 5ae35ff9b..b599ec9ec 100644
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/vpd/mihawk-openpower-fru-inventory/inventory
+++ b/meta-ibm/meta-witherspoon/recipes-phosphor/vpd/mihawk-openpower-fru-inventory/inventory
@@ -1,3 +1,3 @@
-FRUS=ETHERNET,ETHERNET1
-PATHS=/system/chassis/motherboard/bmc/eth0,/system/chassis/motherboard/bmc/eth1
+FRUS=ETHERNET,ETHERNET1,BMC
+PATHS=/system/chassis/motherboard/bmc/eth0,/system/chassis/motherboard/bmc/eth1,/system/chassis/motherboard/bmc
 EEPROM=/sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a340.i2c-bus/i2c-8/8-0050/eeprom