diff options
author | Andrew Cooper <andrew.cooper3@citrix.com> | 2011-06-14 13:02:00 +0100 |
---|---|---|
committer | Andrew Cooper <andrew.cooper3@citrix.com> | 2011-06-14 13:02:00 +0100 |
commit | ef41e4fb40fd8cb8dfcb19e488d1a7a647c8810d (patch) | |
tree | f59d8ffb0b4c366e93acdd04f93179afa286eda2 /xen/arch/x86/apic.c | |
parent | 7c1ac80ccdcba5141fc353b95f8d2432f843648d (diff) | |
download | xen-ef41e4fb40fd8cb8dfcb19e488d1a7a647c8810d.tar.gz xen-ef41e4fb40fd8cb8dfcb19e488d1a7a647c8810d.tar.bz2 xen-ef41e4fb40fd8cb8dfcb19e488d1a7a647c8810d.zip |
x86/apic: record local APIC state on boot
Xen does not store the boot local APIC state which leads to problems
when shutting down for a kexec jump. This patch records the boot
state so we can return to the boot state when kexecing.
Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
Signed-off-by: Keir Fraser <keir@xen.org>
Acked-by: Jan Beulich <jbeulich@novell.com>
Diffstat (limited to 'xen/arch/x86/apic.c')
-rw-r--r-- | xen/arch/x86/apic.c | 62 |
1 files changed, 62 insertions, 0 deletions
diff --git a/xen/arch/x86/apic.c b/xen/arch/x86/apic.c index 6f1272fb22..78b3595119 100644 --- a/xen/arch/x86/apic.c +++ b/xen/arch/x86/apic.c @@ -74,6 +74,12 @@ u8 __read_mostly apic_verbosity; static bool_t __initdata opt_x2apic = 1; boolean_param("x2apic", opt_x2apic); +/* + * Bootstrap processor local APIC boot mode - so we can undo our changes + * to the APIC state. + */ +static enum apic_mode apic_boot_mode = APIC_MODE_INVALID; + bool_t __read_mostly x2apic_enabled = 0; bool_t __read_mostly directed_eoi_enabled = 0; @@ -1438,6 +1444,62 @@ int __init APIC_init_uniprocessor (void) return 0; } +static const char * __init apic_mode_to_str(const enum apic_mode mode) +{ + switch ( mode ) + { + case APIC_MODE_INVALID: + return "invalid"; + case APIC_MODE_DISABLED: + return "disabled"; + case APIC_MODE_XAPIC: + return "xapic"; + case APIC_MODE_X2APIC: + return "x2apic"; + default: + return "unrecognised"; + } +} + +/* Needs to be called during startup. It records the state the BIOS + * leaves the local APIC so we can undo upon kexec. + */ +void __init record_boot_APIC_mode(void) +{ + /* Sanity check - we should only ever run once, but could possibly + * be called several times */ + if ( APIC_MODE_INVALID != apic_boot_mode ) + return; + + apic_boot_mode = current_local_apic_mode(); + + apic_printk(APIC_DEBUG, "APIC boot state is '%s'\n", + apic_mode_to_str(apic_boot_mode)); +} + +/* Look at the bits in MSR_IA32_APICBASE and work out which + * APIC mode we are in */ +enum apic_mode current_local_apic_mode(void) +{ + u64 msr_contents; + + rdmsrl(MSR_IA32_APICBASE, msr_contents); + + /* Reading EXTD bit from the MSR is only valid if CPUID + * says so, else reserved */ + if ( cpu_has(¤t_cpu_data, X86_FEATURE_X2APIC) + && (msr_contents & MSR_IA32_APICBASE_EXTD) ) + return APIC_MODE_X2APIC; + + /* EN bit should always be valid as long as we can read the MSR + */ + if ( msr_contents & MSR_IA32_APICBASE_ENABLE ) + return APIC_MODE_XAPIC; + + return APIC_MODE_DISABLED; +} + + void check_for_unexpected_msi(unsigned int vector) { unsigned long v = apic_read(APIC_ISR + ((vector & ~0x1f) >> 1)); |