diff options
| author | Doug Gilbert <dgilbert@us.ibm.com> | 2017-02-13 12:04:38 -0600 |
|---|---|---|
| committer | Jennifer A. Stofer <stofer@us.ibm.com> | 2017-02-13 17:14:28 -0500 |
| commit | db427bdb6a50395f2a61b71a85ae9715b1204a49 (patch) | |
| tree | 0ff0a13d46c601a1675976e6dd672024eabd6d51 /src/sbefw | |
| parent | cd27f4c4b79f560521683a2e1da912a2f2b12d98 (diff) | |
| download | talos-sbe-db427bdb6a50395f2a61b71a85ae9715b1204a49.tar.gz talos-sbe-db427bdb6a50395f2a61b71a85ae9715b1204a49.zip | |
Correct SbeRegAccess class variable and move cv_instance to .sbss
Change-Id: I88be5ee01d499711e5012fb28a9281f827795a7e
RTC: 137062
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/36368
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Reviewed-by: Joseph J. McGill <jmcgill@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Dean Sanner <dsanner@us.ibm.com>
Reviewed-by: Jennifer A. Stofer <stofer@us.ibm.com>
Diffstat (limited to 'src/sbefw')
| -rw-r--r-- | src/sbefw/sberegaccess.C | 2 | ||||
| -rw-r--r-- | src/sbefw/sberegaccess.H | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/sbefw/sberegaccess.C b/src/sbefw/sberegaccess.C index 97a5de12..15f3f0e6 100644 --- a/src/sbefw/sberegaccess.C +++ b/src/sbefw/sberegaccess.C @@ -97,6 +97,8 @@ static const stateTransitionStr_t stateTransMap[SBE_MAX_TRANSITIONS] = { {SBE_STATE_DMT, SBE_DUMP_FAILURE_EVENT, SBE_STATE_DUMP}, }; +SbeRegAccess SbeRegAccess::cv_instance __attribute__((section (".sbss"))); + /** * @brief Initizlize the class * diff --git a/src/sbefw/sberegaccess.H b/src/sbefw/sberegaccess.H index ac380cd8..2502b06a 100644 --- a/src/sbefw/sberegaccess.H +++ b/src/sbefw/sberegaccess.H @@ -5,7 +5,7 @@ /* */ /* OpenPOWER sbe Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2016 */ +/* Contributors Listed Below - COPYRIGHT 2016,2017 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -57,8 +57,7 @@ class SbeRegAccess */ static SbeRegAccess& theSbeRegAccess() { - static SbeRegAccess iv_instance; - return iv_instance; + return cv_instance; } /** @@ -262,6 +261,7 @@ class SbeRegAccess static const uint64_t SBE_MBX8_MBX3_VALID_MASK = 0x2000000000000000ULL; static const uint64_t SBE_MBX8_MBX6_VALID_MASK = 0x0400000000000000ULL; static const uint64_t SBE_DEV_ID_C4_PIN_MASK = 0x0000000000800000ULL; + static SbeRegAccess cv_instance; }; #endif //__SBEFW_SBEREGACCESS_H |
