From c283187cd8301a0c00259908dd950d31b2f82f67 Mon Sep 17 00:00:00 2001 From: Bill Hoffa Date: Thu, 7 Nov 2019 15:47:00 -0600 Subject: Modify INTRP Initialization Order to route LSI interrupts over PSHIHB - Currently the code sets up routing over PSIHIB and then a second function call overwrites that setting which forces things back on the local wire Change-Id: I7d3b44d48c66f994e8a8758eb75568038492fdaf CQ: SW464174 Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/86669 Tested-by: Jenkins Server Tested-by: Jenkins OP Build CI Tested-by: Jenkins OP HW Tested-by: FSP CI Jenkins Reviewed-by: Ilya Smirnov Reviewed-by: Michael Baiocchi Reviewed-by: Daniel M Crowell --- src/usr/intr/intrrp.C | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/usr/intr/intrrp.C b/src/usr/intr/intrrp.C index d198610af..afc8cefc7 100644 --- a/src/usr/intr/intrrp.C +++ b/src/usr/intr/intrrp.C @@ -547,13 +547,6 @@ errlHndl_t IntrRp::_init() break; } - //Route LSI interrupt events over PSIHB instead of local wire - // This is a HW Bug Workaround for slaves using the PSIHB and - // the master using the local wire - routeLSIInterrupts(l_procIntrHdlr); - - enableLsiInterrupts(); - TRACFCOMP(g_trac_intr, "IntrRp::_init() Enabling PSIHB Interrupts"); //Enable PSIHB Interrupts l_err = enableInterrupts(l_procIntrHdlr); @@ -562,6 +555,13 @@ errlHndl_t IntrRp::_init() TRACFCOMP(g_trac_intr, "IntrRp::_init() Error enabling Interrupts"); break; } + + //Route LSI interrupt events over PSIHB instead of local wire + // This is a HW Bug Workaround for slaves using the PSIHB and + // the master using the local wire + routeLSIInterrupts(l_procIntrHdlr); + + enableLsiInterrupts(); } // Build up list of unregistered LSI sources, at this point no sourced -- cgit v1.2.1