Pass Actual SecureRom size in HDAT to OPAL

Up until now we aligned the SecureRom size for OPAL to consume,
requiring different sizes of SecureRom to be used between OPAL
and PHYP. However, it turned out that it is unnecessary to align
the size for OPAL, so the code can be simplified to remove the
distiction between the size for PHYP and OPAL. Note that the
address of the SecureRom still needs to be aligned.

Change-Id: I223c1af36755efe134ba496c36129f76b14d946d
RTC: 183697
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/53897
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: Nicholas E. Bofferding <bofferdn@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>

1 files changed, 2 insertions, 8 deletions

diff --git a/src/usr/runtime/populate_hbruntime.C b/src/usr/runtime/populate_hbruntime.C
index 66806d87a..d2e0e42ef 100644
--- a/src/usr/runtime/populate_hbruntime.C
+++ b/src/usr/runtime/populate_hbruntime.C
@@ -1236,17 +1236,11 @@ errlHndl_t populate_HbRsvMem(uint64_t i_nodeId, bool i_master_node)
                 // Align size for OPAL
                 size_t l_secRomSizeAligned = ALIGN_X(l_secureRomSize,
                         HBRT_RSVD_MEM_OPAL_ALIGN);
-                // @TODO: RTC:183697 determine if OPAL can also use the
-                // actual size and remove the need for l_hdatEntrySize
-                // Size to add to HDAT entry
-                size_t l_hdatEntrySize = l_secRomSizeAligned;
 
                 uint64_t l_secureRomAddr = 0x0;
                 if(TARGETING::is_phyp_load())
                 {
                     l_secureRomAddr = l_prevDataAddr + l_prevDataSize;
-                    // Specify actual size in HDAT entry for POWERVM
-                    l_hdatEntrySize = l_secureRomSize;
                 }
                 else if(TARGETING::is_sapphire_load())
                 {
@@ -1256,7 +1250,7 @@ errlHndl_t populate_HbRsvMem(uint64_t i_nodeId, bool i_master_node)
                 l_elog = setNextHbRsvMemEntry(HDAT::RHB_TYPE_SECUREBOOT,
                         i_nodeId,
                         l_secureRomAddr,
-                        l_hdatEntrySize,
+                        l_secureRomSize,
                         HBRT_RSVD_MEM__SECUREBOOT);
                 if(l_elog)
                 {
@@ -1264,7 +1258,7 @@ errlHndl_t populate_HbRsvMem(uint64_t i_nodeId, bool i_master_node)
                 }
 
                 l_prevDataAddr = l_secureRomAddr;
-                l_prevDataSize = l_secRomSizeAligned;
+                l_prevDataSize = l_secureRomSize;
 
                 // Load the Cached SecureROM into memory
                 l_elog = mapPhysAddr(l_secureRomAddr, l_secureRomSize, l_vAddr);