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
Another set of x86 related updates:
- Fix the long broken x32 version of the IPC user space headers which was
noticed by Arnd Bergman in course of his ongoing y2038 work. GLIBC seems
to have non broken private copies of these headers so this went unnoticed.
- Two microcode fixlets which address some more fallout from the recent
modifications in that area:
- Unconditionally save the microcode patch, which was only saved when
CPU_HOTPLUG was enabled causing failures in the late loading mechanism
- Make the later loader synchronization finally work under all
circumstances. It was exiting early and causing timeout failures due
to a missing synchronization point.
- Do not use mwait_play_dead() on AMD systems to prevent excessive power
consumption as the CPU cannot go into deep power states from there.
- Address an annoying sparse warning due to lost type qualifiers of the
vmemmap and vmalloc base address constants.
- Prevent reserving crash kernel region on Xen PV as this leads to the
wrong perception that crash kernels actually work there which is not the
case. Xen PV has its own crash mechanism handled by the hypervisor.
- Add missing TLB cpuid values to the table to make the printout on
certain machines correct.
- Enumerate the new CLDEMOTE instruction
- Fix an incorrect SPDX identifier
- Remove stale macros
Thanks,
tglx
-->
Arnd Bergmann (1):
x86/ipc: Fix x32 version of shmid64_ds and msqid64_ds
Borislav Petkov (2):
x86/microcode/intel: Save microcode patch unconditionally
x86/microcode: Do not exit early from __reload_late()
Dou Liyang (2):
x86/vector: Remove the macro VECTOR_OFFSET_START
x86/vector: Remove the unused macro FPU_IRQ
Fenghua Yu (1):
x86/cpufeatures: Enumerate cldemote instruction
Jiri Kosina (1):
x86/mm: Make vmemmap and vmalloc base address constants unsigned long
Petr Tesarik (1):
x86/setup: Do not reserve a crash kernel region if booted on Xen PV
Thomas Gleixner (1):
x86/jailhouse: Fix incorrect SPDX identifier
Yazen Ghannam (1):
x86/smpboot: Don't use mwait_play_dead() on AMD systems
jacek.tom...@poczta.fm (1):
x86/cpu/intel: Add missing TLB cpuid values
arch/x86/include/asm/cpufeatures.h | 1 +
arch/x86/include/asm/irq_vectors.h | 7 --
arch/x86/include/asm/jailhouse_para.h | 2 +-
arch/x86/include/asm/pgtable_64_types.h | 8 +++
arch/x86/include/uapi/asm/msgbuf.h | 31
arch/x86/include/uapi/asm/shmbuf.h | 42 +
arch/x86/kernel/cpu/intel.c | 3 +++
arch/x86/kernel/cpu/microcode/core.c| 6 ++---
arch/x86/kernel/cpu/microcode/intel.c | 2 --
arch/x86/kernel/jailhouse.c | 2 +-
arch/x86/kernel/setup.c | 6 +
arch/x86/kernel/smpboot.c | 2 ++
12 files changed, 93 insertions(+), 19 deletions(-)
diff --git a/arch/x86/include/asm/cpufeatures.h
b/arch/x86/include/asm/cpufeatures.h
index d554c11e01ff..578793e97431 100644
--- a/arch/x86/include/asm/cpufeatures.h
+++ b/arch/x86/include/asm/cpufeatures.h
@@ -320,6 +320,7 @@
#define X86_FEATURE_AVX512_VPOPCNTDQ (16*32+14) /* POPCNT for vectors of
DW/QW */
#define X86_FEATURE_LA57 (16*32+16) /* 5-level page tables */
#define X86_FEATURE_RDPID (16*32+22) /* RDPID instruction */
+#define X86_FEATURE_CLDEMOTE (16*32+25) /* CLDEMOTE instruction */
/* AMD-defined CPU features, CPUID level 0x8007 (EBX), word 17 */
#define X86_FEATURE_OVERFLOW_RECOV (17*32+ 0) /* MCA overflow recovery
support */
diff --git a/arch/x86/include/asm/irq_vectors.h
b/arch/x86/include/asm/irq_vectors.h
index 404c5fdff859..548d90bbf919 100644
--- a/arch/x86/include/asm/irq_vectors.h
+++ b/arch/x86/include/asm/irq_vectors.h
@@ -34,11 +34,6 @@
* (0x80 is the syscall vector, 0x30-0x3f are for ISA)
*/
#define FIRST_EXTERNAL_VECTOR 0x20
-/*
- * We start allocating at 0x21 to spread out vectors evenly between
- * priority levels. (0x80 is the syscall vector)
- */
-#define VECTOR_OFFSET_START1
/*
* Reserve the lowest usable vector (and hence lowest priority) 0x20 for
@@ -119,8 +114,6 @@
#define FIRST_SYSTEM_VECTORNR_VECTORS
#endif
-#define FPU_IRQ 13
-
/*
* Size the maximum number of interrupts.
*
diff --git a/arch/x86/include/asm/jailhouse_para.h
b/arch/x86/include/asm/jailhouse_para.h
index b885a961a150..a34897aef2c2 100644
--- a/arch/x86/include/asm/jailhouse_para.h
+++ b/arch/x86/include/asm/jailhouse_para.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL2.0 */
+/* SPDX-License-Identifier: GPL-2.0 */
/*
* Jailhouse paravirt detection
diff --git a