Remove Simics Hacks from core_activate.C

Change-Id: Iddecb008adaa43eb465aef606dffa66251c3c518
RTC:59409
Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/2774
Tested-by: Jenkins Server
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Reviewed-by: Brian H. Horton <brianh@linux.ibm.com>
Reviewed-by: MIKE J. JONES <mjjones@us.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>

1 files changed, 22 insertions, 116 deletions

diff --git a/src/usr/hwpf/hwp/core_activate/core_activate.C b/src/usr/hwpf/hwp/core_activate/core_activate.C
index 56070edbc..c4acb25cb 100644
--- a/src/usr/hwpf/hwp/core_activate/core_activate.C
+++ b/src/usr/hwpf/hwp/core_activate/core_activate.C
@@ -1,36 +1,31 @@
-/*  IBM_PROLOG_BEGIN_TAG
- *  This is an automatically generated prolog.
- *
- *  $Source: src/usr/hwpf/hwp/core_activate/core_activate.C $
- *
- *  IBM CONFIDENTIAL
- *
- *  COPYRIGHT International Business Machines Corp. 2012
- *
- *  p1
- *
- *  Object Code Only (OCO) source materials
- *  Licensed Internal Code Source Materials
- *  IBM HostBoot Licensed Internal Code
- *
- *  The source code for this program is not published or other-
- *  wise divested of its trade secrets, irrespective of what has
- *  been deposited with the U.S. Copyright Office.
- *
- *  Origin: 30
- *
- *  IBM_PROLOG_END_TAG
- */
+/* IBM_PROLOG_BEGIN_TAG                                                   */
+/* This is an automatically generated prolog.                             */
+/*                                                                        */
+/* $Source: src/usr/hwpf/hwp/core_activate/core_activate.C $              */
+/*                                                                        */
+/* IBM CONFIDENTIAL                                                       */
+/*                                                                        */
+/* COPYRIGHT International Business Machines Corp. 2012,2013              */
+/*                                                                        */
+/* p1                                                                     */
+/*                                                                        */
+/* Object Code Only (OCO) source materials                                */
+/* Licensed Internal Code Source Materials                                */
+/* IBM HostBoot Licensed Internal Code                                    */
+/*                                                                        */
+/* The source code for this program is not published or otherwise         */
+/* divested of its trade secrets, irrespective of what has been           */
+/* deposited with the U.S. Copyright Office.                              */
+/*                                                                        */
+/* Origin: 30                                                             */
+/*                                                                        */
+/* IBM_PROLOG_END_TAG                                                     */
 /**
  *  @file core_activate.C
  *
  *  Support file for IStep: core_activate
  *   Core Activate
  *
- *  *****************************************************************
- *  THIS FILE WAS GENERATED ON 2012-04-11:1609
- *  *****************************************************************
- *
  *  HWP_IGNORE_VERSION_CHECK
  *
  */
@@ -121,63 +116,6 @@ void*    call_host_activate_master( void    *io_pArgs )
                                             (const_cast<TARGETING::Target*>
                                                         (l_cpu_target)) );
 
-
-#if 1
-        //  SIMICS HACK - The values written by simics are not correct -
-        //  Write them here until we can get the actions files fixed.
-        //  @todo RTC 41384
-        const  uint64_t PORE_SBE_CONTROL_0x000E0001 =   0x00000000000E0001 ;
-        const  uint64_t MBOX_SBEVITAL_0x0005001C    =   0x000000000005001C ;
-        fapi::ReturnCode    rc;
-        ecmdDataBufferBase data(64);
-        uint32_t    sbe_code    =   0;
-
-        rc = fapiGetScom(   l_fapi_cpu_target,
-                            PORE_SBE_CONTROL_0x000E0001,
-                            data );
-        if(!rc.ok()) { TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace,"ERROR: reading scom" ); }
-
-        TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace,
-                   "DEBUG: PORE_SBE_CONTROL_0x000E0001  =   0x%lx",
-                   data.getDoubleWord( 0 ) );
-
-        if ( !is_vpo() )
-        {
-            //  proc_prep_master_winkle expects bit 0 to be off (SBE running)
-            data.clearBit(0);
-            rc = fapiPutScom(   l_fapi_cpu_target,
-                                PORE_SBE_CONTROL_0x000E0001,
-                                data );
-        }
-
-        rc = fapiGetScom(   l_fapi_cpu_target,
-                            MBOX_SBEVITAL_0x0005001C,
-                            data );
-        if(!rc.ok()) { TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace,"ERROR: reading scom" ); }
-
-        TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace,
-                   "DEBUG: MBOX_SBEVITAL_0x0005001C =   0x%lx",
-                   data.getDoubleWord( 0 ) );
-
-
-        if ( !is_vpo() )
-        {
-            //  prop_prep_master_winkle expects the SBE to write F011 to
-            //  SBE_VITAL   before we get here.
-            sbe_code    =   0xF011;
-            data.insertFromRight( &sbe_code,
-                                  16,           // ISTEP_NUM_BIT_POSITION
-                                  16 );         // number of bits
-            rc = fapiPutScom(   l_fapi_cpu_target,
-                                MBOX_SBEVITAL_0x0005001C,
-                                data );
-            if(!rc.ok()) { TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace,"ERROR: writing scom" ); }
-        }
-#else
-        TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace,
-                   "Simics has been fixed..." );
-#endif
-
         TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace,
                "call_host_activate_master: call proc_prep_master_winkle." );
 
@@ -236,38 +174,6 @@ void*    call_host_activate_master( void    *io_pArgs )
         TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace,
                    "Returned from Winkle." );
 
-#if 1
-        //  SIMICS HACK - The values written by simics are not correct -
-        //  Write them here until we can get the actions files fixed.
-
-        rc = fapiGetScom(   l_fapi_cpu_target,
-                            MBOX_SBEVITAL_0x0005001C,
-                            data );
-        if(!rc.ok()) { TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace,"ERROR: reading scom" ); }
-
-        TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace,
-                   "DEBUG: MBOX_SBEVITAL_0x0005001C =   0x%lx",
-                   data.getDoubleWord( 0 ) );
-
-        if ( !is_vpo() )
-        {
-            //  prop_stop_deadman_timer expects the SBE to write F015 to
-            //  SBE_VITAL   before we get here.
-            sbe_code    =   0xF015;
-            data.insertFromRight( &sbe_code,
-                              16,           // ISTEP_NUM_BIT_POSITION
-                              16 );         // number of bits
-            rc = fapiPutScom(   l_fapi_cpu_target,
-                                MBOX_SBEVITAL_0x0005001C,
-                                data );
-            if(!rc.ok()) { TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace,"ERROR: writing scom" ); }
-        }
-
-#else
-        TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace,
-                   "Simics has been fixed..." );
-#endif
-
         TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace,
                    "Call proc_stop_deadman_timer..." );