Skip to content

Commit f7da880

Browse files
Venkata-Prasad-Potturubroonie
authored andcommitted
ASoC: SOF: amd: Enable signed firmware image loading for Vangogh platform
Enable signed firmware loading for Vangogh platform using dmi quirks. Signed-off-by: Venkata Prasad Potturu <venkataprasad.potturu@amd.com> Link: https://lore.kernel.org/r/20230809123534.287707-3-venkataprasad.potturu@amd.com Signed-off-by: Mark Brown <broonie@kernel.org>
1 parent 6a69b72 commit f7da880

3 files changed

Lines changed: 40 additions & 0 deletions

File tree

sound/soc/sof/amd/acp.c

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,22 @@
2020
#include "acp.h"
2121
#include "acp-dsp-offset.h"
2222

23+
#define SECURED_FIRMWARE 1
24+
25+
const struct dmi_system_id acp_sof_quirk_table[] = {
26+
{
27+
/* Valve Jupiter device */
28+
.matches = {
29+
DMI_MATCH(DMI_SYS_VENDOR, "Valve"),
30+
DMI_MATCH(DMI_PRODUCT_NAME, "Galileo"),
31+
DMI_MATCH(DMI_PRODUCT_FAMILY, "Sephiroth"),
32+
},
33+
.driver_data = (void *)SECURED_FIRMWARE,
34+
},
35+
{}
36+
};
37+
EXPORT_SYMBOL_GPL(acp_sof_quirk_table);
38+
2339
static int smn_write(struct pci_dev *dev, u32 smn_addr, u32 data)
2440
{
2541
pci_write_config_dword(dev, 0x60, smn_addr);
@@ -468,8 +484,10 @@ EXPORT_SYMBOL_NS(amd_sof_acp_resume, SND_SOC_SOF_AMD_COMMON);
468484
int amd_sof_acp_probe(struct snd_sof_dev *sdev)
469485
{
470486
struct pci_dev *pci = to_pci_dev(sdev->dev);
487+
struct snd_sof_pdata *plat_data = sdev->pdata;
471488
struct acp_dev_data *adata;
472489
const struct sof_amd_acp_desc *chip;
490+
const struct dmi_system_id *dmi_id;
473491
unsigned int addr;
474492
int ret;
475493

@@ -531,6 +549,19 @@ int amd_sof_acp_probe(struct snd_sof_dev *sdev)
531549
sdev->debug_box.size = BOX_SIZE_1024;
532550

533551
adata->signed_fw_image = false;
552+
dmi_id = dmi_first_match(acp_sof_quirk_table);
553+
if (dmi_id && dmi_id->driver_data) {
554+
adata->fw_code_bin = kasprintf(GFP_KERNEL, "%s/sof-%s-code.bin",
555+
plat_data->fw_filename_prefix,
556+
chip->name);
557+
adata->fw_data_bin = kasprintf(GFP_KERNEL, "%s/sof-%s-data.bin",
558+
plat_data->fw_filename_prefix,
559+
chip->name);
560+
adata->signed_fw_image = dmi_id->driver_data;
561+
562+
dev_dbg(sdev->dev, "fw_code_bin:%s, fw_data_bin:%s\n", adata->fw_code_bin,
563+
adata->fw_data_bin);
564+
}
534565
acp_memory_init(sdev);
535566

536567
acp_dsp_stream_init(sdev);

sound/soc/sof/amd/acp.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@
1111
#ifndef __SOF_AMD_ACP_H
1212
#define __SOF_AMD_ACP_H
1313

14+
#include <linux/dmi.h>
15+
1416
#include "../sof-priv.h"
1517
#include "../sof-audio.h"
1618

@@ -297,4 +299,5 @@ int acp_probes_register(struct snd_sof_dev *sdev);
297299
void acp_probes_unregister(struct snd_sof_dev *sdev);
298300

299301
extern struct snd_soc_acpi_mach snd_soc_acpi_amd_vangogh_sof_machines[];
302+
extern const struct dmi_system_id acp_sof_quirk_table[];
300303
#endif

sound/soc/sof/amd/vangogh.c

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,12 +142,18 @@ EXPORT_SYMBOL_NS(sof_vangogh_ops, SND_SOC_SOF_AMD_COMMON);
142142

143143
int sof_vangogh_ops_init(struct snd_sof_dev *sdev)
144144
{
145+
const struct dmi_system_id *dmi_id;
146+
145147
/* common defaults */
146148
memcpy(&sof_vangogh_ops, &sof_acp_common_ops, sizeof(struct snd_sof_dsp_ops));
147149

148150
sof_vangogh_ops.drv = vangogh_sof_dai;
149151
sof_vangogh_ops.num_drv = ARRAY_SIZE(vangogh_sof_dai);
150152

153+
dmi_id = dmi_first_match(acp_sof_quirk_table);
154+
if (dmi_id && dmi_id->driver_data)
155+
sof_vangogh_ops.load_firmware = acp_sof_load_signed_firmware;
156+
151157
return 0;
152158
}
153159

0 commit comments

Comments
 (0)