crypto: ccp - allow callers to use HV-Fixed page API when SEV is disabled

When SEV is disabled, the HV-Fixed page allocation call fails, which in
turn causes SFS initialization to fail.

Fix the HV-Fixed API so callers (for example, SFS) can use it even when
SEV is disabled by performing normal page allocation and freeing.

Fixes: e09701dcdd9c ("crypto: ccp - Add new HV-Fixed page allocation/free API")
Cc: stable@vger.kernel.org
Signed-off-by: Ashish Kalra <ashish.kalra@amd.com>
Reviewed-by: Tom Lendacky <thomas.lendacky@amd.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

diff --git a/drivers/crypto/ccp/sev-dev.c b/drivers/crypto/ccp/sev-dev.c
index 096f993974d1e2d8bb155bbfa57a30364a389001..8b2dfc11289bdcc6e0cca84896b484e4b4c52907 100644 (file)
--- a/drivers/crypto/ccp/sev-dev.c
+++ b/drivers/crypto/ccp/sev-dev.c
@@ -1105,15 +1105,12 @@ struct page *snp_alloc_hv_fixed_pages(unsigned int num_2mb_pages)
 {
        struct psp_device *psp_master = psp_get_master_device();
        struct snp_hv_fixed_pages_entry *entry;
-       struct sev_device *sev;
        unsigned int order;
        struct page *page;
 
-       if (!psp_master || !psp_master->sev_data)
+       if (!psp_master)
                return NULL;
 
-       sev = psp_master->sev_data;
-
        order = get_order(PMD_SIZE * num_2mb_pages);
 
        /*
@@ -1126,7 +1123,8 @@ struct page *snp_alloc_hv_fixed_pages(unsigned int num_2mb_pages)
         * This API uses SNP_INIT_EX to transition allocated pages to HV_Fixed
         * page state, fail if SNP is already initialized.
         */
-       if (sev->snp_initialized)
+       if (psp_master->sev_data &&
+           ((struct sev_device *)psp_master->sev_data)->snp_initialized)
                return NULL;
 
        /* Re-use freed pages that match the request */
@@ -1162,7 +1160,7 @@ void snp_free_hv_fixed_pages(struct page *page)
        struct psp_device *psp_master = psp_get_master_device();
        struct snp_hv_fixed_pages_entry *entry, *nentry;
 
-       if (!psp_master || !psp_master->sev_data)
+       if (!psp_master)
                return;
 
        /*