Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a2510d15 authored by Dou Liyang's avatar Dou Liyang Committed by Thomas Gleixner
Browse files

x86/apic: Split local APIC timer setup from the APIC setup 



apic_bsp_setup() sets up the local APIC, I/O APIC and APIC timer.

The local APIC and I/O APIC setup belongs to interrupt delivery mode
setup. Setting up the local APIC timer for booting CPU is another job
and has nothing to do with interrupt delivery mode setup.

Split local APIC timer setup from the APIC setup, keep it in the original
position for SMP and UP kernel for now.

Signed-off-by: default avatarDou Liyang <douly.fnst@cn.fujitsu.com>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Cc: yinghai@kernel.org
Cc: bhe@redhat.com
Link: https://lkml.kernel.org/r/1505293975-26005-4-git-send-email-douly.fnst@cn.fujitsu.com
parent 4b1669e8

arch/x86/kernel/apic/apic.c

+2 −2
Original line number Diff line number Diff line
@@ -2397,8 +2397,6 @@ int __init apic_bsp_setup(bool upmode) 
	end_local_APIC_setup();

	irq_remap_enable_fault_handling();

	setup_IO_APIC();

	/* Setup local timer */

	x86_init.timers.setup_percpu_clockev();

	return id;

}
@@ -2438,6 +2436,8 @@ int __init APIC_init_uniprocessor(void) 


	default_setup_apic_routing();

	apic_bsp_setup(true);

	/* Setup local timer */

	x86_init.timers.setup_percpu_clockev();

	return 0;

}

arch/x86/kernel/smpboot.c

+5 −0
Original line number Diff line number Diff line
@@ -1340,6 +1340,8 @@ void __init native_smp_prepare_cpus(unsigned int max_cpus) 
	case SMP_FORCE_UP:

		disable_smp();

		apic_bsp_setup(false);

		/* Setup local timer */

		x86_init.timers.setup_percpu_clockev();

		return;

	case SMP_OK:

		break;
@@ -1354,6 +1356,9 @@ void __init native_smp_prepare_cpus(unsigned int max_cpus) 
	default_setup_apic_routing();

	cpu0_logical_apicid = apic_bsp_setup(false);



	/* Setup local timer */

	x86_init.timers.setup_percpu_clockev();



	pr_info("CPU0: ");

	print_cpu_info(&cpu_data(0));