Fix Vdd ceff ratio calculation when active cores is less than sort cores

Change-Id: I6adc2286acbda613ec6678485949d8b7ff5a721b CQ: SW489479 Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/94962 Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com> Reviewed-by: Christopher J Cain <cjcain@us.ibm.com> Reviewed-by: Francesco A Campisano <campisan@us.ibm.com> Reviewed-by: Martha Broyles <mbroyles@us.ibm.com>
open-power · Apr 20, 2020 · ab4dc96 · ab4dc96
1 parent 1bf0c8c
commit ab4dc96
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/src/occ_405/main.c b/src/occ_405/main.c
@@ -5,7 +5,7 @@
 /*                                                                        */
 /* OpenPOWER OnChipController Project                                     */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2011,2019                        */
+/* Contributors Listed Below - COPYRIGHT 2011,2020                        */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */

diff --git a/src/occ_405/occbuildname.c b/src/occ_405/occbuildname.c
@@ -5,7 +5,7 @@
 /*                                                                        */
 /* OpenPOWER OnChipController Project                                     */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2014,2019                        */
+/* Contributors Listed Below - COPYRIGHT 2014,2020                        */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
@@ -34,6 +34,6 @@ volatile const char G_occ_buildname[16] __attribute__((section(".buildname"))) =
 
 #else
 
-volatile const char G_occ_buildname[16] __attribute__((section(".buildname"))) = /*<BuildName>*/  "op_occ_191023a\0"  /*</BuildName>*/ ;
+volatile const char G_occ_buildname[16] __attribute__((section(".buildname"))) = /*<BuildName>*/  "op_occ_200417a\0"  /*</BuildName>*/ ;
 
 #endif
diff --git a/src/occ_405/wof/wof.c b/src/occ_405/wof/wof.c
@@ -5,7 +5,7 @@
 /*                                                                        */
 /* OpenPOWER OnChipController Project                                     */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2016,2019                        */
+/* Contributors Listed Below - COPYRIGHT 2016,2020                        */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
@@ -1376,7 +1376,8 @@ void calculate_ceff_ratio_vdd( void )
            }
 
            // Read iac_tdp_vdd from OCCPstateParmBlock struct
-           g_wof->iac_tdp_vdd = G_oppb.lac_tdp_vdd_turbo_10ma;
+           g_wof->iac_tdp_vdd = multiply_ratio( G_oppb.lac_tdp_vdd_turbo_10ma,
+                                                g_wof->v_ratio );
 
            // Get Vturbo and convert to 100uV (mV -> 100uV) = mV*10
            g_wof->vdd_avg_tdp_100uv = 10 * G_oppb.operating_points[TURBO].vdd_mv;
@@ -1467,8 +1468,8 @@ void calculate_ceff_ratio_vdd( void )
            }
         }  // else track to frequency
 
-        g_wof->c_ratio_vdd_volt = multiply_ratio( g_wof->vdd_avg_tdp_100uv,
-                                                  g_wof->v_ratio );
+        // Get Vturbo and convert to 100uV (mV -> 100uV) = mV*10
+        g_wof->c_ratio_vdd_volt = G_oppb.operating_points[TURBO].vdd_mv * 10;
 
         // Calculate ceff_tdp_vdd
         // iac_tdp_vdd / ((V@Freq*Vratio)^1.3 * (Freq*Fratio))