Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
tjh.dev
kernel
os
linux
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
+6
arch/x86/coco/tdx/tdx.c
+6
arch/x86/coco/tdx/tdx.c
···
16
#include <asm/insn-eval.h>
17
#include <asm/pgtable.h>
18
#include <asm/set_memory.h>
19
+
#include <asm/traps.h>
20
21
/* MMIO direction */
22
#define EPT_READ 0
···
431
reg = insn_get_modrm_reg_ptr(&insn, regs);
432
if (!reg)
433
return -EINVAL;
434
+
}
435
+
436
+
if (!fault_in_kernel_space(ve->gla)) {
437
+
WARN_ONCE(1, "Access to userspace address is not supported");
438
+
return -EINVAL;
439
}
440
441
/*
+5
arch/x86/include/asm/intel-family.h
+5
arch/x86/include/asm/intel-family.h
···
135
136
#define INTEL_LUNARLAKE_M IFM(6, 0xBD)
137
138
/* "Small Core" Processors (Atom/E-Core) */
139
140
#define INTEL_ATOM_BONNELL IFM(6, 0x1C) /* Diamondville, Pineview */
···
179
/* Family 5 */
180
#define INTEL_FAM5_QUARK_X1000 0x09 /* Quark X1000 SoC */
181
#define INTEL_QUARK_X1000 IFM(5, 0x09) /* Quark X1000 SoC */
182
183
#endif /* _ASM_X86_INTEL_FAMILY_H */
···
135
136
#define INTEL_LUNARLAKE_M IFM(6, 0xBD)
137
138
+
#define INTEL_PANTHERLAKE_L IFM(6, 0xCC)
139
+
140
/* "Small Core" Processors (Atom/E-Core) */
141
142
#define INTEL_ATOM_BONNELL IFM(6, 0x1C) /* Diamondville, Pineview */
···
177
/* Family 5 */
178
#define INTEL_FAM5_QUARK_X1000 0x09 /* Quark X1000 SoC */
179
#define INTEL_QUARK_X1000 IFM(5, 0x09) /* Quark X1000 SoC */
180
+
181
+
/* Family 19 */
182
+
#define INTEL_PANTHERCOVE_X IFM(19, 0x01) /* Diamond Rapids */
183
184
#endif /* _ASM_X86_INTEL_FAMILY_H */