PM: Image layout change for CME/SGPE Region of P9 HOMER.

    - implements compact image layout for CME
    - implements compact image layout for SGPE
    - enhances ring debug infrastructure
    - implements size check for consolidated CME/SGPE SRAM Image.
    - Reversal of magic byte used to represent FUSED and NON FUSED core.
    - enhances putring to support scan ring overrides.
    - added gptr and time rings
    - updated in SGPE debug pointer location and boot loader constants.
    - Fixed ex instance ring issue (need to skip conversion of scan
      region type for ex instance ring)
    - memset for CME, SGPE override offset init and
      sanity check in ring code.

Change-Id: Ifb6157dd73a24e0158e6a5f39844d897fba6af56
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/32544
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: Hostboot CI <hostboot-ci+hostboot@us.ibm.com>
Reviewed-by: AMIT KUMAR <akumar3@us.ibm.com>
Reviewed-by: CHRISTOPHER M. RIEDL <cmriedl@us.ibm.com>
Reviewed-by: Gregory S. Still <stillgs@us.ibm.com>
Reviewed-by: Jennifer A. Stofer <stofer@us.ibm.com>
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/32567
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>

1 files changed, 6 insertions, 6 deletions

diff --git a/src/import/chips/p9/procedures/hwp/lib/p9_stop_util.H b/src/import/chips/p9/procedures/hwp/lib/p9_stop_util.H
index 64cf09c74..468bb741f 100755
--- a/src/import/chips/p9/procedures/hwp/lib/p9_stop_util.H
+++ b/src/import/chips/p9/procedures/hwp/lib/p9_stop_util.H
@@ -88,11 +88,11 @@ namespace stopImageSection
 typedef struct
 {
     uint64_t attnOpcodes;
-    uint64_t homerMagicNumber;
+    uint64_t cpmrMagicWord;
     uint32_t buildDate;
     uint32_t version;
     uint8_t  reserve1[7];
-    uint8_t  fuseModeStatus;
+    uint8_t  fusedModeStatus;
     uint32_t cmeImgOffset;
     uint32_t cmeImgLength;
     uint32_t cmeCommonRingOffset;
@@ -111,10 +111,10 @@ typedef struct
  */
 enum
 {
-    FUSE_BIT0 = 0x08,
-    FUSE_BIT1 = 0x04,
-    FUSE_BIT2 = 0x02,
-    FUSE_BIT3 = 0x01,
+    FUSED_CORE_BIT0 = 0x08,
+    FUSED_CORE_BIT1 = 0x04,
+    FUSED_CORE_BIT2 = 0x02,
+    FUSED_CORE_BIT3 = 0x01,
     QUAD_BITS = 0x70
 };