diff options
author | Corey Swenson <cswenson@us.ibm.com> | 2015-05-11 14:03:51 -0500 |
---|---|---|
committer | Patrick Williams <iawillia@us.ibm.com> | 2015-12-11 13:56:27 -0600 |
commit | 5d33811c6f265463f502c19dd2a3173e1bbc38bc (patch) | |
tree | 978fca6284a12f15d4084559317c034775813ac2 /src/usr/xscom | |
parent | 12bdd1a279cf7913b5da2010c8cbbc7ccfacf0a6 (diff) | |
download | blackbird-hostboot-5d33811c6f265463f502c19dd2a3173e1bbc38bc.tar.gz blackbird-hostboot-5d33811c6f265463f502c19dd2a3173e1bbc38bc.zip |
Base kernel changes for Nimbus/Cumulus
Change-Id: Ic5dfde1e975453d760631335bab674919e1109e7
RTC: 126637
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/18321
Tested-by: Jenkins Server
Reviewed-by: Christian Geddes <crgeddes@us.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>
Diffstat (limited to 'src/usr/xscom')
-rw-r--r-- | src/usr/xscom/xscom.C | 6 | ||||
-rw-r--r-- | src/usr/xscom/xscom.H | 8 |
2 files changed, 10 insertions, 4 deletions
diff --git a/src/usr/xscom/xscom.C b/src/usr/xscom/xscom.C index bfc4df2e6..3291ce476 100644 --- a/src/usr/xscom/xscom.C +++ b/src/usr/xscom/xscom.C @@ -201,6 +201,8 @@ uint8_t getMaxChipsPerNode() case CORE_POWER8_MURANO: case CORE_POWER8_VENICE: case CORE_POWER8_NAPLES: + case CORE_POWER9_NIMBUS: + case CORE_POWER9_CUMULUS: case CORE_UNKNOWN: default: l_numOfChips = 8; @@ -662,6 +664,8 @@ void collectXscomFFDC(TARGETING::Target* i_target, uint64_t* i_virtAddr, errlHndl_t& io_errl) { +// @todo-RTC:128077 XSCOM support for P9 +#if (0) errlHndl_t l_err = NULL; HMER l_hmer; uint64_t io_buffer = 0; @@ -728,7 +732,7 @@ void collectXscomFFDC(TARGETING::Target* i_target, // Add the register FFDC to the errorlog passed in. l_logReg.addToLog(io_errl); - +#endif return; } diff --git a/src/usr/xscom/xscom.H b/src/usr/xscom/xscom.H index 372361b53..df49b1ac0 100644 --- a/src/usr/xscom/xscom.H +++ b/src/usr/xscom/xscom.H @@ -5,7 +5,9 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* COPYRIGHT International Business Machines Corp. 2011,2014 */ +/* Contributors Listed Below - COPYRIGHT 2011,2015 */ +/* [+] International Business Machines Corp. */ +/* */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); */ /* you may not use this file except in compliance with the License. */ @@ -38,8 +40,8 @@ /** * @brief The (fixed) base address value for master proc */ -//@todo - Verify this value for HW -#define MASTER_PROC_XSCOM_BASE_ADDR 0x0003FC0000000000 +// @todo-RTC:128077 XSCOM support for P9 +#define MASTER_PROC_XSCOM_BASE_ADDR 0x0006010000000000 /** * @brief Type definition for XSCom address and Chip ID |