Commit 7b2bc5f0 authored by Tycho Andersen (AMD)'s avatar Tycho Andersen (AMD) Committed by Borislav Petkov (AMD)
Browse files

x86/sev, crypto/ccp: Move HSAVE_PA setup to arch/x86/ 



Now that there is snp_prepare() that indicates when the CCP driver wants to
prepare the architecture for SNP_INIT(_EX), move this architecture-specific
bit of code to a more sensible place.

Signed-off-by: default avatarTycho Andersen (AMD) <tycho@kernel.org>
Signed-off-by: default avatarBorislav Petkov (AMD) <bp@alien8.de>
Reviewed-by: default avatarTom Lendacky <thomas.lendacky@amd.com>
Link: https://patch.msgid.link/20260324161301.1353976-6-tycho@kernel.org
parent 299933b1

arch/x86/virt/svm/sev.c

+8 −0
Original line number Diff line number Diff line
@@ -506,6 +506,11 @@ static bool __init setup_rmptable(void) 
	return true;

}



static void clear_hsave_pa(void *arg)

{

	wrmsrq(MSR_VM_HSAVE_PA, 0);

}



void snp_prepare(void)

{

	u64 val;
@@ -529,6 +534,9 @@ void snp_prepare(void) 
	on_each_cpu(mfd_reconfigure, (void *)1, 1);

	on_each_cpu(snp_enable, NULL, 1);



	/* SNP_INIT requires MSR_VM_HSAVE_PA to be cleared on all CPUs. */

	on_each_cpu(clear_hsave_pa, NULL, 1);



	cpus_read_unlock();

}

EXPORT_SYMBOL_FOR_MODULES(snp_prepare, "ccp");

drivers/crypto/ccp/sev-dev.c

+0 −8
Original line number Diff line number Diff line
@@ -1076,11 +1076,6 @@ static inline int __sev_do_init_locked(int *psp_ret) 
		return __sev_init_locked(psp_ret);

}



static void snp_set_hsave_pa(void *arg)

{

	wrmsrq(MSR_VM_HSAVE_PA, 0);

}



/* Hypervisor Fixed pages API interface */

static void snp_hv_fixed_pages_state_update(struct sev_device *sev,

					    enum snp_hv_fixed_pages_state page_state)
@@ -1375,9 +1370,6 @@ static int __sev_snp_init_locked(int *error, unsigned int max_snp_asid) 


	snp_prepare();



	/* SNP_INIT requires MSR_VM_HSAVE_PA to be cleared on all CPUs. */

	on_each_cpu(snp_set_hsave_pa, NULL, 1);



	/*

	 * Starting in SNP firmware v1.52, the SNP_INIT_EX command takes a list

	 * of system physical address ranges to convert into HV-fixed page