Modify how POWERVM is processed in the MCL manager

POWERVM is verified and loaded to its final location before the MCL
processing occurs. Therefore we only need to get the lid sizes and
create HDAT entries
Additionally it was found that sorting the CompInfoMap resulted to
direct key lookup to not work for the POWERVM component, so removed it.

Change-Id: I5008a1eaa01e0910743fdb11fa73b73a26eccd63
RTC: 181900
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/50644
Reviewed-by: Nicholas E. Bofferding <bofferdn@us.ibm.com>
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>
Tested-by: Jenkins OP HW <op-hw-jenkins+hostboot@us.ibm.com>
Reviewed-by: Marshall J. Wilks <mjwilks@us.ibm.com>
Reviewed-by: Michael Baiocchi <mbaiocch@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>

1 files changed, 4 insertions, 19 deletions

diff --git a/src/include/usr/util/utilmclmgr.H b/src/include/usr/util/utilmclmgr.H
index f33d4001f..fd3c826de 100644
--- a/src/include/usr/util/utilmclmgr.H
+++ b/src/include/usr/util/utilmclmgr.H
@@ -198,25 +198,8 @@ struct CompInfo
     void print() const;
 };
 
-// Comparator to ensure PHYP is always the first component to be processed
-struct CompOrderCompare {
-    bool operator() (const ComponentID& lhs, const ComponentID& rhs) const
-    {
-        if((lhs == g_PowervmCompId))
-        {
-            return true;
-        }
-        else if ((rhs == g_PowervmCompId))
-        {
-            return false;
-        }
-
-        return lhs<rhs;
-    }
-};
-
 // Structure for Comp Info cache
-typedef std::map<ComponentID, CompInfo, CompOrderCompare> CompInfoMap;
+typedef std::map<ComponentID, CompInfo> CompInfoMap;
 
 /**
  * @brief Convert Component ID to a char*
@@ -346,10 +329,12 @@ class MasterContainerLidMgr
      *
      * @param[in] io_compInfo - Component info of component to verify
      * @param[out] o_totalSize - Size of all lids reported by the FSP
+     * @param[in] i_isPhypComp - Indicates if PHYP lids
      *
      * @return Error handle if error
      */
-    errlHndl_t loadLids(CompInfo& io_compInfo, size_t& o_totalSize);
+    errlHndl_t loadLids(CompInfo& io_compInfo, size_t& o_totalSize,
+                        bool i_isPhypComp);
 
     /**
      * @brief Verify and Extend Component