diff options
| author | Bill Schwartz <whs@us.ibm.com> | 2014-05-19 21:44:46 -0500 |
|---|---|---|
| committer | A. Patrick Williams III <iawillia@us.ibm.com> | 2014-06-30 19:31:30 -0500 |
| commit | 3b65dfb45938d0e864749fe97f044c275f56f3db (patch) | |
| tree | 2de41582ee15f85276a0e83002e1ae5bba622bad /src/usr/hwas/hwasPlatDeconfigGard.C | |
| parent | 682fbef52aa03bf5920ecc422b9bdb4546f31143 (diff) | |
| download | talos-hostboot-3b65dfb45938d0e864749fe97f044c275f56f3db.tar.gz talos-hostboot-3b65dfb45938d0e864749fe97f044c275f56f3db.zip | |
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>
Diffstat (limited to 'src/usr/hwas/hwasPlatDeconfigGard.C')
| -rw-r--r-- | src/usr/hwas/hwasPlatDeconfigGard.C | 12 |
1 files changed, 11 insertions, 1 deletions
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; } |
