diff options
| author | Mike Baiocchi <mbaiocch@us.ibm.com> | 2020-01-31 00:09:04 -0600 |
|---|---|---|
| committer | William G Hoffa <wghoffa@us.ibm.com> | 2020-02-03 09:22:01 -0600 |
| commit | 26554a3e54aac96a8bafa9ab4fabb45e126d5e1d (patch) | |
| tree | 7e893117b329d2cc65a2e85ffb8282cfcbd7db4e | |
| parent | 779761d1c5e0d143e1b2d7bc1da248345d2dffb8 (diff) | |
| download | talos-hostboot-26554a3e54aac96a8bafa9ab4fabb45e126d5e1d.tar.gz talos-hostboot-26554a3e54aac96a8bafa9ab4fabb45e126d5e1d.zip | |
Move definition of TRACE_ERR_FMT and TRACE_ERR_ARGS
Originally TRACE_ERR_FMT and TRACE_ERR_ARGS were defined in
centaurScomCache.H for the P9 'master' branch. This commit puts
them into the more proper errlentry.H file like they are for
P10's 'master-p10' branch.
Change-Id: Icb7af6ae721a15036804b7d35f49911888eb5eaf
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/90705
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP HW <op-hw-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Zachary Clark <zach@ibm.com>
Reviewed-by: Nicholas E Bofferding <bofferdn@us.ibm.com>
Reviewed-by: William G Hoffa <wghoffa@us.ibm.com>
| -rw-r--r-- | src/include/usr/errl/errlentry.H | 8 | ||||
| -rw-r--r-- | src/include/usr/scom/centaurScomCache.H | 7 | ||||
| -rwxr-xr-x | src/usr/i2c/tpmdd.C | 3 | ||||
| -rw-r--r-- | src/usr/secureboot/node_comm/node_comm.H | 4 | ||||
| -rw-r--r-- | src/usr/secureboot/node_comm/node_comm_transfer.C | 4 |
5 files changed, 13 insertions, 13 deletions
diff --git a/src/include/usr/errl/errlentry.H b/src/include/usr/errl/errlentry.H index fea1a76ef..905203a9e 100644 --- a/src/include/usr/errl/errlentry.H +++ b/src/include/usr/errl/errlentry.H @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2011,2019 */ +/* Contributors Listed Below - COPYRIGHT 2011,2020 */ /* [+] Google Inc. */ /* [+] International Business Machines Corp. */ /* */ @@ -1144,4 +1144,10 @@ inline bool ErrlEntry::getDoHbDump() */ #define ERRL_GETEID_SAFE(errhdl) (errhdl == NULL ? 0 : errhdl->eid()) +// These defines allow standard logging of error information in traces +#define TRACE_ERR_FMT "Error info: PLID=0x%08X, EID=0x%08X, Reason=0x%04X. " + +#define TRACE_ERR_ARGS(pError) \ + ERRL_GETPLID_SAFE(pError), ERRL_GETEID_SAFE(pError), ERRL_GETRC_SAFE(pError) + #endif //ERRLENTRY_H diff --git a/src/include/usr/scom/centaurScomCache.H b/src/include/usr/scom/centaurScomCache.H index 94f345694..0817ae11e 100644 --- a/src/include/usr/scom/centaurScomCache.H +++ b/src/include/usr/scom/centaurScomCache.H @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2011,2018 */ +/* Contributors Listed Below - COPYRIGHT 2011,2020 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -42,11 +42,6 @@ extern trace_desc_t* g_trac_scom; -// These defines allow standard logging of error information in traces -#define TRACE_ERR_FMT "Error info: PLID=0x%08X, EID=0x%08X, Reason=0x%04X. " -#define TRACE_ERR_ARGS(pError) \ - ERRL_GETPLID_SAFE(pError), ERRL_GETEID_SAFE(pError), ERRL_GETRC_SAFE(pError) - namespace SECUREBOOT { diff --git a/src/usr/i2c/tpmdd.C b/src/usr/i2c/tpmdd.C index a6f96514b..93aac12b9 100755 --- a/src/usr/i2c/tpmdd.C +++ b/src/usr/i2c/tpmdd.C @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2011,2019 */ +/* Contributors Listed Below - COPYRIGHT 2011,2020 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -51,7 +51,6 @@ #include <i2c/i2cif.H> #include <secureboot/service.H> #include <secureboot/trustedbootif.H> -#include <scom/centaurScomCache.H> // for TRACE_ERR_FMT, TRACE_ERR_ARGS #include "tpmdd.H" #include "errlud_i2c.H" diff --git a/src/usr/secureboot/node_comm/node_comm.H b/src/usr/secureboot/node_comm/node_comm.H index f8135d2d8..227d53ac2 100644 --- a/src/usr/secureboot/node_comm/node_comm.H +++ b/src/usr/secureboot/node_comm/node_comm.H @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2018,2019 */ +/* Contributors Listed Below - COPYRIGHT 2018,2020 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -31,7 +31,7 @@ #include <time.h> #include <devicefw/userif.H> #include <trace/interface.H> -#include <scom/centaurScomCache.H> // for TRACE_ERR_FMT, TRACE_ERR_ARGS +#include <errl/errlentry.H> // for TRACE_ERR_FMT, TRACE_ERR_ARGS #include <secureboot/nodecommif.H> #include "../trusted/trustedboot.H" #include <secureboot/trustedbootif.H> diff --git a/src/usr/secureboot/node_comm/node_comm_transfer.C b/src/usr/secureboot/node_comm/node_comm_transfer.C index faf39af3e..4b82688f0 100644 --- a/src/usr/secureboot/node_comm/node_comm_transfer.C +++ b/src/usr/secureboot/node_comm/node_comm_transfer.C @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2019 */ +/* Contributors Listed Below - COPYRIGHT 2019,2020 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -29,7 +29,7 @@ #include <time.h> #include <devicefw/userif.H> #include <trace/interface.H> -#include <scom/centaurScomCache.H> // for TRACE_ERR_FMT, TRACE_ERR_ARGS +#include <errl/errlentry.H> // for TRACE_ERR_FMT, TRACE_ERR_ARGS #include <targeting/targplatutil.H> #include <secureboot/nodecommif.H> #include <secureboot/secure_reasoncodes.H> |
