Enable system config command and sensor list

Added configuration data debug command

RTC: 141643
Change-Id: I3d98321508780c25795d66a8d353c36593448a6e
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/22549
Tested-by: FSP CI Jenkins
Reviewed-by: Martha Broyles <mbroyles@us.ibm.com>
Reviewed-by: Wael Elessawy <welessa@us.ibm.com>

3 files changed, 212 insertions, 8 deletions

diff --git a/src/occ_405/sensor/sensor.h b/src/occ_405/sensor/sensor.h
index 4459e08..8fa4e8e 100755
--- a/src/occ_405/sensor/sensor.h
+++ b/src/occ_405/sensor/sensor.h
@@ -51,7 +51,7 @@
 #define MAX_VECTOR_SENSORS          32
 #define MAX_SENSOR_NAME_SZ          16 // including NULL
 #define MAX_SENSOR_UNIT_SZ          4 // including NULL
-#define MAX_AMEC_SENSORS            500
+#define MAX_AMEC_SENSORS            710
 #define VECTOR_SENSOR_DEFAULT_VAL   0xFF
 
 typedef enum
@@ -152,7 +152,7 @@ struct sensor
     uint32_t update_tag;      // Count of the number of 'ticks' that have passed
                               // between updates to this sensor (used for time-
                               // derived sensor)
-    uint16_t ipmi_sid;        // Ipmi sensor id obtained from mrw
+    uint32_t ipmi_sid;        // Ipmi sensor id obtained from mrw
     vectorSensor_t * vector;  // Pointer to vector control structure. NULL if
                               // this is not a vector sensor.
     uint16_t * mini_sensor;   // Pointer to entry in mini-sensor table. NULL if
diff --git a/src/occ_405/sensor/sensor_enum.h b/src/occ_405/sensor/sensor_enum.h
index bbd46f1..e9a394a 100755
--- a/src/occ_405/sensor/sensor_enum.h
+++ b/src/occ_405/sensor/sensor_enum.h
@@ -140,6 +140,18 @@ enum e_gsid
     FREQ250USP0C9,
     FREQ250USP0C10,
     FREQ250USP0C11,
+    FREQ250USP0C12,
+    FREQ250USP0C13,
+    FREQ250USP0C14,
+    FREQ250USP0C15,
+    FREQ250USP0C16,
+    FREQ250USP0C17,
+    FREQ250USP0C18,
+    FREQ250USP0C19,
+    FREQ250USP0C20,
+    FREQ250USP0C21,
+    FREQ250USP0C22,
+    FREQ250USP0C23,
 
     FREQA2MSP0C0,
     FREQA2MSP0C1,
@@ -153,6 +165,18 @@ enum e_gsid
     FREQA2MSP0C9,
     FREQA2MSP0C10,
     FREQA2MSP0C11,
+    FREQA2MSP0C12,
+    FREQA2MSP0C13,
+    FREQA2MSP0C14,
+    FREQA2MSP0C15,
+    FREQA2MSP0C16,
+    FREQA2MSP0C17,
+    FREQA2MSP0C18,
+    FREQA2MSP0C19,
+    FREQA2MSP0C20,
+    FREQA2MSP0C21,
+    FREQA2MSP0C22,
+    FREQA2MSP0C23,
 
     IPS2MSP0C0,
     IPS2MSP0C1,
@@ -166,6 +190,18 @@ enum e_gsid
     IPS2MSP0C9,
     IPS2MSP0C10,
     IPS2MSP0C11,
+    IPS2MSP0C12,
+    IPS2MSP0C13,
+    IPS2MSP0C14,
+    IPS2MSP0C15,
+    IPS2MSP0C16,
+    IPS2MSP0C17,
+    IPS2MSP0C18,
+    IPS2MSP0C19,
+    IPS2MSP0C20,
+    IPS2MSP0C21,
+    IPS2MSP0C22,
+    IPS2MSP0C23,
 
     NOTBZE2MSP0C0,
     NOTBZE2MSP0C1,
@@ -179,6 +215,18 @@ enum e_gsid
     NOTBZE2MSP0C9,
     NOTBZE2MSP0C10,
     NOTBZE2MSP0C11,
+    NOTBZE2MSP0C12,
+    NOTBZE2MSP0C13,
+    NOTBZE2MSP0C14,
+    NOTBZE2MSP0C15,
+    NOTBZE2MSP0C16,
+    NOTBZE2MSP0C17,
+    NOTBZE2MSP0C18,
+    NOTBZE2MSP0C19,
+    NOTBZE2MSP0C20,
+    NOTBZE2MSP0C21,
+    NOTBZE2MSP0C22,
+    NOTBZE2MSP0C23,
 
     NOTFIN2MSP0C0,
     NOTFIN2MSP0C1,
@@ -192,6 +240,18 @@ enum e_gsid
     NOTFIN2MSP0C9,
     NOTFIN2MSP0C10,
     NOTFIN2MSP0C11,
+    NOTFIN2MSP0C12,
+    NOTFIN2MSP0C13,
+    NOTFIN2MSP0C14,
+    NOTFIN2MSP0C15,
+    NOTFIN2MSP0C16,
+    NOTFIN2MSP0C17,
+    NOTFIN2MSP0C18,
+    NOTFIN2MSP0C19,
+    NOTFIN2MSP0C20,
+    NOTFIN2MSP0C21,
+    NOTFIN2MSP0C22,
+    NOTFIN2MSP0C23,
 
     SPURR2MSP0C0,
     SPURR2MSP0C1,
@@ -205,6 +265,18 @@ enum e_gsid
     SPURR2MSP0C9,
     SPURR2MSP0C10,
     SPURR2MSP0C11,
+    SPURR2MSP0C12,
+    SPURR2MSP0C13,
+    SPURR2MSP0C14,
+    SPURR2MSP0C15,
+    SPURR2MSP0C16,
+    SPURR2MSP0C17,
+    SPURR2MSP0C18,
+    SPURR2MSP0C19,
+    SPURR2MSP0C20,
+    SPURR2MSP0C21,
+    SPURR2MSP0C22,
+    SPURR2MSP0C23,
 
     TEMP4MSP0C0,
     TEMP4MSP0C1,
@@ -218,6 +290,18 @@ enum e_gsid
     TEMP4MSP0C9,
     TEMP4MSP0C10,
     TEMP4MSP0C11,
+    TEMP4MSP0C12,
+    TEMP4MSP0C13,
+    TEMP4MSP0C14,
+    TEMP4MSP0C15,
+    TEMP4MSP0C16,
+    TEMP4MSP0C17,
+    TEMP4MSP0C18,
+    TEMP4MSP0C19,
+    TEMP4MSP0C20,
+    TEMP4MSP0C21,
+    TEMP4MSP0C22,
+    TEMP4MSP0C23,
 
     UTIL2MSP0C0,
     UTIL2MSP0C1,
@@ -231,6 +315,18 @@ enum e_gsid
     UTIL2MSP0C9,
     UTIL2MSP0C10,
     UTIL2MSP0C11,
+    UTIL2MSP0C12,
+    UTIL2MSP0C13,
+    UTIL2MSP0C14,
+    UTIL2MSP0C15,
+    UTIL2MSP0C16,
+    UTIL2MSP0C17,
+    UTIL2MSP0C18,
+    UTIL2MSP0C19,
+    UTIL2MSP0C20,
+    UTIL2MSP0C21,
+    UTIL2MSP0C22,
+    UTIL2MSP0C23,
 
     NUTIL3SP0C0,
     NUTIL3SP0C1,
@@ -244,6 +340,18 @@ enum e_gsid
     NUTIL3SP0C9,
     NUTIL3SP0C10,
     NUTIL3SP0C11,
+    NUTIL3SP0C12,
+    NUTIL3SP0C13,
+    NUTIL3SP0C14,
+    NUTIL3SP0C15,
+    NUTIL3SP0C16,
+    NUTIL3SP0C17,
+    NUTIL3SP0C18,
+    NUTIL3SP0C19,
+    NUTIL3SP0C20,
+    NUTIL3SP0C21,
+    NUTIL3SP0C22,
+    NUTIL3SP0C23,
 
     MSTL2MSP0C0,
     MSTL2MSP0C1,
@@ -257,6 +365,18 @@ enum e_gsid
     MSTL2MSP0C9,
     MSTL2MSP0C10,
     MSTL2MSP0C11,
+    MSTL2MSP0C12,
+    MSTL2MSP0C13,
+    MSTL2MSP0C14,
+    MSTL2MSP0C15,
+    MSTL2MSP0C16,
+    MSTL2MSP0C17,
+    MSTL2MSP0C18,
+    MSTL2MSP0C19,
+    MSTL2MSP0C20,
+    MSTL2MSP0C21,
+    MSTL2MSP0C22,
+    MSTL2MSP0C23,
 
     CMT2MSP0C0,
     CMT2MSP0C1,
@@ -270,6 +390,18 @@ enum e_gsid
     CMT2MSP0C9,
     CMT2MSP0C10,
     CMT2MSP0C11,
+    CMT2MSP0C12,
+    CMT2MSP0C13,
+    CMT2MSP0C14,
+    CMT2MSP0C15,
+    CMT2MSP0C16,
+    CMT2MSP0C17,
+    CMT2MSP0C18,
+    CMT2MSP0C19,
+    CMT2MSP0C20,
+    CMT2MSP0C21,
+    CMT2MSP0C22,
+    CMT2MSP0C23,
 
 
     CMBW2MSP0C0,
@@ -284,6 +416,18 @@ enum e_gsid
     CMBW2MSP0C9,
     CMBW2MSP0C10,
     CMBW2MSP0C11,
+    CMBW2MSP0C12,
+    CMBW2MSP0C13,
+    CMBW2MSP0C14,
+    CMBW2MSP0C15,
+    CMBW2MSP0C16,
+    CMBW2MSP0C17,
+    CMBW2MSP0C18,
+    CMBW2MSP0C19,
+    CMBW2MSP0C20,
+    CMBW2MSP0C21,
+    CMBW2MSP0C22,
+    CMBW2MSP0C23,
 
     PPICP0C0,
     PPICP0C1,
@@ -297,6 +441,18 @@ enum e_gsid
     PPICP0C9,
     PPICP0C10,
     PPICP0C11,
+    PPICP0C12,
+    PPICP0C13,
+    PPICP0C14,
+    PPICP0C15,
+    PPICP0C16,
+    PPICP0C17,
+    PPICP0C18,
+    PPICP0C19,
+    PPICP0C20,
+    PPICP0C21,
+    PPICP0C22,
+    PPICP0C23,
 
     PWRPX250USP0C0,
     PWRPX250USP0C1,
@@ -310,6 +466,18 @@ enum e_gsid
     PWRPX250USP0C9,
     PWRPX250USP0C10,
     PWRPX250USP0C11,
+    PWRPX250USP0C12,
+    PWRPX250USP0C13,
+    PWRPX250USP0C14,
+    PWRPX250USP0C15,
+    PWRPX250USP0C16,
+    PWRPX250USP0C17,
+    PWRPX250USP0C18,
+    PWRPX250USP0C19,
+    PWRPX250USP0C20,
+    PWRPX250USP0C21,
+    PWRPX250USP0C22,
+    PWRPX250USP0C23,
 
     // ------------------------------------------------------
     // Regulator Sensors
diff --git a/src/occ_405/sensor/sensor_table.c b/src/occ_405/sensor/sensor_table.c
index 8df70d0..c4978e1 100755
--- a/src/occ_405/sensor/sensor_table.c
+++ b/src/occ_405/sensor/sensor_table.c
@@ -44,7 +44,7 @@ extern amec_sys_t g_amec_sys;
 #define SENSOR_W_CENTAUR_NUM(sensor_name, memc,cent,pp) SENSOR_W_CENTAUR_NUM_HELPER(sensor_name,memc,C,cent,P,pp)
 
 // Will define a set of "core sensor pointers" by passing in base sensor name
-// and ptr to [0] entry of array of 12 core sensors
+// and ptr to [0] entry of array of 24 core sensors
 #define CORE_SENSOR_PTRS(sensor,ptrbase,ptrmember) \
   [SENSOR_W_NUM(sensor, 0)] = ptrbase[ 0].ptrmember, \
   [SENSOR_W_NUM(sensor, 1)] = ptrbase[ 1].ptrmember, \
@@ -57,7 +57,19 @@ extern amec_sys_t g_amec_sys;
   [SENSOR_W_NUM(sensor, 8)] = ptrbase[ 8].ptrmember, \
   [SENSOR_W_NUM(sensor, 9)] = ptrbase[ 9].ptrmember, \
   [SENSOR_W_NUM(sensor,10)] = ptrbase[10].ptrmember, \
-  [SENSOR_W_NUM(sensor,11)] = ptrbase[11].ptrmember
+  [SENSOR_W_NUM(sensor,11)] = ptrbase[11].ptrmember, \
+  [SENSOR_W_NUM(sensor,12)] = ptrbase[12].ptrmember, \
+  [SENSOR_W_NUM(sensor,13)] = ptrbase[13].ptrmember, \
+  [SENSOR_W_NUM(sensor,14)] = ptrbase[14].ptrmember, \
+  [SENSOR_W_NUM(sensor,15)] = ptrbase[15].ptrmember, \
+  [SENSOR_W_NUM(sensor,16)] = ptrbase[16].ptrmember, \
+  [SENSOR_W_NUM(sensor,17)] = ptrbase[17].ptrmember, \
+  [SENSOR_W_NUM(sensor,18)] = ptrbase[18].ptrmember, \
+  [SENSOR_W_NUM(sensor,19)] = ptrbase[19].ptrmember, \
+  [SENSOR_W_NUM(sensor,20)] = ptrbase[20].ptrmember, \
+  [SENSOR_W_NUM(sensor,21)] = ptrbase[21].ptrmember, \
+  [SENSOR_W_NUM(sensor,22)] = ptrbase[22].ptrmember, \
+  [SENSOR_W_NUM(sensor,23)] = ptrbase[23].ptrmember
 
 // Will define a set of "memory controller sensor pointers" by passing in
 // base sensor nameand ptr to [0] entry of array of 8 memcontroller sensors
@@ -110,7 +122,19 @@ extern amec_sys_t g_amec_sys;
   [SENSOR_W_NUM(sensor, 8)] = ptr[ 8], \
   [SENSOR_W_NUM(sensor, 9)] = ptr[ 9], \
   [SENSOR_W_NUM(sensor,10)] = ptr[10], \
-  [SENSOR_W_NUM(sensor,11)] = ptr[11]
+  [SENSOR_W_NUM(sensor,11)] = ptr[11], \
+  [SENSOR_W_NUM(sensor,12)] = ptr[12], \
+  [SENSOR_W_NUM(sensor,13)] = ptr[13], \
+  [SENSOR_W_NUM(sensor,14)] = ptr[14], \
+  [SENSOR_W_NUM(sensor,15)] = ptr[15], \
+  [SENSOR_W_NUM(sensor,16)] = ptr[16], \
+  [SENSOR_W_NUM(sensor,17)] = ptr[17], \
+  [SENSOR_W_NUM(sensor,18)] = ptr[18], \
+  [SENSOR_W_NUM(sensor,19)] = ptr[19], \
+  [SENSOR_W_NUM(sensor,20)] = ptr[20], \
+  [SENSOR_W_NUM(sensor,21)] = ptr[21], \
+  [SENSOR_W_NUM(sensor,22)] = ptr[22], \
+  [SENSOR_W_NUM(sensor,23)] = ptr[23]
 
 // Will define a set of "core mini-sensor pointers" as NULL, since not
 // every sensor must have a mini-sensor.
@@ -126,7 +150,19 @@ extern amec_sys_t g_amec_sys;
   [SENSOR_W_NUM(sensor, 8)] = NULL, \
   [SENSOR_W_NUM(sensor, 9)] = NULL, \
   [SENSOR_W_NUM(sensor,10)] = NULL, \
-  [SENSOR_W_NUM(sensor,11)] = NULL
+  [SENSOR_W_NUM(sensor,11)] = NULL, \
+  [SENSOR_W_NUM(sensor,12)] = NULL, \
+  [SENSOR_W_NUM(sensor,13)] = NULL, \
+  [SENSOR_W_NUM(sensor,14)] = NULL, \
+  [SENSOR_W_NUM(sensor,15)] = NULL, \
+  [SENSOR_W_NUM(sensor,16)] = NULL, \
+  [SENSOR_W_NUM(sensor,17)] = NULL, \
+  [SENSOR_W_NUM(sensor,18)] = NULL, \
+  [SENSOR_W_NUM(sensor,19)] = NULL, \
+  [SENSOR_W_NUM(sensor,20)] = NULL, \
+  [SENSOR_W_NUM(sensor,21)] = NULL, \
+  [SENSOR_W_NUM(sensor,22)] = NULL, \
+  [SENSOR_W_NUM(sensor,23)] = NULL
 
 // Will define a set of "memory controller mini sensor ptrs" by passing in
 // base sensor nameand ptr to [0] entry of array of 8 memcontroller sensors
@@ -283,7 +319,7 @@ const sensor_ptr_t G_amec_sensor_list[] =
   SENSOR_PTR( VRHOT250USPROC,       &g_amec_sys.sys.vrhot250usproc),
 
   // ------------------------------------------------------
-  // Core Sensors (12 of each)
+  // 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),
@@ -435,7 +471,7 @@ const minisensor_ptr_t G_amec_mini_sensor_list[] INIT_SECTION =
   MINI_SENSOR_PTR( VRHOT250USPROC,  NULL),
 
   // ------------------------------------------------------
-  // Core Sensors (12 of each)
+  // Core Sensors (24 of each)
   // ------------------------------------------------------
   CORE_MINI_SENSOR_PTRS_NULL(  FREQ250USP0C ),
   CORE_MINI_SENSOR_PTRS_NULL(   FREQA2MSP0C ),