| Message ID | 20191011095133.14646-1-hegdevasant@linux.vnet.ibm.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | fast-reboot: Fix fast reboot | expand |
| Context | Check | Description |
|---|---|---|
| snowpatch_ozlabs/apply_patch | success | Successfully applied on branch master (1785745d5a7eaefd7d0c135f2a3b0f5d86aefec5) |
| snowpatch_ozlabs/snowpatch_job_snowpatch-skiboot | success | Test snowpatch/job/snowpatch-skiboot on branch master |
| snowpatch_ozlabs/snowpatch_job_snowpatch-skiboot-dco | success | Signed-off-by present |
On 10/11/19 3:21 PM, Vasant Hegde wrote: > Call verify_romem() after patching trap area. Otherwise our > verification fails and hence fast-reboot fails. Oliver, Nick pointed out that you have already posted patch to fix this issue. I should have checked mailing list before debugging :-( Ignore this patch, -Vasant
diff --git a/core/fast-reboot.c b/core/fast-reboot.c index a6c903f3c..6b68525c8 100644 --- a/core/fast-reboot.c +++ b/core/fast-reboot.c @@ -147,11 +147,6 @@ void fast_reboot(void) return; } - if (!fast_reboot_sanity_check()) { - opal_quiesce(QUIESCE_RESUME, -1); - return; - } - cpu_set_sreset_enable(false); cpu_set_ipi_enable(false); @@ -185,6 +180,12 @@ void fast_reboot(void) copy_exception_vectors(); patch_traps(true); + /* Call sanity check after patch_traps() */ + if (!fast_reboot_sanity_check()) { + opal_quiesce(QUIESCE_RESUME, -1); + return; + } + /* * Secondaries may still have an issue with machine checks if they have * HILE set because the machine check exception does not FIXUP_ENDIAN.
Call verify_romem() after patching trap area. Otherwise our verification fails and hence fast-reboot fails. Fixes: 9ddc1a6b (core/util: trap based assertions) Cc: Nicholas Piggin <npiggin@gmail.com> Signed-off-by: Vasant Hegde <hegdevasant@linux.vnet.ibm.com> --- core/fast-reboot.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)