ATTN: Examine correct proc for handling Centaur Attentions

Change-Id: I3166c5331aa4b14152cc9d45bc57c9aefb9cb39f CQ:SW429174 Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/59015 Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com> Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com> Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com> Tested-by: Jenkins OP HW <op-hw-jenkins+hostboot@us.ibm.com> Reviewed-by: Zane C. Shelley <zshelle@us.ibm.com> Reviewed-by: Benjamin J. Weisenbeck <bweisenb@us.ibm.com> Reviewed-by: Caleb N. Palmer <cnpalmer@us.ibm.com> Reviewed-by: Matt Derksen <mderkse1@us.ibm.com> Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
open-power · May 23, 2018 · 11b5f7d · 11b5f7d
1 parent 67499d6
commit 11b5f7d
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 8 deletions.
diff --git a/src/usr/diag/attn/common/attnmem.C b/src/usr/diag/attn/common/attnmem.C
@@ -5,7 +5,7 @@
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2014,2017                        */
+/* Contributors Listed Below - COPYRIGHT 2014,2018                        */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
@@ -186,7 +186,8 @@ TargetHandle_t attnGetMembuf( const TargetHandle_t &i_mc,
 
 bool MemOps::resolve(
         PRDF::AttnData &  i_AttnData,
-        const uint32_t  i_mcNumber )
+        const uint32_t  i_mcNumber,
+        TARGETING::TargetHandle_t  i_procTarg )
 {
     errlHndl_t  l_err = 0;
     bool        l_attnFound = false;
@@ -198,7 +199,22 @@ bool MemOps::resolve(
 
 
     TargetHandleList l_mcTargetList;
-    getAllChiplets(l_mcTargetList, TYPE_MC, true );
+
+    // predicate of functional MC units
+    PredicateCTM           l_unitMatch(CLASS_UNIT, TYPE_MC);
+    PredicateIsFunctional  l_functional;
+    PredicatePostfixExpr   l_pred;
+
+    l_pred.push(&l_unitMatch).push(&l_functional).And();
+
+    // Get all MC units associated with input processor
+    targetService().getAssociated(
+            l_mcTargetList,
+            i_procTarg,
+            TARGETING::TargetService::CHILD_BY_AFFINITY,
+            TARGETING::TargetService::ALL,
+            &l_pred);
+
 
     // Find correct MC chiplet
     for ( auto  l_mc : l_mcTargetList )

diff --git a/src/usr/diag/attn/common/attnmem.H b/src/usr/diag/attn/common/attnmem.H
@@ -5,7 +5,7 @@
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2014,2017                        */
+/* Contributors Listed Below - COPYRIGHT 2014,2018                        */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
@@ -48,14 +48,16 @@ class MemOps : public AttentionOps
          * @brief resolve Find membuf attentions behind the supplied proc.
          *
          * @param[in] i_AttnData Where to put membuf target and attn type
-         * @param[out] i_mcNumber  MC unit to examine (0 or 1)
+         * @param[in] i_mcNumber  MC unit to examine (0 or 1)
+         * @param[in] i_procTarg  Processor to examine for active MC units
          *
          * @retval true  if i_AttnData was set to valid values
          * @retval false if i_AttnData is invalid (no memory attns)
          */
         bool resolve(
                 PRDF::AttnData &  i_AttnData,
-                const uint32_t  i_mcNumber );
+                const uint32_t  i_mcNumber,
+                TARGETING::TargetHandle_t  i_procTarg );
 
         /**
          * @brief dtor

diff --git a/src/usr/diag/attn/common/attnproc.C b/src/usr/diag/attn/common/attnproc.C
@@ -5,7 +5,7 @@
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2014,2017                        */
+/* Contributors Listed Below - COPYRIGHT 2014,2018                        */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
@@ -84,7 +84,8 @@ errlHndl_t ProcOps::query(AttnData & i_attnToCheck, bool & o_active)
                     if ( scomData & ((MC::firstChiplet) >> l_mc) )
                     {
                         // Will handle the first attention
-                        l_cenAttnFound = memOps.resolve( i_attnToCheck, l_mc);
+                        l_cenAttnFound = memOps.resolve( i_attnToCheck, l_mc,
+                                                     i_attnToCheck.targetHndl );
                         // i_attnToCheck gets altered to membuf
                         // if we found valid attention there