WOF: WOF header and OPPB updates

Change-Id: Ib7cdc81fef49707e9f78acc40ecb7218407b44ff
RTC: 169955
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/37859
Reviewed-by: William A. Bryan <wilbryan@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>

1 files changed, 27 insertions, 9 deletions

diff --git a/src/occ_405/amec/amec_parm_table.c b/src/occ_405/amec/amec_parm_table.c
index dc4a17a..b48cef1 100755
--- a/src/occ_405/amec/amec_parm_table.c
+++ b/src/occ_405/amec/amec_parm_table.c
@@ -142,16 +142,33 @@ amec_parm_t g_amec_parm_list[] = {
 
 
     // Begin WOF parameters
-    AMEC_PARM_UINT8(PARM_SIZE_OF_VFRT , "size_of_vfrt", &g_amec_sys.wof.size_of_vfrt ),
-    AMEC_PARM_UINT8(PARM_VFRT_DATA_SIZE , "vfrt_data_size", &g_amec_sys.wof.vfrt_data_size ),
-    AMEC_PARM_UINT8(PARM_ACTIVE_QUADS_START , "actv_quads_start", &g_amec_sys.wof.active_quads_start ),
+    AMEC_PARM_UINT8(PARM_WOF_HDR_VERSION, "wof_hdr_ver", &g_amec_sys.wof.version),
+    AMEC_PARM_UINT16(PARM_VFRT_BLOCK_SIZE, "vfrt_blck_sz", &g_amec_sys.wof.vfrt_block_size),
+ AMEC_PARM_UINT16(PARM_VFRT_BLOCK_HEADER_SZ, "vfrt_blck_hdr_sz", &g_amec_sys.wof.vfrt_blck_hdr_sz),
+    AMEC_PARM_UINT16(PARM_VFRT_DATA_SIZE , "vfrt_data_size", &g_amec_sys.wof.vfrt_data_size ),
     AMEC_PARM_UINT8(PARM_ACTIVE_QUADS_SIZE , "actv_quads_size", &g_amec_sys.wof.active_quads_size ),
-    AMEC_PARM_UINT8(PARM_VDN_START , "vdn_start", &g_amec_sys.wof.vdn_start ),
-    AMEC_PARM_UINT8(PARM_VDN_STEP , "vdn_step", &g_amec_sys.wof.vdn_step ),
-    AMEC_PARM_UINT8(PARM_VDN_SIZE , "vdn_size", &g_amec_sys.wof.vdn_size ),
-    AMEC_PARM_UINT8(PARM_VDD_START , "vdd_start", &g_amec_sys.wof.vdd_start ),
-    AMEC_PARM_UINT8(PARM_VDD_STEP , "vdd_step", &g_amec_sys.wof.vdd_step ),
-    AMEC_PARM_UINT8(PARM_VDD_SIZE , "vdd_size", &g_amec_sys.wof.vdd_size ),
+    AMEC_PARM_UINT8(PARM_CORE_COUNT, "core_count", &g_amec_sys.wof.core_count),
+    AMEC_PARM_UINT16(PARM_VDN_START , "vdn_start", &g_amec_sys.wof.vdn_start ),
+    AMEC_PARM_UINT16(PARM_VDN_STEP , "vdn_step", &g_amec_sys.wof.vdn_step ),
+    AMEC_PARM_UINT16(PARM_VDN_SIZE , "vdn_size", &g_amec_sys.wof.vdn_size ),
+    AMEC_PARM_UINT16(PARM_VDD_START , "vdd_start", &g_amec_sys.wof.vdd_start ),
+    AMEC_PARM_UINT16(PARM_VDD_STEP , "vdd_step", &g_amec_sys.wof.vdd_step ),
+    AMEC_PARM_UINT16(PARM_VDD_SIZE , "vdd_size", &g_amec_sys.wof.vdd_size ),
+    AMEC_PARM_UINT16(PARM_VRATIO_START, "vratio_start", &g_amec_sys.wof.vratio_start ),
+    AMEC_PARM_UINT16(PARM_VRATIO_STEP, "vratio_step", &g_amec_sys.wof.vratio_step ),
+    AMEC_PARM_UINT16(PARM_VRATIO_SIZE, "vratio_size", &g_amec_sys.wof.vratio_size ),
+    AMEC_PARM_UINT16(PARM_FRATIO_START, "fratio_start", &g_amec_sys.wof.fratio_start ),
+    AMEC_PARM_UINT16(PARM_FRATIO_STEP, "fratio_step", &g_amec_sys.wof.fratio_step ),
+    AMEC_PARM_UINT16(PARM_FRATIO_SIZE, "fratio_size", &g_amec_sys.wof.fratio_size ),
+    AMEC_PARM_UINT16_ARRAY(PARM_VDN_PERCENT, "vdn_percent", &g_amec_sys.wof.vdn_percent, 8 ),
+    AMEC_PARM_UINT16(PARM_SOCKET_POWER_W, "socket_power_w", &g_amec_sys.wof.socket_power_w ),
+    AMEC_PARM_UINT16(PARM_NEST_FREQ_MHZ, "nest_freq_mhz", &g_amec_sys.wof.nest_freq_mhz ),
+    AMEC_PARM_UINT16(PARM_NOM_FREQ_MHZ, "nom_freq_mhz", &g_amec_sys.wof.nom_freq_mhz ),
+    AMEC_PARM_UINT16(PARM_RDP_CAPACITY, "rdp_capacity", &g_amec_sys.wof.rdp_capacity ),
+    AMEC_PARM_UINT64(PARM_WOF_TBLS_SRC_TAG, "wofTblSrcTag", &g_amec_sys.wof.wof_tbls_src_tag ),
+    AMEC_PARM_UINT64(PARM_PACKAGE_NAME_HI, "pkg_name_hi", &g_amec_sys.wof.package_name_hi ),
+    AMEC_PARM_UINT64(PARM_PACKAGE_NAME_LO, "pkg_name_lo", &g_amec_sys.wof.package_name_lo ),
+
     AMEC_PARM_UINT16(PARM_VDD_STEP_FROM_START, "vdd_stp_frm_strt", &g_amec_sys.wof.vdd_step_from_start),
     AMEC_PARM_UINT16(PARM_VDN_STEP_FROM_START, "vdn_stp_frm_strt", &g_amec_sys.wof.vdn_step_from_start),
     AMEC_PARM_UINT8(PARM_QUAD_STEP_FROM_START, "quadStpFrmStrt", &g_amec_sys.wof.quad_step_from_start),
@@ -212,6 +229,7 @@ amec_parm_t g_amec_parm_list[] = {
     AMEC_PARM_UINT8(PARM_WOF_INIT_STATE, "wof_init_state", &g_amec_sys.wof.wof_init_state),
     AMEC_PARM_UINT32(PARM_QUAD_STATE_0_ADDR, "quadSt0Addr", &g_amec_sys.wof.quad_state_0_addr),
     AMEC_PARM_UINT32(PARM_QUAD_STATE_1_ADDR, "quadSt1Addr", &g_amec_sys.wof.quad_state_1_addr),
+    AMEC_PARM_UINT32(PARM_PGPE_WOF_STATE_ADDR, "pgpeWofStAddr", &g_amec_sys.wof.pgpe_wof_state_addr),
     AMEC_PARM_UINT32(PARM_REQ_ACTIVE_QUADS_ADDR, "reqActQuadAddr", &g_amec_sys.wof.req_active_quads_addr),
     // End WOF parameters
 };