Merge HWAS commits from Stradale

These changes are to reduce the amount of trace entries, disable garding,
and to print the model type.

Change-Id: Iff1cd4995367c7bfad621f41a36e0080007ec6ef
RTC: 97496
Origin: Google Shared Technology
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/11172
Tested-by: Jenkins Server
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>

3 files changed, 30 insertions, 2 deletions

diff --git a/src/usr/hwas/HBconfig b/src/usr/hwas/HBconfig
new file mode 100644
index 000000000..d41516809
--- /dev/null
+++ b/src/usr/hwas/HBconfig
@@ -0,0 +1,10 @@
+config SKIP_RESTRICT_EX_UNITS
+    default n
+    help
+        Skip restricting the number of ex/cores based on PR keyword
+
+config NO_GARD_SUPPORT
+    default n
+    help
+        Skip guarding when set
+
diff --git a/src/usr/hwas/common/hwas.C b/src/usr/hwas/common/hwas.C
index 73843b505..2b6730e09 100644
--- a/src/usr/hwas/common/hwas.C
+++ b/src/usr/hwas/common/hwas.C
@@ -5,7 +5,10 @@
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* COPYRIGHT International Business Machines Corp. 2011,2014              */
+/* Contributors Listed Below - COPYRIGHT 2012,2014                        */
+/* [+] Google Inc.                                                        */
+/* [+] International Business Machines Corp.                              */
+/*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
 /* you may not use this file except in compliance with the License.       */
@@ -34,6 +37,9 @@
 /******************************************************************************/
 #include <stdint.h>
 #include <algorithm>
+#ifdef __HOSTBOOT_MODULE
+#include <config.h>
+#endif
 
 #include <targeting/common/commontargeting.H>
 #include <targeting/common/utilFilter.H>
@@ -465,6 +471,7 @@ errlHndl_t discoverTargets()
         //  call to restrict EX units, marking bad units as present=false;
         //  deconfigReason = 0 because present is false so this is not a
         //  deconfigured event.
+#ifndef CONFIG_SKIP_RESTRICT_EX_UNITS
         errl = restrictEXunits(l_procPRList, false, 0);
 
         if (errl)
@@ -472,6 +479,7 @@ errlHndl_t discoverTargets()
             HWAS_ERR("discoverTargets: restrictEXunits failed");
             break;
         }
+#endif
 
         // call invokePresentByAssoc() to obtain functional MCS's, MEMBUFs, and
         // DIMM's, call algorithm function presentByAssoc() to determine
diff --git a/src/usr/hwas/hwasPlatDeconfigGard.C b/src/usr/hwas/hwasPlatDeconfigGard.C
index 425fea23a..261ad13de 100644
--- a/src/usr/hwas/hwasPlatDeconfigGard.C
+++ b/src/usr/hwas/hwasPlatDeconfigGard.C
@@ -5,7 +5,10 @@
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* COPYRIGHT International Business Machines Corp. 2013,2014              */
+/* Contributors Listed Below - COPYRIGHT 2013,2014                        */
+/* [+] Google Inc.                                                        */
+/* [+] International Business Machines Corp.                              */
+/*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
 /* you may not use this file except in compliance with the License.       */
@@ -38,6 +41,7 @@
 #include <vpd/mvpdenums.H>
 #include <stdio.h>
 #include <sys/mm.h>
+#include <config.h>
 
 #include <pnor/pnorif.H>
 
@@ -67,6 +71,7 @@ errlHndl_t DeconfigGard::platClearGardRecords(
 {
     errlHndl_t l_pErr = NULL;
 
+#ifndef CONFIG_NO_GARD_SUPPORT
     EntityPath l_targetId;
     if (!i_pTarget)
     {
@@ -118,6 +123,7 @@ errlHndl_t DeconfigGard::platClearGardRecords(
     }
 
     HWAS_MUTEX_UNLOCK(iv_mutex);
+#endif // CONFIG_NO_GARD_SUPPORT
     return l_pErr;
 }
 
@@ -128,6 +134,7 @@ errlHndl_t DeconfigGard::platGetGardRecords(
     errlHndl_t l_pErr = NULL;
     o_records.clear();
 
+#ifndef CONFIG_NO_GARD_SUPPORT
     EntityPath l_targetId;
     if (!i_pTarget)
     {
@@ -173,6 +180,7 @@ errlHndl_t DeconfigGard::platGetGardRecords(
 
     HWAS_MUTEX_UNLOCK(iv_mutex);
     HWAS_INF("Get returning %d GARD Records", o_records.size());
+#endif // CONFIG_NO_GARD_SUPPORT
     return l_pErr;
 }
 
@@ -186,6 +194,7 @@ errlHndl_t DeconfigGard::platCreateGardRecord(
         get_huid(i_pTarget), i_errlEid);
     errlHndl_t l_pErr = NULL;
 
+#ifndef CONFIG_NO_GARD_SUPPORT
     HWAS_MUTEX_LOCK(iv_mutex);
 
     do
@@ -350,6 +359,7 @@ errlHndl_t DeconfigGard::platCreateGardRecord(
     while (0);
 
     HWAS_MUTEX_UNLOCK(iv_mutex);
+#endif // CONFIG_NO_GARD_SUPPORT
     return l_pErr;
 }