Remove workarounds for SPD presence detect

Change-Id: I39ac81fcf079197d065e839d1237c5107e4c6036
RTC: 111211
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/14450
Tested-by: Jenkins Server
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Reviewed-by: Michael Baiocchi <baiocchi@us.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>

1 files changed, 0 insertions, 139 deletions

diff --git a/src/usr/hwpf/hwp/mc_config/mc_config.C b/src/usr/hwpf/hwp/mc_config/mc_config.C
index 12b726ec0..a509047bb 100644
--- a/src/usr/hwpf/hwp/mc_config/mc_config.C
+++ b/src/usr/hwpf/hwp/mc_config/mc_config.C
@@ -78,16 +78,6 @@
 
 #include <config.h>
 
-#ifdef CONFIG_DJVPD_READ_FROM_HW
-#include <hwas/common/hwas.H>
-#include <hwas/common/hwasCommon.H>
-#include <devicefw/driverif.H>
-#endif  // CONFIG_DJVPD_READ_FROM_HW
-
-#ifdef CONFIG_PALMETTO_VDDR
-#include "../dram_training/platform_vddr.H"
-#endif // CONFIG_PALMETTO_VDDR
-
 namespace   MC_CONFIG
 {
 
@@ -97,110 +87,6 @@ using   namespace   ERRORLOG;
 using   namespace   TARGETING;
 using   namespace   fapi;
 
-#ifdef CONFIG_DJVPD_READ_FROM_HW
-// Detect all present DIMMs by reading SPD or PNOR.
-static errlHndl_t detect_present_dimms() {
-    errlHndl_t l_err = NULL;
-
-    TARGETING::Target* pSys;
-    targetService().getTopLevelTarget(pSys);
-
-    // Find list of all DIMMs to call platPresenceDetect against
-    PredicateCTM predDimm(CLASS_LOGICAL_CARD, TYPE_DIMM);
-    TARGETING::TargetHandleList pCheckPres;
-    targetService().getAssociated( pCheckPres, pSys,
-        TargetService::CHILD, TargetService::ALL, &predDimm );
-
-    // Check for present DIMMs
-    // @todo RTC:111211, this should be removed when Mike's FSI changes are in
-    for (TargetHandleList::const_iterator pTarget_it = pCheckPres.begin();
-            pTarget_it != pCheckPres.end();
-            ++pTarget_it)
-    {
-        TARGETING::Target *target = *pTarget_it;
-
-
-        // call deviceRead() to see if they are present
-        bool present = false;
-        size_t presentSize = sizeof(present);
-        l_err = deviceRead(target, &present, presentSize,
-                                DEVICE_PRESENT_ADDRESS());
-
-        if (l_err != NULL)
-        {
-            TRACFCOMP(ISTEPS_TRACE::g_trac_isteps_trace,
-                "mc_config failed presence detect "
-                "target HUID %.8X", target->getAttr<ATTR_HUID>());
-
-            // commit the error but keep going
-            errlCommit(l_err, HWPF_COMP_ID);
-
-            // target is not present - fall thru
-            present = false;
-        }
-
-        if (present == true)
-        {
-            TRACDCOMP(ISTEPS_TRACE::g_trac_isteps_trace,
-                "mc_config detected present "
-                "target HUID %.8X", target->getAttr<ATTR_HUID>());
-
-            // set HWAS state to show DIMM is present, functional.
-            HwasState hwasState = target->getAttr<ATTR_HWAS_STATE>();
-            hwasState.poweredOn     = true;
-            hwasState.present       = true;
-            hwasState.functional    = true;
-            target->setAttr<ATTR_HWAS_STATE>( hwasState );
-        }
-        else
-        {
-            TRACDCOMP(ISTEPS_TRACE::g_trac_isteps_trace,
-                "mc_config no presence target %.8X",
-                target->getAttr<ATTR_HUID>());
-
-            // set HWAS state to show DIMM is not present, not functional.
-            HwasState hwasState = target->getAttr<ATTR_HWAS_STATE>();
-            hwasState.poweredOn     = false;
-            hwasState.present       = false;
-            hwasState.functional    = false;
-            target->setAttr<ATTR_HWAS_STATE>( hwasState );
-        }
-    }
-
-    return NULL;
-}
-
-// Disable any MBAs that don't have any DIMMs under them, otherwise
-// they will fail checks in mss_eff_config later.
-static errlHndl_t disable_unused_mbas() {
-    TARGETING::TargetHandleList l_mbaTargetList;
-    getAllChiplets(l_mbaTargetList, TYPE_MBA);
-
-    // @todo RTC:111211, may need to handle turning the dimms off
-    for (TargetHandleList::const_iterator
-            l_mba_iter = l_mbaTargetList.begin();
-            l_mba_iter != l_mbaTargetList.end();
-            ++l_mba_iter)
-    {
-        TARGETING::Target *mba = *l_mba_iter;
-
-        TARGETING::TargetHandleList l_dimmTargetList;
-        getChildAffinityTargets(l_dimmTargetList, mba,
-                                CLASS_LOGICAL_CARD, TYPE_DIMM, true);
-
-        if (l_dimmTargetList.empty())
-        {
-            // No DIMMs found, mark the MBA as non-functional.
-            HwasState hwasState = mba->getAttr<ATTR_HWAS_STATE>();
-            hwasState.functional    = false;
-            mba->setAttr<ATTR_HWAS_STATE>( hwasState );
-        }
-    }
-
-    return NULL;
-}
-#endif // CONFIG_DJVPD_READ_FROM_HW
-
 //
 //  Wrapper function to call host_collect_dimm_spd
 //
@@ -211,31 +97,6 @@ void*    call_host_collect_dimm_spd( void *io_pArgs )
     TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace,
                       "call_host_collect_dimm_spd entry" );
 
-#ifdef CONFIG_PALMETTO_VDDR
-    // Enable VSPD for reading SPDs.
-    l_err = platform_enable_vspd();
-    if ( l_err != NULL )
-    {
-        return l_err;
-    }
-#endif // CONFIG_PALMETTO_VDDR
-
-#ifdef CONFIG_DJVPD_READ_FROM_HW
-    // Detect all DIMMs by reading SPD or PNOR.
-    l_err = detect_present_dimms();
-    if ( l_err != NULL )
-    {
-        return l_err;
-    }
-
-    // Disable any unused MBAs that do not have DIMMs under them.
-    l_err = disable_unused_mbas();
-    if ( l_err != NULL )
-    {
-        return l_err;
-    }
-#endif // CONFIG_DJVPD_READ_FROM_HW
-
     // Get a list of all present Centaurs
     TargetHandleList l_presCentaurs;
     getChipResources(l_presCentaurs, TYPE_MEMBUF, UTIL_FILTER_PRESENT);