diff options
| author | Chris Steffen <cwsteffen@us.ibm.com> | 2017-05-04 09:00:05 -0500 |
|---|---|---|
| committer | Christian R. Geddes <crgeddes@us.ibm.com> | 2017-08-30 14:16:45 -0400 |
| commit | 5c029ee59d7a39e4127d10f25639f2c19858cb1c (patch) | |
| tree | 5499e39f9ee7a42f3409dd8437a4970550b67ab9 /src/import/chips/centaur | |
| parent | fa23b5bed77b93e39178ba3c83f8fd7c867abc2f (diff) | |
| download | talos-hostboot-5c029ee59d7a39e4127d10f25639f2c19858cb1c.tar.gz talos-hostboot-5c029ee59d7a39e4127d10f25639f2c19858cb1c.zip | |
DMI I/O Scominits
Change-Id: I1bf05adb2f59d7fc281817c113642069a849fdfd
Original-Change-Id: I40e794076545a7bdaf00f2b27e2a0e8b82aa30a8
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/41533
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: Hostboot CI <hostboot-ci+hostboot@us.ibm.com>
Reviewed-by: Gary A. Peterson <garyp@us.ibm.com>
Reviewed-by: Richard J. Knight <rjknight@us.ibm.com>
Reviewed-by: Jennifer A. Stofer <stofer@us.ibm.com>
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/45331
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Reviewed-by: Christian R. Geddes <crgeddes@us.ibm.com>
Diffstat (limited to 'src/import/chips/centaur')
3 files changed, 12 insertions, 29 deletions
diff --git a/src/import/chips/centaur/procedures/hwp/io/p9_io_cen_scominit.C b/src/import/chips/centaur/procedures/hwp/io/p9_io_cen_scominit.C index e1b39005c..0c8b7a9c3 100644 --- a/src/import/chips/centaur/procedures/hwp/io/p9_io_cen_scominit.C +++ b/src/import/chips/centaur/procedures/hwp/io/p9_io_cen_scominit.C @@ -45,20 +45,16 @@ /// @endverbatim ///---------------------------------------------------------------------------- - //------------------------------------------------------------------------------ // Includes //------------------------------------------------------------------------------ -#include <p9_io_scom.H> -#include <p9_io_regs.H> #include <p9_io_cen_scominit.H> - +#include <centaur_dmi_scom.H> //------------------------------------------------------------------------------ // Constant definitions //------------------------------------------------------------------------------ - //------------------------------------------------------------------------------ // Function definitions //------------------------------------------------------------------------------ @@ -68,33 +64,21 @@ fapi2::ReturnCode p9_io_cen_scominit(const CEN_TGT& i_tgt) { // mark HWP entry FAPI_INF("p9_io_cen_scominit: Entering..."); - /* - const uint8_t GROUP_00 = 0; - const uint8_t LANE_00 = 0; - const uint8_t SET_RESET = 1; - const uint8_t CLEAR_RESET = 0; - fapi2::ReturnCode rc = fapi2::FAPI2_RC_SUCCESS; - // 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 ) ); - - // Bus Reset is relatively fast, only needing < a hundred cycles to allow the signal to propogate. - FAPI_TRY( fapi2::delay( 10, 1000 ) ); + fapi2::ReturnCode rc = fapi2::FAPI2_RC_SUCCESS; - FAPI_TRY( io::rmw( OPT_IORESET_HARD_BUS0, i_target, GROUP_00, LANE_00, CLEAR_RESET ) ); + // Get system target + const fapi2::Target<fapi2::TARGET_TYPE_SYSTEM> sys_tgt; FAPI_INF("Invoke FAPI procedure core: input_target"); - FAPI_EXEC_HWP(rc, p9_cen_scom, i_target, l_system_target); + FAPI_EXEC_HWP(rc, centaur_dmi_scom, i_tgt, sys_tgt); + if(rc) + { + FAPI_ERR("P9 I/O Cen Scominit Failed"); + fapi2::current_err = rc; + } - fapi_try_exit: - */ // mark HWP exit FAPI_INF("p9_io_cen_scominit: ...Exiting"); return fapi2::current_err; diff --git a/src/import/chips/centaur/procedures/hwp/io/p9_io_cen_scominit.H b/src/import/chips/centaur/procedures/hwp/io/p9_io_cen_scominit.H index 6b9a812e6..e9f607582 100644 --- a/src/import/chips/centaur/procedures/hwp/io/p9_io_cen_scominit.H +++ b/src/import/chips/centaur/procedures/hwp/io/p9_io_cen_scominit.H @@ -63,7 +63,7 @@ extern "C" { /** * @brief HWP that calls the Centaur SCOM initfiles * - * Should be called for all valid/connected OBUS endpoints + * Should be called for all valid/connected CEN endpoints * * @param[in] i_tgt Reference to CEN chiplet target * - p9.cen.scom.initfile diff --git a/src/import/chips/centaur/procedures/hwp/io/p9_io_cen_scominit.mk b/src/import/chips/centaur/procedures/hwp/io/p9_io_cen_scominit.mk index 77375a4fc..730f67419 100644 --- a/src/import/chips/centaur/procedures/hwp/io/p9_io_cen_scominit.mk +++ b/src/import/chips/centaur/procedures/hwp/io/p9_io_cen_scominit.mk @@ -24,6 +24,5 @@ # IBM_PROLOG_END_TAG PROCEDURE=p9_io_cen_scominit -$(call ADD_MODULE_SRCDIR,$(PROCEDURE),$(ROOTPATH)/chips/p9/procedures/hwp/io/) - +$(call ADD_MODULE_INCDIR,$(PROCEDURE),$(ROOTPATH)/chips/centaur/procedures/hwp/initfiles) $(call BUILD_PROCEDURE) |
