Commit ab24eb9a authored by Thomas Gleixner's avatar Thomas Gleixner Committed by Peter Zijlstra
Browse files

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: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Tested-by: default avatarMichael Kelley <mikelley@microsoft.com>
Tested-by: default avatarOleksandr 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
parent 2de7fd26

arch/x86/xen/enlighten_hvm.c

+5 −6
Original line number Diff line number Diff line
@@ -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);

	}



	if (cpu_acpi_id(cpu) != U32_MAX)

		per_cpu(xen_vcpu_id, cpu) = cpu_acpi_id(cpu);