xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

x86/smpboot: Move apic init code to apic.c

Browse Source 
We better provide proper functions which implement the required code
flow in the apic code rather than letting the smpboot code open code
it. That allows to make more functions static and confines the APIC
functionality to apic.c where it belongs.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: Borislav Petkov <bp@alien8.de>
Cc: Jiang Liu <jiang.liu@linux.intel.com>
Cc: Joerg Roedel <joro@8bytes.org>
Cc: Tony Luck <tony.luck@intel.com>
Link: http://lkml.kernel.org/r/20150115211703.907616730@linutronix.de
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
This commit is contained in:
Thomas Gleixner
2015-01-15 21:22:40 +00:00
parent 30b8b0066c
commit 05f7e46d2a
3 changed files with 47 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
arch/x86/kernel/apic/apic.c
View File

@@ -1445,7 +1445,7 @@ void setup_local_APIC(void)
#endif
}
void end_local_APIC_setup(void)
static void end_local_APIC_setup(void)
{
lapic_setup_esr();
@@ -1462,16 +1462,13 @@ void end_local_APIC_setup(void)
apic_pm_activate();
}
void __init bsp_end_local_APIC_setup(void)
/*
* APIC setup function for application processors. Called from smpboot.c
*/
void apic_ap_setup(void)
{
setup_local_APIC();
end_local_APIC_setup();
/*
* Now that local APIC setup is completed for BP, configure the fault
* handling for interrupt remapping.
*/
irq_remap_enable_fault_handling();
}
#ifdef CONFIG_X86_X2APIC
@@ -1958,7 +1955,7 @@ __visible void smp_trace_error_interrupt(struct pt_regs *regs)
/**
* connect_bsp_APIC - attach the APIC to the interrupt system
*/
void __init connect_bsp_APIC(void)
static void __init connect_bsp_APIC(void)
{
#ifdef CONFIG_X86_32
if (pic_mode) {
@@ -2205,6 +2202,40 @@ void __init apic_set_eoi_write(void (*eoi_write)(u32 reg, u32 v))
}
}
static void __init bsp_end_local_APIC_setup(void)
{
end_local_APIC_setup();
/*
* Now that local APIC setup is completed for BP, configure the fault
* handling for interrupt remapping.
*/
irq_remap_enable_fault_handling();
}
/**
* apic_bsp_setup - Setup function for local apic and io-apic
*
* Returns:
* apic_id of BSP APIC
*/
int __init apic_bsp_setup(void)
{
int id;
connect_bsp_APIC();
setup_local_APIC();
if (x2apic_mode)
id = apic_read(APIC_LDR);
else
id = GET_APIC_LOGICAL_ID(apic_read(APIC_LDR));
enable_IO_APIC();
bsp_end_local_APIC_setup();
setup_IO_APIC();
return id;
}
/*
* This initializes the IO-APIC and APIC hardware if this is
* a UP kernel.