From 7508722e0908dae7096a98d502dbef9917f5857a Mon Sep 17 00:00:00 2001
From: Corey Swenson <cswenson@us.ibm.com>
Date: Wed, 12 Jun 2019 11:59:56 -0500
Subject: Handle NVDIMM encryption errors

 Update ATTR_NVDIMM_ARMED and ATTR_NV_STATUS_FLAG
 Update notifyNvdimmProtectionChange()
 Set encryption error and check before arm/disarm

Change-Id: I1edf738af3460684ee93b02f06ff417c3e72d4e3
RTC:210689
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/78828
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
---
 .../targeting/common/xmltohb/attribute_types.xml   | 40 ++++++++++++++++++----
 1 file changed, 33 insertions(+), 7 deletions(-)

(limited to 'src/usr/targeting/common/xmltohb')

diff --git a/src/usr/targeting/common/xmltohb/attribute_types.xml b/src/usr/targeting/common/xmltohb/attribute_types.xml
index 2ec701237..1637e2903 100644
--- a/src/usr/targeting/common/xmltohb/attribute_types.xml
+++ b/src/usr/targeting/common/xmltohb/attribute_types.xml
@@ -5095,12 +5095,33 @@
       <field>
         <bits>1</bits>
         <default>0</default>
-        <description>NVDIMM controller error detected</description>
-        <name>error_detected</name>
+        <description>Is OCC active</description>
+        <name>occ_active</name>
         <type>uint8_t</type>
       </field>
       <field>
-        <bits>6</bits>
+        <bits>1</bits>
+        <default>0</default>
+        <description>NVDIMM controller fatal error detected</description>
+        <name>fatal_error_detected</name>
+        <type>uint8_t</type>
+      </field>
+      <field>
+        <bits>1</bits>
+        <default>0</default>
+        <description>NVDIMM controller risky error detected</description>
+        <name>risky_error_detected</name>
+        <type>uint8_t</type>
+      </field>
+      <field>
+        <bits>1</bits>
+        <default>0</default>
+        <description>NVDIMM encryption error detected</description>
+        <name>encryption_error_detected</name>
+        <type>uint8_t</type>
+      </field>
+      <field>
+        <bits>3</bits>
         <default>0</default>
         <description>Reserved for future use</description>
         <name>reserved</name>
@@ -5211,10 +5232,15 @@
         NVDIMM status flag. This is used to record the status and
         later report to OPAL/PHYP. Possible values:
 
-        0x08 - contents not preserved (genesis)
-        0x04 - contents preserved
-        0x02 - failed to preserve contents
-        0x01 - unable to preserve future contents
+        0x01 - SCM device unable to persist memory contents
+        0x02 - SCM device failed to persist memory contents
+        0x04 - SCM device contents are persisted from previous IPL
+        0x08 - SCM device contents are not persisted from previous IPL
+        0x10 - SCM device memory life remaining is critically low
+        0x20 - SCM device will be garded off next IPL due to failure
+        0x40 - SCM contents cannot persist due to current platform health status
+        0x80 - SCM device unable to persist memory contents, certain conditions
+               NOTE: set for virtual SCM devices, does not persist across reboot
     </description>
     <simpleType>
       <uint8_t>
-- 
cgit v1.2.1