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/include | |
| parent | 43983e5bbd7a2b1c9a480c60595b2ef9ab520cde (diff) | |
| download | talos-hostboot-114a75e27e8fd2aa81f2829885411ec00ebc5d18.tar.gz talos-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/include')
| -rw-r--r-- | src/include/arch/pvrformat.H | 12 | ||||
| -rw-r--r-- | src/include/sys/misc.h | 6 |
2 files changed, 16 insertions, 2 deletions
diff --git a/src/include/arch/pvrformat.H b/src/include/arch/pvrformat.H index 0e1c462b8..2559ce997 100644 --- a/src/include/arch/pvrformat.H +++ b/src/include/arch/pvrformat.H @@ -113,8 +113,8 @@ struct PVR_t */ enum { - CHIP_DD_MASK = 0x00FF0F0F, - IS_NIMBUS_DD1 = 0x004E0100, + NIMBUS_DD1_MASK = 0x00FF2F0F, + IS_NIMBUS_DD1 = 0x004E0100, // Field: chipType NIMBUS_CHIP = 0, @@ -132,6 +132,14 @@ struct PVR_t P8_VENICE = 0x4D, P9_ALL = 0x4E, }; + + /** + * @brief Return Major.Minor DD level + * @return 8-bit DD level + */ + inline bool isNimbusDD1() { + return ((word & NIMBUS_DD1_MASK) == IS_NIMBUS_DD1); + } }; #endif //_PVRFORMAT_H diff --git a/src/include/sys/misc.h b/src/include/sys/misc.h index cfe62c7d3..cf8b6a93b 100644 --- a/src/include/sys/misc.h +++ b/src/include/sys/misc.h @@ -138,6 +138,12 @@ enum ProcessorCoreType CORE_UNKNOWN, }; +/** + * Strings for ProcessorCoreType + * declared in misc.C + */ +extern const char* ProcessorCoreTypeStrings[CORE_UNKNOWN+1]; + /** @fn cpu_core_type() * @brief Determine the procesore core type. * |
