diff options
| author | Patrick Williams <iawillia@us.ibm.com> | 2013-01-09 13:37:48 -0600 |
|---|---|---|
| committer | A. Patrick Williams III <iawillia@us.ibm.com> | 2013-01-10 11:30:02 -0600 |
| commit | e64a4688e267b52a4bdd28da7566a20a0f7af1f0 (patch) | |
| tree | 5a6b3de0130239200fee999b1907e7c17fc263b6 /src/usr/intr | |
| parent | 7c09df4e22f2e05289e0efbb3a3b7d0ad564c9ed (diff) | |
| download | talos-hostboot-e64a4688e267b52a4bdd28da7566a20a0f7af1f0.tar.gz talos-hostboot-e64a4688e267b52a4bdd28da7566a20a0f7af1f0.zip | |
Remove support for P7.
Change-Id: I9186f42f85d6f6864b51b6935f5d4e5ca510ceb4
RTC: 39872
Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/2901
Tested-by: Jenkins Server
Reviewed-by: ADAM R. MUHLE <armuhle@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>
Diffstat (limited to 'src/usr/intr')
| -rw-r--r-- | src/usr/intr/intrrp.C | 10 | ||||
| -rw-r--r-- | src/usr/intr/intrrp.H | 28 |
2 files changed, 7 insertions, 31 deletions
diff --git a/src/usr/intr/intrrp.C b/src/usr/intr/intrrp.C index f667220f3..d00dc5f8e 100644 --- a/src/usr/intr/intrrp.C +++ b/src/usr/intr/intrrp.C @@ -5,7 +5,7 @@ /* */ /* IBM CONFIDENTIAL */ /* */ -/* COPYRIGHT International Business Machines Corp. 2011,2012 */ +/* COPYRIGHT International Business Machines Corp. 2011,2013 */ /* */ /* p1 */ /* */ @@ -71,11 +71,7 @@ void IntrRp::init( errlHndl_t &io_errlHndl_t ) // ICPBAR = INTP.ICP_BAR[0:25] in P8 = 0x3FFFF800 + (8*node) + procPos -// P7 Scom address 0x02011C09 P8 = 0x020109c9 -// BaseAddress P7: -// BA[18:43] = ICPBAR (P8 says [14:43] (30 bits)) -// BA[47:49] = COREid (0-7) -// BA[50:51] = cpu thread (0-3) +// P8 Scom address = 0x020109c9 // // BaseAddress P8: // BA[14:43] = ICPBAR (30 bits) @@ -427,7 +423,7 @@ void IntrRp::msgHandler() case MSG_INTR_ENABLE_PSI_INTR: { - TARGETING::Target * target = + TARGETING::Target * target = reinterpret_cast<TARGETING::Target *>(msg->data[0]); errlHndl_t err = initIRSCReg(target); msg->data[1] = reinterpret_cast<uint64_t>(err); diff --git a/src/usr/intr/intrrp.H b/src/usr/intr/intrrp.H index ad13c1679..2a32edca4 100644 --- a/src/usr/intr/intrrp.H +++ b/src/usr/intr/intrrp.H @@ -5,7 +5,7 @@ /* */ /* IBM CONFIDENTIAL */ /* */ -/* COPYRIGHT International Business Machines Corp. 2011,2012 */ +/* COPYRIGHT International Business Machines Corp. 2011,2013 */ /* */ /* p1 */ /* */ @@ -27,6 +27,7 @@ #include <builtins.h> #include <limits.h> #include <errl/errlentry.H> +#include <kernel/intmsghandler.H> #include <sys/msg.h> #include <sys/misc.h> #include <intr/interrupt.H> @@ -143,7 +144,7 @@ namespace INTR LINKC_OFFSET = 24, //!< offset to LINKC register XISR_MASK = 0x00FFFFFF, //!< XISR MASK in XIRR register - ICPBAR_EN = 30, //!< BAR enable bit pos + ICPBAR_EN = 30, //!< BAR enable bit pos ICPBAR_SCOM_ADDR = 0x020109ca, //!< ICP BAR scom address // MASK base ICP address @@ -153,14 +154,6 @@ namespace INTR // If the interrupt can't be handled by the current chip there are // three link registers used provide targets to forward the // interrupt to. - // P7: - // [0] last - // [1] LoopTrip - // [2:18] Reserved - // [19:24] PChip - // [25:27] PCore - // [28:29] TSpec - // [30:31] LSpec // // P8: // [0] last @@ -422,20 +415,7 @@ namespace INTR ALWAYS_INLINE uint64_t cpuOffsetAddr(const PIR_t i_pir) const { - // TODO when P7 support is removed then change this - // to use InterruptMsgHdlr::mmio_offset() - uint64_t offset = (i_pir.nodeId * 8) + i_pir.chipId; - offset <<= 20; - switch (cpu_core_type()) - { - case CORE_POWER8_MURANO: - case CORE_POWER8_VENICE: - default: - offset |= static_cast<uint64_t>(i_pir.coreId) << 15; - break; - } - offset |= static_cast<uint64_t>(i_pir.threadId) << 12; - return offset; + return InterruptMsgHdlr::mmio_offset(i_pir.word); } /** |
