INITPROC: Hostboot - SW228141 PLL Rescan for DCCAL

Change-Id: Ic4b2f3b5dda2abe151923ac70103e298a47d4169
CMVC-Prereq:903906
CQ:SW228141
Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/6849
Tested-by: Jenkins Server
Reviewed-by: Thi N. Tran <thi@us.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>

1 files changed, 10 insertions, 24 deletions

diff --git a/src/usr/hwpf/hwp/nest_chiplets/proc_a_x_pci_dmi_pll_setup/proc_a_x_pci_dmi_pll_initf.C b/src/usr/hwpf/hwp/nest_chiplets/proc_a_x_pci_dmi_pll_setup/proc_a_x_pci_dmi_pll_initf.C
index db63cd585..00fbedacf 100644
--- a/src/usr/hwpf/hwp/nest_chiplets/proc_a_x_pci_dmi_pll_setup/proc_a_x_pci_dmi_pll_initf.C
+++ b/src/usr/hwpf/hwp/nest_chiplets/proc_a_x_pci_dmi_pll_setup/proc_a_x_pci_dmi_pll_initf.C
@@ -20,7 +20,7 @@
 /* Origin: 30                                                             */
 /*                                                                        */
 /* IBM_PROLOG_END_TAG                                                     */
-// $Id: proc_a_x_pci_dmi_pll_initf.C,v 1.14 2013/04/29 16:38:51 jmcgill Exp $
+// $Id: proc_a_x_pci_dmi_pll_initf.C,v 1.15 2013/09/30 16:09:56 jmcgill Exp $
 // $Source: /afs/awd/projects/eclipz/KnowledgeBase/.cvsroot/eclipz/chips/p8/working/procedures/ipl/fapi/proc_a_x_pci_dmi_pll_initf.C,v $
 //------------------------------------------------------------------------------
 // *|
@@ -53,26 +53,6 @@ using namespace fapi;
 
 
 //------------------------------------------------------------------------------
-// Constant definitions
-//------------------------------------------------------------------------------
-
-const uint32_t PB_BNDY_DMIPLL_RING_ADDR = 0x02030088;
-const uint32_t AB_BNDY_PLL_RING_ADDR    = 0x08030088;
-const uint32_t PCI_BNDY_PLL_RING_ADDR   = 0x09030088;
-
-const uint32_t DMI_PLL_VCO_WORKAROUND_THRESHOLD_FREQ = 4800;
-
-const uint32_t PB_BNDY_DMIPLL_RING_CCALLOAD_OFFSET = 580;
-const uint32_t PB_BNDY_DMIPLL_RING_CCALFMIN_OFFSET = 581;
-
-const uint32_t AB_BNDY_PLL_RING_CCALLOAD_OFFSET = 278;
-const uint32_t AB_BNDY_PLL_RING_CCALFMIN_OFFSET = 279;
-
-const uint32_t PCI_BNDY_PLL_RING_CCALLOAD_OFFSET = 0x0;
-const uint32_t PCI_BNDY_PLL_RING_CCALFMIN_OFFSET = 0x0;
-
-
-//------------------------------------------------------------------------------
 // Function definition
 //------------------------------------------------------------------------------
 
@@ -237,7 +217,8 @@ fapi::ReturnCode proc_a_x_pci_dmi_pll_initf(const fapi::Target & i_target,
                     ring_data,
                     a_lctank_pll_vco_workaround,
                     AB_BNDY_PLL_RING_CCALLOAD_OFFSET,
-                    AB_BNDY_PLL_RING_CCALFMIN_OFFSET);
+                    AB_BNDY_PLL_RING_CCALFMIN_OFFSET,
+                    false);
             if (rc)
             {
                 FAPI_ERR("Error from proc_a_x_pci_dmi_pll_scan_pll");
@@ -326,7 +307,8 @@ fapi::ReturnCode proc_a_x_pci_dmi_pll_initf(const fapi::Target & i_target,
                     ring_data,
                     dmi_lctank_pll_vco_workaround,
                     PB_BNDY_DMIPLL_RING_CCALLOAD_OFFSET,
-                    PB_BNDY_DMIPLL_RING_CCALFMIN_OFFSET);
+                    PB_BNDY_DMIPLL_RING_CCALFMIN_OFFSET,
+                    true);
             if (rc)
             {
                 FAPI_ERR("Error from proc_a_x_pci_dmi_pll_scan_pll");
@@ -407,7 +389,8 @@ fapi::ReturnCode proc_a_x_pci_dmi_pll_initf(const fapi::Target & i_target,
                     ring_data,
                     false,
                     PCI_BNDY_PLL_RING_CCALLOAD_OFFSET,
-                    PCI_BNDY_PLL_RING_CCALFMIN_OFFSET);
+                    PCI_BNDY_PLL_RING_CCALFMIN_OFFSET,
+                    false);
             if (rc)
             {
                 FAPI_ERR("Error from proc_a_x_pci_dmi_pll_scan_pll");
@@ -434,6 +417,9 @@ fapi::ReturnCode proc_a_x_pci_dmi_pll_initf(const fapi::Target & i_target,
 This section is automatically updated by CVS when you check in this file.
 Be sure to create CVS comments when you commit so that they can be included here.
 $Log: proc_a_x_pci_dmi_pll_initf.C,v $
+Revision 1.15  2013/09/30 16:09:56  jmcgill
+fix HW268965
+
 Revision 1.14  2013/04/29 16:38:51  jmcgill
 add constants for Murano DD1 ccalload/ccalfmin ring offsets used in workaround