Unverified Commit 52d7939d authored by Pierre-Louis Bossart's avatar Pierre-Louis Bossart Committed by Mark Brown
Browse files

ASoC: SOF: Intel: add ops for SKL/KBL 



Add ops and ops_init for SKL and KBL.
Tested on Dell XPS-13-9350 and KBL NUC.

Note: currently only SOF_IPC4_MTRACE_INTEL_CAVS_2 type is supported by
the ipc4-mtrace driver, which is used by CAVS 2.x platforms (ICL, TGL,
ADL) and ACE (MTL).

Signed-off-by: default avatarRanjani Sridharan <ranjani.sridharan@linux.intel.com>
Signed-off-by: default avatarPéter Ujfalusi <peter.ujfalusi@linux.intel.com>
Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20220920131700.133103-5-pierre-louis.bossart@linux.intel.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent e2379d4a

sound/soc/sof/intel/pci-skl.c

+2 −0
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ static struct sof_dev_desc skl_desc = { 
	},

	.nocodec_tplg_filename = "sof-skl-nocodec.tplg",

	.ops = &sof_skl_ops,

	.ops_init = sof_skl_ops_init,

};



static struct sof_dev_desc kbl_desc = {
@@ -59,6 +60,7 @@ static struct sof_dev_desc kbl_desc = { 
	},

	.nocodec_tplg_filename = "sof-kbl-nocodec.tplg",

	.ops = &sof_skl_ops,

	.ops_init = sof_skl_ops_init,

};



/* PCI IDs */

sound/soc/sof/intel/skl.c

+55 −9
Original line number Diff line number Diff line
@@ -23,8 +23,10 @@ 
#include <sound/hdaudio_ext.h>

#include <sound/pcm_params.h>

#include <sound/sof.h>

#include <sound/sof/ext_manifest4.h>



#include "../sof-priv.h"

#include "../ipc4-priv.h"

#include "../ops.h"

#include "hda.h"

#include "../sof-audio.h"
@@ -37,21 +39,65 @@ static const __maybe_unused struct snd_sof_debugfs_map skl_dsp_debugfs[] = { 
	{"dsp", HDA_DSP_BAR,  0, 0x10000},

};



static int __maybe_unused skl_dsp_ipc_get_window_offset(struct snd_sof_dev *sdev, u32 id)

static int skl_dsp_ipc_get_window_offset(struct snd_sof_dev *sdev, u32 id)

{

	return SRAM_MEMORY_WINDOW_BASE + (0x2000 * id);

}



static int skl_dsp_ipc_get_mailbox_offset(struct snd_sof_dev *sdev)

{

	return SRAM_MEMORY_WINDOW_BASE + 0x1000;

}



/* skylake ops */

struct snd_sof_dsp_ops sof_skl_ops = {

	/*

	 * the ops are left empty at this stage since the SOF releases do not

	 * support SKL/KBL.

	 * The ops will be populated when support for the Intel IPC4 is added

	 * to the SOF driver

	 */

struct snd_sof_dsp_ops sof_skl_ops;

EXPORT_SYMBOL_NS(sof_skl_ops, SND_SOC_SOF_INTEL_HDA_COMMON);



int sof_skl_ops_init(struct snd_sof_dev *sdev)

{

	struct sof_ipc4_fw_data *ipc4_data;



	/* common defaults */

	memcpy(&sof_skl_ops, &sof_hda_common_ops, sizeof(struct snd_sof_dsp_ops));



	/* probe/remove/shutdown */

	sof_skl_ops.shutdown	= hda_dsp_shutdown;



	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_CAVS_1_5;



	ipc4_data->mtrace_type = SOF_IPC4_MTRACE_INTEL_CAVS_1_5;



	sof_skl_ops.get_window_offset = skl_dsp_ipc_get_window_offset;

	sof_skl_ops.get_mailbox_offset = skl_dsp_ipc_get_mailbox_offset;



	/* doorbell */

	sof_skl_ops.irq_thread	= hda_dsp_ipc4_irq_thread;



	/* ipc */

	sof_skl_ops.send_msg	= hda_dsp_ipc4_send_msg;



	/* set DAI driver ops */

	hda_set_dai_drv_ops(sdev, &sof_skl_ops);



	/* debug */

	sof_skl_ops.debug_map	= skl_dsp_debugfs;

	sof_skl_ops.debug_map_count	= ARRAY_SIZE(skl_dsp_debugfs);

	sof_skl_ops.ipc_dump	= hda_ipc_dump;



	/* firmware run */

	sof_skl_ops.run = hda_dsp_cl_boot_firmware_skl;



	/* pre/post fw run */

	sof_skl_ops.post_fw_run = hda_dsp_post_fw_run;



	return 0;

};

EXPORT_SYMBOL(sof_skl_ops);

EXPORT_SYMBOL_NS(sof_skl_ops_init, SND_SOC_SOF_INTEL_HDA_COMMON);



const struct sof_intel_dsp_desc skl_chip_info = {

	.cores_num = 2,