Add call to p9a_ocmb_enable to istep 10.4

Per IPL Flow doc for P9 Axone, p9a_ocmb_enable needs to be called on all processors during istep 10.4 RTC: 195553 Change-Id: I50fa98959008cccfe0620c8bc6e62f33ee91c135 Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/71229 Reviewed-by: Roland Veloz <rveloz@us.ibm.com> Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com> Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com> Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com> Tested-by: Jenkins OP HW <op-hw-jenkins+hostboot@us.ibm.com> Reviewed-by: Matt Derksen <mderkse1@us.ibm.com> Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
open-power · Feb 11, 2019 · c023204 · c023204
1 parent 37c6c66
commit c023204
Show file tree

Hide file tree

Showing 4 changed files with 104 additions and 6 deletions.
diff --git a/src/include/usr/isteps/istep10list.H b/src/include/usr/isteps/istep10list.H
@@ -5,7 +5,7 @@
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2012,2018                        */
+/* Contributors Listed Below - COPYRIGHT 2012,2019                        */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
@@ -300,6 +300,7 @@ const DepModInfo g_istep10Dependancies = {
     {
         DEP_LIB(libistep10.so),
         DEP_LIB(libisteps_nest.so),
+        DEP_LIB(libisteps_mss.so),
         DEP_LIB(libsbe.so),
         DEP_LIB(libnestmemutils.so),
         DEP_LIB(libimageprocs.so),

diff --git a/src/usr/isteps/istep10/call_proc_cen_ref_clk_enable.C b/src/usr/isteps/istep10/call_proc_cen_ref_clk_enable.C
@@ -5,7 +5,7 @@
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2015,2018                        */
+/* Contributors Listed Below - COPYRIGHT 2015,2019                        */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
@@ -93,6 +93,7 @@
 
 //HWP
 #include <p9_update_security_ctrl.H>
+#include <p9a_ocmb_enable.H>
 
 // secureboot
 #include <secureboot/service.H>
@@ -988,8 +989,7 @@ void* call_proc_cen_ref_clk_enable(void *io_pArgs )
         // Cumulus only
         fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP> l_fapiProcTarget( *l_proc_iter );
 
-        // Invoke the HWP passing in the proc target and
-        // a bit mask indicating connected centaurs
+        // Invoke the HWP passing in the proc target
         // Cumulus only
         FAPI_INVOKE_HWP(l_errl,
                         p9_cen_ref_clk_enable,
@@ -1016,6 +1016,36 @@ void* call_proc_cen_ref_clk_enable(void *io_pArgs )
                     "SUCCESS : proc_cen_ref_clk_enable",
                     "completed ok");
         }
+
+
+        // Invoke the HWP passing in the proc target
+        // HWP loops on child OCMB targets
+        FAPI_INVOKE_HWP(l_errl,
+                        p9a_ocmb_enable,
+                        l_fapiProcTarget);
+
+        if (l_errl)
+        {
+            TRACFCOMP(ISTEPS_TRACE::g_trac_isteps_trace,
+                    "ERROR : p9a_ocmb_enable",
+                    "failed, returning errorlog" );
+
+            // capture the target data in the elog
+            ErrlUserDetailsTarget( *l_proc_iter ).addToLog( l_errl );
+
+            // Create IStep error log and cross ref error that occurred
+            l_stepError.addErrorDetails( l_errl );
+
+            // Commit error log
+            errlCommit( l_errl, HWPF_COMP_ID );
+        }
+        else
+        {
+            TRACFCOMP(ISTEPS_TRACE::g_trac_isteps_trace,
+                    "SUCCESS : p9a_ocmb_enable",
+                    "completed ok");
+        }
+
     }   // endfor
 
     TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace,

diff --git a/src/usr/isteps/istep10/makefile b/src/usr/isteps/istep10/makefile
@@ -5,7 +5,7 @@
 #
 # OpenPOWER HostBoot Project
 #
-# Contributors Listed Below - COPYRIGHT 2015,2018
+# Contributors Listed Below - COPYRIGHT 2015,2019
 # [+] International Business Machines Corp.
 #
 #
@@ -114,9 +114,12 @@ include ${PROCEDURES_PATH}/hwp/nest/p9_scomoverride_chiplets.mk
 # HWP not ready - p9_trigger_rng_bist.mk
 include ${PROCEDURES_PATH}/hwp/nest/p9_rng_init_phase1.mk
 
-#p9_cen_ref_clk_enable : Centaur Ref Clock Enable
+# p9_cen_ref_clk_enable : Centaur Ref Clock Enable
 include $(PERV_HWP_PATH)/p9_cen_ref_clk_enable.mk
 
+# p9a_ocmb_enable
+include ${PERV_HWP_PATH}/p9a_ocmb_enable.mk
+
 # p9_avsbus_lib.mk sets MODULE, reset here to istep10
 MODULE = istep10
 

diff --git a/src/usr/targeting/common/xmltohb/simics_AXONE.system.xml b/src/usr/targeting/common/xmltohb/simics_AXONE.system.xml
@@ -7389,6 +7389,10 @@
         <!-- 3TB + 16GB -->
         <default>0x30400000000</default>
     </attribute>
+    <attribute>
+        <id>OMI_REFCLOCK_SWIZZLE</id>
+        <default>0</default>
+    </attribute>
 </targetInstance>
 
 <targetInstance>
@@ -7460,6 +7464,10 @@
         <!-- 3TB + 18GB -->
         <default>0x30480000000</default>
     </attribute>
+    <attribute>
+        <id>OMI_REFCLOCK_SWIZZLE</id>
+        <default>1</default>
+    </attribute>
 </targetInstance>
 
 <targetInstance>
@@ -7531,6 +7539,10 @@
         <!-- 3TB + 24GB -->
         <default>0x30600000000</default>
     </attribute>
+    <attribute>
+        <id>OMI_REFCLOCK_SWIZZLE</id>
+        <default>2</default>
+    </attribute>
 </targetInstance>
 
 <targetInstance>
@@ -7602,6 +7614,10 @@
         <!-- 3TB + 26GB -->
         <default>0x30680000000</default>
     </attribute>
+    <attribute>
+        <id>OMI_REFCLOCK_SWIZZLE</id>
+        <default>3</default>
+    </attribute>
 </targetInstance>
 
 <targetInstance>
@@ -7673,6 +7689,10 @@
         <!-- 3TB + 32GB -->
         <default>0x30800000000</default>
     </attribute>
+    <attribute>
+        <id>OMI_REFCLOCK_SWIZZLE</id>
+        <default>4</default>
+    </attribute>
 </targetInstance>
 
 <targetInstance>
@@ -7744,6 +7764,10 @@
         <!-- 3TB + 34GB -->
         <default>0x30880000000</default>
     </attribute>
+    <attribute>
+        <id>OMI_REFCLOCK_SWIZZLE</id>
+        <default>5</default>
+    </attribute>
 </targetInstance>
 
 <targetInstance>
@@ -7815,6 +7839,10 @@
         <!-- 3TB + 40GB -->
         <default>0x30A00000000</default>
     </attribute>
+    <attribute>
+        <id>OMI_REFCLOCK_SWIZZLE</id>
+        <default>6</default>
+    </attribute>
 </targetInstance>
 
 <targetInstance>
@@ -7886,6 +7914,10 @@
         <!-- 3TB + 42GB -->
         <default>0x30A80000000</default>
     </attribute>
+    <attribute>
+        <id>OMI_REFCLOCK_SWIZZLE</id>
+        <default>7</default>
+    </attribute>
 </targetInstance>
 
 <targetInstance>
@@ -7957,6 +7989,10 @@
         <!-- 3TB + 48GB -->
         <default>0x30C00000000</default>
     </attribute>
+    <attribute>
+        <id>OMI_REFCLOCK_SWIZZLE</id>
+        <default>8</default>
+    </attribute>
 </targetInstance>
 
 <targetInstance>
@@ -8028,6 +8064,10 @@
         <!-- 3TB + 50GB -->
         <default>0x30C80000000</default>
     </attribute>
+    <attribute>
+        <id>OMI_REFCLOCK_SWIZZLE</id>
+        <default>9</default>
+    </attribute>
 </targetInstance>
 
 <targetInstance>
@@ -8099,6 +8139,10 @@
         <!-- 3TB + 56GB -->
         <default>0x30E00000000</default>
     </attribute>
+    <attribute>
+        <id>OMI_REFCLOCK_SWIZZLE</id>
+        <default>10</default>
+    </attribute>
 </targetInstance>
 
 <targetInstance>
@@ -8170,6 +8214,10 @@
         <!-- 3TB + 58GB -->
         <default>0x30E80000000</default>
     </attribute>
+    <attribute>
+        <id>OMI_REFCLOCK_SWIZZLE</id>
+        <default>11</default>
+    </attribute>
 </targetInstance>
 
 <targetInstance>
@@ -8241,6 +8289,10 @@
         <!-- 3TB + 64GB -->
         <default>0x31000000000</default>
     </attribute>
+    <attribute>
+        <id>OMI_REFCLOCK_SWIZZLE</id>
+        <default>12</default>
+    </attribute>
 </targetInstance>
 
 <targetInstance>
@@ -8312,6 +8364,10 @@
         <!-- 3TB + 66GB -->
         <default>0x31080000000</default>
     </attribute>
+    <attribute>
+        <id>OMI_REFCLOCK_SWIZZLE</id>
+        <default>13</default>
+    </attribute>
 </targetInstance>
 
 <targetInstance>
@@ -8383,6 +8439,10 @@
         <!-- 3TB + 72GB -->
         <default>0x31200000000</default>
     </attribute>
+    <attribute>
+        <id>OMI_REFCLOCK_SWIZZLE</id>
+        <default>14</default>
+    </attribute>
 </targetInstance>
 
 <targetInstance>
@@ -8454,6 +8514,10 @@
         <!-- 3TB + 74GB -->
         <default>0x31280000000</default>
     </attribute>
+    <attribute>
+        <id>OMI_REFCLOCK_SWIZZLE</id>
+        <default>15</default>
+    </attribute>
 </targetInstance>
 
 <!-- ===================================================================== -->