mirror of
https://github.com/torvalds/linux.git
synced 2026-04-18 14:53:58 -04:00
Merge branches 'apple/dart', 'ti/omap', 'riscv', 'intel/vt-d' and 'amd/amd-vi' into next
This commit is contained in:
@@ -28,6 +28,7 @@
|
||||
#include <linux/fs_struct.h>
|
||||
#include <linux/psp.h>
|
||||
#include <linux/amd-iommu.h>
|
||||
#include <linux/crash_dump.h>
|
||||
|
||||
#include <asm/smp.h>
|
||||
#include <asm/cacheflush.h>
|
||||
@@ -1345,6 +1346,15 @@ static int _sev_platform_init_locked(struct sev_platform_init_args *args)
|
||||
if (!psp_master || !psp_master->sev_data)
|
||||
return -ENODEV;
|
||||
|
||||
/*
|
||||
* Skip SNP/SEV initialization under a kdump kernel as SEV/SNP
|
||||
* may already be initialized in the previous kernel. Since no
|
||||
* SNP/SEV guests are run under a kdump kernel, there is no
|
||||
* need to initialize SNP or SEV during kdump boot.
|
||||
*/
|
||||
if (is_kdump_kernel())
|
||||
return 0;
|
||||
|
||||
sev = psp_master->sev_data;
|
||||
|
||||
if (sev->state == SEV_STATE_INIT)
|
||||
|
||||
Reference in New Issue
Block a user