Revert "UV Support : Augmented STOP API and self restore for enabling UV"

Change-Id: Iaabd787166422b68179901b7785ab3e8a54d35b8
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/65875
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: HWSV CI <hwsv-ci+hostboot@us.ibm.com>
Tested-by: PPE CI <ppe-ci+hostboot@us.ibm.com>
Tested-by: Hostboot CI <hostboot-ci+hostboot@us.ibm.com>
Reviewed-by: Dean Sanner <dsanner@us.ibm.com>
Reviewed-by: RANGANATHPRASAD G. BRAHMASAMUDRA <prasadbgr@in.ibm.com>
Reviewed-by: Gregory S. Still <stillgs@us.ibm.com>
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/65885
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: Daniel M. Crowell <dcrowell@us.ibm.com>

3 files changed, 33 insertions, 286 deletions

diff --git a/src/import/chips/p9/procedures/hwp/pm/p9_hcode_image_build.C b/src/import/chips/p9/procedures/hwp/pm/p9_hcode_image_build.C
index 057896741..fa0340fac 100644
--- a/src/import/chips/p9/procedures/hwp/pm/p9_hcode_image_build.C
+++ b/src/import/chips/p9/procedures/hwp/pm/p9_hcode_image_build.C
@@ -141,17 +141,6 @@ enum
 };
 
 /**
- * @brief models a CPU register restoration area in STOP section of homer image.
- */
-typedef struct
-{
-    uint8_t iv_threadRestoreArea[MAX_THREADS_PER_CORE][CORE_RESTORE_THREAD_AREA_SIZE];
-    uint8_t iv_threadSaveArea[MAX_THREADS_PER_CORE][SELF_SAVE_THREAD_AREA_SIZE];
-    uint8_t iv_coreRestoreArea[CORE_RESTORE_CORE_AREA_SIZE];
-    uint8_t iv_coreSaveArea[CORE_SAVE_CORE_AREA_SIZE];
-} SprRestoreRegion_t;
-
-/**
  * @brief   struct used to manipulate scan ring in HOMER.
  */
 struct RingBufData
@@ -688,101 +677,6 @@ fapi_try_exit:
 
 //------------------------------------------------------------------------------
 
-fapi2::ReturnCode initSelfRestoreRegion( Homerlayout_t* i_pChipHomer )
-{
-    FAPI_INF(">> initSelfRestoreRegion");
-    uint32_t l_fillBlr          =   SWIZZLE_4_BYTE(SELF_RESTORE_BLR_INST);
-    uint32_t l_fillAttn         =   SWIZZLE_4_BYTE(CORE_RESTORE_PAD_OPCODE);
-    uint32_t l_byteCnt          =   0;
-    uint32_t * l_pSelfRestLoc   =
-            (uint32_t *)&i_pChipHomer->cpmrRegion.selfRestoreRegion.coreSelfRestore[0];
-
-    SprRestoreRegion_t * l_pSaveRestore   =
-            (SprRestoreRegion_t *)&i_pChipHomer->cpmrRegion.selfRestoreRegion.coreSelfRestore[0];
-
-    while( l_byteCnt < SELF_RESTORE_CORE_REGS_SIZE )
-    {
-        memcpy( l_pSelfRestLoc, &l_fillAttn, sizeof( uint32_t ) );
-        l_byteCnt += 4;
-        l_pSelfRestLoc++;
-    }
-
-    //Initialize Core SPR and Thread SPR start boundary with BLR instruction.
-
-    FAPI_INF( " Size of SprRestoreRegion_t 0x%08x", sizeof( SprRestoreRegion_t ) );
-    for( uint8_t l_coreId = 0; l_coreId < MAX_CORES_PER_CHIP; l_coreId++ )
-    {
-        memcpy( (uint32_t *)&l_pSaveRestore->iv_coreRestoreArea[0], &l_fillBlr, sizeof(uint32_t) );
-
-        for( uint8_t l_threadId = 0; l_threadId < MAX_THREADS_PER_CORE; l_threadId++ )
-        {
-            memcpy( &l_pSaveRestore->iv_threadRestoreArea[l_threadId][0],
-                    &l_fillBlr,
-                    sizeof(uint32_t) );
-
-            if( 0 == l_threadId )
-            {
-                memcpy( &l_pSaveRestore->iv_coreRestoreArea[0],
-                        &l_fillBlr,
-                        sizeof(uint32_t) );
-            }
-        }
-
-        l_pSaveRestore++;
-    }
-
-    FAPI_INF("<< initSelfRestoreRegion");
-
-    return fapi2::FAPI2_RC_SUCCESS;
-}
-
-//------------------------------------------------------------------------------
-
-fapi2::ReturnCode   initSelfSaveRestoreEntries( Homerlayout_t* i_pChipHomer,
-                                                P9FuncModel & i_procFuncModel )
-{
-    FAPI_DBG(">> initSelfSaveRestoreEntries" );
-    StopReturnCode_t    l_retCode;
-    uint32_t            l_corePos   =   0;
-
-    for( l_corePos = 0; l_corePos < MAX_CORES_PER_CHIP; l_corePos++ )
-    {
-        if( !i_procFuncModel.isCoreFunctional( l_corePos ) )
-        {
-            continue;
-        }
-
-        FAPI_INF( "Core Pos 0x%02d", l_corePos );
-        l_retCode   =  p9_stop_init_cpureg( (void *)i_pChipHomer, l_corePos );
-
-        FAPI_ASSERT( ( STOP_SAVE_SUCCESS == l_retCode ),
-                     fapi2::SELF_RESTORE_INIT_FAILED()
-                     .set_HOMER_PTR( i_pChipHomer )
-                     .set_CORE_POS( l_corePos )
-                     .set_FAILURE_CODE( l_retCode )
-                     .set_EC_LEVEL( i_procFuncModel.getChipLevel() )
-                     .set_CHIP_TYPE( i_procFuncModel.getChipName() ),
-                     "Failed To Initialize The Self-Restore Region 0x%08x", l_retCode );
-
-        l_retCode   =  p9_stop_init_self_save( (void *)i_pChipHomer, l_corePos );
-
-        FAPI_ASSERT( ( STOP_SAVE_SUCCESS == l_retCode ),
-                     fapi2::SELF_SAVE_INIT_FAILED()
-                     .set_HOMER_PTR( i_pChipHomer )
-                     .set_CORE_POS( l_corePos )
-                     .set_FAILURE_CODE( l_retCode )
-                     .set_EC_LEVEL( i_procFuncModel.getChipLevel() )
-                     .set_CHIP_TYPE( i_procFuncModel.getChipName() ),
-                     "Failed To Initialize The Self-Save Region 0x%08x", (uint32_t)l_retCode );
-    }
-
-    fapi_try_exit:
-    FAPI_DBG("<< initSelfSaveRestoreEntries" );
-    return fapi2::current_err;
-}
-
-//------------------------------------------------------------------------------
-
 uint32_t getXipImageSectn( uint8_t * i_srcPtr, uint8_t i_secId, uint8_t i_ecLevel,
                            P9XipSection&  o_ppeSection )
 {
@@ -1383,9 +1277,8 @@ void updateCpmrCmeRegion( Homerlayout_t* i_pChipHomer )
  * @brief   updates various CPMR fields which are associated with self restore code.
  * @param[in]   i_pChipHomer    points to start of P9 HOMER.
  * @param[in]   i_fuseState     core fuse status
- * @param[in]   i_urmorFix      true if URMOR correction is needed else false.
  */
-void updateCpmrHeaderSR( Homerlayout_t* i_pChipHomer, uint8_t i_fusedState, uint8_t i_urmorFix )
+void updateCpmrHeaderSR( Homerlayout_t* i_pChipHomer, uint8_t i_fusedState )
 {
     FAPI_INF(">> updateCpmrHeaderSR");
     cpmrHeader_t* pCpmrHdr =
@@ -1397,11 +1290,6 @@ void updateCpmrHeaderSR( Homerlayout_t* i_pChipHomer, uint8_t i_fusedState, uint
                                 uint32_t(NONFUSED_CORE_MODE);
     pCmeHdr->g_cme_mode_flags = SWIZZLE_4_BYTE(i_fusedState ? 1 : 0);
 
-    if( i_urmorFix )
-    {
-        pCpmrHdr->urmorFix  =   0x01;
-    }
-
     FAPI_INF("CPMR SR");
     FAPI_INF("Fuse Mode                 :   0x%08X", pCpmrHdr->fusedModeStatus );
     FAPI_INF("CME Image Flag            :   0x%08X", SWIZZLE_4_BYTE(pCmeHdr->g_cme_mode_flags));
@@ -1409,7 +1297,6 @@ void updateCpmrHeaderSR( Homerlayout_t* i_pChipHomer, uint8_t i_fusedState, uint
              SWIZZLE_4_BYTE(pCpmrHdr->cmeImgOffset) * 32,
              SWIZZLE_4_BYTE(pCpmrHdr->cmeImgOffset));
     FAPI_DBG("CME Image Size            :   0x%08X", SWIZZLE_4_BYTE(pCpmrHdr->cmeImgLength));
-    FAPI_DBG("URMOR WorkAround Needed   :   %s",  pCpmrHdr->urmorFix ? "Yes" : "No" );
 
     FAPI_INF("<< updateCpmrHeaderSR");
 }
@@ -1659,7 +1546,10 @@ fapi2::ReturnCode buildCoreRestoreImage( void* const i_pImageIn,
     fapi2::current_err  =   fapi2::FAPI2_RC_SUCCESS;
     //Let us find XIP Header for Core Self Restore Image
     P9XipSection ppeSection;
-    uint8_t* pSelfRestImg   =   NULL;
+    uint8_t* pSelfRestImg = NULL;
+    uint32_t wordCnt = 0;
+    uint32_t l_fillBlr  = SWIZZLE_4_BYTE(SELF_RESTORE_BLR_INST);
+    uint32_t l_fillAttn = SWIZZLE_4_BYTE(CORE_RESTORE_PAD_OPCODE);
 
     rcTemp = p9_xip_get_section( i_pImageIn, P9_XIP_SECTION_HW_RESTORE, &ppeSection );
 
@@ -1719,15 +1609,32 @@ fapi2::ReturnCode buildCoreRestoreImage( void* const i_pImageIn,
         //Padding SPR restore area with ATTN Opcode
         FAPI_INF("Padding CPMR Core Restore portion with Attn opcodes");
 
-        FAPI_TRY( initSelfRestoreRegion( i_pChipHomer ),
-                  "Failed To Initialize The Self-Restore Region" );
+        while( wordCnt < SELF_RESTORE_CORE_REGS_SIZE )
+        {
+            uint32_t l_fillPattern = 0;
 
-        FAPI_TRY( initSelfSaveRestoreEntries( i_pChipHomer, i_procFuncModel ),
-                  "Failed To Initialize The Self-Save Region" );
+            if( ( 0 == wordCnt ) || ( 0 == ( wordCnt % CORE_RESTORE_SIZE_PER_THREAD ) ))
+            {
+                l_fillPattern = l_fillBlr;
+            }
+            else
+            {
+                l_fillPattern = l_fillAttn;
+            }
 
-    }
+            //Lab Need: First instruction in thread SPR restore region should be a blr instruction.
+            //This helps in a specific lab scenario. If Self Restore region is populated only for
+            //select number of threads, other threads will not hit attention during the self restore
+            //sequence. Instead, execution will hit a blr and control should return to thread launcher
+            //region.
 
-    updateCpmrHeaderSR( i_pChipHomer, i_fusedState, i_procFuncModel.hasUrmorBug() );
+            memcpy( (uint32_t*)&i_pChipHomer->cpmrRegion.selfRestoreRegion.coreSelfRestore[wordCnt],
+                    &l_fillPattern,
+                    sizeof( uint32_t ));
+            wordCnt += 4;
+        }
+    }
+    updateCpmrHeaderSR( i_pChipHomer, i_fusedState );
 
     if( i_imgType.coreScomBuild )
     {
@@ -4471,145 +4378,6 @@ void customizeMagicWord( Homerlayout_t*     i_pHomer )
 
 //---------------------------------------------------------------------------
 
-/**
- * @brief returns PIR value for a given core and thread.
- * @param[in]   i_corePos       core position
- * @param[in]   i_threadPos     thread position
- * @param[in]   i_fuseMode      fuse status of core.
- * @return      PIR value
- */
-uint64_t getPirValue( uint32_t i_corePos, uint32_t i_threadPos, uint8_t i_fuseMode )
-{
-    uint64_t l_pir      = 0;
-    uint8_t  l_tempPir  = 0;
-    l_tempPir = 0;
-    l_tempPir = (i_corePos / MAX_CORES_PER_QUAD ) << MAX_CORES_PER_QUAD;
-    i_corePos = i_corePos % MAX_CORES_PER_QUAD;
-
-    switch( i_corePos )
-    {
-        case 0:
-            break;
-
-        case 1:
-            if( i_fuseMode )
-            {
-                l_tempPir |= FUSED_CORE_BIT3;
-            }
-            else
-            {
-                l_tempPir |= FUSED_CORE_BIT1;
-            }
-
-            break;
-
-        case 2:
-            l_tempPir |= FUSED_CORE_BIT0;
-            break;
-
-        case 3:
-            if( i_fuseMode )
-            {
-                l_tempPir |= ( FUSED_CORE_BIT0 | FUSED_CORE_BIT3 );
-            }
-            else
-            {
-                l_tempPir |= (FUSED_CORE_BIT0 | FUSED_CORE_BIT1 );
-            }
-
-            break;
-    }
-
-    switch( i_threadPos )
-    {
-        case 0:
-            break;
-
-        case 1:
-            if( i_fuseMode )
-            {
-                l_tempPir |= FUSED_CORE_BIT2;
-            }
-            else
-            {
-                l_tempPir |= FUSED_CORE_BIT3;
-            }
-
-            break;
-
-        case 2:
-            if( i_fuseMode )
-            {
-                l_tempPir |= FUSED_CORE_BIT1;
-            }
-            else
-            {
-                l_tempPir |= FUSED_CORE_BIT2;
-            }
-
-            break;
-
-        case 3:
-            if( i_fuseMode )
-            {
-                l_tempPir |= ( FUSED_CORE_BIT1 | FUSED_CORE_BIT2 );
-            }
-            else
-            {
-                l_tempPir |= ( FUSED_CORE_BIT2 | FUSED_CORE_BIT3);
-            }
-
-            break;
-    }
-
-    l_pir = l_tempPir;
-
-    return l_pir;
-}
-
-//---------------------------------------------------------------------------
-
-/**
- * @brief creates URMOR restore value in HOMER.
- * @param[in]   i_pHomerImage       points to P9 chip's HOMER.
- * @param[in]   i_fuseMode          fuse status of core
- * @param[in]   i_chipFuncModel     describes config details of the P9 chip
- * @return      PIR value
- */
-fapi2::ReturnCode addUrmorRestore( void * const i_pHomerImage,
-                                   uint8_t i_fuseMode,
-                                   P9FuncModel & i_chipFuncModel  )
-{
-    #ifdef __URMOR_TEST
-
-    // to verify UV and HV exit in Cronus environment.
-    uint64_t l_pir      =   0;
-    StopReturnCode_t l_rc;
-
-    for( uint8_t l_corePos = 0; l_corePos < MAX_CORES_PER_CHIP; l_corePos++ )
-    {
-        if( i_chipFuncModel.isCoreFunctional( l_corePos ) )
-        {
-            l_pir = getPirValue( l_corePos, 0, i_fuseMode );
-            l_rc = stopImageSection::p9_stop_save_cpureg( i_pHomerImage,
-                                                          P9_STOP_SPR_URMOR,
-                                                          0x00,
-                                                          l_pir );
-            FAPI_ASSERT( ( !l_rc ),
-                         fapi2::URMOR_RESTORE_ENTRY_FAILED()
-                         .set_PIR( l_pir )
-                         .set_STOP_API_RC( l_rc ),
-                         "Failed To Create URMOR Restore Entry" );
-        }
-    }
-
-fapi_try_exit:
-    #endif
-    return fapi2::current_err;
-}
-
-//---------------------------------------------------------------------------
-
 fapi2::ReturnCode p9_hcode_image_build( CONST_FAPI2_PROC& i_procTgt,
                                         void* const     i_pImageIn,
                                         void*           i_pHomerImage,
@@ -4834,9 +4602,6 @@ fapi2::ReturnCode p9_hcode_image_build( CONST_FAPI2_PROC& i_procTgt,
     //customize magic word based on endianess
     customizeMagicWord( pChipHomer );
 
-    FAPI_TRY( addUrmorRestore( i_pHomerImage, fuseModeState, l_chipFuncModel ),
-              "Failed to create URMOR restore entry" );
-
 fapi_try_exit:
     FAPI_IMP("<< p9_hcode_image_build" );
     return fapi2::current_err;
diff --git a/src/import/chips/p9/procedures/hwp/pm/p9_scan_ring_util.C b/src/import/chips/p9/procedures/hwp/pm/p9_scan_ring_util.C
index 67b1d1d8c..def3c096b 100644
--- a/src/import/chips/p9/procedures/hwp/pm/p9_scan_ring_util.C
+++ b/src/import/chips/p9/procedures/hwp/pm/p9_scan_ring_util.C
@@ -776,8 +776,7 @@ P9FuncModel::P9FuncModel(  ):
     iv_funcExes(0),
     iv_funcQuads(0),
     iv_ddLevel(0),
-    iv_chipName(0),
-    iv_urmorBug(0)
+    iv_chipName(0)
 { }
 //-------------------------------------------------------------------------
 
@@ -802,12 +801,11 @@ P9FuncModel::P9FuncModel( const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP >& i_
 
     FAPI_ATTR_GET_PRIVILEGED(fapi2::ATTR_EC, i_procTgt, iv_ddLevel);
     FAPI_ATTR_GET_PRIVILEGED(fapi2::ATTR_NAME, i_procTgt, iv_chipName);
-    FAPI_ATTR_GET(fapi2::ATTR_CHIP_EC_FEATURE_HW403111, i_procTgt, iv_urmorBug);
 
     FAPI_DBG("functional core : 0x%08x Ex  : 0x%08x quad 0x%08x"
-             "EC : 0x%02x ChipName : 0x%02x URMOR Bug 0x%02x",
+             "EC : 0x%02x ChipName : 0x%02x",
              iv_funcCores, iv_funcExes, iv_funcQuads, iv_ddLevel,
-             iv_chipName, iv_urmorBug );
+             iv_chipName );
 }
 
 //---------------------------------------------------------------------------
@@ -844,18 +842,8 @@ uint8_t P9FuncModel::getChipLevel() const
     return iv_ddLevel;
 }
 
-//-------------------------------------------------------------------------
 uint8_t P9FuncModel::getChipName() const
 {
     return iv_chipName;
 }
-
-//-------------------------------------------------------------------------
-uint8_t P9FuncModel::hasUrmorBug() const
-{
-    return iv_urmorBug;
-}
-
-//-------------------------------------------------------------------------
-
 }
diff --git a/src/import/chips/p9/procedures/hwp/pm/p9_scan_ring_util.H b/src/import/chips/p9/procedures/hwp/pm/p9_scan_ring_util.H
index 074b9f9f9..98a23d1fb 100644
--- a/src/import/chips/p9/procedures/hwp/pm/p9_scan_ring_util.H
+++ b/src/import/chips/p9/procedures/hwp/pm/p9_scan_ring_util.H
@@ -321,11 +321,6 @@ class P9FuncModel
         uint8_t getChipName() const;
 
         /**
-         * returns true if URMOR has a hw bug else false.
-         */
-        uint8_t hasUrmorBug() const;
-
-        /**
          * @brief   constructor
          */
         P9FuncModel(  );
@@ -337,9 +332,8 @@ class P9FuncModel
         uint16_t iv_funcExes;
         uint8_t  iv_funcQuads;
         uint8_t  iv_ddLevel;
-        uint8_t  iv_chipName;
-        uint8_t  iv_urmorBug;
-        uint8_t  iv_reserve[2];
+        uint8_t iv_chipName;
+        uint8_t iv_reserve[3];
 };
 
 }// namesapce p9_hcodeImageBuild ends