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

Merge tag 'x86-urgent-2024-09-29' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull x86 fixes from Ingo Molnar:
 "Fix TDX MMIO #VE fault handling, and add two new Intel model numbers
  for 'Pantherlake' and 'Diamond Rapids'"

* tag 'x86-urgent-2024-09-29' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/cpu: Add two Intel CPU model numbers
  x86/tdx: Fix "in-kernel MMIO" check
parents ec03de73 d1fb034b

arch/x86/coco/tdx/tdx.c

+6 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
#include <asm/insn-eval.h>

#include <asm/pgtable.h>

#include <asm/set_memory.h>

#include <asm/traps.h>



/* MMIO direction */

#define EPT_READ	0
@@ -433,6 +434,11 @@ static int handle_mmio(struct pt_regs *regs, struct ve_info *ve) 
			return -EINVAL;

	}



	if (!fault_in_kernel_space(ve->gla)) {

		WARN_ONCE(1, "Access to userspace address is not supported");

		return -EINVAL;

	}



	/*

	 * Reject EPT violation #VEs that split pages.

	 *

arch/x86/include/asm/intel-family.h

+5 −0
Original line number Diff line number Diff line
@@ -135,6 +135,8 @@ 


#define INTEL_LUNARLAKE_M		IFM(6, 0xBD)



#define INTEL_PANTHERLAKE_L		IFM(6, 0xCC)



/* "Small Core" Processors (Atom/E-Core) */



#define INTEL_ATOM_BONNELL		IFM(6, 0x1C) /* Diamondville, Pineview */
@@ -178,4 +180,7 @@ 
#define INTEL_FAM5_QUARK_X1000		0x09 /* Quark X1000 SoC */

#define INTEL_QUARK_X1000		IFM(5, 0x09) /* Quark X1000 SoC */



/* Family 19 */

#define INTEL_PANTHERCOVE_X		IFM(19, 0x01) /* Diamond Rapids */



#endif /* _ASM_X86_INTEL_FAMILY_H */