diff options
| author | Nicholas Piggin <npiggin@gmail.com> | 2017-11-29 15:37:07 +1000 |
|---|---|---|
| committer | Stewart Smith <stewart@linux.vnet.ibm.com> | 2017-12-03 22:10:56 -0600 |
| commit | acf2c345a98d47c85a5d836a9cca0257c3adc890 (patch) | |
| tree | cffcc3e2e8a0af0701cb3a032b012ab5ef55eefd /core/direct-controls.c | |
| parent | d0e44ad2a9633c9d49504f4a0c69ac730cdc0561 (diff) | |
| download | skiboot-acf2c345a98d47c85a5d836a9cca0257c3adc890.zip skiboot-acf2c345a98d47c85a5d836a9cca0257c3adc890.tar.gz skiboot-acf2c345a98d47c85a5d836a9cca0257c3adc890.tar.bz2 | |
direct-controls: enable fast reboot direct controls for mambo
Add mambo direct controls to stop threads, which is required for
reliable fast-reboot. Enable direct controls by default on mambo.
Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
Signed-off-by: Stewart Smith <stewart@linux.vnet.ibm.com>
Diffstat (limited to 'core/direct-controls.c')
| -rw-r--r-- | core/direct-controls.c | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/core/direct-controls.c b/core/direct-controls.c index 486d2e8..ba3e4d1 100644 --- a/core/direct-controls.c +++ b/core/direct-controls.c @@ -33,7 +33,17 @@ static void mambo_sreset_cpu(struct cpu_thread *cpu) uint32_t thread_id = pir_to_thread_id(cpu->pir); char tcl_cmd[50]; - snprintf(tcl_cmd, sizeof(tcl_cmd), "mysim cpu %i:%i set spr pc 0x100", core_id, thread_id); + snprintf(tcl_cmd, sizeof(tcl_cmd), "mysim cpu 0:%i:%i start_thread 0x100", core_id, thread_id); + callthru_tcl(tcl_cmd, strlen(tcl_cmd)); +} + +static void mambo_stop_cpu(struct cpu_thread *cpu) +{ + uint32_t core_id = pir_to_core_id(cpu->pir); + uint32_t thread_id = pir_to_thread_id(cpu->pir); + char tcl_cmd[50]; + + snprintf(tcl_cmd, sizeof(tcl_cmd), "mysim cpu 0:%i:%i stop_thread", core_id, thread_id); callthru_tcl(tcl_cmd, strlen(tcl_cmd)); } @@ -629,8 +639,14 @@ int sreset_all_prepare(void) prlog(PR_DEBUG, "RESET: Resetting from cpu: 0x%x (core 0x%x)\n", this_cpu()->pir, pir_to_core_id(this_cpu()->pir)); - if (chip_quirk(QUIRK_MAMBO_CALLOUTS)) + if (chip_quirk(QUIRK_MAMBO_CALLOUTS)) { + for_each_ungarded_cpu(cpu) { + if (cpu == this_cpu()) + continue; + mambo_stop_cpu(cpu); + } return OPAL_SUCCESS; + } /* Assert special wakup on all cores. Only on operational cores. */ for_each_ungarded_primary(cpu) { |