1 files changed, 82 insertions, 0 deletions
diff --git a/src/usr/diag/prdf/common/plat/p9/prdfCommonPlugins.C b/src/usr/diag/prdf/common/plat/p9/prdfCommonPlugins.C
index ece3fc1a8..730f99f09 100644
--- a/src/usr/diag/prdf/common/plat/p9/prdfCommonPlugins.C
+++ b/src/usr/diag/prdf/common/plat/p9/prdfCommonPlugins.C
@@ -127,6 +127,88 @@ PRDF_PLUGIN_DEFINE_NS(nimbus_proc,  CommonPlugins, ClearServiceCallFlag_mnfgInfo
 PRDF_PLUGIN_DEFINE_NS(cumulus_proc, CommonPlugins, ClearServiceCallFlag_mnfgInfo);
 PRDF_PLUGIN_DEFINE_NS(axone_proc,   CommonPlugins, ClearServiceCallFlag_mnfgInfo);
 
+/**
+ * @brief   Will change the gard state of any NVDIMMs in the callout list to
+ *          NO_GARD.
+ * @param   i_chip The chip.
+ * @param   io_sc  The step code data struct.
+ * @returns SUCCESS
+ */
+int32_t ClearNvdimmGardState( ExtensibleChip * i_chip,
+                              STEP_CODE_DATA_STRUCT & io_sc )
+{
+    #ifdef __HOSTBOOT_MODULE
+
+    // Call the sdc to clear the NVDIMM mru list.
+    io_sc.service_data->clearNvdimmMruListGard();
+
+    #endif
+
+    return SUCCESS;
+}
+PRDF_PLUGIN_DEFINE_NS(nimbus_mca,    CommonPlugins, ClearNvdimmGardState);
+
+/**
+ * @brief   Will check if any of the DIMMs connected to this chip are NVDIMMs
+ *          and send a message to PHYP/Hostboot that save/restore may work. If
+ *          we are at IPL, we will callout self no gard instead of garding.
+ * @param   i_chip The chip of the DIMM parent.
+ * @param   io_sc  The step code data struct.
+ * @returns SUCCESS if NVDIMMs found at IPL, PRD_SCAN_COMM_REGISTER_ZERO if not.
+ */
+int32_t CheckForNvdimms( ExtensibleChip * i_chip,
+                         STEP_CODE_DATA_STRUCT & io_sc )
+{
+    int32_t rc = PRD_SCAN_COMM_REGISTER_ZERO;
+
+    #ifdef CONFIG_NVDIMM
+    #ifdef __HOSTBOOT_MODULE
+
+    TargetHandleList dimmList = getConnected( i_chip->getTrgt(), TYPE_DIMM );
+
+    // Always loop through all the dimms so we send the
+    // nvdimmNotifyProtChange message for all the NVDIMMs on the target.
+    for ( auto & dimm : dimmList )
+    {
+        // If the callout target is an NVDIMM send a message to
+        // PHYP/Hostboot that a save/restore may work, and if we are at
+        // IPL, do not gard the target.
+        if ( isNVDIMM(dimm) )
+        {
+            // Send the message to PHYP/Hostboot
+            uint32_t l_rc = PlatServices::nvdimmNotifyProtChange( dimm,
+                NVDIMM::NVDIMM_RISKY_HW_ERROR );
+            if ( SUCCESS != l_rc )
+            {
+                PRDF_TRAC( "CheckForNvdimms: nvdimmNotifyProtChange(0x%08x)"
+                           " failed.", PlatServices::getHuid(dimm) );
+                continue;
+            }
+
+            #ifndef __HOSTBOOT_RUNTIME
+            // IPL
+            // We will callout self, no gard. No need for another self callout
+            // from the rule code, so return SUCCESS.
+            rc = SUCCESS;
+            #endif
+        }
+    }
+
+    if ( SUCCESS == rc )
+    {
+        // Callout self, no gard
+        io_sc.service_data->SetCallout( i_chip->getTrgt(), MRU_MED, NO_GARD );
+    }
+
+    #endif // __HOSTBOOT_MODULE
+    #endif // CONFIG_NVDIMM
+
+    return rc;
+}
+PRDF_PLUGIN_DEFINE_NS(nimbus_mcs,    CommonPlugins, CheckForNvdimms);
+PRDF_PLUGIN_DEFINE_NS(nimbus_mca,    CommonPlugins, CheckForNvdimms);
+PRDF_PLUGIN_DEFINE_NS(nimbus_mcbist, CommonPlugins, CheckForNvdimms);
+
 } // namespace CommonPlugins ends
 
 }// namespace PRDF ends