From: "Tycho Andersen (AMD)" <tycho@kernel.org>
Now that there is snp_prepare_for_snp_init() 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: Tycho Andersen (AMD) <tycho@kernel.org>
Reviewed-by: Tom Lendacky <thomas.lendacky@amd.com>
---
arch/x86/virt/svm/sev.c | 8 ++++++++
drivers/crypto/ccp/sev-dev.c | 8 --------
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/arch/x86/virt/svm/sev.c b/arch/x86/virt/svm/sev.c
index b73ea987c69c..e856c13cfdaa 100644
--- a/arch/x86/virt/svm/sev.c
+++ b/arch/x86/virt/svm/sev.c
@@ -506,6 +506,11 @@ static bool __init setup_rmptable(void)
return true;
}
+static void snp_set_hsave_pa(void *arg)
+{
+ wrmsrq(MSR_VM_HSAVE_PA, 0);
+}
+
void snp_prepare_for_snp_init(void)
{
u64 val;
@@ -527,6 +532,9 @@ void snp_prepare_for_snp_init(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(snp_set_hsave_pa, NULL, 1);
}
EXPORT_SYMBOL_FOR_MODULES(snp_prepare_for_snp_init, "ccp");
diff --git a/drivers/crypto/ccp/sev-dev.c b/drivers/crypto/ccp/sev-dev.c
index 07c4736a1f0a..b10104f243b9 100644
--- a/drivers/crypto/ccp/sev-dev.c
+++ b/drivers/crypto/ccp/sev-dev.c
@@ -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_for_snp_init();
- /* 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
--
2.53.0