x86 fixes
Subsystems (3)
Linus,
Please pull the latest x86-urgent-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86-urgent-for-linus
# HEAD: abb2bafd295fe962bbadc329dbfb2146457283ac x86/quirks: Add early quirk to reset Apple AirPort card
This tree contains three commits to fix memory corruption bugs with certain Apple AirPort cards, plus fixes a X86_BUG() ID definitions collision bug in asm/cpufeatures.h.
out-of-topic modifications in x86-urgent-for-linus:
-----------------------------------------------------
drivers/bcma/bcma_private.h # abb2bafd295f: x86/quirks: Add early quirk
include/linux/bcma/bcma.h # abb2bafd295f: x86/quirks: Add early quirk
Thanks,
Ingo
------------------>
Dave Hansen (1):
x86/cpu: Fix duplicated X86_BUG(9) macro
Lukas Wunner (3):
x86/quirks: Apply nvidia_bugs quirk only on root bus x86/quirks: Reintroduce scanning of secondary buses x86/quirks: Add early quirk to reset Apple AirPort card
arch/x86/include/asm/cpufeatures.h | 6 +-- arch/x86/kernel/early-quirks.c | 105 ++++++++++++++++++++++++++++++++----- drivers/bcma/bcma_private.h | 2 - include/linux/bcma/bcma.h | 1 + 4 files changed, 95 insertions(+), 19 deletions(-)
arch/x86/include/asm/cpufeatures.h +2 -4
@@ -301,10 +301,6 @@#define X86_BUG_FXSAVE_LEAK X86_BUG(6)/* FXSAVE leaks FOP/FIP/FOP */ #define X86_BUG_CLFLUSH_MONITOR X86_BUG(7)/* AAI65, CLFLUSH required before MONITOR */ #define X86_BUG_SYSRET_SS_ATTRS X86_BUG(8)/* SYSRET doesn't fix up SS attrs */ -#define X86_BUG_NULL_SEG X86_BUG(9)/* Nulling a selector preserves the base */ -#define X86_BUG_SWAPGS_FENCE X86_BUG(10)/* SWAPGS without input dep on GS */ - -#ifdef CONFIG_X86_32 /* * 64-bit kernels don't use X86_BUG_ESPFIX. Make the define conditional
@@ -312,5 +308,7 @@*/ #define X86_BUG_ESPFIX X86_BUG(9)/* "" IRET to 16-bit SS corrupts ESP/RSP high bits */ #endif +#define X86_BUG_NULL_SEG X86_BUG(10)/* Nulling a selector preserves the base */ +#define X86_BUG_SWAPGS_FENCE X86_BUG(11)/* SWAPGS without input dep on GS */ #endif /* _ASM_X86_CPUFEATURES_H */
arch/x86/kernel/early-quirks.c +92 -13
176 lines not on this page · raw message
drivers/bcma/bcma_private.h +0 -2
@@ -8,8 +8,6 @@#include <linux/bcma/bcma.h> #include <linux/delay.h> -#define BCMA_CORE_SIZE 0x1000 -#define bcma_err (bus, fmt, ...) \ pr_err("bus%d: " fmt, (bus)->num, ##__VA_ARGS__)#define bcma_warn (bus, fmt, ...) \
include/linux/bcma/bcma.h +1 -0
@@ -159,6 +159,7 @@ struct bcma_host_ops {#define BCMA_CORE_DEFAULT 0xFFF#define BCMA_MAX_NR_CORES 16 +#define BCMA_CORE_SIZE 0x1000/* Chip IDs of PCIe devices */ #define BCMA_CHIP_ID_BCM4313 0x4313