summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorBill Hoffa <wghoffa@us.ibm.com>2016-09-14 09:18:09 -0500
committerDaniel M. Crowell <dcrowell@us.ibm.com>2016-10-07 15:29:39 -0400
commit0d9f6d9a95c5b22d4044904e3563945638fe1c75 (patch)
tree54721b39ee4391317ebd18690a37f4fe4d798ce1 /src
parent90b0798b2ba62bd1fc00bbe183b71df5e2d796fb (diff)
downloadblackbird-hostboot-0d9f6d9a95c5b22d4044904e3563945638fe1c75.tar.gz
blackbird-hostboot-0d9f6d9a95c5b22d4044904e3563945638fe1c75.zip
Multi-Proc Interrupt Support with Remote LSIs
Change-Id: I8a981628cd3adc54ba581deb0ce8afb183febef3 RTC: 150562 Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/29719 Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com> Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com> Reviewed-by: Dean Sanner <dsanner@us.ibm.com> Reviewed-by: Prachi Gupta <pragupta@us.ibm.com> Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Diffstat (limited to 'src')
-rw-r--r--src/include/arch/pirformat.H5
-rw-r--r--src/include/usr/intr/interrupt.H3
-rw-r--r--src/usr/intr/intrrp.C732
-rw-r--r--src/usr/intr/intrrp.H131
-rw-r--r--src/usr/isteps/istep10/call_proc_build_smp.C18
-rw-r--r--src/usr/isteps/istep15/host_build_stop_image.C4
6 files changed, 675 insertions, 218 deletions
diff --git a/src/include/arch/pirformat.H b/src/include/arch/pirformat.H
index ec64b669a..19f3609ed 100644
--- a/src/include/arch/pirformat.H
+++ b/src/include/arch/pirformat.H
@@ -81,6 +81,11 @@ struct PIR_t
return word < r.word;
}
+ bool operator== (const PIR_t& rhs)
+ {
+ return (word == rhs.word);
+ }
+
// Some more handy constants
enum
{
diff --git a/src/include/usr/intr/interrupt.H b/src/include/usr/intr/interrupt.H
index 1666abd15..38d0fa473 100644
--- a/src/include/usr/intr/interrupt.H
+++ b/src/include/usr/intr/interrupt.H
@@ -141,6 +141,7 @@ namespace INTR
MSG_INTR_EOI, //!< Issue EOI when received
MSG_INTR_DRAIN_QUEUE, //!< Allow intrp to drain Q of EOI
MSG_INTR_COALESCE, //!< Pending interrupt to be handled
+ MSG_INTR_ENABLE_PSI_INTR, //!< Enable PSIHB Interrupts
};
/**
@@ -215,7 +216,7 @@ namespace INTR
* @param[in] i_target The target processor
* @return error log handle on error
*/
- //errlHndl_t enablePsiIntr(TARGETING::Target * i_target);
+ errlHndl_t enablePsiIntr(TARGETING::Target * i_target);
/**
* Return the interrupt presenter for requested target/thread
diff --git a/src/usr/intr/intrrp.C b/src/usr/intr/intrrp.C
index d7c7292d5..1a0c86c70 100644
--- a/src/usr/intr/intrrp.C
+++ b/src/usr/intr/intrrp.C
@@ -100,6 +100,10 @@ errlHndl_t IntrRp::_init()
TARGETING::Target* procTarget = NULL;
TARGETING::targetService().masterProcChipTargetHandle( procTarget );
+ intr_hdlr_t* l_procIntrHdlr = new intr_hdlr_t(procTarget);
+ iv_masterHdlr = l_procIntrHdlr;
+ iv_chipList.push_back(l_procIntrHdlr);
+
// Set up the IPC message Data area
TARGETING::Target * sys = NULL;
TARGETING::targetService().getTopLevelTarget( sys );
@@ -113,15 +117,23 @@ errlHndl_t IntrRp::_init()
do
{
- //TODO RTC 150562 - updates for multi-chip. My understanding is
- // the setting of the BARs + Enables can be done at the point in the IPL
- // where Xscoms are enabled.
- // Set the Interrupt BAR Scom Registers
- l_err = setInterruptBARs(procTarget);
+ // Set the Interrupt BAR Scom Registers specific to the master
+ l_err = setMasterInterruptBARs(procTarget);
if (l_err)
{
- TRACFCOMP(g_trac_intr, "IntrRp::_init() Error setting Interrupt BARs.");
+ TRACFCOMP(g_trac_intr,
+ "IntrRp::_init() Error setting Master Proc Interrupt BARs.");
+ break;
+ }
+
+ // Set the common Interrupt BAR Scom Registers for the master
+ l_err = setCommonInterruptBARs(iv_masterHdlr);
+
+ if (l_err)
+ {
+ TRACFCOMP(g_trac_intr,
+ "IntrRp::_init() Error setting Common Proc Interrupt BARs.");
break;
}
@@ -173,7 +185,7 @@ errlHndl_t IntrRp::_init()
TRACFCOMP(g_trac_intr, "IntrRp::_init() Enabling PSIHB Interrupts");
//Enable PSIHB Interrupts
- l_err = enableInterrupts();
+ l_err = enableInterrupts(l_procIntrHdlr);
if (l_err)
{
TRACFCOMP(g_trac_intr, "IntrRp::_init() Error enabling Interrupts");
@@ -195,7 +207,7 @@ errlHndl_t IntrRp::_init()
//The INTRP itself will monitor/handle PSU Interrupts
// so unmask those interrupts
- l_err = unmaskInterruptSource(LSI_PSU);
+ l_err = unmaskInterruptSource(LSI_PSU, l_procIntrHdlr);
//Set value for enabled threads
uint64_t l_en_threads = get_enabled_threads();
@@ -219,15 +231,14 @@ void IntrRp::acknowledgeInterrupt()
TRACFCOMP(g_trac_intr, "IntrRp::acknowledgeInterrupt(), read result: %16x", l_ackRead);
}
-errlHndl_t IntrRp::resetIntUnit()
+errlHndl_t IntrRp::resetIntUnit(intr_hdlr_t* i_proc)
{
errlHndl_t l_err = NULL;
uint64_t l_barValue = XIVE_RESET_POWERBUS_QUIESCE_ENABLE;
uint64_t size = sizeof(l_barValue);
uint32_t l_addr = XIVE_RESET_INT_CQ_RST_CTL_SCOM_ADDR;
- TARGETING::Target* procTarget = NULL;
- TARGETING::targetService().masterProcChipTargetHandle( procTarget );
+ TARGETING::Target* procTarget = i_proc->proc;
do {
//First quiesce the power bus
@@ -344,10 +355,10 @@ errlHndl_t IntrRp::resetIntUnit()
return l_err;
}
-errlHndl_t IntrRp::enableInterrupts()
+errlHndl_t IntrRp::enableInterrupts(intr_hdlr_t *i_proc)
{
errlHndl_t err = NULL;
- PSIHB_SW_INTERFACES_t * l_psihb_ptr = iv_psiHbBaseAddr;
+ PSIHB_SW_INTERFACES_t * l_psihb_ptr = i_proc->psiHbBaseAddr;
do
{
@@ -368,7 +379,7 @@ errlHndl_t IntrRp::enableInterrupts()
uint64_t l_masterCoreID = l_masterPir.coreId;
uint64_t l_masterThreadID = l_masterPir.threadId;
- uint64_t * l_ic_ptr = iv_xiveIcBarAddress;
+ uint64_t * l_ic_ptr = i_proc->xiveIcBarAddr;
l_ic_ptr += XIVE_IC_BAR_INT_PC_MMIO_REG_OFFSET;
volatile XIVE_IC_THREAD_CONTEXT_t * l_xive_ic_ptr =
@@ -416,6 +427,29 @@ errlHndl_t IntrRp::enableInterrupts()
return err;
}
+void IntrRp::enableSlaveProcInterruptRouting(intr_hdlr_t *i_proc)
+{
+ PSIHB_SW_INTERFACES_t * l_psihb_ptr = i_proc->psiHbBaseAddr;
+
+ //Route LSI Trigger Page to Master Proc Chip by setting the
+ // ESB Notification Address register on the PSIHB
+ uint64_t l_baseAddr =
+ iv_masterHdlr->proc->getAttr<TARGETING::ATTR_XIVE_CONTROLLER_BAR_ADDR>();
+
+ TRACFCOMP(g_trac_intr, INFO_MRK"Routing LSI Trigger page to Master Proc"
+ " chip by setting esb notification address to:%lx",
+ l_baseAddr + XIVE_IC_ESB_LSI_TRIGGER_PAGE_OFFSET);
+
+ //Set notify to base address, then set valid bit
+ uint64_t l_notifyValue = l_baseAddr + XIVE_IC_ESB_LSI_TRIGGER_PAGE_OFFSET;
+ l_psihb_ptr->esbnotifyaddr = l_notifyValue;
+ l_psihb_ptr->esbnotifyaddr = l_notifyValue + PSI_BRIDGE_ESB_NOTIFY_VALID;
+
+ //Enable Interrupt routing to trigger page written above by setting
+ // the Interrupt Control Register to all 0's
+ l_psihb_ptr->icr = PSI_BRIDGE_ENABLE_LSI_INTR_REMOTE;
+}
+
errlHndl_t IntrRp::disableInterrupts()
{
errlHndl_t err = NULL;
@@ -461,7 +495,11 @@ void IntrRp::msgHandler()
case MSG_INTR_COALESCE:
case MSG_INTR_EXTERN:
{
- std::vector<ext_intr_t> l_pendingInterruptTypes;
+ //ext_intr_t type = NO_INTERRUPT;
+ //Keep a list of all pending interrupts and which proc the
+ // interrupt condition was seen on
+ std::vector< std::pair<intr_hdlr_t, ext_intr_t> >
+ l_pendingIntr;
uint32_t ackResponse =
static_cast<uint32_t>(msg->data[0]>>32);
//Check if LSI-Based Interrupt
@@ -469,94 +507,98 @@ void IntrRp::msgHandler()
{
TRACFCOMP(g_trac_intr, "IntrRp::msgHandler() "
"- LSI Interrupt Detected");
- //Read LSI Interrupt Status register
- PSIHB_SW_INTERFACES_t * l_psihb_ptr = iv_psiHbBaseAddr;
- uint64_t lsiIntStatus = l_psihb_ptr->lsiintstatus;
- TRACFCOMP(g_trac_intr, "IntrRp::msgHandler() "
- "lsiIntStatus 0x%016lx", lsiIntStatus);
- //Loop through each bit, and add any pending interrupts
- // to list for later handling
- for (uint8_t i=0; i < LSI_LAST_SOURCE; i++)
+ //An external interrupt comes from two paths
+ // 1) kernel space - synchronous - response needed
+ // 2) User space (coalesce interrupt) - asynchronous
+ // - no response needed, just free message
+ if (msg_is_async(msg))
{
- uint64_t lsiIntMask = 0x8000000000000000 >> i;
- if (lsiIntMask & lsiIntStatus)
- {
- TRACDCOMP(g_trac_intr, "IntrRp::msgHandler() "
- "Interrupt Type: %d found", i);
- //Pending interrupt for this source type
- l_pendingInterruptTypes.push_back(
- static_cast<ext_intr_t>(i));
- }
+ msg_free(msg);
}
- }
-
- // xirr was read by interrupt message handler.
- // Passed in as upper word of data[0]
- uint32_t xirr = static_cast<uint32_t>(msg->data[0]>>32);
- // data[0] (lower word) has the PIR
- uint64_t l_xirr_pir = msg->data[0];
- uint64_t l_data0 = (l_xirr_pir & 0xFFFFFFFF);
- PIR_t pir = static_cast<PIR_t>(l_data0);
-
- TRACFCOMP(g_trac_intr,
- "External Interrupt received. XIRR=%x, PIR=%x",
- xirr,pir.word);
- //An external interrupt comes from two paths
- // 1) kernel space - synchronous - response needed
- // 2) User space (coalesce interrupt) - asynchronous
- // - no response needed, just free message
- if (msg_is_async(msg))
- {
- msg_free(msg);
- }
- else
- {
- // Acknowlege msg
- msg->data[1] = 0;
- msg_respond(iv_msgQ, msg);
- }
-
- for (auto l_type : l_pendingInterruptTypes)
- {
- //Search if anyone is subscribed to the given
- // interrupt source
- Registry_t::iterator r = iv_registry.find(l_type);
-
- if(r != iv_registry.end() && l_type != INTERPROC_XISR)
+ else
{
- msg_q_t msgQ = r->second.msgQ;
+ // Acknowlege msg
+ msg->data[1] = 0;
+ msg_respond(iv_msgQ, msg);
+ }
- msg_t * rmsg = msg_allocate();
- rmsg->type = r->second.msgType;
- rmsg->data[0] = l_type; // interrupt type
- rmsg->data[1] = l_xirr_pir;
- rmsg->extra_data = NULL;
+ //Read LSI Interrupt Status register from each enabled
+ // proc chip to see which caused the interrupt
+ for(ChipList_t::iterator targ_itr = iv_chipList.begin();
+ targ_itr != iv_chipList.end(); ++targ_itr)
+ {
+ uint64_t lsiIntStatus =
+ (*targ_itr)->psiHbBaseAddr->lsiintstatus;
+ TRACFCOMP(g_trac_intr, "IntrRp::msgHandler() "
+ "lsiIntStatus 0x%016lx", lsiIntStatus);
- int rc = msg_sendrecv_noblk(msgQ,rmsg, iv_msgQ);
- if(rc)
+ //Loop through each bit, and add any pending
+ // interrupts to list for later handling
+ for (uint8_t i=0; i < LSI_LAST_SOURCE; i++)
{
- TRACFCOMP(g_trac_intr,ERR_MRK
- "External Interrupt received type = %d, "
- "but could not send message to registered"
- " handler. Ignoring it. rc = %d",
- (uint32_t) l_type, rc);
+ uint64_t lsiIntMask = 0x8000000000000000 >> i;
+ if (lsiIntMask & lsiIntStatus)
+ {
+ TRACDCOMP(g_trac_intr,"IntrRp::msgHandler()"
+ " Interrupt Type: %d found", i);
+
+ //Get PIR value for the proc with the
+ // interrupt condition
+ uint64_t l_groupId =
+ (*targ_itr)->proc->getAttr
+ <TARGETING::ATTR_FABRIC_GROUP_ID>();
+ uint64_t l_chipId =
+ (*targ_itr)->proc->getAttr
+ <TARGETING::ATTR_FABRIC_CHIP_ID>();
+ //Core + Thread IDs not important so use 0's
+ PIR_t l_pir = PIR_t(l_groupId, l_chipId,
+ 0, 0);
+
+ //Make object to search pending interrupt
+ // list for
+ std::pair<PIR_t, ext_intr_t> l_intr =
+ std::make_pair( l_pir,
+ static_cast<ext_intr_t>(i));
+
+ //See if an interrupt with from Proc with
+ // the same PIR + interrupt source are
+ // still being processed
+ auto l_found = std::find_if(
+ iv_pendingIntr.begin(),
+ iv_pendingIntr.end(),
+ [&l_intr](auto k)->bool
+ {
+ return ((k.first == l_intr.first) &&
+ (k.second == l_intr.second));
+ });
+ if (l_found != iv_pendingIntr.end())
+ {
+ TRACFCOMP(g_trac_intr,
+ "IntrRp::msgHandler() Pending Interrupt already found for pir: 0x%lx,"
+ " interrupt type: %d, Ignoring",
+ l_pir, static_cast<ext_intr_t>(i));
+ }
+ else
+ {
+ //New pending interrupt for source type
+ TRACFCOMP(g_trac_intr,
+ "IntrRp::msgHandler() External Interrupt found for pir: 0x%lx,"
+ " interrupt type: %d",
+ l_pir, static_cast<ext_intr_t>(i));
+
+ //Add to list of interrupts in flight
+ iv_pendingIntr.push_back(l_intr);
+
+ //Call function to route the interrupt
+ //to the appropriate handler
+ routeInterrupt((*targ_itr),
+ static_cast<ext_intr_t>(i),
+ l_pir);
+ }
+ }
}
}
- else if (l_type == LSI_PSU)
- {
- TRACFCOMP(g_trac_intr, "PSU Interrupt Detected");
- handlePsuInterrupt(l_type);
- }
- else // no queue registered for this interrupt type
- {
- // Throw it away for now.
- TRACFCOMP(g_trac_intr,ERR_MRK
- "External Interrupt received type = %d, but "
- "nothing registered to handle it. "
- "Ignoring it.",
- (uint32_t)l_type);
- }
}
}
break;
@@ -636,7 +678,8 @@ void IntrRp::msgHandler()
if(msg->data[0] != INTERPROC_XISR)
{
uint64_t intSource = msg->data[0];
- sendEOI(intSource);
+ PIR_t l_pir = msg->data[1];
+ sendEOI(intSource, l_pir);
}
msg_free(msg);
}
@@ -663,16 +706,20 @@ void IntrRp::msgHandler()
{
//Enable (aka unmask) Interrupts for the source being
// registered for
- err = unmaskInterruptSource(l_intr_type);
- if (err)
+ for(ChipList_t::iterator targ_itr = iv_chipList.begin();
+ targ_itr != iv_chipList.end(); ++targ_itr)
{
- TRACFCOMP(g_trac_intr,
- "IntrRp::msgHandler MSG_INTR_REGISTER_MSGQ error"
- " unmasking interrupt type: %lx",
- l_intr_type);
+ err = unmaskInterruptSource(l_intr_type, *targ_itr);
+ if (err)
+ {
+ TRACFCOMP(g_trac_intr,
+ "IntrRp::msgHandler MSG_INTR_REGISTER_MSGQ "
+ "error unmasking interrupt type: %lx",
+ l_intr_type);
+ break;
+ }
}
}
-
msg->data[1] = reinterpret_cast<uint64_t>(err);
msg_respond(iv_msgQ,msg);
}
@@ -705,7 +752,16 @@ void IntrRp::msgHandler()
break;
case MSG_INTR_ENABLE:
{
- errlHndl_t err = enableInterrupts();
+ errlHndl_t err = NULL;
+ for(ChipList_t::iterator targ_itr = iv_chipList.begin();
+ targ_itr != iv_chipList.end(); ++targ_itr)
+ {
+ err = enableInterrupts(*targ_itr);
+ if (err)
+ {
+ break;
+ }
+ }
msg->data[1] = reinterpret_cast<uint64_t>(err);
msg_respond(iv_msgQ,msg);
}
@@ -718,6 +774,16 @@ void IntrRp::msgHandler()
msg_respond(iv_msgQ,msg);
}
break;
+ case MSG_INTR_ENABLE_PSI_INTR:
+ {
+ TRACFCOMP(g_trac_intr, "MSG_INTR_ENABLE_PSI_INTR received");
+ TARGETING::Target * target =
+ reinterpret_cast<TARGETING::Target *>(msg->data[0]);
+ errlHndl_t err = enableSlaveProcInterrupts(target);
+ msg->data[1] = reinterpret_cast<uint64_t>(err);
+ msg_respond(iv_msgQ,msg);
+ }
+ break;
// Called when a new cpu becomes active other than the master
// Expect a call for each new core
@@ -835,17 +901,82 @@ void IntrRp::msgHandler()
}
}
-errlHndl_t IntrRp::sendEOI(uint64_t& i_intSource)
+errlHndl_t IntrRp::sendEOI(uint64_t& i_intSource, PIR_t& i_pir)
{
- //Send an EOI to the Power bus using the PSIHB ESB Space
- //This is done with a read to the page specific to the interrupt source.
- //Each interrupt source gets one page
- uint64_t * l_psiHbPowerBusEoiAddr =
- iv_psiHbEsbBaseAddr + ((i_intSource)*PAGE_SIZE)/sizeof(uint64_t);
+ intr_hdlr_t* l_proc = NULL;
errlHndl_t l_err = NULL;
+ //Find target handle for Proc to send EOI to
+ for(ChipList_t::iterator targ_itr = iv_chipList.begin();
+ targ_itr != iv_chipList.end(); ++targ_itr)
+ {
+ uint64_t l_groupId = (*targ_itr)->proc->getAttr
+ <TARGETING::ATTR_FABRIC_GROUP_ID>();
+ uint64_t l_chipId = (*targ_itr)->proc->getAttr
+ <TARGETING::ATTR_FABRIC_CHIP_ID>();
+
+ //Core + Thread IDs not important so use 0's
+ PIR_t l_pir = PIR_t(l_groupId, l_chipId, 0, 0);
+
+ if (l_pir == i_pir)
+ {
+ l_proc = *targ_itr;
+ break;
+ }
+ }
+
do {
+ //Check if we found a matching proc handler for the interrupt to EOI
+ if (l_proc == NULL)
+ {
+ TRACFCOMP(g_trac_intr, ERR_MRK"IntrRp::sendEOI couldn't find proc"
+ " handler that matches pir: 0x%lx", i_pir);
+ break;
+ }
+ else
+ {
+ //Make object to search pending interrupt
+ // list for
+ std::pair<PIR_t, ext_intr_t> l_intr = std::make_pair(
+ i_pir,
+ static_cast<ext_intr_t>(i_intSource));
+
+ //See if an interrupt with from Proc with
+ // the same PIR + interrupt source are
+ // still being processed
+ auto l_found = std::find_if(
+ iv_pendingIntr.begin(),
+ iv_pendingIntr.end(),
+ [&l_intr](auto k)->bool
+ {
+ return (k.first == l_intr.first) &&
+ (k.second == l_intr.second);
+ });
+
+ if (l_found == iv_pendingIntr.end())
+ {
+ TRACFCOMP(g_trac_intr, ERR_MRK"IntrRp::msgHandler() Pending"
+ "Interrupt NOT found for pir: 0x%lx,"
+ " interrupt type: %d. Ignoring.",
+ i_pir, static_cast<ext_intr_t>(i_intSource));
+ }
+ else
+ {
+ //Delete pending interrupt for source type
+ TRACFCOMP(g_trac_intr, "IntrRp::sendEOI() Removing pending"
+ " interrupt for pir: 0x%lx, interrupt type: %d",
+ i_pir, static_cast<ext_intr_t>(i_intSource));
+ iv_pendingIntr.erase(l_found);
+ }
+ }
+
+ //Send an EOI to the Power bus using the PSIHB ESB Space
+ //This is done with a read to the page specific to the interrupt source.
+ //Each interrupt source gets one page
+ uint64_t * l_psiHbPowerBusEoiAddr =
+ l_proc->psiHbEsbBaseAddr + ((i_intSource)*PAGE_SIZE)/sizeof(uint64_t);
+
uint64_t eoiRead = *l_psiHbPowerBusEoiAddr;
if (eoiRead != 0)
{
@@ -872,8 +1003,8 @@ errlHndl_t IntrRp::sendEOI(uint64_t& i_intSource)
TRACDCOMP(g_trac_intr, "IntrRp::sendEOI read response: %lx", eoiRead);
- //EOI Part 2 - LSI ESB Internal to the IVPE
- volatile uint64_t * l_lsiEoi = iv_xiveIcBarAddress;
+ //EOI Part 2 - LSI ESB Internal to the IVPE of the Master Proc
+ volatile uint64_t * l_lsiEoi = iv_masterHdlr->xiveIcBarAddr;
l_lsiEoi += XIVE_IC_LSI_EOI_OFFSET;
uint64_t l_intPending = *l_lsiEoi;
@@ -882,6 +1013,7 @@ errlHndl_t IntrRp::sendEOI(uint64_t& i_intSource)
// interrupt will not be triggered via the kernel.
if (l_intPending == 1)
{
+ TRACFCOMP(g_trac_intr, "IntrRp::Need to acknowledge interrupt\n");
//First acknowledge the interrupt so it won't be re-presented
acknowledgeInterrupt();
@@ -921,7 +1053,51 @@ errlHndl_t IntrRp::sendEOI(uint64_t& i_intSource)
return l_err;
}
-errlHndl_t IntrRp::maskAllInterruptSources(void)
+void IntrRp::routeInterrupt(intr_hdlr_t* i_proc,
+ ext_intr_t i_type,
+ PIR_t& i_pir)
+{
+ //Search if anyone is subscribed to the given
+ // interrupt source
+ Registry_t::iterator r = iv_registry.find(i_type);
+
+ if(r != iv_registry.end() && i_type != INTERPROC_XISR)
+ {
+ msg_q_t msgQ = r->second.msgQ;
+
+ msg_t * rmsg = msg_allocate();
+ rmsg->type = r->second.msgType;
+ rmsg->data[0] = i_type; // interrupt type
+ rmsg->data[1] = i_pir.word;
+ rmsg->extra_data = NULL;
+
+ int rc = msg_sendrecv_noblk(msgQ,rmsg, iv_msgQ);
+ if(rc)
+ {
+ TRACFCOMP(g_trac_intr,ERR_MRK
+ "External Interrupt received type = %d, "
+ "but could not send message to registered"
+ " handler. Ignoring it. rc = %d",
+ (uint32_t) i_type, rc);
+ }
+ }
+ else if (i_type == LSI_PSU)
+ {
+ TRACFCOMP(g_trac_intr, "PSU Interrupt Detected");
+ handlePsuInterrupt(i_type, i_proc, i_pir);
+ }
+ else // no queue registered for this interrupt type
+ {
+ // Throw it away for now.
+ TRACFCOMP(g_trac_intr,ERR_MRK
+ "External Interrupt received type = %d, but "
+ "nothing registered to handle it. Ignoring it.",
+ (uint32_t)i_type);
+ }
+ return;
+}
+
+errlHndl_t IntrRp::maskAllInterruptSources()
{
errlHndl_t l_err = NULL;
for (uint8_t i = 0; i < LSI_LAST_SOURCE; i++)
@@ -939,12 +1115,14 @@ errlHndl_t IntrRp::maskAllInterruptSources(void)
return l_err;
}
-errlHndl_t IntrRp::maskInterruptSource(uint8_t l_intr_source)
+errlHndl_t IntrRp::maskInterruptSource(uint8_t i_intr_source,
+ intr_hdlr_t *i_chip)
{
errlHndl_t l_err = NULL;
- uint64_t * l_psiHbEsbptr = iv_psiHbEsbBaseAddr;
+ uint64_t * l_psiHbEsbptr = i_chip->psiHbEsbBaseAddr;
l_psiHbEsbptr +=
- (((l_intr_source*PAGE_SIZE)+PSI_BRIDGE_ESB_OFF_OFFSET)/sizeof(uint64_t));
+ (((i_intr_source*PAGE_SIZE)+PSI_BRIDGE_ESB_OFF_OFFSET)
+ /sizeof(uint64_t));
//MMIO Read to this address transitions the ESB to the off state
volatile uint64_t l_maskRead = *l_psiHbEsbptr;
@@ -958,14 +1136,14 @@ errlHndl_t IntrRp::maskInterruptSource(uint8_t l_intr_source)
{
TRACFCOMP(g_trac_intr, "Error masking interrupt source: %x."
" ESB state is: %lx.",
- l_intr_source, l_maskRead);
+ i_intr_source, l_maskRead);
l_err = new ERRORLOG::ErrlEntry
(
ERRORLOG::ERRL_SEV_INFORMATIONAL, // severity
INTR::MOD_INTRRP_MASKINTERRUPT, // moduleid
INTR::RC_XIVE_ESB_WRONG_STATE, // reason code
- l_intr_source,
+ i_intr_source,
l_maskRead
);
@@ -974,79 +1152,158 @@ errlHndl_t IntrRp::maskInterruptSource(uint8_t l_intr_source)
return l_err;
}
-errlHndl_t IntrRp::unmaskInterruptSource(uint8_t l_intr_source)
+errlHndl_t IntrRp::maskInterruptSource(uint8_t l_intr_source)
{
+ bool l_masked = false;
errlHndl_t l_err = NULL;
- uint64_t * l_psiHbEsbptr = iv_psiHbEsbBaseAddr;
- l_psiHbEsbptr +=
- (((l_intr_source*PAGE_SIZE)+PSI_BRIDGE_ESB_RESET_OFFSET)/sizeof(uint64_t));
+ for(MaskList_t::iterator mask_itr = iv_maskList.begin();
+ mask_itr != iv_maskList.end(); ++mask_itr)
+ {
+ if ((*mask_itr) == l_intr_source)
+ {
+ TRACFCOMP(g_trac_intr, "IntrRp::maskInterruptSource()"
+ " Interrupt source: %x already masked - ignoring",
+ l_intr_source);
+ l_masked = true;
+ }
+ }
- //MMIO Read to this address transitions the ESB to the RESET state
- volatile uint64_t l_unmaskRead = *l_psiHbEsbptr;
- eieio();
+ if(l_masked == false)
+ {
+ iv_maskList.push_back(l_intr_source);
+ for(ChipList_t::iterator targ_itr = iv_chipList.begin();
+ targ_itr != iv_chipList.end(); ++targ_itr)
+ {
+ l_err = maskInterruptSource(l_intr_source,
+ *targ_itr);
- //Perform 2nd read to verify in RESET state - the read returns the previous
- // esb state, so a 2nd read is required to know it is in the off state
- l_unmaskRead = *l_psiHbEsbptr;
+ if (l_err)
+ {
+ break;
+ }
+ }
+ }
+
+ return l_err;
+}
- if (l_unmaskRead != ESB_STATE_RESET)
+errlHndl_t IntrRp::unmaskInterruptSource(uint8_t l_intr_source,
+ intr_hdlr_t *i_proc)
+{
+ bool l_masked = false;
+ errlHndl_t l_err = NULL;
+ for(MaskList_t::iterator mask_itr = iv_maskList.begin();
+ mask_itr != iv_maskList.end(); ++mask_itr)
{
- TRACFCOMP(g_trac_intr, "Error unmasking interrupt source: %x."
+ if ((*mask_itr) == l_intr_source)
+ {
+ TRACFCOMP(g_trac_intr, "IntrRp::unmaskInterruptSource()"
+ " Interrupt source: %x masked - will unmask",
+ l_intr_source);
+ l_masked = true;
+ iv_maskList.erase(mask_itr);
+ break;
+ }
+ }
+
+ if (l_masked == true)
+ {
+ for(ChipList_t::iterator targ_itr = iv_chipList.begin();
+ targ_itr != iv_chipList.end(); ++targ_itr)
+ {
+ uint64_t * l_psiHbEsbptr = (*targ_itr)->psiHbEsbBaseAddr;
+ l_psiHbEsbptr +=
+ (((l_intr_source*PAGE_SIZE)+PSI_BRIDGE_ESB_RESET_OFFSET)
+ /sizeof(uint64_t));
+
+ //MMIO Read to this address transitions the ESB to the RESET state
+ volatile uint64_t l_unmaskRead = *l_psiHbEsbptr;
+ eieio();
+
+ //Perform 2nd read to verify in RESET state - the read returns the
+ // previous esb state, so a 2nd read is required to know it is in
+ // the off state
+ l_unmaskRead = *l_psiHbEsbptr;
+
+ if (l_unmaskRead != ESB_STATE_RESET)
+ {
+ TRACFCOMP(g_trac_intr, "Error unmasking interrupt source: %x."
" ESB state is: %lx.",
l_intr_source, l_unmaskRead);
- l_err = new ERRORLOG::ErrlEntry
- (
- ERRORLOG::ERRL_SEV_INFORMATIONAL, // severity
- INTR::MOD_INTRRP_UNMASKINTERRUPT, // moduleid
- INTR::RC_XIVE_ESB_WRONG_STATE, // reason code
- l_intr_source,
- l_unmaskRead
- );
-
+ /*@ errorlog tag
+ * @errortype ERRL_SEV_INFORMATIONAL
+ * @moduleid INTR::MOD_INTRRP_UNMASKINTERRUPT
+ * @reasoncode INTR::RC_XIVE_ESB_WRONG_STATE
+ * @userdata1 Interrupt Source Number
+ * @userdata12 MMIO Read Value for unmasking
+ * @devdesc Error unmasking interrupt source
+ */
+ l_err = new ERRORLOG::ErrlEntry
+ (
+ ERRORLOG::ERRL_SEV_INFORMATIONAL, // severity
+ INTR::MOD_INTRRP_UNMASKINTERRUPT, // moduleid
+ INTR::RC_XIVE_ESB_WRONG_STATE, // reason code
+ l_intr_source,
+ l_unmaskRead
+ );
+ break;
+ }
+ }
}
+
return l_err;
}
-errlHndl_t IntrRp::setInterruptBARs(TARGETING::Target * i_target)
+errlHndl_t IntrRp::setMasterInterruptBARs(TARGETING::Target * i_target)
{
errlHndl_t l_err = NULL;
do {
- l_err = setPsiHbBAR(i_target);
+ l_err = setXiveIvpeTmBAR1(i_target);
if (l_err)
{
- TRACFCOMP(g_trac_intr, "Error setting PSIHB BAR");
+ TRACFCOMP(g_trac_intr, "Error setting XIVE TM BAR1");
break;
}
+ } while (0);
+
+ return l_err;
+}
+
+errlHndl_t IntrRp::setCommonInterruptBARs(intr_hdlr_t * i_proc)
+{
+ errlHndl_t l_err = NULL;
+
+ do {
- l_err = setPsiHbEsbBAR(i_target, true);
+ l_err = setPsiHbBAR(i_proc);
if (l_err)
{
- TRACFCOMP(g_trac_intr, "Error setting PSIHB ESB BAR");
+ TRACFCOMP(g_trac_intr, "Error setting PSIHB BAR");
break;
}
- l_err = setXiveIcBAR(i_target);
+ //Turn off VPC error when in LSI mode
+ l_err = disableVPCPullErr(i_proc);
if (l_err)
{
- TRACFCOMP(g_trac_intr, "Error setting XIVE IC BAR");
+ TRACFCOMP(g_trac_intr, "Error masking VPC Pull Lsi Err");
break;
}
- //Turn off VPC error when in LSI mode
- l_err = disableVPCPullErr(i_target);
+ l_err = setPsiHbEsbBAR(i_proc, true);
if (l_err)
{
- TRACFCOMP(g_trac_intr, "Error masking VPC Pull Lsi Err");
+ TRACFCOMP(g_trac_intr, "Error setting PSIHB ESB BAR");
break;
}
- l_err = setXiveIvpeTmBAR1(i_target);
+ l_err = setXiveIcBAR(i_proc);
if (l_err)
{
- TRACFCOMP(g_trac_intr, "Error setting XIVE TM BAR1");
+ TRACFCOMP(g_trac_intr, "Error setting XIVE IC BAR");
break;
}
@@ -1055,7 +1312,9 @@ errlHndl_t IntrRp::setInterruptBARs(TARGETING::Target * i_target)
return l_err;
}
-errlHndl_t IntrRp::handlePsuInterrupt(ext_intr_t i_type)
+errlHndl_t IntrRp::handlePsuInterrupt(ext_intr_t i_type,
+ intr_hdlr_t* i_proc,
+ PIR_t& i_pir)
{
//TODO FIXME RTC 149698
// Long term will leverage mask register to avoid
@@ -1065,8 +1324,7 @@ errlHndl_t IntrRp::handlePsuInterrupt(ext_intr_t i_type)
size_t scom_len = sizeof(uint64_t);
uint64_t reg = 0x0;
uint64_t l_elapsed_time_ns = 0;
- TARGETING::Target* procTarget = NULL;
- TARGETING::targetService().masterProcChipTargetHandle( procTarget );
+ TARGETING::Target* procTarget = i_proc->proc;
do
{
@@ -1146,7 +1404,8 @@ errlHndl_t IntrRp::handlePsuInterrupt(ext_intr_t i_type)
//Issue standard EOI for the PSU Interupt
uint64_t intSource = i_type;
TRACFCOMP(g_trac_intr, "Sending PSU EOI");
- sendEOI(intSource);
+
+ sendEOI(intSource, i_pir);
} while(0);
@@ -1322,15 +1581,27 @@ void IntrRp::shutDown(uint64_t i_status)
//Reset PSIHB Interrupt Space
TRACDCOMP(g_trac_intr, "Reset PSIHB Interrupt Space");
- PSIHB_SW_INTERFACES_t * this_psihb_ptr = iv_psiHbBaseAddr;
+
+
+ //First reset INTRP logic for slave procs
+ for(ChipList_t::iterator targ_itr = iv_chipList.begin();
+ targ_itr != iv_chipList.end(); ++targ_itr)
+ {
+ if (*targ_itr != iv_masterHdlr)
+ {
+ PSIHB_SW_INTERFACES_t * this_psihb_ptr = (*targ_itr)->psiHbBaseAddr;
+ this_psihb_ptr->icr = PSI_BRIDGE_INTP_STATUS_CTL_RESET;
+ resetIntUnit(*targ_itr);
+ }
+ }
+
+ //Then reset master proc INTRP logic
+ PSIHB_SW_INTERFACES_t * this_psihb_ptr = iv_masterHdlr->psiHbBaseAddr;
this_psihb_ptr->icr = PSI_BRIDGE_INTP_STATUS_CTL_RESET;
TRACDCOMP(g_trac_intr, "Reset PSIHB INTR Complete");
//Reset XIVE Interrupt unit
- resetIntUnit();
-
- // Reset the IP hardware registers
- iv_cpuList.push_back(iv_masterCpu);
+ resetIntUnit(iv_masterHdlr);
#ifdef CONFIG_ENABLE_P9_IPI
size_t threads = cpu_thread_count();
@@ -2605,11 +2876,12 @@ errlHndl_t INTR::disableExternalInterrupts()
return err;
}
-errlHndl_t IntrRp::setPsiHbBAR(TARGETING::Target * i_target)
+errlHndl_t IntrRp::setPsiHbBAR(intr_hdlr_t *i_proc)
{
errlHndl_t l_err = NULL;
+ TARGETING::Target *l_target = i_proc->proc;
uint64_t l_baseBarValue =
- i_target->getAttr<TARGETING::ATTR_PSI_BRIDGE_BASE_ADDR>();
+ l_target->getAttr<TARGETING::ATTR_PSI_BRIDGE_BASE_ADDR>();
do {
//Get base BAR Value from attribute
@@ -2617,11 +2889,11 @@ errlHndl_t IntrRp::setPsiHbBAR(TARGETING::Target * i_target)
TRACFCOMP(g_trac_intr,"INTR: Setting PSI BRIDGE Bar Address value for -"
" Target %p. PSI BRIDGE BAR value: 0x%016lx",
- i_target,l_barValue);
+ l_target,l_barValue);
//Set base BAR Value
uint64_t size = sizeof(l_barValue);
- l_err = deviceWrite(i_target,
+ l_err = deviceWrite(l_target,
&l_barValue,
size,
DEVICE_SCOM_ADDRESS(PSI_BRIDGE_BAR_SCOM_ADDR));
@@ -2637,9 +2909,9 @@ errlHndl_t IntrRp::setPsiHbBAR(TARGETING::Target * i_target)
size = sizeof(l_barValue);
TRACDCOMP(g_trac_intr,"INTR: Setting PSI BRIDGE Bar enable value for Target - %p. PSI BRIDGE BAR value: 0x%016lx",
- i_target,l_barValue);
+ l_target,l_barValue);
- l_err = deviceWrite(i_target,
+ l_err = deviceWrite(l_target,
&l_barValue,
size,
DEVICE_SCOM_ADDRESS(PSI_BRIDGE_BAR_SCOM_ADDR));
@@ -2653,7 +2925,8 @@ errlHndl_t IntrRp::setPsiHbBAR(TARGETING::Target * i_target)
//Map Memory Internally for HB and store in member variable
void *l_psiHbAddress =
reinterpret_cast<void *>(l_baseBarValue);
- iv_psiHbBaseAddr =
+
+ i_proc->psiHbBaseAddr =
reinterpret_cast<PSIHB_SW_INTERFACES_t *>
(mmio_dev_map(l_psiHbAddress, PAGE_SIZE));
} while(0);
@@ -2661,22 +2934,23 @@ errlHndl_t IntrRp::setPsiHbBAR(TARGETING::Target * i_target)
return l_err;
}
-errlHndl_t IntrRp::setPsiHbEsbBAR(TARGETING::Target * i_target,
- bool i_enable)
+errlHndl_t IntrRp::setPsiHbEsbBAR(intr_hdlr_t *i_proc,
+ bool i_enable)
{
+ TARGETING::Target *l_target = i_proc->proc;
errlHndl_t l_err = NULL;
uint64_t l_baseBarValue
- = i_target->getAttr<TARGETING::ATTR_PSI_HB_ESB_ADDR>();
+ = l_target->getAttr<TARGETING::ATTR_PSI_HB_ESB_ADDR>();
do {
uint64_t l_barValue = l_baseBarValue;
- TRACDCOMP(g_trac_intr,"INTR: Target %p. "
+ TRACFCOMP(g_trac_intr,"INTR: Target %p. "
"PSI BRIDGE ESB BAR value: 0x%016lx",
- i_target,l_barValue);
+ l_target,l_barValue);
uint64_t size = sizeof(l_barValue);
- l_err = deviceWrite(i_target,
+ l_err = deviceWrite(l_target,
&l_barValue,
size,
DEVICE_SCOM_ADDRESS(PSI_BRIDGE_ESB_BAR_SCOM_ADDR));
@@ -2691,11 +2965,11 @@ errlHndl_t IntrRp::setPsiHbEsbBAR(TARGETING::Target * i_target,
if (i_enable)
{
l_barValue += PSI_BRIDGE_ESB_BAR_VALID;
- TRACDCOMP(g_trac_intr,"INTR: Target %p. PSI BRIDGE ESB BAR value: 0x%016lx",
- i_target,l_barValue);
+ TRACFCOMP(g_trac_intr,"INTR: Target %p. PSI BRIDGE ESB BAR value: 0x%016lx",
+ l_target,l_barValue);
size = sizeof(l_barValue);
- l_err = deviceWrite(i_target,
+ l_err = deviceWrite(l_target,
&l_barValue,
size,
DEVICE_SCOM_ADDRESS(PSI_BRIDGE_ESB_BAR_SCOM_ADDR));
@@ -2709,7 +2983,7 @@ errlHndl_t IntrRp::setPsiHbEsbBAR(TARGETING::Target * i_target,
//Map Memory Internally for HB and store in member variable
void *l_psiHbEoiAddress =
reinterpret_cast<void *>(l_baseBarValue);
- iv_psiHbEsbBaseAddr =
+ i_proc->psiHbEsbBaseAddr =
reinterpret_cast<uint64_t *>
(mmio_dev_map(l_psiHbEoiAddress, (LSI_LAST_SOURCE)*PAGE_SIZE));
}
@@ -2757,20 +3031,22 @@ errlHndl_t IntrRp::setXiveIvpeTmBAR1(TARGETING::Target * i_target)
}
-errlHndl_t IntrRp::setXiveIcBAR(TARGETING::Target * i_target)
+errlHndl_t IntrRp::setXiveIcBAR(intr_hdlr_t *i_proc)
{
+ TARGETING::Target *l_target = i_proc->proc;
+
errlHndl_t l_err = NULL;
uint64_t l_baseBarValue
- = i_target->getAttr<TARGETING::ATTR_XIVE_CONTROLLER_BAR_ADDR>();
+ = l_target->getAttr<TARGETING::ATTR_XIVE_CONTROLLER_BAR_ADDR>();
do {
uint64_t l_barValue = l_baseBarValue + XIVE_IC_BAR_VALID;
TRACDCOMP(g_trac_intr,"INTR: Target %p. XIVE IC BAR value: 0x%016lx",
- i_target,l_barValue);
+ l_target,l_barValue);
uint64_t size = sizeof(l_barValue);
- l_err = deviceWrite(i_target,
+ l_err = deviceWrite(l_target,
&l_barValue,
size,
DEVICE_SCOM_ADDRESS(XIVE_IC_BAR_SCOM_ADDR));
@@ -2784,7 +3060,7 @@ errlHndl_t IntrRp::setXiveIcBAR(TARGETING::Target * i_target)
//Map Memory Internally for HB and store in member variable
void *l_xiveIcBarAddress =
reinterpret_cast<void *>(l_baseBarValue);
- iv_xiveIcBarAddress =
+ i_proc->xiveIcBarAddr =
reinterpret_cast<uint64_t *>
(mmio_dev_map(l_xiveIcBarAddress, 40*PAGE_SIZE));
} while(0);
@@ -2792,15 +3068,16 @@ errlHndl_t IntrRp::setXiveIcBAR(TARGETING::Target * i_target)
return l_err;
}
-errlHndl_t IntrRp::disableVPCPullErr(TARGETING::Target * i_target)
+errlHndl_t IntrRp::disableVPCPullErr(intr_hdlr_t * i_proc)
{
errlHndl_t l_err = NULL;
+ TARGETING::Target *l_target = i_proc->proc;
size_t size;
do {
uint64_t l_vpcErrCnfg;
size = sizeof(l_vpcErrCnfg);
- l_err = deviceRead(i_target,
+ l_err = deviceRead(l_target,
&l_vpcErrCnfg,
size,
DEVICE_SCOM_ADDRESS(PU_INT_PC_VPC_ERR_CFG1));
@@ -2812,7 +3089,7 @@ errlHndl_t IntrRp::disableVPCPullErr(TARGETING::Target * i_target)
}
l_vpcErrCnfg &= ~XIVE_IC_VPC_PULL_ERR;
- l_err = deviceWrite(i_target,
+ l_err = deviceWrite(l_target,
&l_vpcErrCnfg,
size,
DEVICE_SCOM_ADDRESS(PU_INT_PC_VPC_ERR_CFG1));
@@ -2983,3 +3260,90 @@ uint64_t INTR::get_enabled_threads( void )
}
return en_threads;
}
+
+errlHndl_t INTR::enablePsiIntr(TARGETING::Target * i_target)
+{
+ errlHndl_t err = NULL;
+ msg_q_t intr_msgQ = msg_q_resolve(VFS_ROOT_MSG_INTR);
+ if(intr_msgQ)
+ {
+ msg_t * msg = msg_allocate();
+ msg->type = MSG_INTR_ENABLE_PSI_INTR;
+ msg->data[0] = reinterpret_cast<uint64_t>(i_target);
+
+ msg_sendrecv(intr_msgQ, msg);
+
+ err = reinterpret_cast<errlHndl_t>(msg->data[1]);
+ msg_free(msg);
+ }
+ else
+ {
+ /*@ errorlog tag
+ * @errortype ERRL_SEV_INFORMATIONAL
+ * @moduleid INTR::MOD_INTR_ENABLE_PSI_INTR
+ * @reasoncode INTR::RC_RP_NOT_INITIALIZED
+ * @userdata1 MSG_INTR_ENABLE_PSI_INTR
+ * @userdata2 0
+ *
+ * @devdesc Interrupt resource provider not initialized yet.
+ *
+ */
+ err = new ERRORLOG::ErrlEntry
+ (
+ ERRORLOG::ERRL_SEV_INFORMATIONAL, // severity
+ INTR::MOD_INTR_ENABLE_PSI_INTR, // moduleid
+ INTR::RC_RP_NOT_INITIALIZED, // reason code
+ static_cast<uint64_t>(MSG_INTR_ENABLE_PSI_INTR),
+ 0
+ );
+ }
+ return err;
+}
+
+errlHndl_t INTR::IntrRp::enableSlaveProcInterrupts(TARGETING::Target * i_target)
+{
+ errlHndl_t l_err = NULL;
+ do
+ {
+ TRACFCOMP(g_trac_intr, "Enabling Interrupts for slave proc with huid: %x",
+ TARGETING::get_huid(i_target));
+
+ intr_hdlr_t* l_procIntrHdlr = new intr_hdlr_t(i_target);
+ iv_chipList.push_back(l_procIntrHdlr);
+
+ //Setup the base Interrupt BAR Registers for this non-master proc
+ l_err = setCommonInterruptBARs(l_procIntrHdlr);
+ if (l_err)
+ {
+ TRACFCOMP(g_trac_intr, ERR_MRK" could not set common interrupt BARs");
+ break;
+ }
+
+ //Apply the masking of the interrupt sources from the master chip to
+ // the slave chip to block unwanted spurious interrupts that there is
+ // no handler for
+ for(MaskList_t::iterator mask_itr = iv_maskList.begin();
+ mask_itr != iv_maskList.end(); ++mask_itr)
+ {
+ l_err = maskInterruptSource(*mask_itr,
+ l_procIntrHdlr);
+ if (l_err)
+ {
+ break;
+ }
+ }
+
+ if (l_err)
+ {
+ break;
+ }
+
+ //Setup the PSIHB interrupt routing to route interrupts from nom-master
+ // proc back to master proc
+ enableSlaveProcInterruptRouting(l_procIntrHdlr);
+
+ } while(0);
+
+ TRACFCOMP(g_trac_intr, INFO_MRK"Slave Proc Interrupt Routing setup complete\n");
+ return l_err;
+}
diff --git a/src/usr/intr/intrrp.H b/src/usr/intr/intrrp.H
index a8a1eafba..f5ebae4f6 100644
--- a/src/usr/intr/intrrp.H
+++ b/src/usr/intr/intrrp.H
@@ -98,9 +98,7 @@ namespace INTR
IntrRp() :
iv_msgQ(NULL),
iv_baseAddr(0),
- iv_masterCpu(0),
- iv_psiHbBaseAddr(NULL),
- iv_psiHbEsbBaseAddr(NULL) {}
+ iv_masterCpu(0) {}
/**
* Destructor
@@ -179,9 +177,11 @@ namespace INTR
PSI_BRIDGE_BAR_ENABLE = 0x0000000000000001ULL,
PSI_BRIDGE_ENABLE_CEC_INTERRUPT = 0x1000000000000000ULL,
PSI_BRIDGE_ESB_BAR_SCOM_ADDR = 0x05012916,
+ PSI_BRIDGE_ENABLE_LSI_INTR_REMOTE = 0x0000000000000000ULL,
//PSI Host Bridge ESB Constants
PSI_BRIDGE_ESB_BAR_VALID = 0x0000000000000001ULL,
+ PSI_BRIDGE_ESB_NOTIFY_VALID = 0x0000000000000001ULL,
PSI_BRIDGE_ESB_OFF_OFFSET = 0xD00,
PSI_BRIDGE_ESB_RESET_OFFSET = 0XC00,
PSI_BRIDGE_PSU_DOORBELL_REG = 0x000D0063,
@@ -194,6 +194,7 @@ namespace INTR
XIVE_IC_BAR_INT_PC_MMIO_REG_OFFSET =
XIVE_IC_PHYSICAL_THREAD_ENABLE_OFFSET/sizeof(uint64_t),
XIVE_IC_THREAD0_ENABLE = 0x8000000000000000ULL,
+ XIVE_IC_ESB_LSI_TRIGGER_PAGE_OFFSET = 0x2000,
XIVE_IC_ESB_EOI_OFFSET = 0x3000,
XIVE_IC_LSI_EOI_OFFSET =
XIVE_IC_ESB_EOI_OFFSET/sizeof(uint64_t),
@@ -279,7 +280,7 @@ namespace INTR
uint64_t dmaupaddr; //DMA Upper Address Register - 0x50
uint64_t icr; //Interrupt Control Register - 0x58
uint64_t esbciaddr; //ESB CI Base Address - 0x60
- uint64_t esbnotifaddr; //ESB Notification Address - 0x68
+ uint64_t esbnotifyaddr; //ESB Notification Address - 0x68
uint64_t ivtofforig; //IVT Offset Origin Register - 0x70
uint64_t lsiintlevel; //LSI Int Level Register (lab use) - 0x78
uint64_t lsiintstatus; //LSI Interrupt Status register - 0x80
@@ -355,6 +356,20 @@ namespace INTR
};
+ struct intr_hdlr_t
+ {
+ TARGETING::Target *proc;
+ PSIHB_SW_INTERFACES_t *psiHbBaseAddr;
+ uint64_t *psiHbEsbBaseAddr;
+ uint64_t *xiveIcBarAddr;
+
+ intr_hdlr_t(): proc(NULL), psiHbBaseAddr(NULL),
+ psiHbEsbBaseAddr(NULL) {}
+ intr_hdlr_t(TARGETING::Target *i_target) :
+ proc(i_target), psiHbBaseAddr(NULL),
+ psiHbEsbBaseAddr(NULL) {}
+ };
+
enum
{
CPU_WAKEUP_SECONDS = 1,
@@ -365,21 +380,26 @@ namespace INTR
typedef std::map<ext_intr_t,intr_response_t> Registry_t;
typedef std::vector<PIR_t> CpuList_t;
- typedef std::vector<TARGETING::Target *> ChipList_t;
- typedef std::vector<ISNvalue_t> ISNList_t;
+ typedef std::vector<intr_hdlr_t *> ChipList_t;
+ typedef std::vector<ISNvalue_t> ISNList_t;
+ typedef std::vector<uint8_t> MaskList_t;
+ typedef std::vector< std::pair<PIR_t,ext_intr_t> >PendingIntrList_t;
msg_q_t iv_msgQ; //!< Kernel Interrupt message queue
Registry_t iv_registry; //!< registered interrupt type
uint64_t iv_baseAddr; //!< Base address of hw INTR regs
PIR_t iv_masterCpu; //!< Master cpu PIR
- PSIHB_SW_INTERFACES_t *iv_psiHbBaseAddr; //INTR PSIHB regs base addr
- uint64_t *iv_psiHbEsbBaseAddr; //INTR PSIHB ESB regs base addr
+ intr_hdlr_t *iv_masterHdlr; //!< Master cpu interrupt handler
uint64_t *iv_xiveIcBarAddress; //XIVE Controller regs base addr
uint64_t *iv_xiveTmBar1Address; //Xive Thread mgmt bar reg 1 addr
CpuList_t iv_cpuList; //!< Other CPU chips
ChipList_t iv_chipList; //!< Proc chips with PSI intr enabled
ISNList_t iv_isnList; //!< List of ISN's to clear on shutdown
+ MaskList_t iv_maskList; //!< List of interrput sources which
+ // are masked
+ PendingIntrList_t iv_pendingIntr; //!< List of pending interrupts
+ // That haven't been EOI'ed
typedef std::pair<uint64_t, msg_t*> IPI_Info_t;
typedef std::map<PIR_t, IPI_Info_t> IPI_Pending_t;
@@ -442,8 +462,10 @@ namespace INTR
/**
* Enable hardware to reporting external interrupts
+ * @param[in] i_proc Proc handler for processor to enable
+ * interrupts for
*/
- errlHndl_t enableInterrupts();
+ errlHndl_t enableInterrupts(intr_hdlr_t *i_proc) ;
/**
* Disable hardware from reporting external interupts
@@ -473,7 +495,16 @@ namespace INTR
* interrupts from the PSIHB to be sent to the HB kernel.
* @return Errorlog from masking the sources
*/
- errlHndl_t maskAllInterruptSources(void);
+ errlHndl_t maskAllInterruptSources();
+
+ /**
+ * Mask specific PSIHB Interrupt source
+ * @param[in] i_intr_source, The interrupt source to be masked
+ * @param[in] i_proc, The proc interrupt handler
+ * @return Errorlog from masking the source
+ */
+ errlHndl_t maskInterruptSource(uint8_t i_intr_source,
+ intr_hdlr_t *i_proc);
/**
* Mask specific PSIHB Interrupt source
@@ -485,16 +516,28 @@ namespace INTR
/**
* Unmask (enable) specific PSIHB Interrupt source
* @param[in] i_intr_source, The interrupt source to be unmasked
+ * @param[in] i_proc, The proc interrupt handler to unmask the
+ * given interrupt source for
* @return Errorlog from unmasking the source
*/
- errlHndl_t unmaskInterruptSource(uint8_t i_intr_source);
+ errlHndl_t unmaskInterruptSource(uint8_t i_intr_source,
+ intr_hdlr_t *i_proc);
/**
- * Set all of the Interrupt BAR scom registers
+ * Set all of the Interrupt BAR scom registers specific
+ * to the master chip.
* @param[in] i_target, the Target.
* @return Errorlog from DeviceWrite
*/
- errlHndl_t setInterruptBARs(TARGETING::Target * i_target);
+ errlHndl_t setMasterInterruptBARs(TARGETING::Target * i_target);
+
+ /**
+ * Set all of the Interrupt BAR scom registers common
+ * to all the chips (procs)
+ * @param[in] i_proc, the interrupt handler for one chip
+ * @return Errorlog from DeviceWrite
+ */
+ errlHndl_t setCommonInterruptBARs(intr_hdlr_t * i_proc);
/**
* Perform HW Functions to acknowledge Interrupt which will
@@ -505,9 +548,22 @@ namespace INTR
/**
* Send EOI (End of Interrupt) sequence
* @param[in] i_intSource, interrupt source to perform EOI for
- * @return Errorlog from DeviceWrite
+ * @param[in] i_pir, The PIR value for the proc where the
+ * interrupt condtion occurred
+ * @return Errorlog from DeviceWriste
*/
- errlHndl_t sendEOI(uint64_t& i_intSource);
+ errlHndl_t sendEOI(uint64_t& i_intSource, PIR_t& i_pir);
+
+ /**
+ * Route Interrupt to correct listener
+ * @param[in] i_proc, the proc intrp handler
+ * @param[in] i_type, the interrupt type
+ * @param[in] i_pir, the pir value for the proc the interrupt
+ * was seen on
+ */
+ void routeInterrupt(intr_hdlr_t* i_proc,
+ ext_intr_t i_type,
+ PIR_t& i_pir);
/**
* Handle Interrupt from PSU Source
@@ -515,48 +571,54 @@ namespace INTR
* - Clear Interrupt Condition
* - Issue EOI
* @param[in] i_type, interrupt type encountered
+ * @param[in] i_proc, The proc interrupt handler for the proc
+ * the interrupt occurred on
+ * param[in] i_pir, The PIR value for the proc the interrupt
+ * was seen on
* @return Errorlog from DeviceWrite
*/
- errlHndl_t handlePsuInterrupt(ext_intr_t i_type);
+ errlHndl_t handlePsuInterrupt(ext_intr_t i_type,
+ intr_hdlr_t* i_proc,
+ PIR_t& i_pir);
/**
* Set the PSI Host Bridge BAR scom register
- * @param[in] i_target, the Target.
+ * @param[in] i_proc, the proc intrp handler
* @return Errorlog from DeviceWrite
*/
- errlHndl_t setPsiHbBAR(TARGETING::Target * i_target);
+ errlHndl_t setPsiHbBAR(intr_hdlr_t* i_proc);
/**
* Set the PSI Host Bridge ESB BAR scom register
- * @param[in] i_target, the Target.
+ * @param[in] i_proc, the proc intrp handler.
* @param[in] i_enable, indicator to enable/disable the BAR
* @return Errorlog from DeviceWrite
*/
- errlHndl_t setPsiHbEsbBAR(TARGETING::Target * i_target,
+ errlHndl_t setPsiHbEsbBAR(intr_hdlr_t* i_proc,
bool i_enable);
/**
* Set the XIVE Thread Management (TM) BAR1 scom register
- * @param[in] i_target, the Target.
+ * @param[in] i_target, the Target
* @return Errorlog from DeviceWrite
*/
errlHndl_t setXiveIvpeTmBAR1(TARGETING::Target * i_target);
/**
* Set the XIVE Interrupt Controller (IC) BAR scom register
- * @param[in] i_target, the Target.
+ * @param[in] i_proc, the proc intrp handler
* @return Errorlog from DeviceWrite
*/
- errlHndl_t setXiveIcBAR(TARGETING::Target * i_target);
+ errlHndl_t setXiveIcBAR(intr_hdlr_t* i_proc);
/**
* When in LSI mode the IC VPC flags and error, thus we
* need to disable while we use, and enable after we clean
* up
- * @param[in] i_target, the Target.
+ * @param[in] i_proc, the proc intrp handler
* @return Errorlog from DeviceWrite
*/
- errlHndl_t disableVPCPullErr(TARGETING::Target * i_target);
+ errlHndl_t disableVPCPullErr(intr_hdlr_t* i_proc);
/**
* When in LSI mode the IC VPC flags and error, thus we
@@ -569,9 +631,26 @@ namespace INTR
/**
* Reset Interrupt Unit (both the XIVE and PSIHB Interrupt Units)
+ * @param[in] i_proc, the proc intrp handler
* @return Errorlog from DeviceWrite
*/
- errlHndl_t resetIntUnit();
+ errlHndl_t resetIntUnit(intr_hdlr_t* i_proc);
+
+ /**
+ * Setup structures, BAR Regs, Mask interrupts, and enable interrupt
+ * routing on non-master proc chip
+ * @param[in] i_target, the proc Target to enable
+ * @return Errorlog from enablement steps
+ */
+ errlHndl_t enableSlaveProcInterrupts(TARGETING::Target * i_target);
+
+ /**
+ * Set correct PSIHB Regs to route + enable LSI interrupts from
+ * non-master proc to correct address on master proc
+ * @param[in] i_proc, the proc intrp handler
+ * @return void
+ */
+ void enableSlaveProcInterruptRouting(intr_hdlr_t* i_proc);
/**
* Initialize the IRSCReg to enable PSI to present interrupts
diff --git a/src/usr/isteps/istep10/call_proc_build_smp.C b/src/usr/isteps/istep10/call_proc_build_smp.C
index 6fdb2f74f..68610117a 100644
--- a/src/usr/isteps/istep10/call_proc_build_smp.C
+++ b/src/usr/isteps/istep10/call_proc_build_smp.C
@@ -36,8 +36,9 @@
#include <targeting/common/target.H>
#include <pbusLinkSvc.H>
-#include <fapi2/target.H>
-#include <fapi2/plat_hwp_invoker.H>
+#include <fapi2/target.H>
+#include <fapi2/plat_hwp_invoker.H>
+#include <intr/interrupt.H>
//@TODO RTC:150562 - Remove when BAR setting handled by INTRRP
#include <devicefw/userif.H>
@@ -58,9 +59,6 @@ void* call_proc_build_smp (void *io_pArgs)
IStepError l_StepError;
- //@TODO RTC:150562 - Long term the INTRRP will set the BARs. This will
- // be signaled via the INTRP::enablePsiIntr() function call
- // and the INTRP will set this BAR like all the others
errlHndl_t l_errl = NULL;
TARGETING::TargetHandleList l_cpuTargetList;
getAllChips(l_cpuTargetList, TYPE_PROC);
@@ -139,6 +137,16 @@ void* call_proc_build_smp (void *io_pArgs)
ERR_MRK"Error enabling FSP BAR");
break;
}
+
+ //Enable PSIHB Interrupts for slave proc
+ l_errl = INTR::enablePsiIntr(curproc);
+ if(l_errl)
+ {
+ // capture the target data in the elog
+ ErrlUserDetailsTarget(curproc).addToLog( l_errl );
+ break;
+ }
+
}
const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>
diff --git a/src/usr/isteps/istep15/host_build_stop_image.C b/src/usr/isteps/istep15/host_build_stop_image.C
index dbb9b8800..9c7bd201b 100644
--- a/src/usr/isteps/istep15/host_build_stop_image.C
+++ b/src/usr/isteps/istep15/host_build_stop_image.C
@@ -139,8 +139,8 @@ errlHndl_t applyHcodeGenCpuRegs( TARGETING::Target *i_procChipTarg,
uint32_t l_rc = 0;
uint32_t l_failAddr = 0;
//Register Values
- uint64_t l_msrVal = cpu_spr_value(CPU_SPR_MSR) ;
- uint64_t l_lpcrVal = cpu_spr_value( CPU_SPR_LPCR);
+ uint64_t l_msrVal = cpu_spr_value(CPU_SPR_MSR);
+ uint64_t l_lpcrVal = cpu_spr_value(CPU_SPR_LPCR);
// See LPCR def, PECE "reg" in Power ISA AS Version: Power8 June 27, 2012
// and 23.7.3.5 - 6 in Murano Book 4
OpenPOWER on IntegriCloud