Revert "Re-apply p9_int_scom inits on shutdown path"

This reverts commit db91ab91d557b402c4f0709e3aaa20bb8025b27c. Change-Id: Id83de4fe211c56de6fa11cc124d57910c434feb7 Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/48476 Tested-by: Christian R. Geddes <crgeddes@us.ibm.com> Reviewed-by: Christian R. Geddes <crgeddes@us.ibm.com>
open-power · Oct 17, 2017 · 34320d3 · 34320d3
1 parent 241fe35
commit 34320d3
Show file tree

Hide file tree

Showing 5 changed files with 83 additions and 174 deletions.
diff --git a/src/include/usr/initservice/initserviceif.H b/src/include/usr/initservice/initserviceif.H
@@ -58,18 +58,18 @@ namespace INITSERVICE
      */
     enum EventPriority_t
     {
-        NOTIFY_FIRST                    = 0,
-        HIGHEST_PRIORITY                = NOTIFY_FIRST,
-        NO_PRIORITY                     = 16,
-        MBOX_PRIORITY                   = 17,
-        INTR_PRIORITY                   = 18,
-        PRESHUTDOWN_INIT_PRIORITY       = 19,
-        LOWEST_PRIORITY                 = 127,
-        CONSOLE_PRIORITY                = LOWEST_PRIORITY,
-        LAST_PRE_MEM_FLUSH_PRIORITY     = LOWEST_PRIORITY,
+        NOTIFY_FIRST     = 0,
+        HIGHEST_PRIORITY = NOTIFY_FIRST,
+        NO_PRIORITY      = 16,
+        MBOX_PRIORITY    = 17,
+        INTR_PRIORITY    = 18,
+        LOWEST_PRIORITY  = 127,
+        CONSOLE_PRIORITY  = LOWEST_PRIORITY,
+        LAST_PRE_MEM_FLUSH_PRIORITY = LOWEST_PRIORITY,
+
         HIGHEST_POST_MEM_FLUSH_PRIORITY = 128,  // 1st post mem flush callback
-        PNOR_RP_PRIORITY                = HIGHEST_POST_MEM_FLUSH_PRIORITY,
-        POST_MEM_FLUSH_NOTIFY_LAST      = 255
+        PNOR_RP_PRIORITY = HIGHEST_POST_MEM_FLUSH_PRIORITY,
+        POST_MEM_FLUSH_NOTIFY_LAST = 255
 
     };
 

diff --git a/src/usr/fapi2/fapi2.mk b/src/usr/fapi2/fapi2.mk
@@ -45,7 +45,6 @@ EXTRAINCDIR += $(ROOTPATH)/src/import/chips/p9/procedures/hwp/sbe/
 EXTRAINCDIR += ${ROOTPATH}/src/import/chips/p9/procedures/hwp/accessors/
 EXTRAINCDIR += ${ROOTPATH}/src/import/chips/p9/procedures/hwp/lib/
 EXTRAINCDIR += ${ROOTPATH}/src/import/chips/p9/procedures/hwp/ffdc/
-EXTRAINCDIR += ${ROOTPATH}/src/import/chips/p9/procedures/hwp/initfiles/
 EXTRAINCDIR += ${HWP_PATH}
 EXTRAINCDIR += ${HWP_PATH_2}/hwp/memory
 EXTRAINCDIR += ${HWP_PATH_2}/hwp/memory/lib/
@@ -153,15 +152,9 @@ include $(ROOTPATH)/src/import/chips/p9/procedures/hwp/pm/p9_pm_get_poundv_bucke
 include $(ROOTPATH)/src/import/chips/p9/procedures/hwp/pm/p9_pm_get_poundw_bucket.mk
 include $(ROOTPATH)/src/import/chips/p9/procedures/hwp/pm/p9_pm_get_poundw_bucket_attr.mk
 
-# We specifically removed this from the istep10.so and placed it here because
-# we have to reapply this init on the shutdown path after the interrupt resource
-# provider is shutdown
-include $(ROOTPATH)/src/import/chips/p9/procedures/hwp/initfiles/p9_int_scom.mk
-
 VPATH += ${HWP_PATH_1}/hwp/accessors
 VPATH += ${ROOTPATH}/src/import/hwpf/fapi2/src/
 VPATH += ${ROOTPATH}/src/import/chips/p9/procedures/hwp/pm/
 VPATH += ${ROOTPATH}/src/import/chips/p9/procedures/hwp/ffdc/
 VPATH += ${ROOTPATH}/src/import/chips/p9/procedures/hwp/lib/
-VPATH += ${ROOTPATH}/src/import/chips/p9/procedures/hwp/initfiles/
 VPATH += ${GENPATH}
diff --git a/src/usr/isteps/istep10/makefile b/src/usr/isteps/istep10/makefile
@@ -84,12 +84,11 @@ include ${PROCEDURES_PATH}/hwp/initfiles/p9_fbc_ioo_dl_scom.mk
 include ${PROCEDURES_PATH}/hwp/initfiles/p9_nx_scom.mk
 include ${PROCEDURES_PATH}/hwp/initfiles/p9_cxa_scom.mk
 include ${PROCEDURES_PATH}/hwp/initfiles/p9_mmu_scom.mk
+include ${PROCEDURES_PATH}/hwp/initfiles/p9_int_scom.mk
 include ${PROCEDURES_PATH}/hwp/initfiles/p9_vas_scom.mk
 include ${PROCEDURES_PATH}/hwp/initfiles/p9c_dmi_scom.mk
 include ${PROCEDURES_PATH}/hwp/initfiles/p9c_mi_scom.mk
 include ${PROCEDURES_PATH}/hwp/initfiles/p9c_mc_scom.mk
-# Note that p9_int_scom.mk is included in fapi2.mk for
-# workaround reasons so we are not including it here
 
 # proc_obus_scominit : Apply scom inits to Obus
 include ${PROCEDURES_PATH}/hwp/io/p9_io_obus_scominit.mk