cpu: Fix hang issue in opal_reinit_cpus()

Commit 87690bd19dbb introduced a label "again" so as to avoid holding
the lock while waiting. But this leads to hang in scenarios like kdump,
where 'cpu_state_os' will be the state for all offline cpus. Actaully,
the wait loop doesn't really take off with the goto statement in it.
This patch tries to fix this problem by removing the goto statement
and unlocking/locking within the wait loop instead.

Signed-off-by: Hari Bathini <hbathini@linux.vnet.ibm.com>
Signed-off-by: Stewart Smith <stewart@linux.vnet.ibm.com>

1 files changed, 1 insertions, 2 deletions

diff --git a/core/cpu.c b/core/cpu.c
index 8f684d2..791d5be 100644
--- a/core/cpu.c
+++ b/core/cpu.c
@@ -644,7 +644,6 @@ static int64_t opal_reinit_cpus(uint64_t flags)
 
 	prerror("OPAL: Trying a CPU re-init with flags: 0x%llx\n", flags);
 
- again:
 	lock(&reinit_lock);
 
 	for (cpu = first_cpu(); cpu; cpu = next_cpu(cpu)) {
@@ -659,7 +658,7 @@ static int64_t opal_reinit_cpus(uint64_t flags)
 				     (cpu->state == cpu_state_os); i++) {
 				unlock(&reinit_lock);
 				time_wait_ms(1);
-				goto again;
+				lock(&reinit_lock);
 			}
 			if (cpu->state == cpu_state_os) {
 				prerror("OPAL: CPU 0x%x not in OPAL !\n", cpu->pir);