Remove pm pstate code and support pgpe init

Change-Id: Ia060ed0325f1fcfaf548b9c0f113c47346bc0ebc
RTC:153885
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/37607
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Reviewed-by: Martin Gloff <mgloff@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>

3 files changed, 2 insertions, 68 deletions

diff --git a/src/usr/isteps/pm/pm.mk b/src/usr/isteps/pm/pm.mk
index 4c006afc3..6a3270d06 100644
--- a/src/usr/isteps/pm/pm.mk
+++ b/src/usr/isteps/pm/pm.mk
@@ -103,3 +103,4 @@ include ${HWP_IMAGEPROCS_PATH}/p9_scan_compression.mk
 include ${NEST_UTIL_PATH}/p9_fbc_utils.mk
 include ${HWP_PM_PATH}/p9_pstate_parameter_block.mk
 include ${HWP_PM_PATH}/p9_pm_get_poundv_bucket.mk
+include ${HWP_PM_PATH}/p9_pm_pstate_gpe_init.mk
diff --git a/src/usr/isteps/pm/pm_common.C b/src/usr/isteps/pm/pm_common.C
index ea829193d..ff7074d89 100644
--- a/src/usr/isteps/pm/pm_common.C
+++ b/src/usr/isteps/pm/pm_common.C
@@ -152,49 +152,6 @@ namespace HBPM
     } // convertHomerPhysToVirt
 
     /**
-     * @brief Build new Pstate Parameter Block for PGPE and CME
-     */
-    errlHndl_t pstateParameterBuild( TARGETING::Target* i_target,
-                                     void* i_homer)
-    {
-        TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace,
-                   ENTER_MRK"pstateParameterBuild(HOMER:%p)",
-                   i_homer);
-
-        errlHndl_t l_errl = nullptr;
-
-        // cast OUR type of target to a FAPI type of target.
-        // figure out homer offsets
-        const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>
-            l_fapiTarg(i_target);
-
-        do
-        {
-            // p9_pstate_parameter_build.C
-/*            FAPI_INVOKE_HWP( l_errl,
-                             p9_pstate_parameter_build,
-                             l_fapiTarg,
-                             i_homer ); @TODO RTC:153885 */
-
-            if (l_errl)
-            {
-                TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace,
-                           ERR_MRK"pstateParameterBuild: "
-                           "p9_pstate_parameter_build failed!" );
-                l_errl->collectTrace("ISTEPS_TRACE",256);
-
-                break;
-            }
-
-        } while(0);
-
-        TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace,
-                   EXIT_MRK"pstateParameterBuild: RC=0x%X, PLID=0x%lX",
-                   ERRL_GETRC_SAFE(l_errl), ERRL_GETPLID_SAFE(l_errl) );
-        return l_errl;
-    } // pstateParameterBuild
-
-    /**
      * @brief Sets up OCC Host data in Homer
      */
     errlHndl_t loadHostDataToHomer( TARGETING::Target* i_proc,
@@ -734,19 +691,6 @@ namespace HBPM
                 break;
             }
 
-            // @TODO RTC:153885 verify parameters on call
-            l_errl = pstateParameterBuild(i_target,
-                                          l_homerVAddr);
-            if(l_errl)
-            {
-                TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace,
-                           ERR_MRK"loadPMComplex: "
-                           "pstateParameterBuild failed! "
-                           "HUID=0x08X OCC_Virt=0x%08X",
-                           get_huid(i_target), l_occImgVaddr );
-                break;
-            }
-
             l_errl = loadHcode(i_target,
                                l_homerVAddr,
                                i_mode);
diff --git a/src/usr/isteps/pm/pm_common.H b/src/usr/isteps/pm/pm_common.H
index 48f887b01..dec9f41bf 100644
--- a/src/usr/isteps/pm/pm_common.H
+++ b/src/usr/isteps/pm/pm_common.H
@@ -5,7 +5,7 @@
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2016                             */
+/* Contributors Listed Below - COPYRIGHT 2016,2017                        */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
@@ -78,17 +78,6 @@ namespace HBPM
     };
 
     /**
-     * @brief Build new Pstate Parameter Block for PGPE and CME
-     *
-     * @param[in] i_target:       Target processor
-     * @param[in] i_homer:        Virtual address of current proc's HOMER
-     *
-     * @return errlHndl_t  Error log Pstate Parameter Block build failed
-     */
-    errlHndl_t pstateParameterBuild( TARGETING::Target* i_target,
-                                     void* i_homer);
-
-    /**
      * @brief Sets up OCC Host data in Homer
      *
      * @param[in] i_proc:         target processor to load