redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

x86: apic - unify disable_local_APIC 

Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
hifive-unleashed-5.1
Cyrill Gorcunov 2008-08-18 20:45:51 +04:00 committed by Ingo Molnar
parent f1ee37891d
commit 990b183e58
2 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/x86/kernel/apic_32.c
View File

@ -796,7 +796,7 @@ void clear_local_APIC(void)
*/
void disable_local_APIC(void)
{
unsigned long value;
unsigned int value;
clear_local_APIC();
@ -808,6 +808,7 @@ void disable_local_APIC(void)
value &= ~APIC_SPIV_APIC_ENABLED;
apic_write(APIC_SPIV, value);
#ifdef CONFIG_X86_32
/*
* When LAPIC was disabled by the BIOS and enabled by the kernel,
* restore the disabled state.
@ -819,6 +820,7 @@ void disable_local_APIC(void)
l &= ~MSR_IA32_APICBASE_ENABLE;
wrmsr(MSR_IA32_APICBASE, l, h);
}
#endif
}
/*

14
arch/x86/kernel/apic_64.c
View File

@ -691,6 +691,20 @@ void disable_local_APIC(void)
value = apic_read(APIC_SPIV);
value &= ~APIC_SPIV_APIC_ENABLED;
apic_write(APIC_SPIV, value);
#ifdef CONFIG_X86_32
/*
* When LAPIC was disabled by the BIOS and enabled by the kernel,
* restore the disabled state.
*/
if (enabled_via_apicbase) {
unsigned int l, h;
rdmsr(MSR_IA32_APICBASE, l, h);
l &= ~MSR_IA32_APICBASE_ENABLE;
wrmsr(MSR_IA32_APICBASE, l, h);
}
#endif
}
void lapic_shutdown(void)