summaryrefslogtreecommitdiffstats
path: root/src/occ_405/main.c
diff options
context:
space:
mode:
authormbroyles <mbroyles@us.ibm.com>2017-06-07 16:38:45 -0500
committerWilliam A. Bryan <wilbryan@us.ibm.com>2017-06-12 13:17:45 -0400
commita635739ec0648a64e897b401915cedabf4123943 (patch)
treeef771a2c6a682d13e0edb3d3e93cf4d12d874276 /src/occ_405/main.c
parentdadf2726aa024c7100fe295af78bdfc2e88fb7ef (diff)
downloadtalos-occ-a635739ec0648a64e897b401915cedabf4123943.tar.gz
talos-occ-a635739ec0648a64e897b401915cedabf4123943.zip
OCC support for no APSS and new GPU Config Data
Change-Id: Id58a06378f3c0a7fd9fb436b96823eca15028031 RTC: 160889 Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/41513 Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com> Reviewed-by: Christopher J. Cain <cjcain@us.ibm.com> Reviewed-by: William A. Bryan <wilbryan@us.ibm.com>
Diffstat (limited to 'src/occ_405/main.c')
-rwxr-xr-xsrc/occ_405/main.c16
1 files changed, 9 insertions, 7 deletions
diff --git a/src/occ_405/main.c b/src/occ_405/main.c
index 9b13641..36bf4ce 100755
--- a/src/occ_405/main.c
+++ b/src/occ_405/main.c
@@ -86,7 +86,7 @@ extern uint32_t G_khz_per_pstate;
extern uint8_t G_proc_pmin;
extern uint8_t G_proc_pmax;
-extern bool G_apss_present;
+extern PWR_READING_TYPE G_pwr_reading_type;
IMAGE_HEADER (G_mainAppImageHdr,__ssx_boot,MAIN_APP_ID,ID_NUM_INVALID);
@@ -1312,14 +1312,16 @@ void master_occ_init()
errlHndl_t l_err = NULL;
// Only do APSS initialization if APSS is present
- if(G_apss_present)
+ if(G_pwr_reading_type == PWR_READING_TYPE_APSS)
+ {
l_err = initialize_apss();
- if( (NULL != l_err))
- {
- MAIN_TRAC_ERR("master_occ_init: Error initializing APSS");
- // commit & delete. CommitErrl handles NULL error log handle
- REQUEST_RESET(l_err);
+ if( (NULL != l_err))
+ {
+ MAIN_TRAC_ERR("master_occ_init: Error initializing APSS");
+ // commit & delete. CommitErrl handles NULL error log handle
+ REQUEST_RESET(l_err);
+ }
}
// Reinitialize the PBAX Queues
OpenPOWER on IntegriCloud