From c731ca00c7494aa48c8eed36179561c36d19220c Mon Sep 17 00:00:00 2001 From: Santosh Puranik Date: Wed, 14 Sep 2016 05:21:51 -0500 Subject: Some updates to FAPI files -- Updates to FAPI headers to get them compiling directly from the mirror in PPE repo. Change-Id: Ia64179ff04c550ec0ef1c4ec56018cf199340ecf Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/29637 Tested-by: Jenkins Server Tested-by: PPE CI Tested-by: Hostboot CI Reviewed-by: Gregory S. Still Reviewed-by: Richard J. Knight Reviewed-by: RANGANATHPRASAD G. BRAHMASAMUDRA Reviewed-by: Sachin Gupta Reviewed-by: Matt K. Light Reviewed-by: Daniel M. Crowell Reviewed-by: Jennifer A. Stofer Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/29639 Tested-by: FSP CI Jenkins Reviewed-by: Santosh S. Puranik --- src/import/chips/p9/utils/p9_putRingUtils.C | 2 +- src/import/hwpf/fapi2/include/error_info.H | 4 +++- src/import/hwpf/fapi2/include/fapi2_target.H | 6 ++++-- src/import/hwpf/fapi2/include/ffdc.H | 5 ++++- src/import/hwpf/fapi2/include/return_code.H | 5 +++-- src/import/hwpf/fapi2/include/utils.H | 6 +++--- 6 files changed, 18 insertions(+), 10 deletions(-) diff --git a/src/import/chips/p9/utils/p9_putRingUtils.C b/src/import/chips/p9/utils/p9_putRingUtils.C index 9b8af399..e4c39b14 100644 --- a/src/import/chips/p9/utils/p9_putRingUtils.C +++ b/src/import/chips/p9/utils/p9_putRingUtils.C @@ -398,7 +398,7 @@ fapi2::ReturnCode setupScanRegion(const fapi2::Target& if (fapi2::TARGET_TYPE_EX & (i_target.get().getFapiTargetType())) { // this gives position of ex (0 or 1) - uint32_t l_ex_number = i_target.getTargetNumber(); + uint32_t l_ex_number = i_target.get().getTargetInstance(); // We are in odd EX and it's placed in bottom half of the EQ if (l_ex_number % 2) diff --git a/src/import/hwpf/fapi2/include/error_info.H b/src/import/hwpf/fapi2/include/error_info.H index 9f0e0419..387bf70e 100644 --- a/src/import/hwpf/fapi2/include/error_info.H +++ b/src/import/hwpf/fapi2/include/error_info.H @@ -32,7 +32,9 @@ #define FAPI2_ERRORINFO_H_ #include -#include +#ifndef __PPE__ + #include +#endif #include #include #include diff --git a/src/import/hwpf/fapi2/include/fapi2_target.H b/src/import/hwpf/fapi2/include/fapi2_target.H index b41eb477..6f2c6793 100644 --- a/src/import/hwpf/fapi2/include/fapi2_target.H +++ b/src/import/hwpf/fapi2/include/fapi2_target.H @@ -1,7 +1,7 @@ /* IBM_PROLOG_BEGIN_TAG */ /* This is an automatically generated prolog. */ /* */ -/* $Source: import/hwpf/fapi2/include/fapi2_target.H $ */ +/* $Source: src/import/hwpf/fapi2/include/fapi2_target.H $ */ /* */ /* OpenPOWER sbe Project */ /* */ @@ -31,7 +31,9 @@ #define __FAPI2_COMMON_TARGET__ #include -#include +#ifndef __PPE__ + #include +#endif // __PPE__ #include #include #include diff --git a/src/import/hwpf/fapi2/include/ffdc.H b/src/import/hwpf/fapi2/include/ffdc.H index 82483d54..6fa2e092 100644 --- a/src/import/hwpf/fapi2/include/ffdc.H +++ b/src/import/hwpf/fapi2/include/ffdc.H @@ -1,7 +1,7 @@ /* IBM_PROLOG_BEGIN_TAG */ /* This is an automatically generated prolog. */ /* */ -/* $Source: import/hwpf/fapi2/include/ffdc.H $ */ +/* $Source: src/import/hwpf/fapi2/include/ffdc.H $ */ /* */ /* OpenPOWER sbe Project */ /* */ @@ -30,6 +30,8 @@ #ifndef FAPI2_FFDC_H_ #define FAPI2_FFDC_H_ +#if !defined (FAPI2_NO_FFDC) && !defined (MINIMUM_FFDC) + #include #include #include @@ -235,4 +237,5 @@ class FirstFailureData }; } +#endif // !defined (FAPI2_NO_FFDC) && !defined (MINIMUM_FFDC) #endif // FAPI2_FFDC_H_ diff --git a/src/import/hwpf/fapi2/include/return_code.H b/src/import/hwpf/fapi2/include/return_code.H index f5569dc2..5a15da19 100644 --- a/src/import/hwpf/fapi2/include/return_code.H +++ b/src/import/hwpf/fapi2/include/return_code.H @@ -1,7 +1,7 @@ /* IBM_PROLOG_BEGIN_TAG */ /* This is an automatically generated prolog. */ /* */ -/* $Source: import/hwpf/fapi2/include/return_code.H $ */ +/* $Source: src/import/hwpf/fapi2/include/return_code.H $ */ /* */ /* OpenPOWER sbe Project */ /* */ @@ -31,6 +31,7 @@ #define __FAPI2_RETURN_CODE__ #include +#include #ifndef FAPI2_NO_FFDC #include @@ -43,7 +44,7 @@ namespace fapi2 /// // Remove the inheritance relationship with FirstFailureData if // the platform doesn't support FFDC. -#ifdef FAPI2_NO_FFDC +#if defined (FAPI2_NO_FFDC) || defined (MINIMUM_FFDC) class ReturnCode #else class ReturnCode : public FirstFailureData diff --git a/src/import/hwpf/fapi2/include/utils.H b/src/import/hwpf/fapi2/include/utils.H index e4f5fa09..4f358fe0 100644 --- a/src/import/hwpf/fapi2/include/utils.H +++ b/src/import/hwpf/fapi2/include/utils.H @@ -1,7 +1,7 @@ /* IBM_PROLOG_BEGIN_TAG */ /* This is an automatically generated prolog. */ /* */ -/* $Source: import/hwpf/fapi2/include/utils.H $ */ +/* $Source: src/import/hwpf/fapi2/include/utils.H $ */ /* */ /* OpenPOWER sbe Project */ /* */ @@ -38,7 +38,7 @@ namespace fapi2 { - +#ifndef __PPE__ /// /// @brief Enable/Disable special wakeup on processor chip core(s) /// @@ -128,7 +128,7 @@ void createPlatLog( fapi2::ReturnCode& io_rc, fapi2::errlSeverity_t i_sev = fapi2::FAPI2_ERRL_SEV_UNRECOVERABLE ); - +#endif // __PPE__ /// /// @brief Delay this thread. Hostboot will use the nanoseconds parameter /// and make a syscall to nanosleep. While in the syscall, the hostboot -- cgit v1.2.1