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: Tycho Andersen (AMD) <tycho@kernel.org>
Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de>
Reviewed-by: Tom Lendacky <thomas.lendacky@amd.com>
Link: https://patch.msgid.link/20260324161301.1353976-6-tycho@kernel.org

diff --git a/arch/x86/virt/svm/sev.c b/arch/x86/virt/svm/sev.c
index 423fe77cc70f9c2721660d2afc54d00757a16066..41f76f15caa131544fbd8afb644715ee0dd850f9 100644 (file)
--- 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 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");

diff --git a/drivers/crypto/ccp/sev-dev.c b/drivers/crypto/ccp/sev-dev.c
index 024eab24314502433909450605e7d0744b7082a2..0d0c09a3a0afa8d23bb7e023622df521213e4ee1 100644 (file)
--- 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();
 
-       /* 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