diff options
| author | Richard J. Knight <rjknight@us.ibm.com> | 2017-01-19 15:42:33 -0600 |
|---|---|---|
| committer | Daniel M. Crowell <dcrowell@us.ibm.com> | 2017-02-28 16:16:41 -0500 |
| commit | e72a22be4474024d7c5810486835b55bd34b45d8 (patch) | |
| tree | fdecc9a3725aea63cd7cdc11d9b53c6ca12c5415 /src/import/chips/p9/procedures/hwp/io | |
| parent | 8a6f2a39aa4f3cf106ee8b78fdc17c59224d4da2 (diff) | |
| download | talos-hostboot-e72a22be4474024d7c5810486835b55bd34b45d8.tar.gz talos-hostboot-e72a22be4474024d7c5810486835b55bd34b45d8.zip | |
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 <pfd-jenkins+hostboot@us.ibm.com>
Reviewed-by: Thi N. Tran <thi@us.ibm.com>
Reviewed-by: Benjamin Gass <bgass@us.ibm.com>
Tested-by: PPE CI <ppe-ci+hostboot@us.ibm.com>
Tested-by: Hostboot CI <hostboot-ci+hostboot@us.ibm.com>
Reviewed-by: Jennifer A. Stofer <stofer@us.ibm.com>
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/35511
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Diffstat (limited to 'src/import/chips/p9/procedures/hwp/io')
| -rw-r--r-- | src/import/chips/p9/procedures/hwp/io/p9_io_obus_scominit.C | 5 | ||||
| -rw-r--r-- | src/import/chips/p9/procedures/hwp/io/p9_io_xbus_scominit.C | 9 |
2 files changed, 10 insertions, 4 deletions
diff --git a/src/import/chips/p9/procedures/hwp/io/p9_io_obus_scominit.C b/src/import/chips/p9/procedures/hwp/io/p9_io_obus_scominit.C index 3f28b7cc5..8c01b8ff7 100644 --- a/src/import/chips/p9/procedures/hwp/io/p9_io_obus_scominit.C +++ b/src/import/chips/p9/procedures/hwp/io/p9_io_obus_scominit.C @@ -78,6 +78,9 @@ fapi2::ReturnCode p9_io_obus_scominit( const fapi2::Target<fapi2::TARGET_TYPE_OB // get system target const fapi2::Target<fapi2::TARGET_TYPE_SYSTEM> l_system_target; + // get a proc target + fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP> l_proc_target = i_target.getParent<fapi2::TARGET_TYPE_PROC_CHIP>(); + // assert IO reset to power-up bus endpoint logic FAPI_TRY( io::rmw( OPT_IORESET_HARD_BUS0, i_target, GROUP_00, LANE_00, SET_RESET ) ); @@ -87,7 +90,7 @@ fapi2::ReturnCode p9_io_obus_scominit( const fapi2::Target<fapi2::TARGET_TYPE_OB FAPI_TRY( io::rmw( OPT_IORESET_HARD_BUS0, i_target, GROUP_00, LANE_00, CLEAR_RESET ) ); FAPI_INF("Invoke FAPI procedure core: input_target"); - FAPI_EXEC_HWP(rc, p9_obus_scom, i_target, l_system_target); + FAPI_EXEC_HWP(rc, p9_obus_scom, i_target, l_system_target, l_proc_target); // mark HWP exit FAPI_INF("p9_io_obus_scominit: ...Exiting"); diff --git a/src/import/chips/p9/procedures/hwp/io/p9_io_xbus_scominit.C b/src/import/chips/p9/procedures/hwp/io/p9_io_xbus_scominit.C index ba6637a6f..971f48fad 100644 --- a/src/import/chips/p9/procedures/hwp/io/p9_io_xbus_scominit.C +++ b/src/import/chips/p9/procedures/hwp/io/p9_io_xbus_scominit.C @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2015,2016 */ +/* Contributors Listed Below - COPYRIGHT 2015,2017 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -130,6 +130,9 @@ fapi2::ReturnCode p9_io_xbus_scominit( // get system target const fapi2::Target<fapi2::TARGET_TYPE_SYSTEM> l_system_target; + // get proc chip to pass for EC level checks in procedure + fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP> l_proc = + i_target.getParent<fapi2::TARGET_TYPE_PROC_CHIP>(); // assert IO reset to power-up bus endpoint logic // read-modify-write, set single reset bit (HW auto-clears) @@ -194,7 +197,7 @@ fapi2::ReturnCode p9_io_xbus_scominit( case ENUM_ATTR_XBUS_GROUP_1: FAPI_INF("Group 1:Invoke FAPI procedure core: input_target"); - FAPI_EXEC_HWP(rc, p9_xbus_g1_scom, i_target, l_system_target); + FAPI_EXEC_HWP(rc, p9_xbus_g1_scom, i_target, l_system_target, l_proc); if( rc ) { @@ -204,7 +207,7 @@ fapi2::ReturnCode p9_io_xbus_scominit( } FAPI_INF("Group 1:Invoke FAPI procedure core: connected_target"); - FAPI_EXEC_HWP(rc, p9_xbus_g1_scom, i_connected_target, l_system_target); + FAPI_EXEC_HWP(rc, p9_xbus_g1_scom, i_connected_target, l_system_target, l_proc); if( rc ) { |
