diff options
| author | Alexander Shishkin <alexander.shishkin@linux.intel.com> | 2023-10-10 17:52:19 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2023-10-11 11:15:47 +0300 |
| commit | 6e74b125155dc8c747d76fb45d8e6d20e9e4fb4d (patch) | |
| tree | 1c06f55d492e7cebcb31bd499e6724cdeb045e25 /arch/x86/kernel/setup.c | |
| parent | c9babd5d95abf3fae6e798605ce5cac98e08daf9 (diff) | |
| download | linux-6e74b125155dc8c747d76fb45d8e6d20e9e4fb4d.tar.xz | |
x86/sev: Move sev_setup_arch() to mem_encrypt.c
Since commit:
4d96f9109109b ("x86/sev: Replace occurrences of sev_active() with cc_platform_has()")
... the SWIOTLB bounce buffer size adjustment and restricted virtio memory
setting also inadvertently apply to TDX: the code is using
cc_platform_has(CC_ATTR_GUEST_MEM_ENCRYPT) as a gatekeeping condition,
which is also true for TDX, and this is also what we want.
To reflect this, move the corresponding code to generic mem_encrypt.c.
No functional changes intended.
Signed-off-by: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Reviewed-by: Tom Lendacky <thomas.lendacky@amd.com>
Link: https://lore.kernel.org/r/20231010145220.3960055-2-alexander.shishkin@linux.intel.com
Diffstat (limited to 'arch/x86/kernel/setup.c')
| -rw-r--r-- | arch/x86/kernel/setup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c index b9145a63da77..ec44dc56ebc8 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c @@ -1124,7 +1124,7 @@ void __init setup_arch(char **cmdline_p) * Needs to run after memblock setup because it needs the physical * memory size. */ - sev_setup_arch(); + mem_encrypt_setup_arch(); efi_fake_memmap(); efi_find_mirror(); |