From dc3c52d27190ebe78774ea12b0c018e61bcf719a Mon Sep 17 00:00:00 2001 From: "Richard J. Knight" Date: Thu, 19 Jan 2017 15:42:33 -0600 Subject: Updates to initcompiler to support DD2 and cumulus -Branch based on scom address changes -Update error cases for missing/unsupported spys RTC:163767 Change-Id: Ifc2b5b05a4cd3397125962959c7113da965e988b Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/35507 Tested-by: Jenkins Server Reviewed-by: Thi N. Tran Reviewed-by: Benjamin Gass Tested-by: PPE CI Tested-by: Hostboot CI Reviewed-by: Jennifer A. Stofer Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/35509 Tested-by: FSP CI Jenkins Reviewed-by: Sachin Gupta --- src/import/chips/p9/procedures/hwp/cache/p9_hcd_cache_scominit.C | 2 +- src/import/chips/p9/procedures/hwp/initfiles/p9_ncu_scom.C | 6 +++++- src/import/chips/p9/procedures/hwp/initfiles/p9_ncu_scom.H | 6 +++--- 3 files changed, 9 insertions(+), 5 deletions(-) (limited to 'src/import/chips') diff --git a/src/import/chips/p9/procedures/hwp/cache/p9_hcd_cache_scominit.C b/src/import/chips/p9/procedures/hwp/cache/p9_hcd_cache_scominit.C index 54aa9ec2..9505bea6 100644 --- a/src/import/chips/p9/procedures/hwp/cache/p9_hcd_cache_scominit.C +++ b/src/import/chips/p9/procedures/hwp/cache/p9_hcd_cache_scominit.C @@ -166,7 +166,7 @@ p9_hcd_cache_scominit( goto fapi_try_exit; } - FAPI_EXEC_HWP(l_rc, p9_ncu_scom, *l_iter, l_sys); + FAPI_EXEC_HWP(l_rc, p9_ncu_scom, *l_iter, l_sys, l_chip); if (l_rc) { diff --git a/src/import/chips/p9/procedures/hwp/initfiles/p9_ncu_scom.C b/src/import/chips/p9/procedures/hwp/initfiles/p9_ncu_scom.C index 3c90ec29..fdd9a101 100644 --- a/src/import/chips/p9/procedures/hwp/initfiles/p9_ncu_scom.C +++ b/src/import/chips/p9/procedures/hwp/initfiles/p9_ncu_scom.C @@ -35,9 +35,13 @@ constexpr uint64_t literal_0x8 = 0x8; constexpr uint64_t literal_0x10 = 0x10; fapi2::ReturnCode p9_ncu_scom(const fapi2::Target& TGT0, - const fapi2::Target& TGT1) + const fapi2::Target& TGT1, const fapi2::Target& TGT2) { { + fapi2::ATTR_EC_Type l_chip_ec; + fapi2::ATTR_NAME_Type l_chip_id; + FAPI_TRY(FAPI_ATTR_GET_PRIVILEGED(fapi2::ATTR_NAME, TGT2, l_chip_id)); + FAPI_TRY(FAPI_ATTR_GET_PRIVILEGED(fapi2::ATTR_EC, TGT2, l_chip_ec)); fapi2::buffer l_scom_buffer; { FAPI_TRY(fapi2::getScom( TGT0, 0x1001100aull, l_scom_buffer )); diff --git a/src/import/chips/p9/procedures/hwp/initfiles/p9_ncu_scom.H b/src/import/chips/p9/procedures/hwp/initfiles/p9_ncu_scom.H index 44097255..f6714ae6 100644 --- a/src/import/chips/p9/procedures/hwp/initfiles/p9_ncu_scom.H +++ b/src/import/chips/p9/procedures/hwp/initfiles/p9_ncu_scom.H @@ -5,7 +5,7 @@ /* */ /* OpenPOWER sbe Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2016 */ +/* Contributors Listed Below - COPYRIGHT 2016,2017 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -32,13 +32,13 @@ typedef fapi2::ReturnCode (*p9_ncu_scom_FP_t)(const fapi2::Target&, - const fapi2::Target&); + const fapi2::Target&, const fapi2::Target&); extern "C" { fapi2::ReturnCode p9_ncu_scom(const fapi2::Target& TGT0, - const fapi2::Target& TGT1); + const fapi2::Target& TGT1, const fapi2::Target& TGT2); } -- cgit v1.2.1