diff options
| author | Patrick Williams <iawillia@us.ibm.com> | 2013-08-08 13:24:49 -0500 |
|---|---|---|
| committer | A. Patrick Williams III <iawillia@us.ibm.com> | 2013-08-09 13:56:01 -0500 |
| commit | 0d9e4cc6e5ec69b1a6284e94f0dc97ae7d52c948 (patch) | |
| tree | ad66e680c2a52c68c5bb948515d8afa569c2de60 /src/kernel | |
| parent | 97bd69daf028bec2f7d7f4fbd8feb49486fb4577 (diff) | |
| download | talos-hostboot-0d9e4cc6e5ec69b1a6284e94f0dc97ae7d52c948.tar.gz talos-hostboot-0d9e4cc6e5ec69b1a6284e94f0dc97ae7d52c948.zip | |
Restore memory state scratch after winkle.
Change-Id: I4871fde72e73a767f57efcce4a4764fde4f32d1e
CQ: SW210030
Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/5742
Tested-by: Jenkins Server
Reviewed-by: Douglas R. Gilbert <dgilbert@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>
Diffstat (limited to 'src/kernel')
| -rw-r--r-- | src/kernel/misc.C | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/kernel/misc.C b/src/kernel/misc.C index 9e19674ad..2cd8a48aa 100644 --- a/src/kernel/misc.C +++ b/src/kernel/misc.C @@ -213,6 +213,10 @@ namespace KernelMisc // Restore timebase. setTB(iv_timebase); + // Restore memory state register. + updateScratchReg(MMIO_SCRATCH_MEMORY_STATE, + kernel_hbDescriptor.kernelMemoryState); + // Restore caller of cpu_master_winkle(). iv_caller->state = TASK_STATE_RUNNING; TaskManager::setCurrentTask(iv_caller); @@ -305,6 +309,10 @@ namespace KernelMisc { printk("Awake!\n"); + // Restore memory state register. + updateScratchReg(MMIO_SCRATCH_MEMORY_STATE, + kernel_hbDescriptor.kernelMemoryState); + // Restore caller of cpu_all_winkle(). iv_caller->state = TASK_STATE_RUNNING; TaskManager::setCurrentTask(iv_caller); |
