diff options
| author | Sachin Gupta <sgupta2m@in.ibm.com> | 2016-08-16 04:36:52 -0500 |
|---|---|---|
| committer | AMIT J. TENDOLKAR <amit.tendolkar@in.ibm.com> | 2016-08-16 07:10:06 -0400 |
| commit | 719e0f0d397a534712c9d391e86113b70f00f08f (patch) | |
| tree | 6aacdd8b11f363f68380c29f17060969f7c89430 /sbe | |
| parent | 66b276ff0913c13de63e7c00fc24cd41858f1dbc (diff) | |
| download | talos-sbe-719e0f0d397a534712c9d391e86113b70f00f08f.tar.gz talos-sbe-719e0f0d397a534712c9d391e86113b70f00f08f.zip | |
Use ATTR_BOOT_FLAGS
Change-Id: I881f70f31a505db821679a12c98a4d1bc12427ff
RTC: 150291
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/28300
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Reviewed-by: AMIT J. TENDOLKAR <amit.tendolkar@in.ibm.com>
Diffstat (limited to 'sbe')
| -rw-r--r-- | sbe/build/citest/etc/patches/standalone.simics.patch | 6 | ||||
| -rw-r--r-- | sbe/sbefw/sberegaccess.C | 18 |
2 files changed, 7 insertions, 17 deletions
diff --git a/sbe/build/citest/etc/patches/standalone.simics.patch b/sbe/build/citest/etc/patches/standalone.simics.patch index 2c16527e..bdc40fd8 100644 --- a/sbe/build/citest/etc/patches/standalone.simics.patch +++ b/sbe/build/citest/etc/patches/standalone.simics.patch @@ -1,4 +1,4 @@ -50,52d49 -< # Set mailbox scratch registers so that the SBE starts in plck mode -< ($hb_masterproc).proc_chip.invoke parallel_store SCOM 0x5003F "20000000_00000000" 64 +52c52 < ($hb_masterproc).proc_chip.invoke parallel_store SCOM 0x5003A "00000000_00000000" 64 +--- +> ($hb_masterproc).proc_chip.invoke parallel_store SCOM 0x5003A "80000000_00000000" 64 diff --git a/sbe/sbefw/sberegaccess.C b/sbe/sbefw/sberegaccess.C index 2d886465..4a83c589 100644 --- a/sbe/sbefw/sberegaccess.C +++ b/sbe/sbefw/sberegaccess.C @@ -143,7 +143,6 @@ uint32_t SbeRegAccess::init() { break; } - Target<TARGET_TYPE_PROC_CHIP> l_chip = plat_getChipTarget(); // Read SBE messaging register into iv_messagingReg l_rc = getscom_abs(PERV_SB_MSG_SCOM, &iv_messagingReg); if(PCB_ERROR_NONE != l_rc) @@ -175,19 +174,10 @@ uint32_t SbeRegAccess::init() else { // Need to read the values off the attributes - // TODO: via RTC 150291 : Needs to be changed when all FW control - // attributes are to be combined into one - uint8_t l_attr = 0; - FAPI_ATTR_GET(ATTR_ISTEP_MODE, l_chip, l_attr); - iv_istepMode = l_attr; - FAPI_ATTR_GET(ATTR_SBE_RUNTIME_MODE, l_chip, l_attr); - iv_sbeDestRuntime = l_attr; - FAPI_ATTR_GET(ATTR_IS_SP_MODE, l_chip, l_attr); - iv_fspAttached = l_attr; - FAPI_ATTR_GET(ATTR_SBE_FFDC_ENABLE, l_chip, l_attr); - iv_collectFFDC = l_attr; - FAPI_ATTR_GET(ATTR_SBE_INTERNAL_FFDC_ENABLE, l_chip, l_attr); - iv_sendFFDC = l_attr; + uint32_t l_attr = 0; + FAPI_ATTR_GET(ATTR_BOOT_FLAGS, Target<TARGET_TYPE_SYSTEM>(), + l_attr); + iv_mbx6 = ((uint64_t) l_attr ) << 32; } if(l_mbx8 & SBE_MBX8_MBX6_VALID_MASK) { |
