From 99560f0e46b52c7a432443e7f5832502f1a9e6b2 Mon Sep 17 00:00:00 2001 From: Wael El-Essawy Date: Tue, 6 Oct 2015 08:55:31 -0500 Subject: fix rtls and applet address bugs and comment out pmc watchdog register access In the current OCC phase, many tasks were removed from the global task table (G_task_table) array, because the OCC code is not ready to schedule them every tick. A bag was introduced when such entries were commented in the G_task_table array in the rtes_tables.c file, without removing the corresponding entries from the corresponding task_id_t enum in the rtls.h header file. The result was wrong mapping between the tasks the corresponding function pointers (func_ptr) entries, and hence, the wrong GPE codes were called from the OCC via the IPC messages. A fix was done by eliminating the corresponding task entries from the task_id_t enum, and remove references to commented out enums, and hence, the discrepancy between the two structures was resolved. In addition, the pmc watchdog register, PMC_STATUS_REG @ 0x40010048 used by the OCC for pmc heartbeat on P8 is no longer defined in SIMICS on P9 The code line that accesses this register was commented out, and it should be later replaced by a new PGPE heartbeat register, when the design is ready. Also, the initAppletAddr() routine was commented out, since the applet image header data structure is currently not setup properly in simics. RTC: 137914 RTC: 135989 Change-Id: I32abf6edfd2536af58b24c97d26eb14902ee6a11 Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/20975 Reviewed-by: William A. Bryan Reviewed-by: Christopher Cain Reviewed-by: Fadi Kassem Tested-by: Fadi Kassem --- src/occ_405/cmdh/cmdh_mnfg_intf.c | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/occ_405/cmdh/cmdh_mnfg_intf.c') diff --git a/src/occ_405/cmdh/cmdh_mnfg_intf.c b/src/occ_405/cmdh/cmdh_mnfg_intf.c index 26f993a..e7f3d6e 100755 --- a/src/occ_405/cmdh/cmdh_mnfg_intf.c +++ b/src/occ_405/cmdh/cmdh_mnfg_intf.c @@ -238,6 +238,8 @@ uint8_t cmdh_mnfg_mem_slew(const cmdh_fsp_cmd_t * i_cmd_ptr, // If we made it here, that means we are starting up a slew run TRAC_INFO("cmdh_mnfg_mem_slew: We are about to start auto-slewing function"); +// TEMP -- NOT SUPPORTED YET IN PHASE1 +/* // Force activation of memory monitoring and control if(!rtl_task_is_runnable(TASK_ID_CENTAUR_CONTROL)) { @@ -297,6 +299,7 @@ uint8_t cmdh_mnfg_mem_slew(const cmdh_fsp_cmd_t * i_cmd_ptr, G_task_table[TASK_ID_CENTAUR_DATA].flags = CENTAUR_DATA_RTL_FLAGS; G_task_table[TASK_ID_CENTAUR_CONTROL].flags = CENTAUR_CONTROL_RTL_FLAGS; } +*/ // Zero out the slew count g_amec->mnfg_parms.mem_slew_counter = 0; -- cgit v1.2.1