diff options
| author | Chris Cain <cjcain@us.ibm.com> | 2014-12-05 11:06:54 -0600 |
|---|---|---|
| committer | A. Patrick Williams III <iawillia@us.ibm.com> | 2014-12-13 10:17:16 -0600 |
| commit | 85351118f1aa6d7cacca6b1085b1d965eeb492c4 (patch) | |
| tree | 1b92a4231a77353369ad95250fbd8f4c61498dbf /src/usr/hwpf | |
| parent | 611d91a0295e17ea202f01e0143fc040820eadb8 (diff) | |
| download | talos-hostboot-85351118f1aa6d7cacca6b1085b1d965eeb492c4.tar.gz talos-hostboot-85351118f1aa6d7cacca6b1085b1d965eeb492c4.zip | |
Move OCCs to active state
Change-Id: I99918d0e1a27ed5cf7cb438e3e8e7f580c5306c7
RTC: 115922
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/14740
Tested-by: Jenkins Server
Reviewed-by: Douglas R. Gilbert <dgilbert@us.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>
Diffstat (limited to 'src/usr/hwpf')
| -rw-r--r-- | src/usr/hwpf/hwp/occ/makefile | 1 | ||||
| -rw-r--r-- | src/usr/hwpf/hwp/occ/occ.C | 22 | ||||
| -rw-r--r-- | src/usr/hwpf/hwp/occ/occ.mk | 2 |
3 files changed, 14 insertions, 11 deletions
diff --git a/src/usr/hwpf/hwp/occ/makefile b/src/usr/hwpf/hwp/occ/makefile index 306b142b3..9eb68e669 100644 --- a/src/usr/hwpf/hwp/occ/makefile +++ b/src/usr/hwpf/hwp/occ/makefile @@ -30,7 +30,6 @@ SUBDIRS += runtime.d ## Objects unique to HB IPL OBJS += occ.o -OBJS += $(if $(CONFIG_HTMGT),occAccess.o) ## Objects common to HB IPL and HBRT include occ.mk diff --git a/src/usr/hwpf/hwp/occ/occ.C b/src/usr/hwpf/hwp/occ/occ.C index 0aea6a1aa..13fcbf949 100644 --- a/src/usr/hwpf/hwp/occ/occ.C +++ b/src/usr/hwpf/hwp/occ/occ.C @@ -53,6 +53,8 @@ #include <vfs/vfs.H> #include <util/utillidmgr.H> +#include <htmgt/htmgt.H> + // Procedures #include <p8_pba_init.H> #include <p8_occ_control.H> @@ -106,7 +108,7 @@ namespace HBOCC HOMER_OFFSET_TO_OCC_IMG; uint64_t i_homerVirtAddr = reinterpret_cast<uint64_t> (i_homerVirtAddrBase) + tmpOffset + - HOMER_OFFSET_TO_OCC_IMG;; + HOMER_OFFSET_TO_OCC_IMG; uint64_t i_commonPhysAddr = i_homerPhysAddrBase + VMM_HOMER_REGION_SIZE; @@ -412,13 +414,17 @@ namespace HBOCC TRACUCOMP( g_fapiTd,ENTER_MRK"activateOCC" ); errlHndl_t l_errl = NULL; TARGETING::Target* l_failedOccTarget = NULL; - //uint8_t l_errStatus = 0; +#ifdef CONFIG_HTMGT + bool occStartSuccess = true; +#endif l_errl = loadnStartAllOccs (l_failedOccTarget); if (l_errl) { errlCommit (l_errl, HWPF_COMP_ID); - //l_errStatus = 1; +#ifdef CONFIG_HTMGT + occStartSuccess = false; +#endif } //TODO RTC:116027 @@ -426,14 +432,10 @@ namespace HBOCC //TODO RTC:115636 //HB enables the scon-via-i2c logic on the OCCs + #ifdef CONFIG_HTMGT - //TODO RTC:115585 - //HTMGT::htmgtOccLoadStartStatus - // (l_errStatus,l_failedOccTarget); - if (l_errl) - { - errlCommit (l_errl, HWPF_COMP_ID); - } + // Report OCC status to HTMGT + HTMGT::processOccStartStatus(occStartSuccess,l_failedOccTarget); #endif TRACUCOMP( g_fapiTd,EXIT_MRK"activateOCC" ); return l_errl; diff --git a/src/usr/hwpf/hwp/occ/occ.mk b/src/usr/hwpf/hwp/occ/occ.mk index 1a513002d..0425824c3 100644 --- a/src/usr/hwpf/hwp/occ/occ.mk +++ b/src/usr/hwpf/hwp/occ/occ.mk @@ -73,6 +73,8 @@ OBJS += p8_ocb_indir_setup_linear.o #common occ functions between ipl and runtime OBJS += occ_common.o +OBJS += $(if $(CONFIG_HTMGT),occAccess.o) + ## NOTE: add a new directory onto the vpaths when you add a new HWP ## EXAMPLE: # VPATH += ${ROOTPATH}/src/usr/hwpf/hwp/occ/<HWP_dir> |
