Revert "PRD: Initial NVDIMM Support"

This reverts commit 027226769c8b4f6f57c31e5ebbc41eca5ade2a28.

Change-Id: I4b618250a71432121900ac711210723d0129d463
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/72081
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Reviewed-by: Brian J. Stegmiller <bjs@us.ibm.com>
Reviewed-by: Zane C. Shelley <zshelle@us.ibm.com>
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/72277
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP HW <op-hw-jenkins+hostboot@us.ibm.com>

14 files changed, 7 insertions, 454 deletions

diff --git a/src/usr/diag/prdf/common/framework/config/prdfRuleChipDomain.H b/src/usr/diag/prdf/common/framework/config/prdfRuleChipDomain.H
index b99c30667..24b7c5633 100755
--- a/src/usr/diag/prdf/common/framework/config/prdfRuleChipDomain.H
+++ b/src/usr/diag/prdf/common/framework/config/prdfRuleChipDomain.H
@@ -53,7 +53,6 @@ class RuleChipDomain : public DomainContainer<RuleChip>
         MCBIST_DOMAIN_SIZE = PROC_DOMAIN_SIZE * 2,
         MCS_DOMAIN_SIZE    = MCBIST_DOMAIN_SIZE * 2,
         MCA_DOMAIN_SIZE    = MCS_DOMAIN_SIZE * 2,
-        NVDIMM_DOMAIN_SIZE = MCA_DOMAIN_SIZE * 2,
         MC_DOMAIN_SIZE     = PROC_DOMAIN_SIZE * 2,
         MI_DOMAIN_SIZE     = MC_DOMAIN_SIZE * 2,
         DMI_DOMAIN_SIZE    = MI_DOMAIN_SIZE * 2,
@@ -73,12 +72,11 @@ class RuleChipDomain : public DomainContainer<RuleChip>
                       PEC_DOMAIN_SIZE + PHB_DOMAIN_SIZE +
                       CAPP_DOMAIN_SIZE +
                       MCBIST_DOMAIN_SIZE + MCS_DOMAIN_SIZE + MCA_DOMAIN_SIZE +
-                      NVDIMM_DOMAIN_SIZE + MEMBUF_DOMAIN_SIZE +
-                      MBA_DOMAIN_SIZE + NPU_DOMAIN_SIZE +
+                      MEMBUF_DOMAIN_SIZE + MBA_DOMAIN_SIZE + NPU_DOMAIN_SIZE +
                       MCC_DOMAIN_SIZE + OMIC_DOMAIN_SIZE + OMI_DOMAIN_SIZE +
                       OCMB_DOMAIN_SIZE,
 
-        TOTAL_DOMAINS = 20,
+        TOTAL_DOMAINS = 19,
     };
 
     /** @fn RuleChipDomain
diff --git a/src/usr/diag/prdf/common/iipconst.h b/src/usr/diag/prdf/common/iipconst.h
index 23966be3a..07c5ded16 100755
--- a/src/usr/diag/prdf/common/iipconst.h
+++ b/src/usr/diag/prdf/common/iipconst.h
@@ -102,8 +102,6 @@ enum DOMAIN_ID
     OMI_DOMAIN    = 0x85,
     OCMB_DOMAIN   = 0x86,
 
-    NVDIMM_DOMAIN = 0x87,
-
     CLOCK_DOMAIN_FAB          = 0x90,
     CLOCK_DOMAIN_MEMBUF       = 0x91,
     CLOCK_DOMAIN_IO           = 0x92,
diff --git a/src/usr/diag/prdf/common/plat/nimbus/nimbus_mca.rule b/src/usr/diag/prdf/common/plat/nimbus/nimbus_mca.rule
index 3a475853a..8a73cbba9 100644
--- a/src/usr/diag/prdf/common/plat/nimbus/nimbus_mca.rule
+++ b/src/usr/diag/prdf/common/plat/nimbus/nimbus_mca.rule
@@ -281,7 +281,7 @@ group gMCACALFIR
     /** MCACALFIR[8]
      *  event_n active on DDR interface
      */
-    (rMCACALFIR, bit(8)) ? analyzeNVDIMM;
+    (rMCACALFIR, bit(8)) ? defaultMaskedError;
 
     /** MCACALFIR[9]
      *  WRQ or RRQ is in a hung state.
diff --git a/src/usr/diag/prdf/common/plat/nimbus/nimbus_mca_actions.rule b/src/usr/diag/prdf/common/plat/nimbus/nimbus_mca_actions.rule
index e91c91a4d..1593f8603 100644
--- a/src/usr/diag/prdf/common/plat/nimbus/nimbus_mca_actions.rule
+++ b/src/usr/diag/prdf/common/plat/nimbus/nimbus_mca_actions.rule
@@ -138,8 +138,4 @@ actionclass mca_ue_algorithm_th_1
 actionclass analyzeDDRPHYFIR { analyze(gDDRPHYFIR); };
 actionclass analyzeMCACALFIR { analyze(gMCACALFIR); };
 actionclass analyzeMCAECCFIR { analyze(gMCAECCFIR); };
-actionclass analyzeNVDIMM
-{
-    try( analyze(connected(TYPE_DIMM, 0)),
-         analyze(connected(TYPE_DIMM, 1)) );
-};
+
diff --git a/src/usr/diag/prdf/common/plat/nimbus/nimbus_nvdimm.rule b/src/usr/diag/prdf/common/plat/nimbus/nimbus_nvdimm.rule
deleted file mode 100644
index 14f60ef51..000000000
--- a/src/usr/diag/prdf/common/plat/nimbus/nimbus_nvdimm.rule
+++ /dev/null
@@ -1,351 +0,0 @@
-# IBM_PROLOG_BEGIN_TAG
-# This is an automatically generated prolog.
-#
-# $Source: src/usr/diag/prdf/common/plat/nimbus/nimbus_nvdimm.rule $
-#
-# OpenPOWER HostBoot Project
-#
-# Contributors Listed Below - COPYRIGHT 2018,2019
-# [+] International Business Machines Corp.
-#
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# permissions and limitations under the License.
-#
-# IBM_PROLOG_END_TAG
-
-chip nimbus_nvdimm
-{
-    name        "NIMBUS NVDIMM target";
-    targettype  TYPE_DIMM;
-    sigoff      0x9000;
-    dump        DUMP_CONTENT_HW;
-    scomlen     8;
-
- #############################################################################
- #                                                                           #
- #  ######                                                                   #
- #  #     #  ######   ####     ###    ####    #####  ######  #####    ####   #
- #  #     #  #       #    #     #    #          #    #       #    #  #       #
- #  ######   #####   #          #     ####      #    #####   #    #   ####   #
- #  #   #    #       #  ###     #         #     #    #       #####        #  #
- #  #    #   #       #    #     #    #    #     #    #       #   #   #    #  #
- #  #     #  ######   ####     ###    ####      #    ######  #    #   ####   #
- #                                                                           #
- #############################################################################
-
-    ############################################################################
-    # NVDIMM Status Registers
-    ############################################################################
-
-    register MODULE_HEALTH_REG
-    {
-        name        "NVDIMM Module Health Register";
-        scomaddr    0xA0;
-        scomlen     8;
-        capture     group default;
-    };
-
-    register HEALTH_STATUS0_REG
-    {
-        name        "NVDIMM Health Status0 Register";
-        scomaddr    0xA1;
-        scomlen     8;
-        capture     group default;
-    };
-
-    register HEALTH_STATUS1_REG
-    {
-        name        "NVDIMM Health Status1 Register";
-        scomaddr    0xA2;
-        scomlen     8;
-        capture     group default;
-    };
-
-    register ERROR_THRESHOLD_STATUS_REG
-    {
-        name        "NVDIMM Error Threshold Status Register";
-        scomaddr    0xA5;
-        scomlen     8;
-        capture     group default;
-    };
-
-    register WARNING_THRESHOLD_STATUS_REG
-    {
-        name        "NVDIMM Warning Threshold Status Register";
-        scomaddr    0xA7;
-        scomlen     8;
-        capture     group default;
-    };
-};
-
- ##############################################################################
- #                                                                            #
- # ####                                 #                                     #
- # #   # #   # #    #####  ###      #  # #    ##  ##### ###  ###  #   #  ###  #
- # #   # #   # #    #     #        #  #   #  #  #   #    #  #   # ##  # #     #
- # ####  #   # #    ####   ###    #  ####### #      #    #  #   # # # #  ###  #
- # #  #  #   # #    #         #  #   #     # #  #   #    #  #   # #  ##     # #
- # #   #  ###  #### #####  ###  #    #     #  ##    #   ###  ###  #   #  ###  #
- #                                                                            #
- ##############################################################################
-
-rule rPersistencyLost
-{
-    RECOVERABLE:
-      summary( 0, rHEALTH_STATUS0_REG ) |
-      summary( 1, rHEALTH_STATUS1_REG ) |
-      summary( 2, rERROR_THRESHOLD_STATUS_REG );
-};
-
-group gPersistencyLost filter singlebit
-{
-    (rPersistencyLost, bit(0)) ? analyzeHealthStatus0;
-    (rPersistencyLost, bit(1)) ? analyzeHealthStatus1;
-    (rPersistencyLost, bit(2)) ? analyzeErrorThrStatus;
-};
-
-################################################################################
-# P9 NVDIMM target MODULE_HEALTH_REG
-################################################################################
-
-rule rMODULE_HEALTH_REG
-{
-    RECOVERABLE:
-        MODULE_HEALTH_REG;
-};
-
-group gMODULE_HEALTH_REG attntype RECOVERABLE filter singlebit
-{
-    /** MODULE_HEALTH_REG[0]
-     *  Persistency Lost
-     */
-    (rMODULE_HEALTH_REG, bit(0)) ? analyzePersistencyLost;
-
-    /** MODULE_HEALTH_REG[1]
-     *  Warning Threshold Exceeded
-     */
-    (rMODULE_HEALTH_REG, bit(1)) ? analyzeWarningThrStatus;
-
-    /** MODULE_HEALTH_REG[2]
-     *  Persistency Restored
-     */
-    (rMODULE_HEALTH_REG, bit(2)) ? defaultMaskedError;
-
-    /** MODULE_HEALTH_REG[3]
-     *  Below Warning Threshold
-     */
-    (rMODULE_HEALTH_REG, bit(3)) ? defaultMaskedError;
-
-    /** MODULE_HEALTH_REG[4]
-     *  Hardware Failure
-     */
-    (rMODULE_HEALTH_REG, bit(4)) ? defaultMaskedError;
-
-    /** MODULE_HEALTH_REG[5]
-     *  EVENT_N_LOW
-     */
-    (rMODULE_HEALTH_REG, bit(5)) ? defaultMaskedError;
-
-};
-
-################################################################################
-# P9 NVDIMM target HEALTH_STATUS0_REG
-################################################################################
-
-rule rHEALTH_STATUS0_REG
-{
-    RECOVERABLE:
-        HEALTH_STATUS0_REG;
-};
-
-group gHEALTH_STATUS0_REG filter singlebit
-{
-    /** HEALTH_STATUS0_REG[0]
-     *  Voltage Regulator Fail
-     */
-    (rHEALTH_STATUS0_REG, bit(0)) ? defaultMaskedError;
-
-    /** HEALTH_STATUS0_REG[1]
-     *  VDD Lost
-     */
-    (rHEALTH_STATUS0_REG, bit(1)) ? defaultMaskedError;
-
-    /** HEALTH_STATUS0_REG[2]
-     *  VPP Lost
-     */
-    (rHEALTH_STATUS0_REG, bit(2)) ? defaultMaskedError;
-
-    /** HEALTH_STATUS0_REG[3]
-     *  VTT Lost
-     */
-    (rHEALTH_STATUS0_REG, bit(3)) ? defaultMaskedError;
-
-    /** HEALTH_STATUS0_REG[4]
-     *  DRAM no Self Refresh
-     */
-    (rHEALTH_STATUS0_REG, bit(4)) ? defaultMaskedError;
-
-    /** HEALTH_STATUS0_REG[5]
-     *  Controller HW Error
-     */
-    (rHEALTH_STATUS0_REG, bit(5)) ? defaultMaskedError;
-
-    /** HEALTH_STATUS0_REG[6]
-     *  NV Controller HW Error
-     */
-    (rHEALTH_STATUS0_REG, bit(6)) ? defaultMaskedError;
-
-    /** HEALTH_STATUS0_REG[7]
-     *  NVM Lifetime Error
-     */
-    (rHEALTH_STATUS0_REG, bit(7)) ? defaultMaskedError;
-
-};
-
-################################################################################
-# P9 NVDIMM target HEALTH_STATUS1_REG
-################################################################################
-
-rule rHEALTH_STATUS1_REG
-{
-    RECOVERABLE:
-        HEALTH_STATUS1_REG;
-};
-
-group gHEALTH_STATUS1_REG filter singlebit
-{
-    /** HEALTH_STATUS1_REG[0]
-     *  Insufficient Energy
-     */
-    (rHEALTH_STATUS1_REG, bit(0)) ? defaultMaskedError;
-
-    /** HEALTH_STATUS1_REG[1]
-     *  Invalid Firmware
-     */
-    (rHEALTH_STATUS1_REG, bit(1)) ? defaultMaskedError;
-
-    /** HEALTH_STATUS1_REG[2]
-     *  Configuration Data Error
-     */
-    (rHEALTH_STATUS1_REG, bit(2)) ? defaultMaskedError;
-
-    /** HEALTH_STATUS1_REG[3]
-     *  No Energy Source
-     */
-    (rHEALTH_STATUS1_REG, bit(3)) ? defaultMaskedError;
-
-    /** HEALTH_STATUS1_REG[4]
-     *  Energy Policy Not Set
-     */
-    (rHEALTH_STATUS1_REG, bit(4)) ? defaultMaskedError;
-
-    /** HEALTH_STATUS1_REG[5]
-     *  Energy Source HW Error
-     */
-    (rHEALTH_STATUS1_REG, bit(5)) ? defaultMaskedError;
-
-    /** HEALTH_STATUS1_REG[6]
-     *  Energy Source Health Assessment Error
-     */
-    (rHEALTH_STATUS1_REG, bit(6)) ? defaultMaskedError;
-
-    /** HEALTH_STATUS1_REG[7]
-     *  Reserved
-     */
-    (rHEALTH_STATUS1_REG, bit(7)) ? defaultMaskedError;
-
-};
-
-################################################################################
-# P9 NVDIMM target ERROR_THRESHOLD_STATUS_REG
-################################################################################
-
-rule rERROR_THRESHOLD_STATUS_REG
-{
-    RECOVERABLE:
-        ERROR_THRESHOLD_STATUS_REG;
-};
-
-group gERROR_THRESHOLD_STATUS_REG filter singlebit
-{
-    /** ERROR_THRESHOLD_STATUS_REG[0]
-     *  NVM Lifetime Error
-     */
-    (rERROR_THRESHOLD_STATUS_REG, bit(0)) ? defaultMaskedError;
-
-    /** ERROR_THRESHOLD_STATUS_REG[1]
-     *  ES Lifetime Error
-     */
-    (rERROR_THRESHOLD_STATUS_REG, bit(1)) ? defaultMaskedError;
-
-    /** ERROR_THRESHOLD_STATUS_REG[2]
-     *  ES Temperature Error
-     */
-    (rERROR_THRESHOLD_STATUS_REG, bit(2)) ? defaultMaskedError;
-
-    /** ERROR_THRESHOLD_STATUS_REG[3]
-     *  Reserved
-     */
-    (rERROR_THRESHOLD_STATUS_REG, bit(3|4|5|6|7)) ? defaultMaskedError;
-
-};
-
-################################################################################
-# P9 NVDIMM target WARNING_THRESHOLD_STATUS_REG
-################################################################################
-
-rule rWARNING_THRESHOLD_STATUS_REG
-{
-    RECOVERABLE:
-        WARNING_THRESHOLD_STATUS_REG;
-};
-
-group gWARNING_THRESHOLD_STATUS_REG filter singlebit
-{
-    /** WARNING_THRESHOLD_STATUS_REG[0]
-     *  NVM Lifetime Warning
-     */
-    (rWARNING_THRESHOLD_STATUS_REG, bit(0)) ? defaultMaskedError;
-
-    /** WARNING_THRESHOLD_STATUS_REG[1]
-     *  ES Lifetime Warning
-     */
-    (rWARNING_THRESHOLD_STATUS_REG, bit(1)) ? defaultMaskedError;
-
-    /** WARNING_THRESHOLD_STATUS_REG[2]
-     *  ES Temperature Warning
-     */
-    (rWARNING_THRESHOLD_STATUS_REG, bit(2)) ? defaultMaskedError;
-
-};
-
- ##############################################################################
- #                                                                            #
- #    #                                  ###                                  #
- #   # #    ##  ##### ###  ###  #   #   #   # #     #    ###   ###  ###  ###  #
- #  #   #  #  #   #    #  #   # ##  #   #     #    # #  #     #     #   #     #
- # ####### #      #    #  #   # # # #   #     #   #####  ###   ###  ##   ###  #
- # #     # #  #   #    #  #   # #  ##   #   # #   #   #     #     # #       # #
- # #     #  ##    #   ###  ###  #   #    ###  ### #   #  ###   ###  ###  ###  #
- #                                                                            #
- ##############################################################################
-
-# Include the actions defined for this target
-.include "p9_common_actions.rule";
-
-actionclass analyzeHealthStatus0    { analyze(gHEALTH_STATUS0_REG); };
-actionclass analyzeHealthStatus1    { analyze(gHEALTH_STATUS1_REG); };
-actionclass analyzeErrorThrStatus   { analyze(gERROR_THRESHOLD_STATUS_REG); };
-actionclass analyzeWarningThrStatus { analyze(gWARNING_THRESHOLD_STATUS_REG); };
-actionclass analyzePersistencyLost  { analyze(gPersistencyLost); };
-
diff --git a/src/usr/diag/prdf/common/plat/p9/prdfCommonPlugins.C b/src/usr/diag/prdf/common/plat/p9/prdfCommonPlugins.C
index fab3f3bf0..ece3fc1a8 100644
--- a/src/usr/diag/prdf/common/plat/p9/prdfCommonPlugins.C
+++ b/src/usr/diag/prdf/common/plat/p9/prdfCommonPlugins.C
@@ -69,7 +69,6 @@ PRDF_PLUGIN_DEFINE_NS( nimbus_ec,      CommonPlugins, ClearServiceCallFlag );
 PRDF_PLUGIN_DEFINE_NS( nimbus_eq,      CommonPlugins, ClearServiceCallFlag );
 PRDF_PLUGIN_DEFINE_NS( nimbus_ex,      CommonPlugins, ClearServiceCallFlag );
 PRDF_PLUGIN_DEFINE_NS( nimbus_mca,     CommonPlugins, ClearServiceCallFlag );
-PRDF_PLUGIN_DEFINE_NS( nimbus_nvdimm,  CommonPlugins, ClearServiceCallFlag );
 PRDF_PLUGIN_DEFINE_NS( nimbus_mcbist,  CommonPlugins, ClearServiceCallFlag );
 PRDF_PLUGIN_DEFINE_NS( nimbus_mcs,     CommonPlugins, ClearServiceCallFlag );
 PRDF_PLUGIN_DEFINE_NS( nimbus_obus,    CommonPlugins, ClearServiceCallFlag );
diff --git a/src/usr/diag/prdf/common/plat/p9/prdfP9Configurator.C b/src/usr/diag/prdf/common/plat/p9/prdfP9Configurator.C
index d631a48ff..cbf60758d 100755
--- a/src/usr/diag/prdf/common/plat/p9/prdfP9Configurator.C
+++ b/src/usr/diag/prdf/common/plat/p9/prdfP9Configurator.C
@@ -46,7 +46,6 @@
 #include <prdfP9ExDomain.H>
 #include <prdfP9McDomain.H>
 #include <prdfP9McaDomain.H>
-#include <prdfP9NvdimmDomain.H>
 #include <prdfP9McbistDomain.H>
 #include <prdfP9MccDomain.H>
 #include <prdfP9McsDomain.H>
@@ -107,7 +106,6 @@ errlHndl_t PlatConfigurator::build()
             unitMap[TYPE_MCBIST] = new McbistDomain( MCBIST_DOMAIN );
             unitMap[TYPE_MCS   ] = new McsDomain(    MCS_DOMAIN    );
             unitMap[TYPE_MCA   ] = new McaDomain(    MCA_DOMAIN    );
-            unitMap[TYPE_DIMM  ] = new NvdimmDomain( NVDIMM_DOMAIN );
 
             break;
 
@@ -257,8 +255,7 @@ errlHndl_t PlatConfigurator::addDomainChips( TARGETING::TYPE i_type,
                             { TYPE_OBUS,   nimbus_obus    },
                             { TYPE_MCBIST, nimbus_mcbist  },
                             { TYPE_MCS,    nimbus_mcs     },
-                            { TYPE_MCA,    nimbus_mca     },
-                            { TYPE_DIMM,   nimbus_nvdimm  }, } },
+                            { TYPE_MCA,    nimbus_mca     }, } },
         { MODEL_CUMULUS,  { { TYPE_PROC,   cumulus_proc   },
                             { TYPE_EQ,     cumulus_eq     },
                             { TYPE_EX,     cumulus_ex     },
@@ -301,19 +298,7 @@ errlHndl_t PlatConfigurator::addDomainChips( TARGETING::TYPE i_type,
     // Iterate all the targets for this type and add to given domain.
     for ( const auto & trgt : getFunctionalTargetList(i_type) )
     {
-        TARGETING::MODEL model;
-
-        // If the target type is TYPE_DIMM, assume it is an NVDIMM, so we need
-        // to get the parent MCA to use to get the chip model
-        if ( TYPE_DIMM == getTargetType(trgt) )
-        {
-            TargetHandle_t parentMca = getConnectedParent( trgt, TYPE_MCA );
-            model = getChipModel( parentMca );
-        }
-        else
-        {
-            model = getChipModel( trgt );
-        }
+        TARGETING::MODEL model = getChipModel( trgt );
 
         // Ensure this model is supported.
         if ( fnMap.end() == fnMap.find(model) )
diff --git a/src/usr/diag/prdf/common/plat/p9/prdfP9NvdimmDomain.H b/src/usr/diag/prdf/common/plat/p9/prdfP9NvdimmDomain.H
deleted file mode 100644
index 1ce23c57b..000000000
--- a/src/usr/diag/prdf/common/plat/p9/prdfP9NvdimmDomain.H
+++ /dev/null
@@ -1,61 +0,0 @@
-/* IBM_PROLOG_BEGIN_TAG                                                   */
-/* This is an automatically generated prolog.                             */
-/*                                                                        */
-/* $Source: src/usr/diag/prdf/common/plat/p9/prdfP9NvdimmDomain.H $       */
-/*                                                                        */
-/* OpenPOWER HostBoot Project                                             */
-/*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2016,2019                        */
-/* [+] International Business Machines Corp.                              */
-/*                                                                        */
-/*                                                                        */
-/* Licensed under the Apache License, Version 2.0 (the "License");        */
-/* you may not use this file except in compliance with the License.       */
-/* You may obtain a copy of the License at                                */
-/*                                                                        */
-/*     http://www.apache.org/licenses/LICENSE-2.0                         */
-/*                                                                        */
-/* Unless required by applicable law or agreed to in writing, software    */
-/* distributed under the License is distributed on an "AS IS" BASIS,      */
-/* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or        */
-/* implied. See the License for the specific language governing           */
-/* permissions and limitations under the License.                         */
-/*                                                                        */
-/* IBM_PROLOG_END_TAG                                                     */
-
-#ifndef __prdfP9NvdimmDomain_H
-#define __prdfP9NvdimmDomain_H
-
-#include <prdfRuleChipDomain.H>
-
-namespace PRDF
-{
-
-class NvdimmDomain : public RuleChipDomain
-{
-  public:
-
-    /**
-     * @brief Constructor
-     * @param i_did  The domain ID
-     * @param i_size The projected size of the domain
-     */
-    NvdimmDomain( DOMAIN_ID i_did, uint32_t i_size = NVDIMM_DOMAIN_SIZE ) :
-                  RuleChipDomain( i_did, i_size )
-    {}
-
-    /**
-     * @brief  Query for an attention of a specific type in this domain
-     * @param  i_attnType [MACHINE_CHECK | RECOVERABLE | SPECIAL]
-     * @return false
-     * @note   This function will always return false. That way PRD will look
-     *         for the attention via the processor chip.
-     */
-    virtual bool Query( ATTENTION_TYPE i_attnType )
-    {  return false;  }
-
-};
-
-} // end namespace PRDF
-
-#endif /* __prdfP9NvdimmDomain_H */
diff --git a/src/usr/diag/prdf/common/plat/prdfTargetServices.C b/src/usr/diag/prdf/common/plat/prdfTargetServices.C
index 32a2eac3c..3f54469c6 100755
--- a/src/usr/diag/prdf/common/plat/prdfTargetServices.C
+++ b/src/usr/diag/prdf/common/plat/prdfTargetServices.C
@@ -1232,6 +1232,7 @@ TARGETING::TargetHandle_t getParentChip( TARGETING::TargetHandle_t i_target )
             }
             break;
         }
+
         default:
             PRDF_ERR( "[getParentChip] Unsupported class: %d", l_class );
     }
diff --git a/src/usr/diag/prdf/common/plugins/prdfLogParse_common.C b/src/usr/diag/prdf/common/plugins/prdfLogParse_common.C
index ad4126d96..c6cd47d0b 100644
--- a/src/usr/diag/prdf/common/plugins/prdfLogParse_common.C
+++ b/src/usr/diag/prdf/common/plugins/prdfLogParse_common.C
@@ -298,13 +298,6 @@ void getTargetInfo( HUID i_chipId, TARGETING::TYPE & o_targetType,
                       l_node, l_chip, l_chiplet );
             break;
 
-        case TYPE_DIMM: // NVDIMM
-            l_chip    = l_chip / MAX_NVDIMM_PER_PROC;
-            l_chiplet = l_chiplet % MAX_NVDIMM_PER_PROC;
-            snprintf( o_chipName, i_sz_chipName, "dimm(n%dp%dc%d)",
-                      l_node, l_chip, l_chiplet );
-            break;
-
         default:
             snprintf( o_chipName, i_sz_chipName, "????" );
     }
diff --git a/src/usr/diag/prdf/common/plugins/prdfParserEnums.H b/src/usr/diag/prdf/common/plugins/prdfParserEnums.H
index 0269c2c74..d0d5ce589 100644
--- a/src/usr/diag/prdf/common/plugins/prdfParserEnums.H
+++ b/src/usr/diag/prdf/common/plugins/prdfParserEnums.H
@@ -100,8 +100,6 @@ enum PositionBounds
     MAX_DIMM_PER_RANK   = 2,
     MAX_L4_PER_MEMBUF   = 1,
 
-    MAX_NVDIMM_PER_PROC = MAX_DIMM_PER_PORT * MAX_MCA_PER_PROC,
-
     MAX_MCC_PER_MI      = 2,
     MAX_MCC_PER_MC      = MAX_MCC_PER_MI * MAX_MI_PER_MC,
     MAX_MCC_PER_PROC    = MAX_MCC_PER_MC * MAX_MC_PER_PROC,
diff --git a/src/usr/diag/prdf/common/rule/prdfRuleFiles.C b/src/usr/diag/prdf/common/rule/prdfRuleFiles.C
index e50fcf945..875066b64 100755
--- a/src/usr/diag/prdf/common/rule/prdfRuleFiles.C
+++ b/src/usr/diag/prdf/common/rule/prdfRuleFiles.C
@@ -46,7 +46,6 @@ namespace PRDF
     const char * nimbus_mcbist  = "nimbus_mcbist";
     const char * nimbus_mcs     = "nimbus_mcs";
     const char * nimbus_mca     = "nimbus_mca";
-    const char * nimbus_nvdimm  = "nimbus_nvdimm";
 
     // P9 Cumulus Chip
     const char * cumulus_proc = "cumulus_proc";
diff --git a/src/usr/diag/prdf/common/rule/prdfRuleFiles.H b/src/usr/diag/prdf/common/rule/prdfRuleFiles.H
index a93aea505..5c543b495 100755
--- a/src/usr/diag/prdf/common/rule/prdfRuleFiles.H
+++ b/src/usr/diag/prdf/common/rule/prdfRuleFiles.H
@@ -47,7 +47,6 @@ namespace PRDF
     extern const char * nimbus_mcbist;
     extern const char * nimbus_mcs;
     extern const char * nimbus_mca;
-    extern const char * nimbus_nvdimm;
 
     // P9 Cumulus Chip
     extern const char * cumulus_proc;
diff --git a/src/usr/diag/prdf/common/rule/prdf_rule.mk b/src/usr/diag/prdf/common/rule/prdf_rule.mk
index f907cee45..f4f46e18b 100644
--- a/src/usr/diag/prdf/common/rule/prdf_rule.mk
+++ b/src/usr/diag/prdf/common/rule/prdf_rule.mk
@@ -36,7 +36,6 @@ PRDR_RULE_TABLES += nimbus_xbus.prf
 PRDR_RULE_TABLES += nimbus_mcbist.prf
 PRDR_RULE_TABLES += nimbus_mcs.prf
 PRDR_RULE_TABLES += nimbus_mca.prf
-PRDR_RULE_TABLES += nimbus_nvdimm.prf
 
 # P9 Cumulus Chip
 PRDR_RULE_TABLES += cumulus_proc.prf