diff options
| author | Thi Tran <thi@us.ibm.com> | 2016-08-11 15:47:28 -0500 |
|---|---|---|
| committer | Daniel M. Crowell <dcrowell@us.ibm.com> | 2016-08-25 14:37:27 -0400 |
| commit | 1400bea75a6bbd2083a8b39095470102479c8514 (patch) | |
| tree | cbaaf9fb0250c36978f13c22b8f6e3b9d92f29b0 /src | |
| parent | 40da72e30f4cc45dcacff9c8c223e682a69ee4a5 (diff) | |
| download | talos-hostboot-1400bea75a6bbd2083a8b39095470102479c8514.tar.gz talos-hostboot-1400bea75a6bbd2083a8b39095470102479c8514.zip | |
Integrating p9.vas.scom.initfile
Change-Id: Iee916495138b37369f6ea191855ef6b5a431fa8b
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/28183
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: Hostboot CI <hostboot-ci+hostboot@us.ibm.com>
Reviewed-by: Jenny Huynh <jhuynh@us.ibm.com>
Reviewed-by: Joseph J. McGill <jmcgill@us.ibm.com>
Reviewed-by: Jennifer A. Stofer <stofer@us.ibm.com>
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/28190
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')
| -rw-r--r-- | src/import/chips/p9/procedures/hwp/nest/p9_chiplet_scominit.C | 12 | ||||
| -rw-r--r-- | src/usr/isteps/istep08/makefile | 1 | ||||
| -rw-r--r-- | src/usr/scom/scom.C | 5 |
3 files changed, 18 insertions, 0 deletions
diff --git a/src/import/chips/p9/procedures/hwp/nest/p9_chiplet_scominit.C b/src/import/chips/p9/procedures/hwp/nest/p9_chiplet_scominit.C index 20cc1aaf1..dd001e92d 100644 --- a/src/import/chips/p9/procedures/hwp/nest/p9_chiplet_scominit.C +++ b/src/import/chips/p9/procedures/hwp/nest/p9_chiplet_scominit.C @@ -50,6 +50,7 @@ #include <p9_nx_scom.H> #include <p9_mmu_scom.H> #include <p9_int_scom.H> +#include <p9_vas_scom.H> //------------------------------------------------------------------------------ // Function definitions @@ -218,6 +219,17 @@ fapi2::ReturnCode p9_chiplet_scominit(const fapi2::Target<fapi2::TARGET_TYPE_PRO goto fapi_try_exit; } + // Invoke VAS SCOM initfile + FAPI_DBG("Invoking p9.vas.scom.initfile on target %s...", l_procTargetStr); + FAPI_EXEC_HWP(l_rc, p9_vas_scom, i_target, FAPI_SYSTEM); + + if (l_rc) + { + FAPI_ERR("Error from p9_vas_scom"); + fapi2::current_err = l_rc; + goto fapi_try_exit; + } + fapi_try_exit: FAPI_DBG("End"); return fapi2::current_err; diff --git a/src/usr/isteps/istep08/makefile b/src/usr/isteps/istep08/makefile index 28be6e632..af1eb8796 100644 --- a/src/usr/isteps/istep08/makefile +++ b/src/usr/isteps/istep08/makefile @@ -112,6 +112,7 @@ include ${PROCEDURES_PATH}/hwp/initfiles/p9_nx_scom.mk include ${PROCEDURES_PATH}/hwp/initfiles/p9_cxa_scom.mk include ${PROCEDURES_PATH}/hwp/initfiles/p9_mmu_scom.mk include ${PROCEDURES_PATH}/hwp/initfiles/p9_int_scom.mk +include ${PROCEDURES_PATH}/hwp/initfiles/p9_vas_scom.mk # proc_xbus_scominit : Apply scom inits to Xbus include ${PROCEDURES_PATH}/hwp/io/p9_io_xbus_scominit.mk diff --git a/src/usr/scom/scom.C b/src/usr/scom/scom.C index 51384571c..8bd86c9ea 100644 --- a/src/usr/scom/scom.C +++ b/src/usr/scom/scom.C @@ -725,6 +725,11 @@ errlHndl_t doScomOp(DeviceFW::OperationType i_opType, case 0x05012c49: case 0x05013148: case 0x05013149: + case 0x03011803: + case 0x03011806: + case 0x03011807: + case 0x0301184e: + case 0x0301184f: TRACFCOMP( g_trac_scom, "Skipping scom to %.8X!", i_addr ); skipit = true; default: |
