UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

ASoC: SOF: Intel: HDA: Set up sof_ipc4_fw_data for IPC4 

Allocate the sof_ipc4_fw_data struct for IPC4 and set the fw header offset
for the platforms which will be used by the core when loading the firmware
image.

The core expects that the "private" field in struct snd_sof_dev (which is
unused today with IPC3) is used to save this data.

Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Reviewed-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Reviewed-by: Rander Wang <rander.wang@intel.com>
Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20220511171648.1622993-6-ranjani.sridharan@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Ranjani Sridharan 2022-05-11 10:16:48 -07:00 committed by Mark Brown
parent c62ff366b3
commit a4cfdebdfe
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
3 changed files with 35 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sound/soc/sof/intel/apl.c
View File

@ -15,6 +15,8 @@
* Hardware interface for audio DSP on Apollolake and GeminiLake * Hardware interface for audio DSP on Apollolake and GeminiLake
*/ */
#include <sound/sof/ext_manifest4.h>
#include "../ipc4-priv.h"
#include "../sof-priv.h" #include "../sof-priv.h"
#include "hda.h" #include "hda.h"
#include "../sof-audio.h" #include "../sof-audio.h"
@ -46,6 +48,16 @@ int sof_apl_ops_init(struct snd_sof_dev *sdev)
} }
if (sdev->pdata->ipc_type == SOF_INTEL_IPC4) { if (sdev->pdata->ipc_type == SOF_INTEL_IPC4) {
struct sof_ipc4_fw_data *ipc4_data;
sdev->private = devm_kzalloc(sdev->dev, sizeof(*ipc4_data), GFP_KERNEL);
if (!sdev->private)
return -ENOMEM;
ipc4_data = sdev->private;
ipc4_data->manifest_fw_hdr_offset = SOF_MAN4_FW_HDR_OFFSET;
/* doorbell */
sof_apl_ops.irq_thread = hda_dsp_ipc4_irq_thread; sof_apl_ops.irq_thread = hda_dsp_ipc4_irq_thread;
/* ipc */ /* ipc */

12
sound/soc/sof/intel/cnl.c
View File

@ -15,7 +15,9 @@
* Hardware interface for audio DSP on Cannonlake. * Hardware interface for audio DSP on Cannonlake.
*/ */
#include <sound/sof/ext_manifest4.h>
#include <sound/sof/ipc4/header.h> #include <sound/sof/ipc4/header.h>
#include "../ipc4-priv.h"
#include "../ops.h" #include "../ops.h"
#include "hda.h" #include "hda.h"
#include "hda-ipc.h" #include "hda-ipc.h"
@ -344,6 +346,16 @@ int sof_cnl_ops_init(struct snd_sof_dev *sdev)
} }
if (sdev->pdata->ipc_type == SOF_INTEL_IPC4) { if (sdev->pdata->ipc_type == SOF_INTEL_IPC4) {
struct sof_ipc4_fw_data *ipc4_data;
sdev->private = devm_kzalloc(sdev->dev, sizeof(*ipc4_data), GFP_KERNEL);
if (!sdev->private)
return -ENOMEM;
ipc4_data = sdev->private;
ipc4_data->manifest_fw_hdr_offset = SOF_MAN4_FW_HDR_OFFSET;
/* doorbell */
sof_cnl_ops.irq_thread = cnl_ipc4_irq_thread; sof_cnl_ops.irq_thread = cnl_ipc4_irq_thread;
/* ipc */ /* ipc */

11
sound/soc/sof/intel/tgl.c
View File

@ -9,6 +9,8 @@
* Hardware interface for audio DSP on Tigerlake. * Hardware interface for audio DSP on Tigerlake.
*/ */
#include <sound/sof/ext_manifest4.h>
#include "../ipc4-priv.h"
#include "../ops.h" #include "../ops.h"
#include "hda.h" #include "hda.h"
#include "hda-ipc.h" #include "hda-ipc.h"
@ -79,6 +81,15 @@ int sof_tgl_ops_init(struct snd_sof_dev *sdev)
} }
if (sdev->pdata->ipc_type == SOF_INTEL_IPC4) { if (sdev->pdata->ipc_type == SOF_INTEL_IPC4) {
struct sof_ipc4_fw_data *ipc4_data;
sdev->private = devm_kzalloc(sdev->dev, sizeof(*ipc4_data), GFP_KERNEL);
if (!sdev->private)
return -ENOMEM;
ipc4_data = sdev->private;
ipc4_data->manifest_fw_hdr_offset = SOF_MAN4_FW_HDR_OFFSET;
/* doorbell */ /* doorbell */
sof_tgl_ops.irq_thread = cnl_ipc4_irq_thread; sof_tgl_ops.irq_thread = cnl_ipc4_irq_thread;