summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--hwp/nest/Makefile2
-rw-r--r--hwp/nest/nesterrors.mk17
-rw-r--r--hwp/nest/nestfiles.mk2
-rwxr-xr-xhwp/nest/p9_sbe_fabricinit_errors.xml31
-rw-r--r--sbe/image/Makefile1
5 files changed, 51 insertions, 2 deletions
diff --git a/hwp/nest/Makefile b/hwp/nest/Makefile
index 5a24f54e..c1fc1f6c 100644
--- a/hwp/nest/Makefile
+++ b/hwp/nest/Makefile
@@ -1,5 +1,5 @@
-# This Makefile compiles all of the core hardware procedure code. See the
+# This Makefile compiles all of the nest hardware procedure code. See the
# "nestfiles.mk" file in this directory.
#all generated files from this makefile will end up in obj/nest
diff --git a/hwp/nest/nesterrors.mk b/hwp/nest/nesterrors.mk
new file mode 100644
index 00000000..1463c571
--- /dev/null
+++ b/hwp/nest/nesterrors.mk
@@ -0,0 +1,17 @@
+# @file nesterrors.mk
+#
+# @brief mk for including error files
+#
+# @page ChangeLogs Change Logs
+# @section nesterrors.mk
+#
+##########################################################################
+# Error Files
+##########################################################################
+
+NEST_CURR_DIR := $(abspath $(dir $(lastword $(MAKEFILE_LIST))))
+
+# This variable name must not change
+ERROR_XML_FILES += $(NEST_CURR_DIR)/p9_sbe_fabricinit_errors.xml
+
+
diff --git a/hwp/nest/nestfiles.mk b/hwp/nest/nestfiles.mk
index a2512371..aa2abc12 100644
--- a/hwp/nest/nestfiles.mk
+++ b/hwp/nest/nestfiles.mk
@@ -14,7 +14,7 @@
NEST-CPP-SOURCES = p9_sbe_mcs_setup.C
NEST-CPP-SOURCES +=p9_sbe_scominit.C
-#NEST-CPP-SOURCES +=p9_sbe_fabricinit.C
+NEST-CPP-SOURCES +=p9_sbe_fabricinit.C
NEST-C-SOURCES =
NEST-S-SOURCES =
diff --git a/hwp/nest/p9_sbe_fabricinit_errors.xml b/hwp/nest/p9_sbe_fabricinit_errors.xml
new file mode 100755
index 00000000..7a382602
--- /dev/null
+++ b/hwp/nest/p9_sbe_fabricinit_errors.xml
@@ -0,0 +1,31 @@
+<!-- Halt codes for p9_sbe_fabricinit -->
+<hwpErrors>
+ <!-- ******************************************************************** -->
+ <hwpError>
+ <rc>RC_P9_SBE_FABRICINIT_FBC_STOPPED_ERR</rc>
+ <description>
+ Procedure: p9_sbe_fabricinit
+ Fabric init sequence not attempted, fabric arbitration is stopped.
+ </description>
+ <ffdc>TARGET</ffdc>
+ </hwpError>
+ <!-- ******************************************************************** -->
+ <hwpError>
+ <rc>RC_P9_SBE_FABRICINIT_FAILED_ERR</rc>
+ <description>
+ Procedure: p9_sbe_fabricinit
+ Fabric init failed, or mismatch in expected ADU status.
+ </description>
+ <ffdc>TARGET</ffdc>
+ </hwpError>
+ <!-- ******************************************************************** -->
+ <hwpError>
+ <rc>RC_P9_SBE_FABRICINIT_NO_INIT_ERR</rc>
+ <description>
+ Procedure: p9_sbe_fabricinit
+ ADU operation completed successfully, but fabric was not initialized.
+ </description>
+ <ffdc>TARGET</ffdc>
+ </hwpError>
+ <!-- ******************************************************************** -->
+</hwpErrors>
diff --git a/sbe/image/Makefile b/sbe/image/Makefile
index 82e9e703..1bc7aa8c 100644
--- a/sbe/image/Makefile
+++ b/sbe/image/Makefile
@@ -82,6 +82,7 @@ NEST_MAKE_DIR := $(NEST_SRCDIR)
LIB_DIRS += -L$(OBJDIR)/nest
NESTLIB := $(OBJDIR)/nest/libnest.a
LLIBS += -lnest
+include $(NEST_SRCDIR)/nesterrors.mk
SBE_TOOLS := $(TOOLS_IMAGE_DIR)/sbe_xip_tool $(TOOLS_IMAGE_DIR)/sbe_default_tool
OpenPOWER on IntegriCloud