diff options
| author | Dan Crowell <dcrowell@us.ibm.com> | 2017-04-28 15:20:00 -0500 |
|---|---|---|
| committer | Daniel M. Crowell <dcrowell@us.ibm.com> | 2017-05-11 23:39:31 -0400 |
| commit | 114a75e27e8fd2aa81f2829885411ec00ebc5d18 (patch) | |
| tree | 845408b7b6e7b6569e2c20a61e8b08e4566461c7 /src/usr/isteps | |
| parent | 43983e5bbd7a2b1c9a480c60595b2ef9ab520cde (diff) | |
| download | blackbird-hostboot-114a75e27e8fd2aa81f2829885411ec00ebc5d18.tar.gz blackbird-hostboot-114a75e27e8fd2aa81f2829885411ec00ebc5d18.zip | |
Fix PVR check for Nimbus DD1
Added check for bit 18 to distinguish between Nimbus DD1.0 and
Cumulus DD1.0
Consolidated Nimbus DD1 checking to a common function
Added printk output that shows which CPU we're running on
Modified some existing printk output to use fewer characters
Change-Id: I1c42df0051fc2d9cc5fa54d95f68c3bd26b86462
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/39876
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Reviewed-by: Corey V. Swenson <cswenson@us.ibm.com>
Reviewed-by: Martin Gloff <mgloff@us.ibm.com>
Reviewed-by: Christian R. Geddes <crgeddes@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Diffstat (limited to 'src/usr/isteps')
| -rw-r--r-- | src/usr/isteps/istep06/thread_activate/thread_activate.C | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/usr/isteps/istep06/thread_activate/thread_activate.C b/src/usr/isteps/istep06/thread_activate/thread_activate.C index 26d374ef7..100556d37 100644 --- a/src/usr/isteps/istep06/thread_activate/thread_activate.C +++ b/src/usr/isteps/istep06/thread_activate/thread_activate.C @@ -268,16 +268,15 @@ void activate_threads( errlHndl_t& io_rtaskRetErrl ) // set the fused core mode attribute bool l_smt8 = false; - uint32_t l_pvr = mmio_pvr_read() & 0xFFFFFFFF; - if( (l_pvr & PVR_t::CHIP_DD_MASK) == PVR_t::IS_NIMBUS_DD1 ) + PVR_t l_pvr( mmio_pvr_read() & 0xFFFFFFFF ); + if( l_pvr.isNimbusDD1() ) { sys->setAttr<TARGETING::ATTR_FUSED_CORE_MODE> (TARGETING::FUSED_CORE_MODE_SMT4_DEFAULT); } else { - uint32_t l_smt = (l_pvr & PVR_t::SMT_MASK) >> PVR_t::SMT_SHIFT; - if( l_smt == PVR_t::SMT4_MODE ) + if( l_pvr.smt == PVR_t::SMT4_MODE ) { sys->setAttr<TARGETING::ATTR_FUSED_CORE_MODE> (TARGETING::FUSED_CORE_MODE_SMT4_ONLY); |
