Attribute Review - Nest

Change-Id: I6af714a8975122a4e83c955a21913ede0d643453
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/23164
Tested-by: Jenkins Server
Tested-by: PPE CI
Tested-by: Hostboot CI
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Reviewed-by: Joseph J. McGill <jmcgill@us.ibm.com>
Reviewed-by: Jennifer A. Stofer <stofer@us.ibm.com>
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/23168
Tested-by: FSP CI Jenkins

3 files changed, 20 insertions, 20 deletions

diff --git a/src/usr/hwpf/hwp/activate_powerbus/proc_build_smp/proc_build_smp.C b/src/usr/hwpf/hwp/activate_powerbus/proc_build_smp/proc_build_smp.C
index cafd82852..6517d1fae 100644
--- a/src/usr/hwpf/hwp/activate_powerbus/proc_build_smp/proc_build_smp.C
+++ b/src/usr/hwpf/hwp/activate_powerbus/proc_build_smp/proc_build_smp.C
@@ -5,7 +5,7 @@
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2012,2015                        */
+/* Contributors Listed Below - COPYRIGHT 2012,2016                        */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
@@ -98,56 +98,56 @@ fapi::ReturnCode proc_build_smp_process_system(
 
         // get PB frequency attribute
         FAPI_DBG("proc_build_smp_process_system: Querying PB frequency attribute");
-        rc = FAPI_ATTR_GET(ATTR_FREQ_PB,
+        rc = FAPI_ATTR_GET(ATTR_FREQ_PB_MHZ,
                            NULL,
                            io_smp.freq_pb);
         if (!rc.ok())
         {
-            FAPI_ERR("proc_build_smp_process_system: Error from FAPI_ATTR_GET (ATTR_FREQ_PB");
+            FAPI_ERR("proc_build_smp_process_system: Error from FAPI_ATTR_GET (ATTR_FREQ_PB_MHZ");
             break;
         }
 
         // get A bus frequency attribute
         FAPI_DBG("proc_build_smp_process_system: Querying A bus frequency attribute");
-        rc = FAPI_ATTR_GET(ATTR_FREQ_A,
+        rc = FAPI_ATTR_GET(ATTR_FREQ_A_MHZ,
                            NULL,
                            io_smp.freq_a);
         if (!rc.ok())
         {
-            FAPI_ERR("proc_build_smp_process_system: Error from FAPI_ATTR_GET (ATTR_FREQ_A");
+            FAPI_ERR("proc_build_smp_process_system: Error from FAPI_ATTR_GET (ATTR_FREQ_A_MHZ");
             break;
         }
 
         // get X bus frequency attribute
         FAPI_DBG("proc_build_smp_process_system: Querying X bus frequency attribute");
-        rc = FAPI_ATTR_GET(ATTR_FREQ_X,
+        rc = FAPI_ATTR_GET(ATTR_FREQ_X_MHZ,
                            NULL,
                            io_smp.freq_x);
         if (!rc.ok())
         {
-            FAPI_ERR("proc_build_smp_process_system: Error from FAPI_ATTR_GET (ATTR_FREQ_X");
+            FAPI_ERR("proc_build_smp_process_system: Error from FAPI_ATTR_GET (ATTR_FREQ_X_MHZ");
             break;
         }
 
         // get core floor frequency attribute
         FAPI_DBG("proc_build_smp_process_system: Querying core floor frequency attribute");
-        rc = FAPI_ATTR_GET(ATTR_FREQ_CORE_FLOOR,
+        rc = FAPI_ATTR_GET(ATTR_FREQ_CORE_FLOOR_MHZ,
                            NULL,
                            io_smp.freq_core_floor);
         if (!rc.ok())
         {
-            FAPI_ERR("proc_build_smp_process_system: Error from FAPI_ATTR_GET (ATTR_FREQ_CORE_FLOOR)");
+            FAPI_ERR("proc_build_smp_process_system: Error from FAPI_ATTR_GET (ATTR_FREQ_CORE_FLOOR_MHZ)");
             break;
         }
 
         // get core nominal frequency attribute
         FAPI_DBG("proc_build_smp_process_system: Querying core nominal frequency attribute");
-        rc = FAPI_ATTR_GET(ATTR_FREQ_CORE_NOMINAL,
+        rc = FAPI_ATTR_GET(ATTR_FREQ_CORE_NOMINAL_MHZ,
                            NULL,
                            io_smp.freq_core_nom);
         if (!rc.ok())
         {
-            FAPI_ERR("proc_build_smp_process_system: Error from FAPI_ATTR_GET (ATTR_FREQ_CORE_NOMINAL)");
+            FAPI_ERR("proc_build_smp_process_system: Error from FAPI_ATTR_GET (ATTR_FREQ_CORE_NOMINAL_MHZ)");
             break;
         }
 
@@ -175,12 +175,12 @@ fapi::ReturnCode proc_build_smp_process_system(
 
         // get PCIe frequency attribute
         FAPI_DBG("proc_build_smp_process_system: Querying PCIe frequency attribute");
-        rc = FAPI_ATTR_GET(ATTR_FREQ_PCIE,
+        rc = FAPI_ATTR_GET(ATTR_FREQ_PCIE_MHZ,
                            NULL,
                            io_smp.freq_pcie);
         if (!rc.ok())
         {
-            FAPI_ERR("proc_build_smp_process_system: Error from FAPI_ATTR_GET (ATTR_FREQ_PCIE");
+            FAPI_ERR("proc_build_smp_process_system: Error from FAPI_ATTR_GET (ATTR_FREQ_PCIE_MHZ");
             break;
         }
 
diff --git a/src/usr/hwpf/hwp/build_winkle_images/p8_slw_build/p8_xip_customize.C b/src/usr/hwpf/hwp/build_winkle_images/p8_slw_build/p8_xip_customize.C
index 156ecc593..886d2c8db 100644
--- a/src/usr/hwpf/hwp/build_winkle_images/p8_slw_build/p8_xip_customize.C
+++ b/src/usr/hwpf/hwp/build_winkle_images/p8_slw_build/p8_xip_customize.C
@@ -5,7 +5,7 @@
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2012,2015                        */
+/* Contributors Listed Below - COPYRIGHT 2012,2016                        */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
@@ -2348,10 +2348,10 @@ ReturnCode p8_xip_customize( const fapi::Target &i_target,
 
     // determine nest frequency
     uint32_t freq_pb;
-    rc = FAPI_ATTR_GET(ATTR_FREQ_PB, NULL, freq_pb);
+    rc = FAPI_ATTR_GET(ATTR_FREQ_PB_MHZ, NULL, freq_pb);
     if (!rc.ok())
     {
-        FAPI_ERR("Error from FAPI_ATTR_GET (ATTR_FREQ_PB)");
+        FAPI_ERR("Error from FAPI_ATTR_GET (ATTR_FREQ_PB_MHZ)");
         return rc;
     }
 
diff --git a/src/usr/hwpf/hwp/dram_training/mem_pll_setup/cen_mem_pll_initf.C b/src/usr/hwpf/hwp/dram_training/mem_pll_setup/cen_mem_pll_initf.C
index 728a83c28..1e4c9fb6f 100644
--- a/src/usr/hwpf/hwp/dram_training/mem_pll_setup/cen_mem_pll_initf.C
+++ b/src/usr/hwpf/hwp/dram_training/mem_pll_setup/cen_mem_pll_initf.C
@@ -5,7 +5,7 @@
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2012,2014                        */
+/* Contributors Listed Below - COPYRIGHT 2012,2016                        */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
@@ -339,11 +339,11 @@ fapi::ReturnCode cen_mem_pll_initf(const fapi::Target & i_target)
             FAPI_ERR("Failed to get attribute: ATTR_MSS_FREQ.");
             break;
         }
-        // ATTR_FREQ_PB is a "system" attribute, so use NULL as the target.
-        rc = FAPI_ATTR_GET( ATTR_FREQ_PB, NULL, nest_freq);
+        // ATTR_FREQ_PB_MHZ is a "system" attribute, so use NULL as the target.
+        rc = FAPI_ATTR_GET( ATTR_FREQ_PB_MHZ, NULL, nest_freq);
         if (rc)
         {
-            FAPI_ERR("Failed to get attribute: ATTR_FREQ_PB.");
+            FAPI_ERR("Failed to get attribute: ATTR_FREQ_PB_MHZ.");
             break;
         }