Remove invalid HRMOR setting code

At one point in time there was a plan to have the SBE read the HRMOR
and set it in the keyAddr stash space that is used to talk to HB.
That plan was cancelled but the code was added to Hostboot. This
commit removes the old invalid code.

Change-Id: I026f07065ae3fc74849ffc4c08fcebbf01aec86f
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/62564
Reviewed-by: William G. Hoffa <wghoffa@us.ibm.com>
Tested-by: Jenkins Server <pfd-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>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Matt Derksen <mderkse1@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>

2 files changed, 7 insertions, 27 deletions

diff --git a/src/include/usr/sbeio/sbeioif.H b/src/include/usr/sbeio/sbeioif.H
index f42278911..9376f7b22 100644
--- a/src/include/usr/sbeio/sbeioif.H
+++ b/src/include/usr/sbeio/sbeioif.H
@@ -37,8 +37,13 @@ namespace SBEIO
 {
     enum KeyAddrStashKeys
     {
-        RSV_MEM_ATTR_ADDR  = 0x01,  //Start at non-zero
-        HYPERVISOR_HRMOR   = 0x02,
+        RSV_MEM_ATTR_ADDR  = 0x01,  // Start at non-zero
+        DEPRECATED_1       = 0x02,  // 0x2 was previously planned to be
+                                    // used to pass HRMOR but SBE did not
+                                    // implement it. There is old version
+                                    // of hostboot that look at this so
+                                    // reusing this could break backwards
+                                    // compatibility
         RELOC_PAYLOAD_ADDR = 0x03,
         //On SBE side struct is defaulted so that
         //Keys are 0xFF and Vals are 0xFFFFFFFFFFFFFFFF
diff --git a/src/usr/targeting/targetservicestart.C b/src/usr/targeting/targetservicestart.C
index 5b7e639dd..66b796f22 100755
--- a/src/usr/targeting/targetservicestart.C
+++ b/src/usr/targeting/targetservicestart.C
@@ -457,31 +457,6 @@ static void initializeAttributes(TargetService& i_targetService,
             l_pTopLevel->setAttr<ATTR_HB_RSV_MEM_NEXT_SECTION>(0);
             l_pTopLevel->setAttr<ATTR_ATTN_CHK_ALL_PROCS>(1);
 
-            //It is possible that the hypervisor moved the HRMOR
-            //The SBE should have read the HRMOR value from the master
-            //core prior to stopping its clocks and passed that
-            //value to the bootloader. The bootloader passes this to
-            //HB via the BlToHbDataManager
-            // Setup physical TOC address
-            uint64_t l_hyp_hrmor = 0;
-
-            Bootloader::keyAddrPair_t l_keyAddrPairs =
-            g_BlToHbDataManager.getKeyAddrPairs();
-
-            for (uint8_t keyIndex = 0; keyIndex < MAX_ROW_COUNT; keyIndex++)
-            {
-                if(l_keyAddrPairs.key[keyIndex] == SBEIO::HYPERVISOR_HRMOR)
-                {
-                    l_hyp_hrmor = l_keyAddrPairs.addr[keyIndex];
-                }
-            }
-
-            if(l_hyp_hrmor)
-            {
-                l_pTopLevel->setAttr<ATTR_PAYLOAD_BASE>(l_hyp_hrmor);
-            }
-
-
             //Assemble list of functional procs and zero out virtual address values
             //to ensure they get set again this IPL
             TARGETING::PredicateCTM l_chipFilter(CLASS_CHIP, TYPE_PROC);