From: Joerg Roedel joro@sev.home.8bytes.org

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.

Cc: stable@vger.kernel.org Signed-off-by: Joerg Roedel joro@sev.home.8bytes.org --- drivers/crypto/ccp/sev-dev.c | 3 +++ 1 file changed, 3 insertions(+)

diff --git a/drivers/crypto/ccp/sev-dev.c b/drivers/crypto/ccp/sev-dev.c index cb9b4c4e371e..9883e3afe10b 100644 --- a/drivers/crypto/ccp/sev-dev.c +++ b/drivers/crypto/ccp/sev-dev.c @@ -42,6 +42,9 @@ 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"); +MODULE_FIRMWARE("amd/amd_sev_fam17h_model3xh.sbin"); + static bool psp_dead; static int psp_timeout;