SW267784: Need offset attributes applied to Brazos loadline equation

Change-Id: I7dcb1ea158b23f6b02a6ad8c1f5dc55443d3ac67
CQ:SW267784
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/12030
Reviewed-by: Thi N. Tran <thi@us.ibm.com>
Tested-by: Thi N. Tran <thi@us.ibm.com>
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/12053
Tested-by: Jenkins Server
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>

3 files changed, 19 insertions, 9 deletions

diff --git a/src/usr/hwpf/hwp/pstates/pstates/p8_build_pstate_datablock.C b/src/usr/hwpf/hwp/pstates/pstates/p8_build_pstate_datablock.C
index bea1414fa..9b77f36a9 100755
--- a/src/usr/hwpf/hwp/pstates/pstates/p8_build_pstate_datablock.C
+++ b/src/usr/hwpf/hwp/pstates/pstates/p8_build_pstate_datablock.C
@@ -22,12 +22,12 @@
 /* permissions and limitations under the License.                         */
 /*                                                                        */
 /* IBM_PROLOG_END_TAG                                                     */
-// $Id: p8_build_pstate_datablock.C,v 1.37 2014/06/03 16:59:05 daviddu Exp $
+// $Id: p8_build_pstate_datablock.C,v 1.38 2014/07/03 02:57:43 daviddu Exp $
 // $Source: /afs/awd/projects/eclipz/KnowledgeBase/.cvsroot/eclipz/chips/p8/working/procedures/ipl/fapi/p8_build_pstate_datablock.C,v $
 //------------------------------------------------------------------------------
 // *! (C) Copyright International Business Machines Corp. 2012
 // *! All Rights Reserved -- Property of IBM
-// *! ***  ***
+// *! *** IBM Confidential ***
 //------------------------------------------------------------------------------
 // *! OWNER NAME:  Jim Yacynych         Email: jimyac@us.ibm.com
 // *! BACKUP NAME: Greg Still           Email: stillgs@us.ibm.com
@@ -229,6 +229,9 @@ p8_build_pstate_datablock(const Target& i_target,
     s132a_parms.vcs_load_line_uohm    = attr.attr_proc_r_loadline_vcs;
     s132a_parms.vdd_distribution_uohm = attr.attr_proc_r_distloss_vdd;
     s132a_parms.vcs_distribution_uohm = attr.attr_proc_r_distloss_vcs;
+    // SW267784
+    s132a_parms.vdd_voffset_uv = attr.attr_proc_vrm_voffset_vdd;
+    s132a_parms.vcs_voffset_uv = attr.attr_proc_vrm_voffset_vcs;
 
     // --------------------------------------
     // Create Chip characterization structure
diff --git a/src/usr/hwpf/hwp/pstates/pstates/pstate_tables.c b/src/usr/hwpf/hwp/pstates/pstates/pstate_tables.c
index 56a79f21e..2a57af50a 100755
--- a/src/usr/hwpf/hwp/pstates/pstates/pstate_tables.c
+++ b/src/usr/hwpf/hwp/pstates/pstates/pstate_tables.c
@@ -5,7 +5,9 @@
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* COPYRIGHT International Business Machines Corp. 2013,2014              */
+/* Contributors Listed Below - COPYRIGHT 2013,2014                        */
+/* [+] International Business Machines Corp.                              */
+/*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
 /* you may not use this file except in compliance with the License.       */
@@ -20,7 +22,7 @@
 /* permissions and limitations under the License.                         */
 /*                                                                        */
 /* IBM_PROLOG_END_TAG                                                     */
-// $Id: pstate_tables.c,v 1.21 2014/05/27 15:33:49 daviddu Exp $
+// $Id: pstate_tables.c,v 1.22 2014/07/03 02:57:52 daviddu Exp $
 
 /// \file pstate_tables.c
 /// \brief This file contains code used to generate Pstate tables from real or
@@ -217,11 +219,13 @@ chip_characterization_create(ChipCharacterization *characterization,
 
             ops[gpst_points].vdd_corrected_uv =
                 ops[gpst_points].vdd_uv +
-                ((ops[gpst_points].idd_ma * (parameters->vdd_load_line_uohm + parameters->vdd_distribution_uohm)) / 1000); // jwy add in distribution_uohm
+                ((ops[gpst_points].idd_ma * (parameters->vdd_load_line_uohm + parameters->vdd_distribution_uohm)) / 1000) + // jwy add in distribution_uohm
+                parameters->vdd_voffset_uv; // SW267784 add in offset in uohm
 
             ops[gpst_points].vcs_corrected_uv =
                 ops[gpst_points].vcs_uv +
-                ((ops[gpst_points].ics_ma * (parameters->vcs_load_line_uohm + parameters->vcs_distribution_uohm)) / 1000); // jwy add in distribution_uohm
+                ((ops[gpst_points].ics_ma * (parameters->vcs_load_line_uohm + parameters->vcs_distribution_uohm)) / 1000) +  // jwy add in distribution_uohm
+                parameters->vcs_voffset_uv;   // SW267784 add in offset in uohm
 
             // iVRM 'Effective' voltages are set to the measured voltages
 
diff --git a/src/usr/hwpf/hwp/pstates/pstates/pstate_tables.h b/src/usr/hwpf/hwp/pstates/pstates/pstate_tables.h
index 12ef17888..be0116f10 100755
--- a/src/usr/hwpf/hwp/pstates/pstates/pstate_tables.h
+++ b/src/usr/hwpf/hwp/pstates/pstates/pstate_tables.h
@@ -5,7 +5,9 @@
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* COPYRIGHT International Business Machines Corp. 2013,2014              */
+/* Contributors Listed Below - COPYRIGHT 2013,2014                        */
+/* [+] International Business Machines Corp.                              */
+/*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
 /* you may not use this file except in compliance with the License.       */
@@ -23,7 +25,7 @@
 #ifndef __PSTATE_TABLES_H__
 #define __PSTATE_TABLES_H__
 
-// $Id: pstate_tables.h,v 1.9 2014/06/03 16:59:05 daviddu Exp $
+// $Id: pstate_tables.h,v 1.10 2014/07/03 02:57:52 daviddu Exp $
 
 /// \file pstate_tables.h 
 /// \brief Code used to generate Pstate tables from real or imagined chip
@@ -107,7 +109,8 @@ typedef struct {
     uint32_t vcs_load_line_uohm;
     uint32_t vdd_distribution_uohm;
     uint32_t vcs_distribution_uohm;
-
+    uint32_t vdd_voffset_uv;
+    uint32_t vcs_voffset_uv;
 } OperatingPointParameters;