WOF: update core leakage current in power off state

Change-Id: I0bc5ebe8a3d30ff24ae0dd7abe54484721925470
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/23842
Tested-by: FSP CI Jenkins
Reviewed-by: ANDRES A. LUGO-REYES <aalugore@us.ibm.com>
Reviewed-by: William A. Bryan <wilbryan@us.ibm.com>

Author: lefurgy

src/occ/amec/amec_sensors_core.c

@@ -5,7 +5,7 @@
 /*                                                                        */
 /* OpenPOWER OnChipController Project                                     */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2011,2015                        */
+/* Contributors Listed Below - COPYRIGHT 2011,2016                        */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
@@ -174,19 +174,6 @@ void amec_update_proc_core_sensors(uint8_t i_core)
     //-------------------------------------------------------
     amec_calc_spurr(i_core);
 
-    //-------------------------------------------------------
-    // Voltage
-    //-------------------------------------------------------
-    amec_sensors_core_voltage(i_core);
-
-    //-------------------------------------------------------
-    // Leakage current (for WOF)
-    // Note: Run after core temperature and voltage updates
-    //         amec_calc_dts_sensors()
-    //         amec_sensors_core_voltage()
-    //-------------------------------------------------------
-    amec_wof_calc_core_leakage(i_core);
-
     // ------------------------------------------------------
     // Update PREVIOUS values for next time
     // ------------------------------------------------------
@@ -222,6 +209,24 @@ void amec_update_proc_core_sensors(uint8_t i_core)
     // hi 3 bits in 0.796 day resolution with 512MHz TOD clock
     sensor_update( AMECSENSOR_PTR(TODclock2), l_temp16);
   }
+
+  // Always update core voltage and leakage current even when
+  // core is turned off. Required for correct WOF operation.
+  if(CORE_PRESENT(i_core))
+  {
+    //-------------------------------------------------------
+    // Voltage
+    //-------------------------------------------------------
+    amec_sensors_core_voltage(i_core);
+
+    //-------------------------------------------------------
+    // Leakage current (for WOF)
+    // Note: Run after core temperature and voltage updates
+    //         amec_calc_dts_sensors()
+    //         amec_sensors_core_voltage()
+    //-------------------------------------------------------
+    amec_wof_calc_core_leakage(i_core);
+  }
 }