From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 12 Aug 2023 15:47:01 +0000 (-0700)
Subject: Merge tag 'x86_urgent_for_v6.5_rc6' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: microblaze-v6.8~758
X-Git-Url: http://git.monstr.eu/?a=commitdiff_plain;h=43972cf2deb2f54a97530c82b88c555fd682428e;p=linux-2.6-microblaze.git

Merge tag 'x86_urgent_for_v6.5_rc6' of git://git./linux/kernel/git/tip/tip

Pull x86 fixes from Borislav Petkov:

 - Do not parse the confidential computing blob on non-AMD hardware as
   it leads to an EFI config table ending up unmapped

 - Use the correct segment selector in the 32-bit version of getcpu() in
   the vDSO

 - Make sure vDSO and VVAR regions are placed in the 47-bit VA range
   even on 5-level paging systems

 - Add models 0x90-0x91 to the range of AMD Zenbleed-affected CPUs

* tag 'x86_urgent_for_v6.5_rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/cpu/amd: Enable Zenbleed fix for AMD Custom APU 0405
  x86/mm: Fix VDSO and VVAR placement on 5-level paging machines
  x86/linkage: Fix typo of BUILD_VDSO in asm/linkage.h
  x86/vdso: Choose the right GDT_ENTRY_CPUNODE for 32-bit getcpu() on 64-bit kernel
  x86/sev: Do not try to parse for the CC blob on non-AMD hardware
---

43972cf2deb2f54a97530c82b88c555fd682428e
diff --cc arch/x86/kernel/cpu/amd.c
index b55d8f82b621,c15b4f02b4cf..70f9d56f9305
--- a/arch/x86/kernel/cpu/amd.c
+++ b/arch/x86/kernel/cpu/amd.c
@@@ -73,12 -73,9 +73,13 @@@ static const int amd_erratum_1054[] 
  static const int amd_zenbleed[] =
  	AMD_LEGACY_ERRATUM(AMD_MODEL_RANGE(0x17, 0x30, 0x0, 0x4f, 0xf),
  			   AMD_MODEL_RANGE(0x17, 0x60, 0x0, 0x7f, 0xf),
+ 			   AMD_MODEL_RANGE(0x17, 0x90, 0x0, 0x91, 0xf),
  			   AMD_MODEL_RANGE(0x17, 0xa0, 0x0, 0xaf, 0xf));
  
 +static const int amd_div0[] =
 +	AMD_LEGACY_ERRATUM(AMD_MODEL_RANGE(0x17, 0x00, 0x0, 0x2f, 0xf),
 +			   AMD_MODEL_RANGE(0x17, 0x50, 0x0, 0x5f, 0xf));
 +
  static bool cpu_has_amd_erratum(struct cpuinfo_x86 *cpu, const int *erratum)
  {
  	int osvw_id = *erratum++;