Remove hdat attribute sync hack from mss_eff_config

This was needed initially in bringup because attributes were not being
populated by hardware procedures (because they didnt exist yet)

Change-Id: If199a695440a4e5342044910f9e9ced38b796788
RTC:143191
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/28135
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: Christian R. Geddes <crgeddes@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>

3 files changed, 7 insertions, 105 deletions

diff --git a/src/include/usr/targeting/attrsync.H b/src/include/usr/targeting/attrsync.H
index bff660b60..b8c52fe7e 100644
--- a/src/include/usr/targeting/attrsync.H
+++ b/src/include/usr/targeting/attrsync.H
@@ -5,7 +5,7 @@
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2012,2015                        */
+/* Contributors Listed Below - COPYRIGHT 2012,2016                        */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
@@ -104,7 +104,7 @@ namespace   TARGETING
              *                  return errl !=  NULL  -> failure
              *
              */
-            errlHndl_t  syncSectionToFsp( 
+            errlHndl_t  syncSectionToFsp(
                                     TARGETING::SECTION_TYPE i_section_to_sync );
 
             /**
@@ -191,7 +191,7 @@ namespace   TARGETING
              *           TARGETING::MBOX_MSG_TYPE passed in to define the
              *           message sending policy.
              *
-             *  @param[in/out] i_msg 
+             *  @param[in/out] i_msg
              *                    This parameter is used as both input and an
              *                    output parameter. If the message is sent
              *                    synchronusly the response will be populated
@@ -251,7 +251,7 @@ namespace   TARGETING
      *  @brief  Handles synchronization of all RW targeting attributes from
      *          hostboot to the fsp; the following sections are
      *          synchronized.
-     * 
+     *
      *           1). SECTION_TYPE_PNOR_RW
      *           2). SECTION_TYPE_HEAP_PNOR_INIT
      *           3). SECTION_TYPE_HEAP_PNOR_ZERO_INIT
@@ -267,7 +267,7 @@ namespace   TARGETING
      *  @brief  Handles synchronization of all RW targeting attributes from
      *          the fsp to hostboot; the following sections are
      *          synchronized.
-     * 
+     *
      *           1). SECTION_TYPE_PNOR_RW
      *           2). SECTION_TYPE_HEAP_PNOR_INIT
      *           3). SECTION_TYPE_HEAP_PNOR_ZERO_INIT
@@ -279,14 +279,7 @@ namespace   TARGETING
      */
     errlHndl_t syncAllAttributesFromFsp();
 
-    /**
-     *  @brief  A temporary hack to set attributes that HDAT needs.
-     *          To be removed by RTC: 143191
-     *  @return     errlHndl_t
-     *                  return errl ==  NULL  -> success
-     *                  return errl !=  NULL  -> failure
-     */
-    errlHndl_t hdatAttrHack();
+
 
 } // namespace
 #endif
diff --git a/src/usr/isteps/istep07/call_mss_eff_config.C b/src/usr/isteps/istep07/call_mss_eff_config.C
index 56c3a896f..a53c19a3f 100644
--- a/src/usr/isteps/istep07/call_mss_eff_config.C
+++ b/src/usr/isteps/istep07/call_mss_eff_config.C
@@ -48,7 +48,6 @@
 #include    <config.h>
 #include    <fapi2.H>
 #include    <fapi2/plat_hwp_invoker.H>
-#include    <targeting/attrsync.H>
 
 // HWP
 #include    <p9_mss_eff_config.H>
@@ -151,8 +150,6 @@ void*    call_mss_eff_config( void *io_pArgs )
 
     TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace, "call_mss_eff_config entry" );
 
-    TARGETING::hdatAttrHack();
-
     TARGETING::Target* l_sys = NULL;
     targetService().getTopLevelTarget(l_sys);
     assert( l_sys != NULL );
diff --git a/src/usr/targeting/attrsync.C b/src/usr/targeting/attrsync.C
index 9a443e917..6faca132a 100644
--- a/src/usr/targeting/attrsync.C
+++ b/src/usr/targeting/attrsync.C
@@ -27,7 +27,7 @@
 #include <targeting/common/trace.H>
 #include <initservice/initserviceif.H>
 #include <errl/hberrltypes.H>
-#include <hwas/common/hwasCommon.H>
+
 
 using namespace ERRORLOG;
 
@@ -603,94 +603,6 @@ namespace TARGETING
         return  l_errl;
     }
 
-    //TODO RTC 143191
-    errlHndl_t hdatAttrHack()
-    {
-        TARG_INF(ENTER_MRK "hdatAttrHack" );
-
-        errlHndl_t l_errl = NULL;
-        do{
-
-            //sys-sys-power9 - base
-            TARGETING::Target* l_pTopLevel = NULL;
-            TARGETING::targetService().getTopLevelTarget(l_pTopLevel);
-            l_pTopLevel->setAttr<ATTR_FREQ_X_MHZ>(0xfa0);
-
-            //chip-base
-            PredicateCTM predEnc(CLASS_ENC);
-            PredicateCTM predChip(CLASS_CHIP);
-            PredicateCTM predDimm(CLASS_LOGICAL_CARD, TYPE_DIMM);
-            PredicatePostfixExpr checkExpr;
-            checkExpr.push(&predChip).push(&predDimm).Or().push(&predEnc).Or();
-
-            TargetHandleList pCheckPres;
-            targetService().getAssociated( pCheckPres, l_pTopLevel,
-               TargetService::CHILD, TargetService::ALL, &checkExpr );
-
-            TARG_INF("pCheckPres size: %d", pCheckPres.size());
-            l_errl = HWAS::platPresenceDetect(pCheckPres);
-            TARG_INF("pCheckPres size: %d", pCheckPres.size());
-
-            std::sort(pCheckPres.begin(),pCheckPres.end(),
-                   compareTargetHuid);
-
-            for(TargetHandleList::const_iterator pTarget_it =
-                   pCheckPres.begin();
-                   pTarget_it != pCheckPres.end();
-                   ++pTarget_it
-               )
-            {
-                TargetHandle_t pTarget = *pTarget_it;
-                if(pTarget->getAttr<ATTR_CLASS>() == CLASS_CHIP)
-                {
-                    pTarget->setAttr<ATTR_CHIP_ID>(0x20D1);
-                    pTarget->setAttr<ATTR_EC>(0x10);
-                }
-            }
-
-            //chip-processor - chip
-            TARGETING::TargetHandleList l_procList;
-            getAllChips(l_procList, TYPE_PROC);
-
-            for(TargetHandleList::const_iterator proc = l_procList.begin();
-                proc != l_procList.end(); ++proc)
-            {
-                uint64_t mirrorBase[] = {0x800000000000,0x0,0x0,0x0};
-                (*proc)->setAttr<ATTR_PROC_MIRROR_BASES>(mirrorBase);
-                uint64_t mirrorSize[] = {0x400000000,0x0,0x0,0x0};
-                (*proc)->setAttr<ATTR_PROC_MIRROR_SIZES>(mirrorSize);
-                //(*proc)->setAttr<ATTR_FABRIC_CHIP_ID>(0); //defaulted in attribute_types.xml
-                //(*proc)->setAttr<ATTR_FABRIC_NODE_ID>(0); //defualted in attribute_types.xml
-                uint64_t memBases[] = {0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0};
-                (*proc)->setAttr<ATTR_PROC_MEM_BASES>(memBases);
-                uint64_t memSizes[] = {0x800000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0};
-                (*proc)->setAttr<ATTR_PROC_MEM_SIZES>(memSizes);
-                (*proc)->setAttr<ATTR_PROC_NHTM_BAR_BASE_ADDR>(0);
-                //(*proc)->setAttr<ATTR_PROC_PCIE_LANE_EQUALIZATION>(pcieLane); //defaulted in attribute_types.xml
-                uint8_t mssMem[] = {0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0};
-                (*proc)->setAttr<ATTR_MSS_MEM_MC_IN_GROUP>(mssMem);
-                uint8_t procActive = 0xc0;
-                (*proc)->setAttr<ATTR_PROC_PCIE_PHB_ACTIVE>(procActive);
-
-                //mca
-                TARGETING::TargetHandleList l_mcaList;
-                getChildChiplets(l_mcaList,(*proc),TARGETING::TYPE_MCA);
-                for(TargetHandleList::const_iterator mca = l_mcaList.begin();
-                    mca != l_mcaList.end(); ++mca)
-                {
-                    uint32_t effDimmSize[][2] = {{0x4,0x0},{0x4,0x0}};
-                    (*mca)->setAttr<ATTR_EFF_DIMM_SIZE>(effDimmSize);
-                }
-
-                //EFFECTIVE_EC was hardcoded as well.
-            }
-
-        } while (0);
-
-        TARG_INF( EXIT_MRK "hdatAttrHack" );
-        return l_errl;
-    }
-
 };   // end namespace