Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c61a56ab authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull x86 fixes from Thomas Gleixner:
 "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"

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/ipc: Fix x32 version of shmid64_ds and msqid64_ds
  x86/setup: Do not reserve a crash kernel region if booted on Xen PV
  x86/cpu/intel: Add missing TLB cpuid values
  x86/smpboot: Don't use mwait_play_dead() on AMD systems
  x86/mm: Make vmemmap and vmalloc base address constants unsigned long
  x86/vector: Remove the unused macro FPU_IRQ
  x86/vector: Remove the macro VECTOR_OFFSET_START
  x86/cpufeatures: Enumerate cldemote instruction
  x86/microcode: Do not exit early from __reload_late()
  x86/microcode/intel: Save microcode patch unconditionally
  x86/jailhouse: Fix incorrect SPDX identifier
parents 65f4d6d0 1a512c08

arch/x86/include/asm/cpufeatures.h

+1 −0
Original line number Diff line number Diff line
@@ -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 0x80000007 (EBX), word 17 */

#define X86_FEATURE_OVERFLOW_RECOV	(17*32+ 0) /* MCA overflow recovery support */

arch/x86/include/asm/irq_vectors.h

+0 −7
Original line number Diff line number Diff line
@@ -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_START		1



/*

 * Reserve the lowest usable vector (and hence lowest priority)  0x20 for
@@ -119,8 +114,6 @@ 
#define FIRST_SYSTEM_VECTOR		NR_VECTORS

#endif



#define FPU_IRQ				  13



/*

 * Size the maximum number of interrupts.

 *

arch/x86/include/asm/jailhouse_para.h

+1 −1
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL2.0 */

/* SPDX-License-Identifier: GPL-2.0 */



/*

 * Jailhouse paravirt detection

arch/x86/include/asm/pgtable_64_types.h

+4 −4
Original line number Diff line number Diff line
@@ -105,14 +105,14 @@ extern unsigned int ptrs_per_p4d; 
#define LDT_PGD_ENTRY		(pgtable_l5_enabled ? LDT_PGD_ENTRY_L5 : LDT_PGD_ENTRY_L4)

#define LDT_BASE_ADDR		(LDT_PGD_ENTRY << PGDIR_SHIFT)



#define __VMALLOC_BASE_L4	0xffffc90000000000

#define __VMALLOC_BASE_L5 	0xffa0000000000000

#define __VMALLOC_BASE_L4	0xffffc90000000000UL

#define __VMALLOC_BASE_L5 	0xffa0000000000000UL



#define VMALLOC_SIZE_TB_L4	32UL

#define VMALLOC_SIZE_TB_L5	12800UL



#define __VMEMMAP_BASE_L4	0xffffea0000000000

#define __VMEMMAP_BASE_L5	0xffd4000000000000

#define __VMEMMAP_BASE_L4	0xffffea0000000000UL

#define __VMEMMAP_BASE_L5	0xffd4000000000000UL



#ifdef CONFIG_DYNAMIC_MEMORY_LAYOUT

# define VMALLOC_START		vmalloc_base

arch/x86/include/uapi/asm/msgbuf.h

+31 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */

#ifndef __ASM_X64_MSGBUF_H

#define __ASM_X64_MSGBUF_H



#if !defined(__x86_64__) || !defined(__ILP32__)

#include <asm-generic/msgbuf.h>

#else

/*

 * The msqid64_ds structure for x86 architecture with x32 ABI.

 *

 * On x86-32 and x86-64 we can just use the generic definition, but

 * x32 uses the same binary layout as x86_64, which is differnet

 * from other 32-bit architectures.

 */



struct msqid64_ds {

	struct ipc64_perm msg_perm;

	__kernel_time_t msg_stime;	/* last msgsnd time */

	__kernel_time_t msg_rtime;	/* last msgrcv time */

	__kernel_time_t msg_ctime;	/* last change time */

	__kernel_ulong_t msg_cbytes;	/* current number of bytes on queue */

	__kernel_ulong_t msg_qnum;	/* number of messages in queue */

	__kernel_ulong_t msg_qbytes;	/* max number of bytes on queue */

	__kernel_pid_t msg_lspid;	/* pid of last msgsnd */

	__kernel_pid_t msg_lrpid;	/* last receive pid */

	__kernel_ulong_t __unused4;

	__kernel_ulong_t __unused5;

};



#endif



#endif /* __ASM_GENERIC_MSGBUF_H */