diff options
| author | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2017-08-18 12:11:16 +0300 |
|---|---|---|
| committer | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2017-08-19 15:30:40 +0000 |
| commit | ff284f656606548f122c59a9ffb6ab453ca89149 (patch) | |
| tree | f04801df002509c12a735dbfa7a5fa91d9857850 /src/include | |
| parent | aeb2d64c85ca2c3a77f50d57e3a92f6fc0a5c2d3 (diff) | |
| download | coreboot-ff284f656606548f122c59a9ffb6ab453ca89149.tar.xz | |
arch/x86: Fix ugly NEED_LAPIC use
Change-Id: I2d6fdfd0465fe5f558daa04c6f980f7226596b55
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/21087
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'src/include')
| -rw-r--r-- | src/include/cpu/x86/lapic.h | 32 |
1 files changed, 18 insertions, 14 deletions
diff --git a/src/include/cpu/x86/lapic.h b/src/include/cpu/x86/lapic.h index e781b5a5bb..6121230a22 100644 --- a/src/include/cpu/x86/lapic.h +++ b/src/include/cpu/x86/lapic.h @@ -6,13 +6,6 @@ #include <halt.h> #include <smp/node.h> -/* See if I need to initialize the local APIC */ -#if IS_ENABLED(CONFIG_SMP) || IS_ENABLED(CONFIG_IOAPIC) -# define NEED_LAPIC 1 -#else -# define NEED_LAPIC 0 -#endif - static inline __attribute__((always_inline)) unsigned long lapic_read( unsigned long reg) { @@ -32,12 +25,12 @@ static inline __attribute__((always_inline)) void lapic_wait_icr_idle(void) static inline void enable_lapic(void) { - msr_t msr; msr = rdmsr(LAPIC_BASE_MSR); msr.hi &= 0xffffff00; - msr.lo &= 0x000007ff; - msr.lo |= LAPIC_DEFAULT_BASE | (1 << 11); + msr.lo &= ~LAPIC_BASE_MSR_ADDR_MASK; + msr.lo |= LAPIC_DEFAULT_BASE; + msr.lo |= LAPIC_BASE_MSR_ENABLE; wrmsr(LAPIC_BASE_MSR, msr); } @@ -45,7 +38,7 @@ static inline void disable_lapic(void) { msr_t msr; msr = rdmsr(LAPIC_BASE_MSR); - msr.lo &= ~(1 << 11); + msr.lo &= ~LAPIC_BASE_MSR_ENABLE; wrmsr(LAPIC_BASE_MSR, msr); } @@ -146,13 +139,24 @@ static inline int lapic_remote_read(int apicid, int reg, unsigned long *pvalue) return result; } +void do_lapic_init(void); -void setup_lapic(void); +/* See if I need to initialize the local APIC */ +static inline int need_lapic_init(void) +{ + return IS_ENABLED(CONFIG_SMP) || IS_ENABLED(CONFIG_IOAPIC); +} + +static inline void setup_lapic(void) +{ + if (need_lapic_init()) + do_lapic_init(); + else + disable_lapic(); +} -#if IS_ENABLED(CONFIG_SMP) struct device; int start_cpu(struct device *cpu); -#endif /* CONFIG_SMP */ #endif /* !__PRE_RAM__ */ |