Patch "crypto: ccp - Refactor out sev_fw_alloc()" has been added to the 5.10-stable tree

[Sasha Levin <sashal@xxxxxxxxxx>]

This is a note to let you know that I've just added the patch titled

    crypto: ccp - Refactor out sev_fw_alloc()

to the 5.10-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     crypto-ccp-refactor-out-sev_fw_alloc.patch
and it can be found in the queue-5.10 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.



commit f52c519e0e08c770a48de84d38cd55b296ad9caf
Author: Peter Gonda <pgonda@xxxxxxxxxx>
Date:   Tue Dec 7 15:33:04 2021 -0800

    crypto: ccp - Refactor out sev_fw_alloc()
    
    [ Upstream commit cc17982d58d1e67eab831e7023ede999dda56173 ]
    
    Create a helper function sev_fw_alloc() which can be used to allocate
    aligned memory regions for use by the PSP firmware. Currently only used
    for the SEV-ES TMR region but will be used for the SEV_INIT_EX NV memory
    region.
    
    Signed-off-by: Peter Gonda <pgonda@xxxxxxxxxx>
    Reviewed-by: Marc Orr <marcorr@xxxxxxxxxx>
    Acked-by: David Rientjes <rientjes@xxxxxxxxxx>
    Acked-by: Brijesh Singh <brijesh.singh@xxxxxxx>
    Cc: Tom Lendacky <thomas.lendacky@xxxxxxx>
    Cc: Brijesh Singh <brijesh.singh@xxxxxxx>
    Cc: Marc Orr <marcorr@xxxxxxxxxx>
    Cc: Joerg Roedel <jroedel@xxxxxxx>
    Cc: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
    Cc: David Rientjes <rientjes@xxxxxxxxxx>
    Cc: John Allen <john.allen@xxxxxxx>
    Cc: "David S. Miller" <davem@xxxxxxxxxxxxx>
    Cc: Paolo Bonzini <pbonzini@xxxxxxxxxx>
    Cc: linux-crypto@xxxxxxxxxxxxxxx
    Cc: linux-kernel@xxxxxxxxxxxxxxx
    Signed-off-by: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
    Stable-dep-of: 46a334a98f58 ("crypto: ccp - Flush the SEV-ES TMR memory before giving it to firmware")
    Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>

diff --git a/drivers/crypto/ccp/sev-dev.c b/drivers/crypto/ccp/sev-dev.c
index e70ae98de1189..8a900226d73a3 100644
--- a/drivers/crypto/ccp/sev-dev.c
+++ b/drivers/crypto/ccp/sev-dev.c
@@ -138,6 +138,17 @@ static int sev_cmd_buffer_len(int cmd)
 	return 0;
 }
 
+static void *sev_fw_alloc(unsigned long len)
+{
+	struct page *page;
+
+	page = alloc_pages(GFP_KERNEL, get_order(len));
+	if (!page)
+		return NULL;
+
+	return page_address(page);
+}
+
 static int __sev_do_cmd_locked(int cmd, void *data, int *psp_ret)
 {
 	struct psp_device *psp = psp_master;
@@ -1040,7 +1051,6 @@ EXPORT_SYMBOL_GPL(sev_issue_cmd_external_user);
 void sev_pci_init(void)
 {
 	struct sev_device *sev = psp_master->sev_data;
-	struct page *tmr_page;
 	int error, rc;
 
 	if (!sev)
@@ -1056,14 +1066,10 @@ void sev_pci_init(void)
 		sev_get_api_version();
 
 	/* Obtain the TMR memory area for SEV-ES use */
-	tmr_page = alloc_pages(GFP_KERNEL, get_order(SEV_ES_TMR_SIZE));
-	if (tmr_page) {
-		sev_es_tmr = page_address(tmr_page);
-	} else {
-		sev_es_tmr = NULL;
+	sev_es_tmr = sev_fw_alloc(SEV_ES_TMR_SIZE);
+	if (!sev_es_tmr)
 		dev_warn(sev->dev,
 			 "SEV: TMR allocation failed, SEV-ES support unavailable\n");
-	}
 
 	/* Initialize the platform */
 	rc = sev_platform_init(&error);