ASoC: SOF: amd: Move signed_fw_image to struct acp_quirk_entry

[ Upstream commit 33c3d813330718c403a60d220f03fbece0f4fb5c ]

The signed_fw_image member of struct sof_amd_acp_desc is used to enable
signed firmware support in the driver via the acp_sof_quirk_table.

In preparation to support additional use cases of the quirk table (i.e.
adding new flags), move signed_fw_image to a new struct acp_quirk_entry
and update all references to it accordingly.

No functional changes intended.

Signed-off-by: Cristian Ciocaltea <cristian.ciocaltea@collabora.com>
Link: https://msgid.link/r/20240220201623.438944-2-cristian.ciocaltea@collabora.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Stable-dep-of: 094d11768f74 ("ASoC: SOF: amd: Skip IRAM/DRAM size modification for Steam Deck OLED")
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/sound/soc/sof/amd/acp-loader.c b/sound/soc/sof/amd/acp-loader.c
index d2d21478399e02d1fd010ad4897b08e58602fd73..aad904839b817cd74d3731d8b06e8739c27bb43e 100644 (file)
--- a/sound/soc/sof/amd/acp-loader.c
+++ b/sound/soc/sof/amd/acp-loader.c
@@ -173,7 +173,7 @@ int acp_dsp_pre_fw_run(struct snd_sof_dev *sdev)
 
        adata = sdev->pdata->hw_pdata;
 
-       if (adata->signed_fw_image)
+       if (adata->quirks && adata->quirks->signed_fw_image)
                size_fw = adata->fw_bin_size - ACP_FIRMWARE_SIGNATURE;
        else
                size_fw = adata->fw_bin_size;

diff --git a/sound/soc/sof/amd/acp.c b/sound/soc/sof/amd/acp.c
index 9794d64a110fdb594c5c5a9405cbd02e8e940a2a..deddf8a92db874dcca0691c97e67c523b08ec745 100644 (file)
--- a/sound/soc/sof/amd/acp.c
+++ b/sound/soc/sof/amd/acp.c
@@ -20,12 +20,14 @@
 #include "acp.h"
 #include "acp-dsp-offset.h"
 
-#define SECURED_FIRMWARE 1
-
 static bool enable_fw_debug;
 module_param(enable_fw_debug, bool, 0444);
 MODULE_PARM_DESC(enable_fw_debug, "Enable Firmware debug");
 
+static struct acp_quirk_entry quirk_valve_galileo = {
+       .signed_fw_image = true,
+};
+
 const struct dmi_system_id acp_sof_quirk_table[] = {
        {
                /* Valve Jupiter device */
@@ -34,7 +36,7 @@ const struct dmi_system_id acp_sof_quirk_table[] = {
                        DMI_MATCH(DMI_PRODUCT_NAME, "Galileo"),
                        DMI_MATCH(DMI_PRODUCT_FAMILY, "Sephiroth"),
                },
-               .driver_data = (void *)SECURED_FIRMWARE,
+               .driver_data = &quirk_valve_galileo,
        },
        {}
 };
@@ -255,7 +257,7 @@ int configure_and_run_sha_dma(struct acp_dev_data *adata, void *image_addr,
                }
        }
 
-       if (adata->signed_fw_image)
+       if (adata->quirks && adata->quirks->signed_fw_image)
                snd_sof_dsp_write(sdev, ACP_DSP_BAR, ACP_SHA_DMA_INCLUDE_HDR, ACP_SHA_HEADER);
 
        snd_sof_dsp_write(sdev, ACP_DSP_BAR, ACP_SHA_DMA_STRT_ADDR, start_addr);
@@ -556,26 +558,27 @@ int amd_sof_acp_probe(struct snd_sof_dev *sdev)
        sdev->debug_box.offset = sdev->host_box.offset + sdev->host_box.size;
        sdev->debug_box.size = BOX_SIZE_1024;
 
-       adata->signed_fw_image = false;
        dmi_id = dmi_first_match(acp_sof_quirk_table);
-       if (dmi_id && dmi_id->driver_data) {
-               adata->fw_code_bin = devm_kasprintf(sdev->dev, GFP_KERNEL,
-                                                   "sof-%s-code.bin",
-                                                   chip->name);
-               if (!adata->fw_code_bin) {
-                       ret = -ENOMEM;
-                       goto free_ipc_irq;
+       if (dmi_id) {
+               adata->quirks = dmi_id->driver_data;
+
+               if (adata->quirks->signed_fw_image) {
+                       adata->fw_code_bin = devm_kasprintf(sdev->dev, GFP_KERNEL,
+                                                           "sof-%s-code.bin",
+                                                           chip->name);
+                       if (!adata->fw_code_bin) {
+                               ret = -ENOMEM;
+                               goto free_ipc_irq;
+                       }
+
+                       adata->fw_data_bin = devm_kasprintf(sdev->dev, GFP_KERNEL,
+                                                           "sof-%s-data.bin",
+                                                           chip->name);
+                       if (!adata->fw_data_bin) {
+                               ret = -ENOMEM;
+                               goto free_ipc_irq;
+                       }
                }
-
-               adata->fw_data_bin = devm_kasprintf(sdev->dev, GFP_KERNEL,
-                                                   "sof-%s-data.bin",
-                                                   chip->name);
-               if (!adata->fw_data_bin) {
-                       ret = -ENOMEM;
-                       goto free_ipc_irq;
-               }
-
-               adata->signed_fw_image = dmi_id->driver_data;
        }
 
        adata->enable_fw_debug = enable_fw_debug;

diff --git a/sound/soc/sof/amd/acp.h b/sound/soc/sof/amd/acp.h
index c645aee216fd0b5fa94f4d69e482f103d4015419..90a2d9d0dd6338e327050d1b5fe03d47465297fa 100644 (file)
--- a/sound/soc/sof/amd/acp.h
+++ b/sound/soc/sof/amd/acp.h
@@ -193,6 +193,10 @@ struct sof_amd_acp_desc {
        u32 probe_reg_offset;
 };
 
+struct acp_quirk_entry {
+       bool signed_fw_image;
+};
+
 /* Common device data struct for ACP devices */
 struct acp_dev_data {
        struct snd_sof_dev  *dev;
@@ -213,7 +217,7 @@ struct acp_dev_data {
        u8 *data_buf;
        dma_addr_t sram_dma_addr;
        u8 *sram_data_buf;
-       bool signed_fw_image;
+       struct acp_quirk_entry *quirks;
        struct dma_descriptor dscr_info[ACP_MAX_DESC];
        struct acp_dsp_stream stream_buf[ACP_MAX_STREAM];
        struct acp_dsp_stream *dtrace_stream;

diff --git a/sound/soc/sof/amd/vangogh.c b/sound/soc/sof/amd/vangogh.c
index de15d21aa6d982ab218e317a0661f13ba744e982..bc6ffdb5471a58ae4b30b27ba166fd356a974edd 100644 (file)
--- a/sound/soc/sof/amd/vangogh.c
+++ b/sound/soc/sof/amd/vangogh.c
@@ -143,6 +143,7 @@ EXPORT_SYMBOL_NS(sof_vangogh_ops, SND_SOC_SOF_AMD_COMMON);
 int sof_vangogh_ops_init(struct snd_sof_dev *sdev)
 {
        const struct dmi_system_id *dmi_id;
+       struct acp_quirk_entry *quirks;
 
        /* common defaults */
        memcpy(&sof_vangogh_ops, &sof_acp_common_ops, sizeof(struct snd_sof_dsp_ops));
@@ -151,8 +152,12 @@ int sof_vangogh_ops_init(struct snd_sof_dev *sdev)
        sof_vangogh_ops.num_drv = ARRAY_SIZE(vangogh_sof_dai);
 
        dmi_id = dmi_first_match(acp_sof_quirk_table);
-       if (dmi_id && dmi_id->driver_data)
-               sof_vangogh_ops.load_firmware = acp_sof_load_signed_firmware;
+       if (dmi_id) {
+               quirks = dmi_id->driver_data;
+
+               if (quirks->signed_fw_image)
+                       sof_vangogh_ops.load_firmware = acp_sof_load_signed_firmware;
+       }
 
        return 0;
 }