Consolidating HBRT reserved memory (ATTR,ATTR_OVERRIDE,VPD) into a single entry

Change-Id: I9fc5846d9901ac79c59bb149b8f55b5c7ca2fa73
RTC: 171863
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/41141
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Reviewed-by: Martin Gloff <mgloff@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: Daniel M. Crowell <dcrowell@us.ibm.com>

2 files changed, 21 insertions, 43 deletions

diff --git a/src/usr/vpd/rtvpd_load.C b/src/usr/vpd/rtvpd_load.C
index af528692c..5fb8948e2 100644
--- a/src/usr/vpd/rtvpd_load.C
+++ b/src/usr/vpd/rtvpd_load.C
@@ -102,26 +102,27 @@ errlHndl_t bld_vpd_image(PNOR::SectionId vpd_type,
 }
 
 // External function see vpd_if.H
-errlHndl_t VPD::vpd_load_rt_image(uint64_t & o_vpd_addr)
+errlHndl_t VPD::vpd_load_rt_image(uint64_t & io_vpd_addr, bool i_virtualAddr)
 {
     errlHndl_t err = NULL;
 
     do
     {
-        void* vptr = reinterpret_cast<void*>(o_vpd_addr);
+        void* vptr = reinterpret_cast<void*>(io_vpd_addr);
         uint8_t* vpd_ptr = reinterpret_cast<uint8_t*>(vptr);
 
         bool l_is_no_load = TARGETING::is_no_load();
-        if( l_is_no_load )
+        if( l_is_no_load && !i_virtualAddr)
         {
-            o_vpd_addr = TARGETING::get_top_mem_addr();
-            assert (o_vpd_addr != 0,
+            io_vpd_addr = TARGETING::get_top_mem_addr();
+            assert (io_vpd_addr != 0,
                     "vpd_load_rt_image: Top of memory was 0!");
 
-            o_vpd_addr -= VMM_RT_VPD_OFFSET;
+            io_vpd_addr -= VMM_RT_VPD_OFFSET;
 
-            vptr = mm_block_map(reinterpret_cast<void*>(o_vpd_addr),
+            vptr = mm_block_map(reinterpret_cast<void*>(io_vpd_addr),
                                 VMM_RT_VPD_SIZE);
+
             vpd_ptr = reinterpret_cast<uint8_t*>(vptr);
 
             assert(vptr != NULL,"vpd_load_rt_image: Could not map VPD memory");
@@ -153,7 +154,7 @@ errlHndl_t VPD::vpd_load_rt_image(uint64_t & o_vpd_addr)
             break;
         }
 
-        if ( l_is_no_load )
+        if ( l_is_no_load && !i_virtualAddr)
         {
             mm_block_unmap(vptr);
         }
diff --git a/src/usr/vpd/runtime/rt_vpd.C b/src/usr/vpd/runtime/rt_vpd.C
index 44ca261bf..e83889381 100644
--- a/src/usr/vpd/runtime/rt_vpd.C
+++ b/src/usr/vpd/runtime/rt_vpd.C
@@ -32,6 +32,7 @@
 #include <i2c/eepromif.H>
 #include <runtime/interface.h>
 #include <targeting/common/util.H>
+#include <util/runtime/util_rt.H>
 #include "vpd.H"
 #include "mvpd.H"
 #include "cvpd.H"
@@ -96,51 +97,27 @@ errlHndl_t getPnorAddr( pnorInformation & i_pnorInfo,
     // Get the reserved_mem_addr only once
     if( g_reserved_mem_addr == 0 )
     {
-        if( g_hostInterfaces != NULL &&
-            g_hostInterfaces->get_reserved_mem)
-        {
-            g_reserved_mem_addr =
-                g_hostInterfaces->get_reserved_mem("ibm,hbrt-vpd-image",0);
+        uint64_t l_vpdSize;
+        g_reserved_mem_addr = hb_get_rt_rsvd_mem(HBRT_MEM_LABEL_VPD,
+                                                 0,
+                                                 l_vpdSize);
 
-            if( g_reserved_mem_addr == 0 )
-            {
-                TRACFCOMP(g_trac_vpd,ERR_MRK"rt_vpd: Failed to get VPD addr. "
-                        "vpd_type: %d",
-                        i_pnorInfo.pnorSection);
-                /*@
-                * @errortype
-                * @moduleid     VPD::VPD_RT_GET_ADDR
-                * @reasoncode   VPD::VPD_RT_NULL_VPD_PTR
-                * @userdata1    VPD type
-                * @userdata2    0
-                * @devdesc      Hypervisor returned NULL address for VPD
-                */
-                err = new ERRORLOG::ErrlEntry(ERRORLOG::ERRL_SEV_INFORMATIONAL,
-                                            VPD::VPD_RT_GET_ADDR,
-                                            VPD::VPD_RT_NULL_VPD_PTR,
-                                            i_pnorInfo.pnorSection,
-                                            0);
-
-                err->addProcedureCallout(HWAS::EPUB_PRC_HB_CODE,
-                                        HWAS::SRCI_PRIORITY_HIGH);
-
-                err->collectTrace( "VPD", 256);
-            }
-        }
-        else // interface not set
+        if( g_reserved_mem_addr == 0 )
         {
-            TRACFCOMP(g_trac_vpd,ERR_MRK"Hypervisor vpd interface not linked");
+            TRACFCOMP(g_trac_vpd,ERR_MRK"rt_vpd: Failed to get VPD addr. "
+                    "vpd_type: %d",
+                    i_pnorInfo.pnorSection);
             /*@
             * @errortype
             * @moduleid     VPD::VPD_RT_GET_ADDR
-            * @reasoncode   VPD::VPD_RT_NOT_INITIALIZED
+            * @reasoncode   VPD::VPD_RT_NULL_VPD_PTR
             * @userdata1    VPD type
             * @userdata2    0
-            * @devdesc      Runtime VPD interface not linked.
+            * @devdesc      Hypervisor returned NULL address for VPD
             */
             err = new ERRORLOG::ErrlEntry(ERRORLOG::ERRL_SEV_INFORMATIONAL,
                                         VPD::VPD_RT_GET_ADDR,
-                                        VPD::VPD_RT_NOT_INITIALIZED,
+                                        VPD::VPD_RT_NULL_VPD_PTR,
                                         i_pnorInfo.pnorSection,
                                         0);