diff options
| author | Joachim Fenkes <fenkes@de.ibm.com> | 2018-06-22 17:01:12 +0200 |
|---|---|---|
| committer | Sachin Gupta <sgupta2m@in.ibm.com> | 2018-06-26 22:32:42 -0400 |
| commit | 477bacfa844150ae288433ed68de406ca453f874 (patch) | |
| tree | cfc624426c46536a9bf71b14c64e5dadb9f9bfd9 /src/import/chips | |
| parent | c2f19a1bfda6839566353e4c16c6a02ac6eb9108 (diff) | |
| download | talos-sbe-477bacfa844150ae288433ed68de406ca453f874.tar.gz talos-sbe-477bacfa844150ae288433ed68de406ca453f874.zip | |
p9_sbe_tp_chiplet_init3: Don't meddle with osclite controls on Cumulus
During the clock_test2 substep, the procedure would unconditionally
clear use_osc_1_0 from ROOT_CTRL3, which turns the use_osc field (that
has been set up in istep 0) into an invalid value and breaks redundant
PCI clock failover.
Not removing that piece of code altogether because it does not appear
to hurt anything on Nimbus and it was explicitly requested by Uli back
in the Nimbus days, even though we don't remember his rationale.
Change-Id: Ieffe1946980a65c302f60d80f83b527e24d74b3b
CQ: SW434930
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/61188
Reviewed-by: Joseph J. McGill <jmcgill@us.ibm.com>
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: PPE CI <ppe-ci+hostboot@us.ibm.com>
Reviewed-by: Manish K. Chowdhary <manichow@in.ibm.com>
Reviewed-by: Jennifer A. Stofer <stofer@us.ibm.com>
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/61230
Reviewed-by: Sachin Gupta <sgupta2m@in.ibm.com>
Diffstat (limited to 'src/import/chips')
| -rw-r--r-- | src/import/chips/p9/procedures/hwp/perv/p9_sbe_tp_chiplet_init3.C | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/import/chips/p9/procedures/hwp/perv/p9_sbe_tp_chiplet_init3.C b/src/import/chips/p9/procedures/hwp/perv/p9_sbe_tp_chiplet_init3.C index 1ec914ee..12e3aed0 100644 --- a/src/import/chips/p9/procedures/hwp/perv/p9_sbe_tp_chiplet_init3.C +++ b/src/import/chips/p9/procedures/hwp/perv/p9_sbe_tp_chiplet_init3.C @@ -311,17 +311,6 @@ static fapi2::ReturnCode p9_sbe_tp_chiplet_init3_clock_test2( l_data64.setBit<PERV_ROOT_CTRL6_SET_TPFSI_OSCSW1_PGOOD>(); FAPI_TRY(fapi2::putScom(i_target_chip, PERV_ROOT_CTRL6_SCOM, l_data64)); - //Getting ROOT_CTRL3 register value - FAPI_TRY(fapi2::getScom(i_target_chip, PERV_ROOT_CTRL3_SCOM, - l_read)); //l_read = PIB.ROOT_CTRL3 - - l_read.clearBit<17>(); - - FAPI_DBG("turn off use_osc_1_0"); - //Setting ROOT_CTRL3 register value - //PIB.ROOT_CTRL3 = l_read - FAPI_TRY(fapi2::putScom(i_target_chip, PERV_ROOT_CTRL3_SCOM, l_read)); - if (cumulus_only_ec_attr) //Cumulus only { FAPI_DBG("Cumulus - Mask OSC err"); @@ -329,6 +318,17 @@ static fapi2::ReturnCode p9_sbe_tp_chiplet_init3_clock_test2( } else { + //Getting ROOT_CTRL3 register value + FAPI_TRY(fapi2::getScom(i_target_chip, PERV_ROOT_CTRL3_SCOM, + l_read)); //l_read = PIB.ROOT_CTRL3 + + l_read.clearBit<17>(); + + FAPI_DBG("turn off use_osc_1_0"); + //Setting ROOT_CTRL3 register value + //PIB.ROOT_CTRL3 = l_read + FAPI_TRY(fapi2::putScom(i_target_chip, PERV_ROOT_CTRL3_SCOM, l_read)); + FAPI_DBG("Mask OSC err"); //Setting OSCERR_MASK register value //PIB.OSCERR_MASK = OSC_ERROR_MASK |
