INITPROC: Hostboot - from defect SW224356 - PSTATE procedures

Change-Id: I5358dab2f24f26054fb004ff980c9fe4638cff6c
CMVC-Coreq:896229
CQ:SW224356
Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/6446
Tested-by: Jenkins Server
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>

3 files changed, 16 insertions, 15 deletions

diff --git a/src/usr/runtime/common/hsvc_procdata.C b/src/usr/runtime/common/hsvc_procdata.C
index e01f95eb3..b47a91453 100644
--- a/src/usr/runtime/common/hsvc_procdata.C
+++ b/src/usr/runtime/common/hsvc_procdata.C
@@ -39,8 +39,6 @@ HSVC_LOAD_ATTR( ATTR_PM_APSS_CHIP_SELECT );
 HSVC_LOAD_ATTR( ATTR_PM_PBAX_BRDCST_ID_VECTOR );
 HSVC_LOAD_ATTR( ATTR_PM_PBAX_CHIPID );
 HSVC_LOAD_ATTR( ATTR_PM_PBAX_NODEID );
-HSVC_LOAD_ATTR( ATTR_PM_PSTATE_UNDERVOLTING_MAXIMUM );
-HSVC_LOAD_ATTR( ATTR_PM_PSTATE_UNDERVOLTING_MINIMUM );
 HSVC_LOAD_ATTR( ATTR_PM_SPIVID_PORT_ENABLE );
 // -- Input: src/usr/hwpf/hwp/runtime_attributes/pm_hwp_attributes.xml --
 HSVC_LOAD_ATTR( ATTR_PM_AISS_TIMEOUT );
diff --git a/src/usr/runtime/common/hsvc_sysdata.C b/src/usr/runtime/common/hsvc_sysdata.C
index b253bfd90..d4b393fbb 100644
--- a/src/usr/runtime/common/hsvc_sysdata.C
+++ b/src/usr/runtime/common/hsvc_sysdata.C
@@ -89,9 +89,12 @@ HSVC_LOAD_ATTR( ATTR_PM_RESONANT_CLOCK_LOW_BAND_UPPER_FREQUENCY );
 HSVC_LOAD_ATTR( ATTR_PM_SAFE_FREQUENCY );
 HSVC_LOAD_ATTR( ATTR_PM_SPIPSS_FREQUENCY );
 HSVC_LOAD_ATTR( ATTR_PM_SPIVID_FREQUENCY );
-HSVC_LOAD_ATTR( ATTR_PROC_R_DISTLOSS );
-HSVC_LOAD_ATTR( ATTR_PROC_R_LOADLINE );
-HSVC_LOAD_ATTR( ATTR_PROC_VRM_VOFFSET );
+HSVC_LOAD_ATTR( ATTR_PROC_R_DISTLOSS_VDD );
+HSVC_LOAD_ATTR( ATTR_PROC_R_DISTLOSS_VCS );
+HSVC_LOAD_ATTR( ATTR_PROC_R_LOADLINE_VDD );
+HSVC_LOAD_ATTR( ATTR_PROC_R_LOADLINE_VCS );
+HSVC_LOAD_ATTR( ATTR_PROC_VRM_VOFFSET_VDD );
+HSVC_LOAD_ATTR( ATTR_PROC_VRM_VOFFSET_VCS );
 // -- Input: ../../xml/attribute_info/system_attributes.xml --
 HSVC_LOAD_ATTR( ATTR_ALL_MCS_IN_INTERLEAVING_GROUP );
 HSVC_LOAD_ATTR( ATTR_BOOT_FREQ_MHZ );
diff --git a/src/usr/runtime/test/runtimeattrstest.H b/src/usr/runtime/test/runtimeattrstest.H
index 5fedfe42c..691a5a73c 100644
--- a/src/usr/runtime/test/runtimeattrstest.H
+++ b/src/usr/runtime/test/runtimeattrstest.H
@@ -88,11 +88,11 @@ class RuntimeAttrsTest: public CxxTest::TestSuite
         }
         bool freq_found = false;
 
-        fapi::ATTR_PROC_R_LOADLINE_Type loadline = 0;
-        l_rc = FAPI_ATTR_GET(ATTR_PROC_R_LOADLINE,NULL,loadline);
+        fapi::ATTR_PROC_R_LOADLINE_VDD_Type loadline = 0;
+        l_rc = FAPI_ATTR_GET(ATTR_PROC_R_LOADLINE_VDD,NULL,loadline);
         if( l_rc )
         {
-            TS_FAIL("Error getting fapi::ATTR_PROC_R_LOADLINE");
+            TS_FAIL("Error getting fapi::ATTR_PROC_R_LOADLINE_VDD");
         }
         bool loadline_found = false;
 
@@ -120,24 +120,24 @@ class RuntimeAttrsTest: public CxxTest::TestSuite
                     }
                 }
             }
-            else if( headers[attr].id == fapi::ATTR_PROC_R_LOADLINE )
+            else if( headers[attr].id == fapi::ATTR_PROC_R_LOADLINE_VDD )
             {
                 loadline_found = true;
                 if( headers[attr].sizeBytes !=
-                    sizeof(fapi::ATTR_PROC_R_LOADLINE_Type) )
+                    sizeof(fapi::ATTR_PROC_R_LOADLINE_VDD_Type) )
                 {
                     TRACFCOMP( g_trac_runtime, "size=%.16X", headers[attr].sizeBytes );
-                    TS_FAIL("Size of fapi::ATTR_PROC_R_LOADLINE data is wrong");
+                    TS_FAIL("Size of fapi::ATTR_PROC_R_LOADLINE_VDD data is wrong");
                 }
                 else
                 {
-                    fapi::ATTR_PROC_R_LOADLINE_Type* loadline_act =
-                      reinterpret_cast<fapi::ATTR_PROC_R_LOADLINE_Type*>
+                    fapi::ATTR_PROC_R_LOADLINE_VDD_Type* loadline_act =
+                      reinterpret_cast<fapi::ATTR_PROC_R_LOADLINE_VDD_Type*>
                       (beginning+headers[attr].offset);
                     if( *loadline_act != loadline )
                     {
                         TRACFCOMP( g_trac_runtime, "Expected=%X, Actual=%X", loadline, *loadline_act );
-                        TS_FAIL("fapi::ATTR_PROC_R_LOADLINE data is wrong");
+                        TS_FAIL("fapi::ATTR_PROC_R_LOADLINE_VDD data is wrong");
                     }
                 }
             }
@@ -156,7 +156,7 @@ class RuntimeAttrsTest: public CxxTest::TestSuite
         }
         if( !loadline_found )
         {
-            TS_FAIL("Never found ATTR_PROC_R_LOADLINE in system attributes");
+            TS_FAIL("Never found ATTR_PROC_R_LOADLINE_VDD in system attributes");
         }
 
         TRACFCOMP( g_trac_runtime, "testVerifySystemAttributes> finish" );