From 415a7a297bcd313516be30ae88277379f3377cc9 Mon Sep 17 00:00:00 2001 From: William Bryan Date: Thu, 6 Aug 2015 17:38:30 -0500 Subject: OCC405 Stripped Down and Compiles Change-Id: Ic5c0536de429106975f5b5b0831c645d6f53e86c Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/19650 Tested-by: William A. Bryan Reviewed-by: Martha Broyles Reviewed-by: William A. Bryan --- src/occ_405/proc/proc_data.h | 19 +++++++++++++------ src/occ_405/proc/proc_data_control.h | 2 +- src/occ_405/proc/proc_pstate.h | 25 ++++++++++++++----------- 3 files changed, 28 insertions(+), 18 deletions(-) (limited to 'src/occ_405/proc') diff --git a/src/occ_405/proc/proc_data.h b/src/occ_405/proc/proc_data.h index 03dc6b2..2c7193e 100755 --- a/src/occ_405/proc/proc_data.h +++ b/src/occ_405/proc/proc_data.h @@ -29,7 +29,7 @@ #include #include #include "rtls.h" -#include "gpe_data.h" +//#include "gpe_data.h" //Returns 0 if the specified core is not present. Otherwise, returns none-zero. #define CORE_PRESENT(occ_core_id) \ @@ -84,10 +84,13 @@ enum eOccProcCores CORE_11 = 11, }; -typedef CoreData gpe_bulk_core_data_t; +// TEMP -- CoreData no longer exists +//typedef CoreData gpe_bulk_core_data_t; //Processor data collect structures used for task data pointers //gpe_req.request.parameter points to GpeGetCoreDataParms +// TEMP -- CoreData / PoreFlex objects no longer exist +/* struct bulk_core_data_task { uint8_t start_core; uint8_t current_core; @@ -96,6 +99,7 @@ struct bulk_core_data_task { PoreFlex gpe_req; } __attribute__ ((__packed__)); typedef struct bulk_core_data_task bulk_core_data_task_t; +*/ //Only PCBS_LOCAL_PSTATE_FREQ_TARGET_STATUS_REG register is being //collected at this time. Other register will be added when needed. @@ -113,8 +117,9 @@ struct gpe_fast_core_data { typedef struct gpe_fast_core_data gpe_fast_core_data_t; //Global low and high cores structures used for task data pointers -extern bulk_core_data_task_t G_low_cores; -extern bulk_core_data_task_t G_high_cores; +// TEMP -- CoreData / PoreFlex objects no longer exist +//extern bulk_core_data_task_t G_low_cores; +//extern bulk_core_data_task_t G_high_cores; //Global G_present_cores is bitmask of all OCC core numbering extern uint32_t G_present_cores; @@ -171,9 +176,11 @@ void task_fast_core_data( task_t * i_task ); //Returns a pointer to the most up-to-date bulk core data for the core //associated with the specified OCC core id. -gpe_bulk_core_data_t * proc_get_bulk_core_data_ptr( const uint8_t i_occ_core_id ); +// TEMP -- CoreData / PoreFlex objects no longer exist +//gpe_bulk_core_data_t * proc_get_bulk_core_data_ptr( const uint8_t i_occ_core_id ); //Returns a pointer to the most up-to-date fast core data -gpe_fast_core_data_t * proc_get_fast_core_data_ptr( void ); +// TEMP -- CoreData / PoreFlex objects no longer exist +//gpe_fast_core_data_t * proc_get_fast_core_data_ptr( void ); #endif //_PROC_DATA_H diff --git a/src/occ_405/proc/proc_data_control.h b/src/occ_405/proc/proc_data_control.h index 6e151e8..cad7202 100755 --- a/src/occ_405/proc/proc_data_control.h +++ b/src/occ_405/proc/proc_data_control.h @@ -29,7 +29,7 @@ #include #include #include "rtls.h" -#include "gpe_control.h" +//#include "gpe_control.h" // Initialze the structures used by the GPE void proc_core_data_control_init( void ); diff --git a/src/occ_405/proc/proc_pstate.h b/src/occ_405/proc/proc_pstate.h index 3ac8439..928dec5 100755 --- a/src/occ_405/proc/proc_pstate.h +++ b/src/occ_405/proc/proc_pstate.h @@ -27,17 +27,17 @@ #define PROC_PSTATE_H #include "ssx.h" -#include "cmdh_service_codes.h" +//#include "cmdh_service_codes.h" #include "errl.h" #include "trac.h" #include "rtls.h" #include "occ_common.h" #include "state.h" -#include "cmdh_fsp_cmds.h" -#include "cmdhDbugCmd.h" +//#include "cmdh_fsp_cmds.h" +//#include "cmdhDbugCmd.h" #include "appletManager.h" -#include "gpsm.h" -#include "pstates.h" +//#include "gpsm.h" +//#include "pstates.h" // GPSM DCM Synchronization - used by MBOX to transfer between DCM M & S typedef struct @@ -90,29 +90,32 @@ enum { OCC_RESET = 0x05, }; -extern GlobalPstateTable G_global_pstate_table; +//extern GlobalPstateTable G_global_pstate_table; extern uint32_t G_mhz_per_pstate; extern sapphire_table_t G_sapphire_table; // Initialize PState Table -errlHndl_t proc_gpsm_pstate_initialize(const PstateSuperStructure* i_pss); +// TEMP -- PstateSuperStructure no longer exists +//errlHndl_t proc_gpsm_pstate_initialize(const PstateSuperStructure* i_pss); // Entry function for enabling Pstates once table is installed -void proc_gpsm_dcm_sync_enable_pstates_smh(void); +//void proc_gpsm_dcm_sync_enable_pstates_smh(void); // Get DCM Sync State -proc_gpsm_dcm_sync_occfw_t proc_gpsm_dcm_sync_get_state(void); +//proc_gpsm_dcm_sync_occfw_t proc_gpsm_dcm_sync_get_state(void); // Pull down DCM pair's Sync State & Info via Mbox void proc_gpsm_dcm_sync_update_from_mbox(proc_gpsm_dcm_sync_occfw_t * i_dcm_sync_state); // Helper function to translate from Frequency to nearest Pstate -Pstate proc_freq2pstate(uint32_t i_freq_mhz); +// TEMP -- Pstate no longer exists +//Pstate proc_freq2pstate(uint32_t i_freq_mhz); // Helper function to translate from Pstate to nearest Frequency -uint32_t proc_pstate2freq(Pstate i_pstate); +// TEMP -- Pstate no longer exists +//uint32_t proc_pstate2freq(Pstate i_pstate); // Helper function to determine if we are a DCM inline bool proc_is_dcm(); -- cgit v1.2.1