summaryrefslogtreecommitdiffstats
path: root/src/build
diff options
context:
space:
mode:
authorAmit Tendolkar <amit.tendolkar@in.ibm.com>2017-05-25 11:13:48 -0500
committerSachin Gupta <sgupta2m@in.ibm.com>2017-07-19 12:05:54 -0400
commitc8f584b6f782940ce6c8007406b5836009e38c6f (patch)
tree188d0e6ce0c7c3e56712aa01f67d4156844a8f76 /src/build
parent7f2681158e4054347ca36913216da845c4103132 (diff)
downloadtalos-sbe-c8f584b6f782940ce6c8007406b5836009e38c6f.tar.gz
talos-sbe-c8f584b6f782940ce6c8007406b5836009e38c6f.zip
Optimized PPE FFDC collection framework
Allows SBE to collect CME / SGPE FFDC for errors from p9_sbe_check_master_stop15 in istep16 Change-Id: Ie31336fae9d29e14dbb7995cd438b87ef615d4b6 RTC: 174610 Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/41375 Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com> Reviewed-by: Brian T. Vanderpool <vanderp@us.ibm.com> Tested-by: Hostboot CI <hostboot-ci+hostboot@us.ibm.com> Tested-by: PPE CI <ppe-ci+hostboot@us.ibm.com> Reviewed-by: Michael S. Floyd <mfloyd@us.ibm.com> Reviewed-by: Jennifer A. Stofer <stofer@us.ibm.com> Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/42600 Reviewed-by: Hostboot Team <hostboot@us.ibm.com> Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com> Reviewed-by: Sachin Gupta <sgupta2m@in.ibm.com>
Diffstat (limited to 'src/build')
-rw-r--r--src/build/img_defs.mk6
-rw-r--r--src/build/import_hwp_mk/istep4/Makefile2
-rw-r--r--src/build/import_hwp_mk/istep4/istep4files.mk7
3 files changed, 13 insertions, 2 deletions
diff --git a/src/build/img_defs.mk b/src/build/img_defs.mk
index 9d902dfc..7c675468 100644
--- a/src/build/img_defs.mk
+++ b/src/build/img_defs.mk
@@ -186,6 +186,10 @@ ifndef HWPLIB_SRCDIR
export HWPLIB_SRCDIR = $(IMPORT_SRCDIR)/chips/p9/procedures/hwp/lib
endif
+ifndef HWPFFDC_SRCDIR
+export HWPFFDC_SRCDIR = $(IMPORT_SRCDIR)/chips/p9/procedures/hwp/ffdc
+endif
+
ifndef IMAGEPROCS_TOOL_DIR
export IMAGEPROCS_TOOL_DIR = $(IMPORT_SRCDIR)/tools/imageProcs
endif
@@ -211,7 +215,7 @@ export P9_XIP_BINDIR = $(BASE_OBJDIR)/xip
endif
ifndef IMG_INCLUDES
-export IMG_INCLUDES = -I$(IMAGEPROCS_SRCDIR) -I$(P9_XIP_SRCDIR) -I$(BUILD_DIR) -I$(CACHE_SRCDIR) -I$(UTILS_SRCDIR) -I$(CORE_SRCDIR) -I$(PERV_SRCDIR) -I$(NEST_SRCDIR) -I$(PM_SRCDIR) -I$(INITFILES_SRCDIR)
+export IMG_INCLUDES = -I$(IMAGEPROCS_SRCDIR) -I$(P9_XIP_SRCDIR) -I$(BUILD_DIR) -I$(CACHE_SRCDIR) -I$(UTILS_SRCDIR) -I$(CORE_SRCDIR) -I$(PERV_SRCDIR) -I$(NEST_SRCDIR) -I$(PM_SRCDIR) -I$(INITFILES_SRCDIR) -I$(HWPLIB_SRCDIR) -I$(HWPFFDC_SRCDIR)
endif
ifndef BOOT_OBJDIR
diff --git a/src/build/import_hwp_mk/istep4/Makefile b/src/build/import_hwp_mk/istep4/Makefile
index 116b783d..f9f38dce 100644
--- a/src/build/import_hwp_mk/istep4/Makefile
+++ b/src/build/import_hwp_mk/istep4/Makefile
@@ -31,7 +31,7 @@ export SUB_OBJDIR = /$(IMPORT_OBJDIR)/istep4
include img_defs.mk
include istep4files.mk
-export VPATH = $(PERV_SRCDIR):$(NEST_SRCDIR):$(CACHE_SRCDIR):$(CORE_SRCDIR):$(PM_SRCDIR):$(INITFILES_SRCDIR):$(LIB_SRCDIR)
+export VPATH = $(PERV_SRCDIR):$(NEST_SRCDIR):$(CACHE_SRCDIR):$(CORE_SRCDIR):$(PM_SRCDIR):$(INITFILES_SRCDIR):$(LIB_SRCDIR):$(HWPLIB_SRCDIR):$(HWPFFDC_SRCDIR)
ifneq ($(ddlevel), DD2)
GCC-CFLAGS += -mlongcall
diff --git a/src/build/import_hwp_mk/istep4/istep4files.mk b/src/build/import_hwp_mk/istep4/istep4files.mk
index e4d0a424..fca57ab0 100644
--- a/src/build/import_hwp_mk/istep4/istep4files.mk
+++ b/src/build/import_hwp_mk/istep4/istep4files.mk
@@ -29,6 +29,7 @@
##########################################################################
# Object Files
##########################################################################
+include img_defs.mk
ISTEP4-CPP-SOURCES = p9_hcd_cache_poweron.C
ISTEP4-CPP-SOURCES +=p9_hcd_cache_chiplet_reset.C
@@ -60,6 +61,12 @@ ISTEP4-CPP-SOURCES +=p9_ncu_scom.C
ISTEP4-CPP-SOURCES +=p9_l2_scom.C
ISTEP4-CPP-SOURCES +=p9_l3_scom.C
ISTEP4-CPP-SOURCES +=p9_common_poweronoff.C
+ifeq ($(ddlevel), DD2)
+ISTEP4-CPP-SOURCES +=p9_eq_clear_atomic_lock.C
+ISTEP4-CPP-SOURCES +=p9_collect_deadman_ffdc.C
+ISTEP4-CPP-SOURCES +=p9_sbe_ppe_ffdc.C
+ISTEP4-CPP-SOURCES +=p9_sbe_ppe_utils.C
+endif
ISTEP4-CPP-SOURCES +=p9_sbe_check_master_stop15.C
ISTEP4-C-SOURCES =
ISTEP4-S-SOURCES =
OpenPOWER on IntegriCloud