Commit 3f8f0133 authored by Ashish Kalra's avatar Ashish Kalra Committed by Herbert Xu
Browse files

crypto: ccp - Move SEV/SNP Platform initialization to KVM 



SNP initialization is forced during PSP driver probe purely because SNP
can't be initialized if VMs are running.  But the only in-tree user of
SEV/SNP functionality is KVM, and KVM depends on PSP driver for the same.
Forcing SEV/SNP initialization because a hypervisor could be running
legacy non-confidential VMs make no sense.

This patch removes SEV/SNP initialization from the PSP driver probe
time and moves the requirement to initialize SEV/SNP functionality
to KVM if it wants to use SEV/SNP.

Suggested-by: default avatarSean Christopherson <seanjc@google.com>
Reviewed-by: default avatarAlexey Kardashevskiy <aik@amd.com>
Signed-off-by: default avatarAshish Kalra <ashish.kalra@amd.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 6f1d5a35

drivers/crypto/ccp/sev-dev.c

+0 −13
Original line number Diff line number Diff line
@@ -1347,10 +1347,6 @@ static int _sev_platform_init_locked(struct sev_platform_init_args *args) 
	if (sev->state == SEV_STATE_INIT)

		return 0;



	/*

	 * Legacy guests cannot be running while SNP_INIT(_EX) is executing,

	 * so perform SEV-SNP initialization at probe time.

	 */

	rc = __sev_snp_init_locked(&args->error);

	if (rc && rc != -ENODEV)

		return rc;
@@ -2524,9 +2520,7 @@ EXPORT_SYMBOL_GPL(sev_issue_cmd_external_user); 
void sev_pci_init(void)

{

	struct sev_device *sev = psp_master->sev_data;

	struct sev_platform_init_args args = {0};

	u8 api_major, api_minor, build;

	int rc;



	if (!sev)

		return;
@@ -2549,13 +2543,6 @@ void sev_pci_init(void) 
			 api_major, api_minor, build,

			 sev->api_major, sev->api_minor, sev->build);



	/* Initialize the platform */

	args.probe = true;

	rc = sev_platform_init(&args);

	if (rc)

		dev_err(sev->dev, "SEV: failed to INIT error %#x, rc %d\n",

			args.error, rc);



	return;



err: