PM:Added an EQ sub-section for restoration of SCOM registers of scope quad.

Dropped a section meant for restoration of NC SCOMS. Introduced
a new EQ section. It is intended for restoring SCOM registers which
are spread across the quad.

Change-Id: Icdc5ba4affd74b454e22b576ee0866be3ace1183
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/29557
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: Hostboot CI <hostboot-ci+hostboot@us.ibm.com>
Reviewed-by: Gregory S. Still <stillgs@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Reviewed-by: Jennifer A. Stofer <stofer@us.ibm.com>

3 files changed, 11 insertions, 12 deletions

diff --git a/import/chips/p9/procedures/utils/stopreg/p9_stop_api.C b/import/chips/p9/procedures/utils/stopreg/p9_stop_api.C
index 9596ff80..85664524 100755
--- a/import/chips/p9/procedures/utils/stopreg/p9_stop_api.C
+++ b/import/chips/p9/procedures/utils/stopreg/p9_stop_api.C
@@ -725,7 +725,7 @@ StopReturnCode_t editScomEntry( uint32_t i_scomAddr, uint64_t i_scomData,
  * @return      STOP_SAVE_SUCCESS if new  entry is added, STOP_SAVE_FAIL otherwise.
  * @note        adds an entry at a given location. It can be used to add entry in
  *              place of NOP, at the end of table or as first entry of the cache
- *              sub-section(L2, L3 or NC ).
+ *              sub-section(L2, L3 or EQ ).
  */
 StopReturnCode_t updateScomEntry( uint32_t i_scomAddr, uint64_t i_scomData,
                                   ScomEntry_t* i_scomEntry   )
@@ -794,7 +794,7 @@ StopReturnCode_t p9_stop_save_scom( void* const   i_pImage,
         {
             // chiplet is a cache. let us find start address of cache section
             // associated with given chiplet. A cache section associated with
-            // given chiplet is split in to L2, L3 and NC area.
+            // given chiplet is split in to L2, L3 and EQ area.
             pStopCacheScomStart = CACHE_SECTN_START(i_pImage,
                                                     chipletId);
         }
@@ -810,9 +810,9 @@ StopReturnCode_t p9_stop_save_scom( void* const   i_pImage,
 
         switch( i_section )
         {
-            case P9_STOP_SECTION_NC:
+            case P9_STOP_SECTION_EQ_SCOM:
                 pScomEntry = pStopCacheScomStart->nonCacheArea;
-                entryLimit = MAX_NC_SCOM_ENTRIES;
+                entryLimit = MAX_EQ_SCOM_ENTRIES;
                 break;
 
             case P9_STOP_SECTION_L2:
diff --git a/import/chips/p9/procedures/utils/stopreg/p9_stop_api.H b/import/chips/p9/procedures/utils/stopreg/p9_stop_api.H
index cf12c103..2f9f8ce3 100755
--- a/import/chips/p9/procedures/utils/stopreg/p9_stop_api.H
+++ b/import/chips/p9/procedures/utils/stopreg/p9_stop_api.H
@@ -103,13 +103,12 @@ typedef enum
  */
 typedef enum
 {
-    P9_STOP_SECTION_MIN = 0,
-    P9_STOP_SECTION_CORE_SCOM = 1,
-    P9_STOP_SECTION_EQ_SCOM =  2,
-    P9_STOP_SECTION_NC =  2, //deprecated
-    P9_STOP_SECTION_L2  = 3,
-    P9_STOP_SECTION_L3  = 4,
-    P9_STOP_SECTION_MAX = 5
+    P9_STOP_SECTION_MIN         = 0,
+    P9_STOP_SECTION_CORE_SCOM   = 1,
+    P9_STOP_SECTION_EQ_SCOM     = 2,
+    P9_STOP_SECTION_L2          = 3,
+    P9_STOP_SECTION_L3          = 4,
+    P9_STOP_SECTION_MAX         = 5
 } ScomSection_t;
 
 #ifdef __cplusplus
diff --git a/import/chips/p9/procedures/utils/stopreg/p9_stop_data_struct.H b/import/chips/p9/procedures/utils/stopreg/p9_stop_data_struct.H
index 43e3c05f..2fa52225 100755
--- a/import/chips/p9/procedures/utils/stopreg/p9_stop_data_struct.H
+++ b/import/chips/p9/procedures/utils/stopreg/p9_stop_data_struct.H
@@ -92,7 +92,7 @@ typedef struct
  */
 typedef struct
 {
-    ScomEntry_t  nonCacheArea[MAX_NC_SCOM_ENTRIES];
+    ScomEntry_t  nonCacheArea[MAX_EQ_SCOM_ENTRIES];
     ScomEntry_t  l2CacheArea[MAX_L2_SCOM_ENTRIES];
     ScomEntry_t  l3CacheArea[MAX_L3_SCOM_ENTRIES];
 } StopCacheSection_t;