EMPATH Sensor Counters

RTC:148388

Change-Id: Iae66cd0a73032fa908eb96a149d4163397c2e275
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/27781
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Christopher J. Cain <cjcain@us.ibm.com>
Reviewed-by: William A. Bryan <wilbryan@us.ibm.com>
Reviewed-by: Wael El-Essawy <welessa@us.ibm.com>
Reviewed-by: Martha Broyles <mbroyles@us.ibm.com>

3 files changed, 162 insertions, 219 deletions

diff --git a/src/occ_405/sensor/sensor_enum.h b/src/occ_405/sensor/sensor_enum.h
index 5a6f44a..9c9a1ba 100755
--- a/src/occ_405/sensor/sensor_enum.h
+++ b/src/occ_405/sensor/sensor_enum.h
@@ -5,7 +5,7 @@
 /*                                                                        */
 /* OpenPOWER OnChipController Project                                     */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2011,2015                        */
+/* Contributors Listed Below - COPYRIGHT 2011,2016                        */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
@@ -111,20 +111,20 @@ enum e_gsid
     // ------------------------------------------------------
     // Processor Sensors
     // ------------------------------------------------------
-    FREQA2MSP0,
-    IPS2MSP0,
+    FREQA4MSP0,
+    IPS4MSP0,
     MEMSP2MSP0,
     PWR250USP0,
     PWR250USVDD0,
     CUR250USVDD0,
     PWR250USVCS0,
     PWR250USMEM0,
-    SLEEPCNT2MSP0,
-    WINKCNT2MSP0,
+    SLEEPCNT4MSP0,
+    WINKCNT4MSP0,
     SP250USP0,
     TEMP4MSP0,
     TEMP4MSP0PEAK,
-    UTIL2MSP0,
+    UTIL4MSP0,
     VRFAN250USPROC,
     VRHOT250USPROC,
 
@@ -153,130 +153,105 @@ enum e_gsid
     FREQ250USP0C22,
     FREQ250USP0C23,
 
-    FREQA2MSP0C0,
-    FREQA2MSP0C1,
-    FREQA2MSP0C2,
-    FREQA2MSP0C3,
-    FREQA2MSP0C4,
-    FREQA2MSP0C5,
-    FREQA2MSP0C6,
-    FREQA2MSP0C7,
-    FREQA2MSP0C8,
-    FREQA2MSP0C9,
-    FREQA2MSP0C10,
-    FREQA2MSP0C11,
-    FREQA2MSP0C12,
-    FREQA2MSP0C13,
-    FREQA2MSP0C14,
-    FREQA2MSP0C15,
-    FREQA2MSP0C16,
-    FREQA2MSP0C17,
-    FREQA2MSP0C18,
-    FREQA2MSP0C19,
-    FREQA2MSP0C20,
-    FREQA2MSP0C21,
-    FREQA2MSP0C22,
-    FREQA2MSP0C23,
-
-    IPS2MSP0C0,
-    IPS2MSP0C1,
-    IPS2MSP0C2,
-    IPS2MSP0C3,
-    IPS2MSP0C4,
-    IPS2MSP0C5,
-    IPS2MSP0C6,
-    IPS2MSP0C7,
-    IPS2MSP0C8,
-    IPS2MSP0C9,
-    IPS2MSP0C10,
-    IPS2MSP0C11,
-    IPS2MSP0C12,
-    IPS2MSP0C13,
-    IPS2MSP0C14,
-    IPS2MSP0C15,
-    IPS2MSP0C16,
-    IPS2MSP0C17,
-    IPS2MSP0C18,
-    IPS2MSP0C19,
-    IPS2MSP0C20,
-    IPS2MSP0C21,
-    IPS2MSP0C22,
-    IPS2MSP0C23,
-
-    NOTBZE2MSP0C0,
-    NOTBZE2MSP0C1,
-    NOTBZE2MSP0C2,
-    NOTBZE2MSP0C3,
-    NOTBZE2MSP0C4,
-    NOTBZE2MSP0C5,
-    NOTBZE2MSP0C6,
-    NOTBZE2MSP0C7,
-    NOTBZE2MSP0C8,
-    NOTBZE2MSP0C9,
-    NOTBZE2MSP0C10,
-    NOTBZE2MSP0C11,
-    NOTBZE2MSP0C12,
-    NOTBZE2MSP0C13,
-    NOTBZE2MSP0C14,
-    NOTBZE2MSP0C15,
-    NOTBZE2MSP0C16,
-    NOTBZE2MSP0C17,
-    NOTBZE2MSP0C18,
-    NOTBZE2MSP0C19,
-    NOTBZE2MSP0C20,
-    NOTBZE2MSP0C21,
-    NOTBZE2MSP0C22,
-    NOTBZE2MSP0C23,
-
-    NOTFIN2MSP0C0,
-    NOTFIN2MSP0C1,
-    NOTFIN2MSP0C2,
-    NOTFIN2MSP0C3,
-    NOTFIN2MSP0C4,
-    NOTFIN2MSP0C5,
-    NOTFIN2MSP0C6,
-    NOTFIN2MSP0C7,
-    NOTFIN2MSP0C8,
-    NOTFIN2MSP0C9,
-    NOTFIN2MSP0C10,
-    NOTFIN2MSP0C11,
-    NOTFIN2MSP0C12,
-    NOTFIN2MSP0C13,
-    NOTFIN2MSP0C14,
-    NOTFIN2MSP0C15,
-    NOTFIN2MSP0C16,
-    NOTFIN2MSP0C17,
-    NOTFIN2MSP0C18,
-    NOTFIN2MSP0C19,
-    NOTFIN2MSP0C20,
-    NOTFIN2MSP0C21,
-    NOTFIN2MSP0C22,
-    NOTFIN2MSP0C23,
-
-    SPURR2MSP0C0,
-    SPURR2MSP0C1,
-    SPURR2MSP0C2,
-    SPURR2MSP0C3,
-    SPURR2MSP0C4,
-    SPURR2MSP0C5,
-    SPURR2MSP0C6,
-    SPURR2MSP0C7,
-    SPURR2MSP0C8,
-    SPURR2MSP0C9,
-    SPURR2MSP0C10,
-    SPURR2MSP0C11,
-    SPURR2MSP0C12,
-    SPURR2MSP0C13,
-    SPURR2MSP0C14,
-    SPURR2MSP0C15,
-    SPURR2MSP0C16,
-    SPURR2MSP0C17,
-    SPURR2MSP0C18,
-    SPURR2MSP0C19,
-    SPURR2MSP0C20,
-    SPURR2MSP0C21,
-    SPURR2MSP0C22,
-    SPURR2MSP0C23,
+    FREQA4MSP0C0,
+    FREQA4MSP0C1,
+    FREQA4MSP0C2,
+    FREQA4MSP0C3,
+    FREQA4MSP0C4,
+    FREQA4MSP0C5,
+    FREQA4MSP0C6,
+    FREQA4MSP0C7,
+    FREQA4MSP0C8,
+    FREQA4MSP0C9,
+    FREQA4MSP0C10,
+    FREQA4MSP0C11,
+    FREQA4MSP0C12,
+    FREQA4MSP0C13,
+    FREQA4MSP0C14,
+    FREQA4MSP0C15,
+    FREQA4MSP0C16,
+    FREQA4MSP0C17,
+    FREQA4MSP0C18,
+    FREQA4MSP0C19,
+    FREQA4MSP0C20,
+    FREQA4MSP0C21,
+    FREQA4MSP0C22,
+    FREQA4MSP0C23,
+
+    IPS4MSP0C0,
+    IPS4MSP0C1,
+    IPS4MSP0C2,
+    IPS4MSP0C3,
+    IPS4MSP0C4,
+    IPS4MSP0C5,
+    IPS4MSP0C6,
+    IPS4MSP0C7,
+    IPS4MSP0C8,
+    IPS4MSP0C9,
+    IPS4MSP0C10,
+    IPS4MSP0C11,
+    IPS4MSP0C12,
+    IPS4MSP0C13,
+    IPS4MSP0C14,
+    IPS4MSP0C15,
+    IPS4MSP0C16,
+    IPS4MSP0C17,
+    IPS4MSP0C18,
+    IPS4MSP0C19,
+    IPS4MSP0C20,
+    IPS4MSP0C21,
+    IPS4MSP0C22,
+    IPS4MSP0C23,
+
+    NOTBZE4MSP0C0,
+    NOTBZE4MSP0C1,
+    NOTBZE4MSP0C2,
+    NOTBZE4MSP0C3,
+    NOTBZE4MSP0C4,
+    NOTBZE4MSP0C5,
+    NOTBZE4MSP0C6,
+    NOTBZE4MSP0C7,
+    NOTBZE4MSP0C8,
+    NOTBZE4MSP0C9,
+    NOTBZE4MSP0C10,
+    NOTBZE4MSP0C11,
+    NOTBZE4MSP0C12,
+    NOTBZE4MSP0C13,
+    NOTBZE4MSP0C14,
+    NOTBZE4MSP0C15,
+    NOTBZE4MSP0C16,
+    NOTBZE4MSP0C17,
+    NOTBZE4MSP0C18,
+    NOTBZE4MSP0C19,
+    NOTBZE4MSP0C20,
+    NOTBZE4MSP0C21,
+    NOTBZE4MSP0C22,
+    NOTBZE4MSP0C23,
+
+    NOTFIN4MSP0C0,
+    NOTFIN4MSP0C1,
+    NOTFIN4MSP0C2,
+    NOTFIN4MSP0C3,
+    NOTFIN4MSP0C4,
+    NOTFIN4MSP0C5,
+    NOTFIN4MSP0C6,
+    NOTFIN4MSP0C7,
+    NOTFIN4MSP0C8,
+    NOTFIN4MSP0C9,
+    NOTFIN4MSP0C10,
+    NOTFIN4MSP0C11,
+    NOTFIN4MSP0C12,
+    NOTFIN4MSP0C13,
+    NOTFIN4MSP0C14,
+    NOTFIN4MSP0C15,
+    NOTFIN4MSP0C16,
+    NOTFIN4MSP0C17,
+    NOTFIN4MSP0C18,
+    NOTFIN4MSP0C19,
+    NOTFIN4MSP0C20,
+    NOTFIN4MSP0C21,
+    NOTFIN4MSP0C22,
+    NOTFIN4MSP0C23,
 
     TEMP4MSP0C0,
     TEMP4MSP0C1,
@@ -303,30 +278,30 @@ enum e_gsid
     TEMP4MSP0C22,
     TEMP4MSP0C23,
 
-    UTIL2MSP0C0,
-    UTIL2MSP0C1,
-    UTIL2MSP0C2,
-    UTIL2MSP0C3,
-    UTIL2MSP0C4,
-    UTIL2MSP0C5,
-    UTIL2MSP0C6,
-    UTIL2MSP0C7,
-    UTIL2MSP0C8,
-    UTIL2MSP0C9,
-    UTIL2MSP0C10,
-    UTIL2MSP0C11,
-    UTIL2MSP0C12,
-    UTIL2MSP0C13,
-    UTIL2MSP0C14,
-    UTIL2MSP0C15,
-    UTIL2MSP0C16,
-    UTIL2MSP0C17,
-    UTIL2MSP0C18,
-    UTIL2MSP0C19,
-    UTIL2MSP0C20,
-    UTIL2MSP0C21,
-    UTIL2MSP0C22,
-    UTIL2MSP0C23,
+    UTIL4MSP0C0,
+    UTIL4MSP0C1,
+    UTIL4MSP0C2,
+    UTIL4MSP0C3,
+    UTIL4MSP0C4,
+    UTIL4MSP0C5,
+    UTIL4MSP0C6,
+    UTIL4MSP0C7,
+    UTIL4MSP0C8,
+    UTIL4MSP0C9,
+    UTIL4MSP0C10,
+    UTIL4MSP0C11,
+    UTIL4MSP0C12,
+    UTIL4MSP0C13,
+    UTIL4MSP0C14,
+    UTIL4MSP0C15,
+    UTIL4MSP0C16,
+    UTIL4MSP0C17,
+    UTIL4MSP0C18,
+    UTIL4MSP0C19,
+    UTIL4MSP0C20,
+    UTIL4MSP0C21,
+    UTIL4MSP0C22,
+    UTIL4MSP0C23,
 
     NUTIL3SP0C0,
     NUTIL3SP0C1,
@@ -403,32 +378,6 @@ enum e_gsid
     CMT2MSP0C22,
     CMT2MSP0C23,
 
-
-    CMBW2MSP0C0,
-    CMBW2MSP0C1,
-    CMBW2MSP0C2,
-    CMBW2MSP0C3,
-    CMBW2MSP0C4,
-    CMBW2MSP0C5,
-    CMBW2MSP0C6,
-    CMBW2MSP0C7,
-    CMBW2MSP0C8,
-    CMBW2MSP0C9,
-    CMBW2MSP0C10,
-    CMBW2MSP0C11,
-    CMBW2MSP0C12,
-    CMBW2MSP0C13,
-    CMBW2MSP0C14,
-    CMBW2MSP0C15,
-    CMBW2MSP0C16,
-    CMBW2MSP0C17,
-    CMBW2MSP0C18,
-    CMBW2MSP0C19,
-    CMBW2MSP0C20,
-    CMBW2MSP0C21,
-    CMBW2MSP0C22,
-    CMBW2MSP0C23,
-
     PPICP0C0,
     PPICP0C1,
     PPICP0C2,
diff --git a/src/occ_405/sensor/sensor_info.c b/src/occ_405/sensor/sensor_info.c
index 08e0e54..6e4838d 100755
--- a/src/occ_405/sensor/sensor_info.c
+++ b/src/occ_405/sensor/sensor_info.c
@@ -1,11 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/occ/sensor/sensor_info.c $                                */
+/* $Source: src/occ_405/sensor/sensor_info.c $                            */
 /*                                                                        */
 /* OpenPOWER OnChipController Project                                     */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2011,2015                        */
+/* Contributors Listed Below - COPYRIGHT 2011,2016                        */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
@@ -216,20 +216,20 @@ const sensor_info_t G_sensor_info[]   =
   SENSOR_INFO_T_ENTRY(       TODclock2,  "day\0",   AMEC_SENSOR_TYPE_TIME,  AMEC_SENSOR_LOC_ALL, AMEC_SENSOR_NONUM,   AMEEFP_2MS_IN_HZ,   AMEFP( 795364,-6)  ),
 
   /* ==ProcSensors==        NameString  Units                      Type              Location             Number                Freq      ScaleFactor   */
-  SENSOR_INFO_T_ENTRY(      FREQA2MSP0, "MHz\0",    AMEC_SENSOR_TYPE_FREQ, AMEC_SENSOR_LOC_PROC, AMEC_SENSOR_NONUM,   AMEEFP_2MS_IN_HZ,   AMEFP(  1, 0)  ),
-  SENSOR_INFO_T_ENTRY(        IPS2MSP0, "MIP\0",    AMEC_SENSOR_TYPE_PERF, AMEC_SENSOR_LOC_PROC, AMEC_SENSOR_NONUM,   AMEEFP_2MS_IN_HZ,   AMEFP(  1, 0)  ),
+  SENSOR_INFO_T_ENTRY(      FREQA4MSP0, "MHz\0",    AMEC_SENSOR_TYPE_FREQ, AMEC_SENSOR_LOC_PROC, AMEC_SENSOR_NONUM,   AMEEFP_2MS_IN_HZ,   AMEFP(  1, 0)  ),
+  SENSOR_INFO_T_ENTRY(        IPS4MSP0, "MIP\0",    AMEC_SENSOR_TYPE_PERF, AMEC_SENSOR_LOC_PROC, AMEC_SENSOR_NONUM,   AMEEFP_2MS_IN_HZ,   AMEFP(  1, 0)  ),
   SENSOR_INFO_T_ENTRY(      MEMSP2MSP0,   "%\0",    AMEC_SENSOR_TYPE_TIME, AMEC_SENSOR_LOC_PROC, AMEC_SENSOR_NONUM,   AMEEFP_2MS_IN_HZ,   AMEFP(  1, 0)  ),
   SENSOR_INFO_T_ENTRY(      PWR250USP0,   "W\0",   AMEC_SENSOR_TYPE_POWER, AMEC_SENSOR_LOC_PROC, AMEC_SENSOR_NONUM, AMEEFP_250US_IN_HZ,   AMEFP(  1, 0)  ),
   SENSOR_INFO_T_ENTRY(    PWR250USVDD0,   "W\0",   AMEC_SENSOR_TYPE_POWER, AMEC_SENSOR_LOC_PROC, AMEC_SENSOR_NONUM, AMEEFP_250US_IN_HZ,   AMEFP(  1, 0)  ),
   SENSOR_INFO_T_ENTRY(    CUR250USVDD0,   "A\0", AMEC_SENSOR_TYPE_CURRENT, AMEC_SENSOR_LOC_PROC, AMEC_SENSOR_NONUM, AMEEFP_250US_IN_HZ,   AMEFP(  1,-2)  ),
   SENSOR_INFO_T_ENTRY(    PWR250USVCS0,   "W\0",   AMEC_SENSOR_TYPE_POWER, AMEC_SENSOR_LOC_PROC, AMEC_SENSOR_NONUM, AMEEFP_250US_IN_HZ,   AMEFP(  1, 0)  ),
   SENSOR_INFO_T_ENTRY(    PWR250USMEM0,   "W\0",   AMEC_SENSOR_TYPE_POWER, AMEC_SENSOR_LOC_PROC, AMEC_SENSOR_NONUM, AMEEFP_250US_IN_HZ,   AMEFP(  1, 0)  ),
-  SENSOR_INFO_T_ENTRY(   SLEEPCNT2MSP0,   "#\0",    AMEC_SENSOR_TYPE_PERF, AMEC_SENSOR_LOC_PROC, AMEC_SENSOR_NONUM,   AMEEFP_2MS_IN_HZ,   AMEFP(  1, 0)  ),
-  SENSOR_INFO_T_ENTRY(    WINKCNT2MSP0,   "#\0",    AMEC_SENSOR_TYPE_PERF, AMEC_SENSOR_LOC_PROC, AMEC_SENSOR_NONUM,   AMEEFP_2MS_IN_HZ,   AMEFP(  1, 0)  ),
+  SENSOR_INFO_T_ENTRY(   SLEEPCNT4MSP0,   "#\0",    AMEC_SENSOR_TYPE_PERF, AMEC_SENSOR_LOC_PROC, AMEC_SENSOR_NONUM,   AMEEFP_2MS_IN_HZ,   AMEFP(  1, 0)  ),
+  SENSOR_INFO_T_ENTRY(    WINKCNT4MSP0,   "#\0",    AMEC_SENSOR_TYPE_PERF, AMEC_SENSOR_LOC_PROC, AMEC_SENSOR_NONUM,   AMEEFP_2MS_IN_HZ,   AMEFP(  1, 0)  ),
   SENSOR_INFO_T_ENTRY(       SP250USP0,   "%\0",    AMEC_SENSOR_TYPE_FREQ, AMEC_SENSOR_LOC_PROC, AMEC_SENSOR_NONUM, AMEEFP_250US_IN_HZ,   AMEFP(  1, 0)  ),
   SENSOR_INFO_T_ENTRY(       TEMP4MSP0,   "C\0",    AMEC_SENSOR_TYPE_TEMP, AMEC_SENSOR_LOC_PROC, AMEC_SENSOR_NONUM,   AMEEFP_2MS_IN_HZ,   AMEFP(  1, 0)  ),
   SENSOR_INFO_T_ENTRY(   TEMP4MSP0PEAK,   "C\0",    AMEC_SENSOR_TYPE_TEMP, AMEC_SENSOR_LOC_PROC, AMEC_SENSOR_NONUM,   AMEEFP_2MS_IN_HZ,   AMEFP(  1, 0)  ),
-  SENSOR_INFO_T_ENTRY(       UTIL2MSP0,   "%\0",    AMEC_SENSOR_TYPE_UTIL, AMEC_SENSOR_LOC_PROC, AMEC_SENSOR_NONUM,   AMEEFP_2MS_IN_HZ,   AMEFP(  1,-2)  ),
+  SENSOR_INFO_T_ENTRY(       UTIL4MSP0,   "%\0",    AMEC_SENSOR_TYPE_UTIL, AMEC_SENSOR_LOC_PROC, AMEC_SENSOR_NONUM,   AMEEFP_2MS_IN_HZ,   AMEFP(  1,-2)  ),
   SENSOR_INFO_T_ENTRY(  VRFAN250USPROC, "pin\0",    AMEC_SENSOR_TYPE_TEMP,  AMEC_SENSOR_LOC_VRM, AMEC_SENSOR_NONUM, AMEEFP_250US_IN_HZ,   AMEFP(  1, 0)  ),
   SENSOR_INFO_T_ENTRY(  VRHOT250USPROC, "pin\0",    AMEC_SENSOR_TYPE_TEMP,  AMEC_SENSOR_LOC_VRM, AMEC_SENSOR_NONUM, AMEEFP_250US_IN_HZ,   AMEFP(  1, 0)  ),
 
@@ -241,17 +241,15 @@ const sensor_info_t G_sensor_info[]   =
 
   /* ==CoreSensors==        NameString  Units                      Type              Location             Number                Freq      ScaleFactor   */
   SENS_CORE_ENTRY_SET(   FREQ250USP0C , "MHz\0",    AMEC_SENSOR_TYPE_FREQ, AMEC_SENSOR_LOC_CORE, AMEC_SENSOR_NONUM, AMEEFP_250US_IN_HZ,   AMEFP(  1, 0)  ),
-  SENS_CORE_ENTRY_SET(    FREQA2MSP0C , "MHz\0",    AMEC_SENSOR_TYPE_FREQ, AMEC_SENSOR_LOC_CORE, AMEC_SENSOR_NONUM,   AMEEFP_2MS_IN_HZ,   AMEFP(  1, 0)  ),
-  SENS_CORE_ENTRY_SET(      IPS2MSP0C , "MIP\0",    AMEC_SENSOR_TYPE_PERF, AMEC_SENSOR_LOC_CORE, AMEC_SENSOR_NONUM,   AMEEFP_2MS_IN_HZ,   AMEFP(  1, 0)  ),
-  SENS_CORE_ENTRY_SET(   NOTBZE2MSP0C , "cyc\0",    AMEC_SENSOR_TYPE_PERF, AMEC_SENSOR_LOC_CORE, AMEC_SENSOR_NONUM,   AMEEFP_2MS_IN_HZ,   AMEFP(  1, 0)  ),
-  SENS_CORE_ENTRY_SET(   NOTFIN2MSP0C , "cyc\0",    AMEC_SENSOR_TYPE_PERF, AMEC_SENSOR_LOC_CORE, AMEC_SENSOR_NONUM,   AMEEFP_2MS_IN_HZ,   AMEFP(  1, 0)  ),
-  SENS_CORE_ENTRY_SET(    SPURR2MSP0C ,   "%\0",    AMEC_SENSOR_TYPE_PERF, AMEC_SENSOR_LOC_CORE, AMEC_SENSOR_NONUM,   AMEEFP_2MS_IN_HZ,   AMEFP(  1, 0)  ),
+  SENS_CORE_ENTRY_SET(    FREQA4MSP0C , "MHz\0",    AMEC_SENSOR_TYPE_FREQ, AMEC_SENSOR_LOC_CORE, AMEC_SENSOR_NONUM,   AMEEFP_2MS_IN_HZ,   AMEFP(  1, 0)  ),
+  SENS_CORE_ENTRY_SET(      IPS4MSP0C , "MIP\0",    AMEC_SENSOR_TYPE_PERF, AMEC_SENSOR_LOC_CORE, AMEC_SENSOR_NONUM,   AMEEFP_2MS_IN_HZ,   AMEFP(  1, 0)  ),
+  SENS_CORE_ENTRY_SET(   NOTBZE4MSP0C , "cyc\0",    AMEC_SENSOR_TYPE_PERF, AMEC_SENSOR_LOC_CORE, AMEC_SENSOR_NONUM,   AMEEFP_2MS_IN_HZ,   AMEFP(  1, 0)  ),
+  SENS_CORE_ENTRY_SET(   NOTFIN4MSP0C , "cyc\0",    AMEC_SENSOR_TYPE_PERF, AMEC_SENSOR_LOC_CORE, AMEC_SENSOR_NONUM,   AMEEFP_2MS_IN_HZ,   AMEFP(  1, 0)  ),
   SENS_CORE_ENTRY_SET(     TEMP4MSP0C ,   "C\0",    AMEC_SENSOR_TYPE_TEMP, AMEC_SENSOR_LOC_CORE, AMEC_SENSOR_NONUM,   AMEEFP_2MS_IN_HZ,   AMEFP(  1, 0)  ),
-  SENS_CORE_ENTRY_SET(     UTIL2MSP0C ,   "%\0",    AMEC_SENSOR_TYPE_UTIL, AMEC_SENSOR_LOC_CORE, AMEC_SENSOR_NONUM,   AMEEFP_2MS_IN_HZ,   AMEFP(  1,-2)  ),
+  SENS_CORE_ENTRY_SET(     UTIL4MSP0C ,   "%\0",    AMEC_SENSOR_TYPE_UTIL, AMEC_SENSOR_LOC_CORE, AMEC_SENSOR_NONUM,   AMEEFP_2MS_IN_HZ,   AMEFP(  1,-2)  ),
   SENS_CORE_ENTRY_SET(     NUTIL3SP0C ,   "%\0",    AMEC_SENSOR_TYPE_UTIL, AMEC_SENSOR_LOC_CORE, AMEC_SENSOR_NONUM,    AMEEFP_3S_IN_HZ,   AMEFP(  1,-2)  ),
   SENS_CORE_ENTRY_SET(     MSTL2MSP0C , "cpi\0",    AMEC_SENSOR_TYPE_PERF, AMEC_SENSOR_LOC_CORE, AMEC_SENSOR_NONUM,   AMEEFP_2MS_IN_HZ,   AMEFP(  1, 0)  ),
   SENS_CORE_ENTRY_SET(      CMT2MSP0C ,   "%\0",    AMEC_SENSOR_TYPE_PERF, AMEC_SENSOR_LOC_CORE, AMEC_SENSOR_NONUM,   AMEEFP_2MS_IN_HZ,   AMEFP(  1, 0)  ),
-  SENS_CORE_ENTRY_SET(     CMBW2MSP0C , "GBs\0",    AMEC_SENSOR_TYPE_PERF, AMEC_SENSOR_LOC_CORE, AMEC_SENSOR_NONUM,   AMEEFP_2MS_IN_HZ,   AMEFP(  256, -5)  ),
   SENS_CORE_ENTRY_SET(        PPICP0C ,   "%\0",    AMEC_SENSOR_TYPE_PERF, AMEC_SENSOR_LOC_CORE, AMEC_SENSOR_NONUM,   AMEEFP_2MS_IN_HZ,   AMEFP(  1, 0)  ),
   SENS_CORE_ENTRY_SET(  PWRPX250USP0C ,   "W\0",   AMEC_SENSOR_TYPE_POWER, AMEC_SENSOR_LOC_CORE, AMEC_SENSOR_NONUM, AMEEFP_250US_IN_HZ,   AMEFP(  1, 0)  ),
 
diff --git a/src/occ_405/sensor/sensor_table.c b/src/occ_405/sensor/sensor_table.c
index 409b7af..f8fe271 100755
--- a/src/occ_405/sensor/sensor_table.c
+++ b/src/occ_405/sensor/sensor_table.c
@@ -5,7 +5,7 @@
 /*                                                                        */
 /* OpenPOWER OnChipController Project                                     */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2011,2015                        */
+/* Contributors Listed Below - COPYRIGHT 2011,2016                        */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
@@ -301,20 +301,20 @@ const sensor_ptr_t G_amec_sensor_list[] =
   // ------------------------------------------------------
   // Processor Sensors
   // ------------------------------------------------------
-  SENSOR_PTR( FREQA2MSP0,           &g_amec_sys.proc[0].freqa2ms),
-  SENSOR_PTR( IPS2MSP0,             &g_amec_sys.proc[0].ips2ms),
+  SENSOR_PTR( FREQA4MSP0,           &g_amec_sys.proc[0].freqa4ms),
+  SENSOR_PTR( IPS4MSP0,             &g_amec_sys.proc[0].ips4ms),
   SENSOR_PTR( MEMSP2MSP0,           &g_amec_sys.proc[0].memsp2ms),
   SENSOR_PTR( PWR250USP0,           &g_amec_sys.proc[0].pwr250us),
   SENSOR_PTR( PWR250USVDD0,         &g_amec_sys.proc[0].pwr250usvdd),
   SENSOR_PTR( CUR250USVDD0,         &g_amec_sys.proc[0].cur250usvdd),
   SENSOR_PTR( PWR250USVCS0,         &g_amec_sys.proc[0].pwr250usvcs),
   SENSOR_PTR( PWR250USMEM0,         &g_amec_sys.proc[0].pwr250usmem),
-  SENSOR_PTR( SLEEPCNT2MSP0,        &g_amec_sys.proc[0].sleepcnt2ms),
-  SENSOR_PTR( WINKCNT2MSP0,         &g_amec_sys.proc[0].winkcnt2ms),
+  SENSOR_PTR( SLEEPCNT4MSP0,        &g_amec_sys.proc[0].sleepcnt4ms),
+  SENSOR_PTR( WINKCNT4MSP0,         &g_amec_sys.proc[0].winkcnt4ms),
   SENSOR_PTR( SP250USP0,            &g_amec_sys.proc[0].sp250us),
   SENSOR_PTR( TEMP4MSP0,            &g_amec_sys.proc[0].temp4ms),
   SENSOR_PTR( TEMP4MSP0PEAK,        &g_amec_sys.proc[0].temp4mspeak),
-  SENSOR_PTR( UTIL2MSP0,            &g_amec_sys.proc[0].util2ms),
+  SENSOR_PTR( UTIL4MSP0,            &g_amec_sys.proc[0].util4ms),
   SENSOR_PTR( VRFAN250USPROC,       &g_amec_sys.sys.vrfan250usproc),
   SENSOR_PTR( VRHOT250USPROC,       &g_amec_sys.sys.vrhot250usproc),
 
@@ -322,17 +322,15 @@ const sensor_ptr_t G_amec_sensor_list[] =
   // Core Sensors (24 of each)
   // ------------------------------------------------------
   CORE_SENSOR_PTRS( FREQ250USP0C ,  &g_amec_sys.proc[0].core, freq250us),
-  CORE_SENSOR_PTRS( FREQA2MSP0C ,   &g_amec_sys.proc[0].core, freqa2ms),
-  CORE_SENSOR_PTRS( IPS2MSP0C ,     &g_amec_sys.proc[0].core, ips2ms),
-  CORE_SENSOR_PTRS( NOTBZE2MSP0C ,  &g_amec_sys.proc[0].core, mcpifd2ms),
-  CORE_SENSOR_PTRS( NOTFIN2MSP0C ,  &g_amec_sys.proc[0].core, mcpifi2ms),
-  CORE_SENSOR_PTRS( SPURR2MSP0C ,   &g_amec_sys.proc[0].core, spurr2ms),
+  CORE_SENSOR_PTRS( FREQA4MSP0C ,   &g_amec_sys.proc[0].core, freqa4ms),
+  CORE_SENSOR_PTRS( IPS4MSP0C ,     &g_amec_sys.proc[0].core, ips4ms),
+  CORE_SENSOR_PTRS( NOTBZE4MSP0C ,  &g_amec_sys.proc[0].core, mcpifd4ms),
+  CORE_SENSOR_PTRS( NOTFIN4MSP0C ,  &g_amec_sys.proc[0].core, mcpifi4ms),
   CORE_SENSOR_PTRS( TEMP4MSP0C ,    &g_amec_sys.proc[0].core, temp4ms),
-  CORE_SENSOR_PTRS( UTIL2MSP0C ,    &g_amec_sys.proc[0].core, util2ms),
+  CORE_SENSOR_PTRS( UTIL4MSP0C ,    &g_amec_sys.proc[0].core, util4ms),
   CORE_SENSOR_PTRS( NUTIL3SP0C ,    &g_amec_sys.proc[0].core, nutil3s),
   CORE_SENSOR_PTRS( MSTL2MSP0C ,    &g_amec_sys.proc[0].core, mstl2ms),
   CORE_SENSOR_PTRS( CMT2MSP0C ,     &g_amec_sys.proc[0].core, cmt2ms),
-  CORE_SENSOR_PTRS( CMBW2MSP0C ,    &g_amec_sys.proc[0].core, cmbw2ms),
   CORE_SENSOR_PTRS( PPICP0C ,       &g_amec_sys.proc[0].core, ppic),
   CORE_SENSOR_PTRS( PWRPX250USP0C , &g_amec_sys.proc[0].core, pwrpx250us),
 
@@ -453,20 +451,20 @@ const minisensor_ptr_t G_amec_mini_sensor_list[] INIT_SECTION =
   // ------------------------------------------------------
   // Processor Sensors
   // ------------------------------------------------------
-  MINI_SENSOR_PTR(     FREQA2MSP0,  &G_dcom_slv_outbox_tx.freqa2msp0),
-  MINI_SENSOR_PTR(       IPS2MSP0,  &G_dcom_slv_outbox_tx.ips2msp0),
+  MINI_SENSOR_PTR(     FREQA4MSP0,  &G_dcom_slv_outbox_tx.freqa4msp0),
+  MINI_SENSOR_PTR(       IPS4MSP0,  &G_dcom_slv_outbox_tx.ips4msp0),
   MINI_SENSOR_PTR(     MEMSP2MSP0,  NULL),
   MINI_SENSOR_PTR(     PWR250USP0,  &G_dcom_slv_outbox_tx.pwr250usp0),
   MINI_SENSOR_PTR(   PWR250USVDD0,  NULL),
   MINI_SENSOR_PTR(   CUR250USVDD0,  NULL),
   MINI_SENSOR_PTR(   PWR250USVCS0,  NULL),
   MINI_SENSOR_PTR(   PWR250USMEM0,  &G_dcom_slv_outbox_tx.pwr250usmemp0),
-  MINI_SENSOR_PTR(  SLEEPCNT2MSP0,  &G_dcom_slv_outbox_tx.sleepcnt2msp0),
-  MINI_SENSOR_PTR(   WINKCNT2MSP0,  &G_dcom_slv_outbox_tx.winkcnt2msp0),
+  MINI_SENSOR_PTR(  SLEEPCNT4MSP0,  &G_dcom_slv_outbox_tx.sleepcnt4msp0),
+  MINI_SENSOR_PTR(   WINKCNT4MSP0,  &G_dcom_slv_outbox_tx.winkcnt4msp0),
   MINI_SENSOR_PTR(      SP250USP0,  NULL),
   MINI_SENSOR_PTR(      TEMP4MSP0,  &G_dcom_slv_outbox_tx.temp4msp0),
   MINI_SENSOR_PTR(  TEMP4MSP0PEAK,  &G_dcom_slv_outbox_tx.temp4msp0peak),
-  MINI_SENSOR_PTR(      UTIL2MSP0,  &G_dcom_slv_outbox_tx.util2msp0),
+  MINI_SENSOR_PTR(      UTIL4MSP0,  &G_dcom_slv_outbox_tx.util4msp0),
   MINI_SENSOR_PTR( VRFAN250USPROC,  &G_dcom_slv_outbox_tx.vrfan250usproc),
   MINI_SENSOR_PTR( VRHOT250USPROC,  NULL),
 
@@ -474,17 +472,15 @@ const minisensor_ptr_t G_amec_mini_sensor_list[] INIT_SECTION =
   // Core Sensors (24 of each)
   // ------------------------------------------------------
   CORE_MINI_SENSOR_PTRS_NULL(  FREQ250USP0C ),
-  CORE_MINI_SENSOR_PTRS_NULL(   FREQA2MSP0C ),
-  CORE_MINI_SENSOR_PTRS(          IPS2MSP0C, &G_dcom_slv_outbox_tx.ips2msp0cy    ),
-  CORE_MINI_SENSOR_PTRS(       NOTBZE2MSP0C, &G_dcom_slv_outbox_tx.mcpifd2msp0cy ),
-  CORE_MINI_SENSOR_PTRS(       NOTFIN2MSP0C, &G_dcom_slv_outbox_tx.mcpifi2msp0cy ),
-  CORE_MINI_SENSOR_PTRS_NULL(   SPURR2MSP0C ),
+  CORE_MINI_SENSOR_PTRS_NULL(   FREQA4MSP0C ),
+  CORE_MINI_SENSOR_PTRS(          IPS4MSP0C, &G_dcom_slv_outbox_tx.ips4msp0cy    ),
+  CORE_MINI_SENSOR_PTRS(       NOTBZE4MSP0C, &G_dcom_slv_outbox_tx.mcpifd4msp0cy ),
+  CORE_MINI_SENSOR_PTRS(       NOTFIN4MSP0C, &G_dcom_slv_outbox_tx.mcpifi4msp0cy ),
   CORE_MINI_SENSOR_PTRS_NULL(    TEMP4MSP0C ),
-  CORE_MINI_SENSOR_PTRS(         UTIL2MSP0C, &G_dcom_slv_outbox_tx.util2msp0cy   ),
+  CORE_MINI_SENSOR_PTRS(         UTIL4MSP0C, &G_dcom_slv_outbox_tx.util4msp0cy   ),
   CORE_MINI_SENSOR_PTRS(         NUTIL3SP0C, &G_dcom_slv_outbox_tx.nutil3sp0cy   ),
   CORE_MINI_SENSOR_PTRS_NULL(    MSTL2MSP0C ),
   CORE_MINI_SENSOR_PTRS_NULL(     CMT2MSP0C ),
-  CORE_MINI_SENSOR_PTRS_NULL(    CMBW2MSP0C ),
   CORE_MINI_SENSOR_PTRS_NULL(       PPICP0C ),
   CORE_MINI_SENSOR_PTRS(      PWRPX250USP0C, &G_dcom_slv_outbox_tx.pwrpx250usp0cy), //