diff options
| -rwxr-xr-x | src/build/debug/simics-debug-framework.py | 18 | ||||
| -rw-r--r-- | src/kernel/start.S | 2 | ||||
| -rw-r--r-- | src/usr/isteps/istep16/call_host_activate_master.C | 10 |
3 files changed, 5 insertions, 25 deletions
diff --git a/src/build/debug/simics-debug-framework.py b/src/build/debug/simics-debug-framework.py index 24dee4eeb..48a8d4818 100755 --- a/src/build/debug/simics-debug-framework.py +++ b/src/build/debug/simics-debug-framework.py @@ -6,7 +6,7 @@ # # OpenPOWER HostBoot Project # -# Contributors Listed Below - COPYRIGHT 2011,2015 +# Contributors Listed Below - COPYRIGHT 2011,2016 # [+] Google Inc. # [+] International Business Machines Corp. # @@ -513,22 +513,6 @@ def magic_instruction_callback(user_arg, cpu, arg): cmd = 'shell "fcp --force -o0 -R %s:PAYLOAD simicsPayload.ecc; ecc --remove --p8 simicsPayload.ecc simicsPayload"; load-file simicsPayload 0x%x' % (flash_file, load_addr) SIM_run_alone( run_command, cmd ) - if arg == 7015: - print "Wake up master Thread CORE0 - 7015 start \n"; - - # If more than 1 thread, we only want to do - # this on 4th hit -- won't worry about it for now. - setIar0 = "system_cmp0.cpu0_0_00_0->iar=0x100" - SIM_run_alone(run_command, setIar0 ) - - # need to disable and then re-enable thread0 to - # make it appear to wake back up - disable0 = "system_cmp0.cpu0_0_00_0.disable" - SIM_run_alone(run_command, disable0 ) - enable0 = "system_cmp0.cpu0_0_00_0.enable" - SIM_run_alone(run_command, enable0 ) - print "Master Thread should be awake now \n"; - if arg == 7016: print "Wake up rest of CORE0 - 7017 start \n"; diff --git a/src/kernel/start.S b/src/kernel/start.S index 740f961e8..5d30ed15d 100644 --- a/src/kernel/start.S +++ b/src/kernel/start.S @@ -908,8 +908,6 @@ kernel_execute_stop: ;// Execute stop. 1: - ;// Magic instruction(7015) to allow simics to trigger thread wakeup - rlwimi r27,r27,0,6,23 ;// When GCC supports 'stop', you can use it .long 0x4C0002E4 diff --git a/src/usr/isteps/istep16/call_host_activate_master.C b/src/usr/isteps/istep16/call_host_activate_master.C index ad2d57961..a90a97549 100644 --- a/src/usr/isteps/istep16/call_host_activate_master.C +++ b/src/usr/isteps/istep16/call_host_activate_master.C @@ -87,10 +87,9 @@ void* call_host_activate_master (void *io_pArgs) "Target HUID %.8X", TARGETING::get_huid(l_fapi2_coreTarget)); -// @TODO RTC:147553 Enable startDeadmanLoop -//In the future possibly move default "waitTime" value to SBEIO code -// uint64_t waitTime = 10000; -// l_errl = SBEIO::startDeadmanLoop(waitTime); + //In the future possibly move default "waitTime" value to SBEIO code + uint64_t waitTime = 10000; + l_errl = SBEIO::startDeadmanLoop(waitTime); if ( l_errl ) { @@ -237,8 +236,7 @@ void* call_host_activate_master (void *io_pArgs) "Call proc_stop_deadman_timer. Target %.8X", TARGETING::get_huid(l_core_target) ); -// @TODO RTC:147553 Enable stopDeadmanLoop -// l_errl = SBEIO::stopDeadmanLoop(); + l_errl = SBEIO::stopDeadmanLoop(); if ( l_errl ) { |
