Skip to contentSkip to conversation

crypto: ccp: Annotate SEV Firmware file names

PATCH Superseded Joerg Roedel 2 participants 2 messages Apr 23, 2021

Subsystems (4)
Stable branch Crypto API AMD cryptographic coprocessor (CCP) driver AMD cryptographic coprocessor (CCP) driver - SEV support

v3 of 4 Superseded Latest is v4 →

lore
Share & tools
lore

Joerg Roedel

author
#0 lore raw

PATCH v3 1/1 crypto: ccp: Annotate SEV Firmware file names

From: Joerg Roedel <[email protected]>

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 [email protected]
Signed-off-by Joerg Roedel <[email protected]>
---
 drivers/crypto/ccp/sev-dev.c | 4 ++++
 1 file changed, 4 insertions(+)
drivers/crypto/ccp/sev-dev.c +4 -0
index cb9b4c4e371e..675ff925a59d 100644
@@ -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;
Signature · 1 line
2.31.1
maintainer Acked-by on v3 1/1
#1 lore raw
Quoted 11 lines · Joerg Roedel

From: Joerg Roedel <[email protected]>

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 [email protected]
Signed-off-by Joerg Roedel <[email protected]>

Do we want a Fixes: tag?

Fixes e93720606efd ("crypto: ccp - Allow SEV firmware to be chosen based on Family and Model")

No need to go back farther than when that firmware filename format was introduced.

Otherwise,

Acked-by Tom Lendacky <[email protected]>
Quoted 20 lines
---
 drivers/crypto/ccp/sev-dev.c | 4 ++++
 1 file changed, 4 insertions(+)
drivers/crypto/ccp/sev-dev.c +4 -0
index cb9b4c4e371e..675ff925a59d 100644
@@ -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;