x86/xen/hvm: Get rid of DEAD_FROZEN handling
No point in this conditional voodoo. Un-initializing the lock mechanism is safe to be called unconditionally even if it was already invoked when the CPU died. Remove the invocation of xen_smp_intr_free() as that has been already cleaned up in xen_cpu_dead_hvm(). Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> Tested-by: Michael Kelley <mikelley@microsoft.com> Tested-by: Oleksandr Natalenko <oleksandr@natalenko.name> Tested-by: Helge Deller <deller@gmx.de> # parisc Tested-by: Guilherme G. Piccoli <gpiccoli@igalia.com> # Steam Deck Link: https://lore.kernel.org/r/20230512205256.423407127@linutronix.de
This commit is contained in:
parent
2de7fd26d9
commit
ab24eb9abb
@ -161,13 +161,12 @@ static int xen_cpu_up_prepare_hvm(unsigned int cpu)
|
||||
int rc = 0;
|
||||
|
||||
/*
|
||||
* This can happen if CPU was offlined earlier and
|
||||
* offlining timed out in common_cpu_die().
|
||||
* If a CPU was offlined earlier and offlining timed out then the
|
||||
* lock mechanism is still initialized. Uninit it unconditionally
|
||||
* as it's safe to call even if already uninited. Interrupts and
|
||||
* timer have already been handled in xen_cpu_dead_hvm().
|
||||
*/
|
||||
if (cpu_report_state(cpu) == CPU_DEAD_FROZEN) {
|
||||
xen_smp_intr_free(cpu);
|
||||
xen_uninit_lock_cpu(cpu);
|
||||
}
|
||||
xen_uninit_lock_cpu(cpu);
|
||||
|
||||
if (cpu_acpi_id(cpu) != U32_MAX)
|
||||
per_cpu(xen_vcpu_id, cpu) = cpu_acpi_id(cpu);
|
||||
|
Loading…
x
Reference in New Issue
Block a user