Commit 5d5d6229 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'x86_urgent_for_v6.16_rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull x86 fixes from Borislav Petkov:

 - Update Kirill's email address

 - Allow hugetlb PMD sharing only on 64-bit as it doesn't make a whole
   lotta sense on 32-bit

 - Add fixes for a misconfigured AMD Zen2 client which wasn't even
   supposed to run Linux

* tag 'x86_urgent_for_v6.16_rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  MAINTAINERS: Update Kirill Shutemov's email address for TDX
  x86/mm: Disable hugetlb page table sharing on 32-bit
  x86/CPU/AMD: Disable INVLPGB on Zen2
  x86/rdrand: Disable RDSEED on AMD Cyan Skillfish
parents 41998eeb cb73e53f

.mailmap

+1 −0
Original line number Diff line number Diff line
@@ -416,6 +416,7 @@ Kenneth W Chen <kenneth.w.chen@intel.com> 
Kenneth Westfield <quic_kwestfie@quicinc.com> <kwestfie@codeaurora.org>

Kiran Gunda <quic_kgunda@quicinc.com> <kgunda@codeaurora.org>

Kirill Tkhai <tkhai@ya.ru> <ktkhai@virtuozzo.com>

Kirill A. Shutemov <kas@kernel.org> <kirill.shutemov@linux.intel.com>

Kishon Vijay Abraham I <kishon@kernel.org> <kishon@ti.com>

Konrad Dybcio <konradybcio@kernel.org> <konrad.dybcio@linaro.org>

Konrad Dybcio <konradybcio@kernel.org> <konrad.dybcio@somainline.org>

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -26939,7 +26939,7 @@ F: arch/x86/kernel/stacktrace.c 
F:	arch/x86/kernel/unwind_*.c









X86 TRUST DOMAIN EXTENSIONS (TDX)









M:	Kirill A. Shutemov <kirill.shutemov@linux.intel.com>









M:	Kirill A. Shutemov <kas@kernel.org>









R:	Dave Hansen <dave.hansen@linux.intel.com>









L:	x86@kernel.org









L:	linux-coco@lists.linux.dev

























arch/x86/Kconfig



+1
−1






























Original line number
Diff line number
Diff line







@@ -147,7 +147,7 @@ config X86







	select ARCH_WANTS_DYNAMIC_TASK_STRUCT









	select ARCH_WANTS_NO_INSTR









	select ARCH_WANT_GENERAL_HUGETLB









	select ARCH_WANT_HUGE_PMD_SHARE









	select ARCH_WANT_HUGE_PMD_SHARE		if X86_64









	select ARCH_WANT_LD_ORPHAN_WARN









	select ARCH_WANT_OPTIMIZE_DAX_VMEMMAP	if X86_64









	select ARCH_WANT_OPTIMIZE_HUGETLB_VMEMMAP	if X86_64
































arch/x86/include/asm/msr-index.h



+1
−0






























Original line number
Diff line number
Diff line







@@ -628,6 +628,7 @@







#define MSR_AMD64_OSVW_STATUS		0xc0010141









#define MSR_AMD_PPIN_CTL		0xc00102f0









#define MSR_AMD_PPIN			0xc00102f1









#define MSR_AMD64_CPUID_FN_7		0xc0011002









#define MSR_AMD64_CPUID_FN_1		0xc0011004









#define MSR_AMD64_LS_CFG		0xc0011020









#define MSR_AMD64_DC_CFG		0xc0011022
































arch/x86/kernel/cpu/amd.c



+10
−0






























Original line number
Diff line number
Diff line







@@ -974,6 +974,16 @@ static void init_amd_zen2(struct cpuinfo_x86 *c)







	init_spectral_chicken(c);









	fix_erratum_1386(c);









	zen2_zenbleed_check(c);



















	/* Disable RDSEED on AMD Cyan Skillfish because of an error. */









	if (c->x86_model == 0x47 && c->x86_stepping == 0x0) {









		clear_cpu_cap(c, X86_FEATURE_RDSEED);









		msr_clear_bit(MSR_AMD64_CPUID_FN_7, 18);









		pr_emerg("RDSEED is not reliable on this platform; disabling.\n");









	}



















	/* Correct misconfigured CPUID on some clients. */









	clear_cpu_cap(c, X86_FEATURE_INVLPGB);









}



















static void init_amd_zen3(struct cpuinfo_x86 *c)