Merge branch 'stable/for-linus-5.11' of git://git.kernel.org/pub/scm/linux/kernel...

Pull swiotlb update from Konrad Rzeszutek Wilk:
 "A generic (but for right now engaged only with AMD SEV) mechanism to
  adjust a larger size SWIOTLB based on the total memory of the SEV
  guests which right now require the bounce buffer for interacting with
  the outside world.

  Normal knobs (swiotlb=XYZ) still work"

* 'stable/for-linus-5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb:
  x86,swiotlb: Adjust SWIOTLB bounce buffer size for SEV guests

diff --combined arch/x86/kernel/setup.c
index a23130c86bdd20c2e59e8b4f60512f382a57ac55,874b2c17af4105697595cad0d893edc63c7b0b16..740f3bdb3f61939d28da1e8bdd47552a6912b298
--- 1/arch/x86/kernel/setup.c
--- 2/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@@ -119,6 -119,11 +119,6 @@@ EXPORT_SYMBOL(boot_cpu_data)
  
  unsigned int def_to_bigsmp;
  
 -/* For MCA, but anyone else can use it if they want */
 -unsigned int machine_id;
 -unsigned int machine_submodel_id;
 -unsigned int BIOS_revision;
 -
  struct apm_info apm_info;
  EXPORT_SYMBOL(apm_info);
  
@@@ -1049,6 -1054,12 +1049,12 @@@ void __init setup_arch(char **cmdline_p
        memblock_set_current_limit(ISA_END_ADDRESS);
        e820__memblock_setup();
  
+       /*
+        * Needs to run after memblock setup because it needs the physical
+        * memory size.
+        */
+       sev_setup_arch();
+ 
        reserve_bios_regions();
  
        efi_fake_memmap();