| From c8671c7dc7d51125ab9f651697866bf4a9132277 Mon Sep 17 00:00:00 2001 |
| From: Joerg Roedel <jroedel@suse.de> |
| Date: Mon, 26 Apr 2021 10:17:48 +0200 |
| Subject: crypto: ccp - Annotate SEV Firmware file names |
| |
| From: Joerg Roedel <jroedel@suse.de> |
| |
| commit c8671c7dc7d51125ab9f651697866bf4a9132277 upstream. |
| |
| Annotate the firmware files CCP might need using MODULE_FIRMWARE(). |
| This will get them included into an initrd when CCP is also included |
| there. Otherwise the CCP module will not find its firmware when loaded |
| before the root-fs is mounted. |
| This can cause problems when the pre-loaded SEV firmware is too old to |
| support current SEV and SEV-ES virtualization features. |
| |
| Fixes: e93720606efd ("crypto: ccp - Allow SEV firmware to be chosen based on Family and Model") |
| Cc: stable@vger.kernel.org # v4.20+ |
| Acked-by: Tom Lendacky <thomas.lendacky@amd.com> |
| Signed-off-by: Joerg Roedel <jroedel@suse.de> |
| Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/crypto/ccp/sev-dev.c | 4 ++++ |
| 1 file changed, 4 insertions(+) |
| |
| --- a/drivers/crypto/ccp/sev-dev.c |
| +++ b/drivers/crypto/ccp/sev-dev.c |
| @@ -42,6 +42,10 @@ static int psp_probe_timeout = 5; |
| module_param(psp_probe_timeout, int, 0644); |
| MODULE_PARM_DESC(psp_probe_timeout, " default timeout value, in seconds, during PSP device probe"); |
| |
| +MODULE_FIRMWARE("amd/amd_sev_fam17h_model0xh.sbin"); /* 1st gen EPYC */ |
| +MODULE_FIRMWARE("amd/amd_sev_fam17h_model3xh.sbin"); /* 2nd gen EPYC */ |
| +MODULE_FIRMWARE("amd/amd_sev_fam19h_model0xh.sbin"); /* 3rd gen EPYC */ |
| + |
| static bool psp_dead; |
| static int psp_timeout; |
| |
