cleanup hwas error module/reasoncodes to work with FSP better.

Change-Id: I1ae2fafab64811d6f68f57d437bd5fba16a5d532
CQ: SW239708
Co-req: 910348
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/8284
Tested-by: Jenkins Server
Reviewed-by: MIKE J. JONES <mjjones@us.ibm.com>
Reviewed-by: Donald E. Dahle <dedahle@us.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>

3 files changed, 82 insertions, 45 deletions

diff --git a/src/include/usr/hwas/common/hwas_reasoncodes.H b/src/include/usr/hwas/common/hwas_reasoncodes.H
index 071623629..b053973f8 100644
--- a/src/include/usr/hwas/common/hwas_reasoncodes.H
+++ b/src/include/usr/hwas/common/hwas_reasoncodes.H
@@ -5,7 +5,7 @@
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
-/* COPYRIGHT International Business Machines Corp. 2011,2013              */
+/* COPYRIGHT International Business Machines Corp. 2011,2014              */
 /*                                                                        */
 /* p1                                                                     */
 /*                                                                        */
@@ -29,35 +29,22 @@ namespace HWAS
     {
         MOD_DECONFIG_GARD         = 0x01,
         MOD_PROCESS_CALLOUT       = 0x02,
-        MOD_HOST_DISCOVER_TARGETS = 0x03,
-        MOD_HOST_GARD             = 0x04,
-        MOD_CHECK_MIN_HW          = 0x05,
+        MOD_CHECK_MIN_HW          = 0x03,
     };
 
     enum HwasReasonCode
     {
-        // these are HWAS Common specific, and will get mapped into 'correct'
-        //  codes by the appropriate platform-specific function
-        RC_TARGET_NOT_DECONFIGURABLE        = 0x01,
-        RC_TARGET_NOT_GARDABLE              = 0x02,
-        RC_GARD_REPOSITORY_FULL             = 0x03,
-        RC_TARGET_NOT_FOUND_FOR_GARD_RECORD = 0x04,
-        RC_INVALID_TARGET                   = 0x05,
-        RC_TOP_LEVEL_TARGET_NULL            = 0x06,
+        RC_TARGET_NOT_DECONFIGURABLE        = HWAS_COMP_ID | 0x01,
+        RC_TARGET_NOT_FOUND_FOR_GARD_RECORD = HWAS_COMP_ID | 0x02,
+        RC_INVALID_TARGET                   = HWAS_COMP_ID | 0x03,
         //
         //  System Availability Service codes
         //  The first is a blanket error that will be returned to the caller,
         //      further errors will be committed in the routine.
-        RC_SYSAVAIL_INSUFFICIENT_HW         = 0x10,
-        //  common with FSP
-        RC_SYSAVAIL_NO_CORES_FUNC           = 0x11,
-        RC_SYSAVAIL_NO_MEMORY_FUNC          = 0x12,
-        //  fsp only
-        RC_SYSAVAIL_NO_PROCS_FUNC           = 0x13,
-        RC_SYSAVAIL_NO_PROC_CLOCKS_FUNC     = 0x14,
-        RC_SYSAVAIL_NO_MEM_CLOCKS_FUNC      = 0x15,
-        RC_SYSAVAIL_NO_TOD_CLOCKS_FUNC      = 0x16,
-        // For each new reason code, update FSP's hwasPlatError.C file
+        RC_SYSAVAIL_INSUFFICIENT_HW         = HWAS_COMP_ID | 0x04,
+        RC_SYSAVAIL_NO_CORES_FUNC           = HWAS_COMP_ID | 0x05,
+        RC_SYSAVAIL_NO_MEMORY_FUNC          = HWAS_COMP_ID | 0x06,
+        RC_SYSAVAIL_NO_PROCS_FUNC           = HWAS_COMP_ID | 0x07,
     };
 };
 
diff --git a/src/include/usr/hwas/hwasPlatError.H b/src/include/usr/hwas/hwasPlatError.H
index 34f75425d..eada8450c 100644
--- a/src/include/usr/hwas/hwasPlatError.H
+++ b/src/include/usr/hwas/hwasPlatError.H
@@ -1,26 +1,25 @@
-/*  IBM_PROLOG_BEGIN_TAG
- *  This is an automatically generated prolog.
- *
- *  $Source: src/include/usr/hwas/hwasPlatError.H $
- *
- *  IBM CONFIDENTIAL
- *
- *  COPYRIGHT International Business Machines Corp. 2012
- *
- *  p1
- *
- *  Object Code Only (OCO) source materials
- *  Licensed Internal Code Source Materials
- *  IBM HostBoot Licensed Internal Code
- *
- *  The source code for this program is not published or other-
- *  wise divested of its trade secrets, irrespective of what has
- *  been deposited with the U.S. Copyright Office.
- *
- *  Origin: 30
- *
- *  IBM_PROLOG_END_TAG
- */
+/* IBM_PROLOG_BEGIN_TAG                                                   */
+/* This is an automatically generated prolog.                             */
+/*                                                                        */
+/* $Source: src/include/usr/hwas/hwasPlatError.H $                        */
+/*                                                                        */
+/* IBM CONFIDENTIAL                                                       */
+/*                                                                        */
+/* COPYRIGHT International Business Machines Corp. 2012,2014              */
+/*                                                                        */
+/* p1                                                                     */
+/*                                                                        */
+/* Object Code Only (OCO) source materials                                */
+/* Licensed Internal Code Source Materials                                */
+/* IBM HostBoot Licensed Internal Code                                    */
+/*                                                                        */
+/* The source code for this program is not published or otherwise         */
+/* divested of its trade secrets, irrespective of what has been           */
+/* deposited with the U.S. Copyright Office.                              */
+/*                                                                        */
+/* Origin: 30                                                             */
+/*                                                                        */
+/* IBM_PROLOG_END_TAG                                                     */
 #ifndef __HWAS_PLAT_ERROR_H
 #define __HWAS_PLAT_ERROR_H
 
@@ -41,6 +40,7 @@
 
 #include <hbotcompid.H>
 #include <errl/errlentry.H>
+#include <hwas/hwasplatreasoncodes.H>
 
 namespace HWAS
 {
diff --git a/src/include/usr/hwas/hwasplatreasoncodes.H b/src/include/usr/hwas/hwasplatreasoncodes.H
new file mode 100644
index 000000000..fc14e2a0d
--- /dev/null
+++ b/src/include/usr/hwas/hwasplatreasoncodes.H
@@ -0,0 +1,50 @@
+/* IBM_PROLOG_BEGIN_TAG                                                   */
+/* This is an automatically generated prolog.                             */
+/*                                                                        */
+/* $Source: src/include/usr/hwas/hwasplatreasoncodes.H $                  */
+/*                                                                        */
+/* IBM CONFIDENTIAL                                                       */
+/*                                                                        */
+/* COPYRIGHT International Business Machines Corp. 2014                   */
+/*                                                                        */
+/* p1                                                                     */
+/*                                                                        */
+/* Object Code Only (OCO) source materials                                */
+/* Licensed Internal Code Source Materials                                */
+/* IBM HostBoot Licensed Internal Code                                    */
+/*                                                                        */
+/* The source code for this program is not published or otherwise         */
+/* divested of its trade secrets, irrespective of what has been           */
+/* deposited with the U.S. Copyright Office.                              */
+/*                                                                        */
+/* Origin: 30                                                             */
+/*                                                                        */
+/* IBM_PROLOG_END_TAG                                                     */
+#ifndef HWASPLATREASONCODES_H
+#define HWASPLATREASONCODES_H
+
+namespace HWAS
+{
+    enum HwasPlatModuleID
+    {
+        //
+        // Code to identify discrete error locations/events
+        //
+        //  @note Must always start @ 0x80, since common module IDs occupy
+        //      0x00 -> 0x7F range
+        MOD_HOST_DISCOVER_TARGETS = 0x80,
+        MOD_HOST_GARD             = 0x81,
+        MOD_PLAT_DECONFIG_GARD    = 0x82,
+    };
+
+    enum HwasPlatReasonCode
+    {
+        //  @note Must always start @ 0x80, since common reason codes occupy
+        //      0x00 -> 0x7F range
+        RC_TOP_LEVEL_TARGET_NULL            = HWAS_COMP_ID | 0x80,
+        RC_TARGET_NOT_GARDABLE              = HWAS_COMP_ID | 0x81,
+        RC_GARD_REPOSITORY_FULL             = HWAS_COMP_ID | 0x82,
+    };
+};
+
+#endif