diff options
Diffstat (limited to 'src/include')
| -rw-r--r-- | src/include/runtime/interface.h | 15 | ||||
| -rw-r--r-- | src/include/usr/hwpf/hwp/occ/occ.H | 11 | ||||
| -rw-r--r-- | src/include/usr/isteps/istep21list.H | 5 |
3 files changed, 21 insertions, 10 deletions
diff --git a/src/include/runtime/interface.h b/src/include/runtime/interface.h index 910e83c3b..dcc7523b3 100644 --- a/src/include/runtime/interface.h +++ b/src/include/runtime/interface.h @@ -5,7 +5,9 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* COPYRIGHT International Business Machines Corp. 2013,2014 */ +/* Contributors Listed Below - COPYRIGHT 2013,2014 */ +/* [+] International Business Machines Corp. */ +/* */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); */ /* you may not use this file except in compliance with the License. */ @@ -174,7 +176,7 @@ typedef struct runtimeInterfaces * @param[in] i_chip - XSCOM chip id of processor based on devtree defn * @return 0 on success else return code */ - int(*loadOCC)(uint64_t i_homer_addr_phys, + int(*occ_load)(uint64_t i_homer_addr_phys, uint64_t i_homer_addr_va, uint64_t i_common_addr_phys, uint64_t i_common_addr_va, @@ -188,7 +190,7 @@ typedef struct runtimeInterfaces * @param[in] i_num_chips - Number of chips in the array * @return 0 on success else return code */ - int (*startOCCs)(uint64_t* i_chip, + int (*occ_start)(uint64_t* i_chip, size_t i_num_chips); /** Stop OCC hold OCCs in reset @@ -199,9 +201,14 @@ typedef struct runtimeInterfaces * @param[in] i_num_chips - Number of chips in the array * @return 0 on success else return code */ - int (*stopOCCs)(uint64_t* i_chip, + int (*occ_stop)(uint64_t* i_chip, size_t i_num_chips); + /** Reset OCC upon failure + * @param [in]: i_chipId: Id of processor with failing OCC + * @return NONE + */ + void (*occ_error) (uint64_t i_chipId); // Reserve some space for future growth. void (*reserved[32])(void); diff --git a/src/include/usr/hwpf/hwp/occ/occ.H b/src/include/usr/hwpf/hwp/occ/occ.H index aa00823d5..ea9e4c1c7 100644 --- a/src/include/usr/hwpf/hwp/occ/occ.H +++ b/src/include/usr/hwpf/hwp/occ/occ.H @@ -52,10 +52,19 @@ namespace HBOCC { * @brief Starts OCCs on all Processors in the node * This is intended to be used for AVP testing. * + * @param[out] o_failedOccTarget: Pointer to the target failing + * loadnStartAllOccs * @return errlHndl_t Error log if OCC load failed */ - errlHndl_t loadnStartAllOccs(); + errlHndl_t loadnStartAllOccs(TARGETING::Target *& o_failedOccTarget); + /** + * @brief Starts OCCs on all Processors in the node + * This is intended to be used for Open Power. + * + * @return errlHndl_t Error log if OCC load failed + */ + errlHndl_t activateOCC (); } //end OCC namespace #endif diff --git a/src/include/usr/isteps/istep21list.H b/src/include/usr/isteps/istep21list.H index 53c02bb82..6959f079d 100644 --- a/src/include/usr/isteps/istep21list.H +++ b/src/include/usr/isteps/istep21list.H @@ -90,12 +90,7 @@ const DepModInfo g_istep21Dependancies = { #ifdef CONFIG_SET_NOMINAL_PSTATE DEP_LIB(libpstates.so), #endif -/* - * This library is loaded dynamically when needed in start_payload. - * Adding statement here to make listdeps.pl happy. - DEP_LIB(libocc.so), -*/ NULL } }; |
