diff mbox series

[3/4] ASoC: SOF: Intel: add initial SKL/KBL hardware support

Message ID 20220919123617.44096-4-pierre-louis.bossart@linux.intel.com (mailing list archive)
State Superseded
Headers show
Series ASoC: SOF: Add SKL/KBL support for IPC4 CI tests | expand

Commit Message

Pierre-Louis Bossart Sept. 19, 2022, 12:36 p.m. UTC
In preparation of the IPCv4 IPC support, this patch adds
support for SkyLake and KabyLake boot and descriptors
used when probing the PCI driver.

The work was initially contributed in 2018 by Liam Girdwood and Zhu
Yingjiang, and abandoned due to firmware signature issues. With the
upcoming support of IPC v4, and hence the Intel closed-source
firmware, it's time to re-add this capability.

The SKL ops are left empty at this time since the driver cannot be
tested with the SOF firmware. The ops will be populated when the IPC4
is added during the next kernel cycles.

Tested with the IPC4 and closed-source firmware on Dell XPS 9350
and KBL NUC with HDaudio codecs. The SSP and DMIC interfaces are not
supported at this time.

Co-developed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: Péter Ujfalusi <peter.ujfalusi@linux.intel.com>
Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
---
 sound/soc/sof/intel/Kconfig          | 25 ++++++++
 sound/soc/sof/intel/Makefile         |  4 ++
 sound/soc/sof/intel/hda-ipc.c        |  8 +++
 sound/soc/sof/intel/hda-loader-skl.c |  7 +--
 sound/soc/sof/intel/hda.c            |  2 +
 sound/soc/sof/intel/hda.h            |  4 ++
 sound/soc/sof/intel/pci-skl.c        | 89 ++++++++++++++++++++++++++++
 sound/soc/sof/intel/skl.c            | 70 ++++++++++++++++++++++
 8 files changed, 204 insertions(+), 5 deletions(-)
 create mode 100644 sound/soc/sof/intel/pci-skl.c
 create mode 100644 sound/soc/sof/intel/skl.c

Comments

Mark Brown Sept. 20, 2022, 11:19 a.m. UTC | #1
On Mon, Sep 19, 2022 at 02:36:16PM +0200, Pierre-Louis Bossart wrote:
> In preparation of the IPCv4 IPC support, this patch adds
> support for SkyLake and KabyLake boot and descriptors
> used when probing the PCI driver.

This breaks an x86_64 allmodconfig build:

In file included from /build/stage/linux/sound/soc/sof/intel/hda-loader-skl.c:25:
/build/stage/linux/sound/soc/sof/intel/hda-loader-skl.c: In function ‘cl_dsp_init_skl’:
/build/stage/linux/sound/soc/sof/intel/hda-loader-skl.c:372:56: error: ‘HDA_DSP_ROM_STS_MASK’ undeclared (first use in this function)
  372 |                                             ((status & HDA_DSP_ROM_STS_MASK)
      |                                                        ^~~~~~~~~~~~~~~~~~~~
/build/stage/linux/sound/soc/sof/intel/../ops.h:551:21: note: in definition of macro ‘snd_sof_dsp_read_poll_timeout’
  551 |                 if (cond) { \
      |                     ^~~~
/build/stage/linux/sound/soc/sof/intel/hda-loader-skl.c:372:56: note: each undeclared identifier is reported only once for each function it appears in
  372 |                                             ((status & HDA_DSP_ROM_STS_MASK)
      |                                                        ^~~~~~~~~~~~~~~~~~~~
/build/stage/linux/sound/soc/sof/intel/../ops.h:551:21: note: in definition of macro ‘snd_sof_dsp_read_poll_timeout’
  551 |                 if (cond) { \
      |                     ^~~~
/build/stage/linux/sound/soc/sof/intel/hda-loader-skl.c:373:49: error: ‘HDA_DSP_ROM_INIT’ undeclared (first use in this function); did you mean ‘HDA_DSP_REG_HIPCT’?
  373 |                                              == HDA_DSP_ROM_INIT),
      |                                                 ^~~~~~~~~~~~~~~~
/build/stage/linux/sound/soc/sof/intel/../ops.h:551:21: note: in definition of macro ‘snd_sof_dsp_read_poll_timeout’
  551 |                 if (cond) { \
      |                     ^~~~
/build/stage/linux/sound/soc/sof/intel/hda-loader-skl.c: In function ‘hda_dsp_cl_boot_firmware_skl’:
/build/stage/linux/sound/soc/sof/intel/hda-loader-skl.c:553:53: error: ‘HDA_DSP_ROM_STS_MASK’ undeclared (first use in this function)
  553 |                                             ((reg & HDA_DSP_ROM_STS_MASK)
      |                                                     ^~~~~~~~~~~~~~~~~~~~
/build/stage/linux/sound/soc/sof/intel/../ops.h:551:21: note: in definition of macro ‘snd_sof_dsp_read_poll_timeout’
  551 |                 if (cond) { \
      |                     ^~~~
/build/stage/linux/sound/soc/sof/intel/hda-loader-skl.c:554:49: error: ‘HDA_DSP_ROM_RFW_START’ undeclared (first use in this function); did you mean ‘HDA_DSP_SRAM_REG_FW_STATUS’?
  554 |                                              == HDA_DSP_ROM_RFW_START),
      |                                                 ^~~~~~~~~~~~~~~~~~~~~
/build/stage/linux/sound/soc/sof/intel/../ops.h:551:21: note: in definition of macro ‘snd_sof_dsp_read_poll_timeout’
  551 |                 if (cond) { \
      |                     ^~~~
make[5]: *** [/build/stage/linux/scripts/Makefile.build:249: sound/soc/sof/intel/hda-loader-skl.o] Error 1
make[5]: Target '__build' not remade because of errors.
make[4]: *** [/build/stage/linux/scripts/Makefile.build:465: sound/soc/sof/intel] Error 2
make[4]: Target '__build' not remade because of errors.
make[3]: *** [/build/stage/linux/scripts/Makefile.build:465: sound/soc/sof] Error 2
make[3]: Target '__build' not remade because of errors.
make[2]: *** [/build/stage/linux/scripts/Makefile.build:465: sound/soc] Error 2
make[2]: Target '__build' not remade because of errors.
make[1]: *** [/build/stage/linux/Makefile:1852: sound] Error 2
make[1]: Target '__all' not remade because of errors.
make: *** [Makefile:222: __sub-make] Error 2
Takashi Iwai Sept. 20, 2022, 11:31 a.m. UTC | #2
On Tue, 20 Sep 2022 13:19:27 +0200,
Mark Brown wrote:
> 
> On Mon, Sep 19, 2022 at 02:36:16PM +0200, Pierre-Louis Bossart wrote:
> > In preparation of the IPCv4 IPC support, this patch adds
> > support for SkyLake and KabyLake boot and descriptors
> > used when probing the PCI driver.
> 
> This breaks an x86_64 allmodconfig build:
> 
> In file included from /build/stage/linux/sound/soc/sof/intel/hda-loader-skl.c:25:
> /build/stage/linux/sound/soc/sof/intel/hda-loader-skl.c: In function ‘cl_dsp_init_skl’:
> /build/stage/linux/sound/soc/sof/intel/hda-loader-skl.c:372:56: error: ‘HDA_DSP_ROM_STS_MASK’ undeclared (first use in this function)
>   372 |                                             ((status & HDA_DSP_ROM_STS_MASK)
>       |                                                        ^~~~~~~~~~~~~~~~~~~~

It seems that it's defined in my tree, so maybe I need to apply those
on mine.  Or you can merge the for-next branch of my tree as a
preliminary work.  Let me know your preference.


thanks,

Takashi
Pierre-Louis Bossart Sept. 20, 2022, 12:15 p.m. UTC | #3
On 9/20/22 13:31, Takashi Iwai wrote:
> On Tue, 20 Sep 2022 13:19:27 +0200,
> Mark Brown wrote:
>>
>> On Mon, Sep 19, 2022 at 02:36:16PM +0200, Pierre-Louis Bossart wrote:
>>> In preparation of the IPCv4 IPC support, this patch adds
>>> support for SkyLake and KabyLake boot and descriptors
>>> used when probing the PCI driver.
>>
>> This breaks an x86_64 allmodconfig build:
>>
>> In file included from /build/stage/linux/sound/soc/sof/intel/hda-loader-skl.c:25:
>> /build/stage/linux/sound/soc/sof/intel/hda-loader-skl.c: In function ‘cl_dsp_init_skl’:
>> /build/stage/linux/sound/soc/sof/intel/hda-loader-skl.c:372:56: error: ‘HDA_DSP_ROM_STS_MASK’ undeclared (first use in this function)
>>   372 |                                             ((status & HDA_DSP_ROM_STS_MASK)
>>       |                                                        ^~~~~~~~~~~~~~~~~~~~
> 
> It seems that it's defined in my tree, so maybe I need to apply those
> on mine.  Or you can merge the for-next branch of my tree as a
> preliminary work.  Let me know your preference.

Sorry about that, I am not sure what happened here, this constant has
been defined since 2019. Let me double-check.

184fdfca4ba63d (Keyon Jie             2019-07-22 09:13:51 -0500 254)
#define HDA_DSP_ROM_STS_MASK                       GENMASK(23, 0)
Pierre-Louis Bossart Sept. 20, 2022, 12:26 p.m. UTC | #4
On 9/20/22 14:15, Pierre-Louis Bossart wrote:
> 
> 
> On 9/20/22 13:31, Takashi Iwai wrote:
>> On Tue, 20 Sep 2022 13:19:27 +0200,
>> Mark Brown wrote:
>>>
>>> On Mon, Sep 19, 2022 at 02:36:16PM +0200, Pierre-Louis Bossart wrote:
>>>> In preparation of the IPCv4 IPC support, this patch adds
>>>> support for SkyLake and KabyLake boot and descriptors
>>>> used when probing the PCI driver.
>>>
>>> This breaks an x86_64 allmodconfig build:
>>>
>>> In file included from /build/stage/linux/sound/soc/sof/intel/hda-loader-skl.c:25:
>>> /build/stage/linux/sound/soc/sof/intel/hda-loader-skl.c: In function ‘cl_dsp_init_skl’:
>>> /build/stage/linux/sound/soc/sof/intel/hda-loader-skl.c:372:56: error: ‘HDA_DSP_ROM_STS_MASK’ undeclared (first use in this function)
>>>   372 |                                             ((status & HDA_DSP_ROM_STS_MASK)
>>>       |                                                        ^~~~~~~~~~~~~~~~~~~~
>>
>> It seems that it's defined in my tree, so maybe I need to apply those
>> on mine.  Or you can merge the for-next branch of my tree as a
>> preliminary work.  Let me know your preference.
> 
> Sorry about that, I am not sure what happened here, this constant has
> been defined since 2019. Let me double-check.
> 
> 184fdfca4ba63d (Keyon Jie             2019-07-22 09:13:51 -0500 254)
> #define HDA_DSP_ROM_STS_MASK                       GENMASK(23, 0)

My bad, this definition was removed in "ASoC: SOF: Intel: hda: Drop no
longer used ROM state definitions", and I mistakenly didn't squash the
patch from Peter that dealt with this change for SKL.

Will send a v2, sorry for the noise.
diff mbox series

Patch

diff --git a/sound/soc/sof/intel/Kconfig b/sound/soc/sof/intel/Kconfig
index 3f54678e810ba..7af495fb61256 100644
--- a/sound/soc/sof/intel/Kconfig
+++ b/sound/soc/sof/intel/Kconfig
@@ -95,6 +95,31 @@  config SND_SOC_SOF_MERRIFIELD
 	  Say Y if you have such a device.
 	  If unsure select "N".
 
+config SND_SOC_SOF_INTEL_SKL
+	tristate
+	select SND_SOC_SOF_HDA_COMMON
+	select SND_SOC_SOF_INTEL_IPC4
+
+config SND_SOC_SOF_SKYLAKE
+	tristate "SOF support for SkyLake"
+	default SND_SOC_SOF_PCI
+	select SND_SOC_SOF_INTEL_SKL
+	help
+	  This adds support for the Intel(R) platforms using the SkyLake processors.
+	  Say Y if you have such a device.
+	  If unsure select "N".
+	  This is intended only for developers and not a recommend option for distros.
+
+config SND_SOC_SOF_KABYLAKE
+	tristate "SOF support for KabyLake"
+	default SND_SOC_SOF_PCI
+	select SND_SOC_SOF_INTEL_SKL
+	help
+	  This adds support for the Intel(R) platforms using the KabyLake processors.
+	  Say Y if you have such a device.
+	  If unsure select "N".
+	  This is intended only for developers and not a recommend option for distros.
+
 config SND_SOC_SOF_INTEL_APL
 	tristate
 	select SND_SOC_SOF_HDA_COMMON
diff --git a/sound/soc/sof/intel/Makefile b/sound/soc/sof/intel/Makefile
index a079159bb2f02..8b8ea03617850 100644
--- a/sound/soc/sof/intel/Makefile
+++ b/sound/soc/sof/intel/Makefile
@@ -6,7 +6,9 @@  snd-sof-acpi-intel-bdw-objs := bdw.o
 snd-sof-intel-hda-common-objs := hda.o hda-loader.o hda-stream.o hda-trace.o \
 				 hda-dsp.o hda-ipc.o hda-ctrl.o hda-pcm.o \
 				 hda-dai.o hda-bus.o \
+				 skl.o hda-loader-skl.o \
 				 apl.o cnl.o tgl.o icl.o mtl.o hda-common-ops.o
+
 snd-sof-intel-hda-common-$(CONFIG_SND_SOC_SOF_HDA_PROBES) += hda-probes.o
 
 snd-sof-intel-hda-objs := hda-codec.o
@@ -20,6 +22,7 @@  obj-$(CONFIG_SND_SOC_SOF_HDA_COMMON) += snd-sof-intel-hda-common.o
 obj-$(CONFIG_SND_SOC_SOF_HDA) += snd-sof-intel-hda.o
 
 snd-sof-pci-intel-tng-objs := pci-tng.o
+snd-sof-pci-intel-skl-objs := pci-skl.o
 snd-sof-pci-intel-apl-objs := pci-apl.o
 snd-sof-pci-intel-cnl-objs := pci-cnl.o
 snd-sof-pci-intel-icl-objs := pci-icl.o
@@ -27,6 +30,7 @@  snd-sof-pci-intel-tgl-objs := pci-tgl.o
 snd-sof-pci-intel-mtl-objs := pci-mtl.o
 
 obj-$(CONFIG_SND_SOC_SOF_MERRIFIELD) += snd-sof-pci-intel-tng.o
+obj-$(CONFIG_SND_SOC_SOF_INTEL_SKL) += snd-sof-pci-intel-skl.o
 obj-$(CONFIG_SND_SOC_SOF_INTEL_APL) += snd-sof-pci-intel-apl.o
 obj-$(CONFIG_SND_SOC_SOF_INTEL_CNL) += snd-sof-pci-intel-cnl.o
 obj-$(CONFIG_SND_SOC_SOF_INTEL_ICL) += snd-sof-pci-intel-icl.o
diff --git a/sound/soc/sof/intel/hda-ipc.c b/sound/soc/sof/intel/hda-ipc.c
index c597ef491d383..9b3667c705e47 100644
--- a/sound/soc/sof/intel/hda-ipc.c
+++ b/sound/soc/sof/intel/hda-ipc.c
@@ -304,6 +304,7 @@  irqreturn_t hda_dsp_ipc_irq_thread(int irq, void *context)
 /* Check if an IPC IRQ occurred */
 bool hda_dsp_check_ipc_irq(struct snd_sof_dev *sdev)
 {
+	struct sof_intel_hda_dev *hda = sdev->pdata->hw_pdata;
 	bool ret = false;
 	u32 irq_status;
 
@@ -319,6 +320,13 @@  bool hda_dsp_check_ipc_irq(struct snd_sof_dev *sdev)
 	if (irq_status & HDA_DSP_ADSPIS_IPC)
 		ret = true;
 
+	/* CLDMA message ? */
+	if (irq_status & HDA_DSP_ADSPIS_CL_DMA) {
+		hda->code_loading = 0;
+		wake_up(&hda->waitq);
+		ret = false;
+	}
+
 out:
 	return ret;
 }
diff --git a/sound/soc/sof/intel/hda-loader-skl.c b/sound/soc/sof/intel/hda-loader-skl.c
index 02f3b43842058..002e04346a762 100644
--- a/sound/soc/sof/intel/hda-loader-skl.c
+++ b/sound/soc/sof/intel/hda-loader-skl.c
@@ -93,17 +93,14 @@ 
 
 /* Buffer Descriptor List Lower Base Address */
 #define HDA_CL_SD_BDLPLBA_SHIFT		7
-#define HDA_CL_SD_BDLPLBA_MASK		(0x1ffffff << HDA_CL_SD_BDLPLBA_SHIFT)
+#define HDA_CL_SD_BDLPLBA_MASK		GENMASK(31, 7)
 #define HDA_CL_SD_BDLPLBA(x)		\
 	((BDL_ALIGN(lower_32_bits(x)) << HDA_CL_SD_BDLPLBA_SHIFT) & \
 	 HDA_CL_SD_BDLPLBA_MASK)
 
 /* Buffer Descriptor List Upper Base Address */
-#define HDA_CL_SD_BDLPUBA_SHIFT		0
-#define HDA_CL_SD_BDLPUBA_MASK		(0xffffffff << HDA_CL_SD_BDLPUBA_SHIFT)
 #define HDA_CL_SD_BDLPUBA(x)		\
-		((upper_32_bits(x) << HDA_CL_SD_BDLPUBA_SHIFT) & \
-		 HDA_CL_SD_BDLPUBA_MASK)
+			(upper_32_bits(x))
 
 /* Software Position in Buffer Enable */
 #define HDA_CL_SPBFIFO_SPBFCCTL_SPIBE_SHIFT	0
diff --git a/sound/soc/sof/intel/hda.c b/sound/soc/sof/intel/hda.c
index eec54c8bb0e9a..f7068a7e2e818 100644
--- a/sound/soc/sof/intel/hda.c
+++ b/sound/soc/sof/intel/hda.c
@@ -1136,6 +1136,8 @@  int hda_dsp_probe(struct snd_sof_dev *sdev)
 
 	INIT_DELAYED_WORK(&hdev->d0i3_work, hda_dsp_d0i3_work);
 
+	init_waitqueue_head(&hdev->waitq);
+
 	hdev->nhlt = intel_nhlt_init(sdev->dev);
 
 	return 0;
diff --git a/sound/soc/sof/intel/hda.h b/sound/soc/sof/intel/hda.h
index 9ce44ef6fdd21..dedc5ef5fbacd 100644
--- a/sound/soc/sof/intel/hda.h
+++ b/sound/soc/sof/intel/hda.h
@@ -418,6 +418,7 @@ 
 #endif
 
 /* Intel HD Audio SRAM Window 0*/
+#define HDA_DSP_SRAM_REG_ROM_STATUS_SKL	0x8000
 #define HDA_ADSP_SRAM0_BASE_SKL		0x8000
 
 /* Firmware status window */
@@ -773,6 +774,8 @@  int hda_dsp_dais_suspend(struct snd_sof_dev *sdev);
  */
 extern struct snd_sof_dsp_ops sof_hda_common_ops;
 
+extern struct snd_sof_dsp_ops sof_skl_ops;
+int sof_skl_ops_init(struct snd_sof_dev *sdev);
 extern struct snd_sof_dsp_ops sof_apl_ops;
 int sof_apl_ops_init(struct snd_sof_dev *sdev);
 extern struct snd_sof_dsp_ops sof_cnl_ops;
@@ -784,6 +787,7 @@  int sof_icl_ops_init(struct snd_sof_dev *sdev);
 extern struct snd_sof_dsp_ops sof_mtl_ops;
 int sof_mtl_ops_init(struct snd_sof_dev *sdev);
 
+extern const struct sof_intel_dsp_desc skl_chip_info;
 extern const struct sof_intel_dsp_desc apl_chip_info;
 extern const struct sof_intel_dsp_desc cnl_chip_info;
 extern const struct sof_intel_dsp_desc icl_chip_info;
diff --git a/sound/soc/sof/intel/pci-skl.c b/sound/soc/sof/intel/pci-skl.c
new file mode 100644
index 0000000000000..2b803f8b32e99
--- /dev/null
+++ b/sound/soc/sof/intel/pci-skl.c
@@ -0,0 +1,89 @@ 
+// SPDX-License-Identifier: (GPL-2.0-only OR BSD-3-Clause)
+//
+// This file is provided under a dual BSD/GPLv2 license.  When using or
+// redistributing this file, you may do so under either license.
+//
+// Copyright(c) 2018-2022 Intel Corporation. All rights reserved.
+//
+
+#include <linux/module.h>
+#include <linux/pci.h>
+#include <sound/soc-acpi.h>
+#include <sound/soc-acpi-intel-match.h>
+#include <sound/sof.h>
+#include "../ops.h"
+#include "../sof-pci-dev.h"
+
+/* platform specific devices */
+#include "hda.h"
+
+static struct sof_dev_desc skl_desc = {
+	.machines		= snd_soc_acpi_intel_skl_machines,
+	.resindex_lpe_base	= 0,
+	.resindex_pcicfg_base	= -1,
+	.resindex_imr_base	= -1,
+	.chip_info = &skl_chip_info,
+	.irqindex_host_ipc	= -1,
+	.ipc_supported_mask	= BIT(SOF_INTEL_IPC4),
+	.ipc_default		= SOF_INTEL_IPC4,
+	.default_fw_path = {
+		[SOF_INTEL_IPC4] = "intel/avs/skl",
+	},
+	.default_tplg_path = {
+		[SOF_INTEL_IPC4] = "intel/avs-tplg",
+	},
+	.default_fw_filename = {
+		[SOF_INTEL_IPC4] = "dsp_basefw.bin",
+	},
+	.nocodec_tplg_filename = "sof-skl-nocodec.tplg",
+	.ops = &sof_skl_ops,
+};
+
+static struct sof_dev_desc kbl_desc = {
+	.machines		= snd_soc_acpi_intel_kbl_machines,
+	.resindex_lpe_base	= 0,
+	.resindex_pcicfg_base	= -1,
+	.resindex_imr_base	= -1,
+	.chip_info = &skl_chip_info,
+	.irqindex_host_ipc	= -1,
+	.ipc_supported_mask	= BIT(SOF_INTEL_IPC4),
+	.ipc_default		= SOF_INTEL_IPC4,
+	.default_fw_path = {
+		[SOF_INTEL_IPC4] = "intel/avs/kbl",
+	},
+	.default_tplg_path = {
+		[SOF_INTEL_IPC4] = "intel/avs-tplg",
+	},
+	.default_fw_filename = {
+		[SOF_INTEL_IPC4] = "dsp_basefw.bin",
+	},
+	.nocodec_tplg_filename = "sof-kbl-nocodec.tplg",
+	.ops = &sof_skl_ops,
+};
+
+/* PCI IDs */
+static const struct pci_device_id sof_pci_ids[] = {
+	/* Sunrise Point-LP */
+	{ PCI_DEVICE(0x8086, 0x9d70), .driver_data = (unsigned long)&skl_desc},
+	/* KBL */
+	{ PCI_DEVICE(0x8086, 0x9d71), .driver_data = (unsigned long)&kbl_desc},
+	{ 0, }
+};
+MODULE_DEVICE_TABLE(pci, sof_pci_ids);
+
+/* pci_driver definition */
+static struct pci_driver snd_sof_pci_intel_skl_driver = {
+	.name = "sof-audio-pci-intel-skl",
+	.id_table = sof_pci_ids,
+	.probe = hda_pci_intel_probe,
+	.remove = sof_pci_remove,
+	.shutdown = sof_pci_shutdown,
+	.driver = {
+		.pm = &sof_pci_pm,
+	},
+};
+module_pci_driver(snd_sof_pci_intel_skl_driver);
+
+MODULE_LICENSE("Dual BSD/GPL");
+MODULE_IMPORT_NS(SND_SOC_SOF_INTEL_HDA_COMMON);
+MODULE_IMPORT_NS(SND_SOC_SOF_PCI_DEV);
diff --git a/sound/soc/sof/intel/skl.c b/sound/soc/sof/intel/skl.c
new file mode 100644
index 0000000000000..446a7afddfdbe
--- /dev/null
+++ b/sound/soc/sof/intel/skl.c
@@ -0,0 +1,70 @@ 
+// SPDX-License-Identifier: (GPL-2.0-only OR BSD-3-Clause)
+//
+// This file is provided under a dual BSD/GPLv2 license.  When using or
+// redistributing this file, you may do so under either license.
+//
+// Copyright(c) 2018-2022 Intel Corporation. All rights reserved.
+//
+
+/*
+ * Hardware interface for audio DSP on Skylake and Kabylake.
+ */
+
+#include <linux/delay.h>
+#include <linux/device.h>
+#include <linux/dma-mapping.h>
+#include <linux/firmware.h>
+#include <linux/fs.h>
+#include <linux/interrupt.h>
+#include <linux/module.h>
+#include <linux/slab.h>
+#include <linux/pci.h>
+#include <linux/pm_runtime.h>
+#include <sound/hdaudio_ext.h>
+#include <sound/pcm_params.h>
+#include <sound/sof.h>
+
+#include "../sof-priv.h"
+#include "../ops.h"
+#include "hda.h"
+#include "../sof-audio.h"
+
+#define SRAM_MEMORY_WINDOW_BASE 0x8000
+
+static const __maybe_unused struct snd_sof_debugfs_map skl_dsp_debugfs[] = {
+	{"hda", HDA_DSP_HDA_BAR, 0, 0x4000},
+	{"pp", HDA_DSP_PP_BAR,  0, 0x1000},
+	{"dsp", HDA_DSP_BAR,  0, 0x10000},
+};
+
+static int __maybe_unused skl_dsp_ipc_get_window_offset(struct snd_sof_dev *sdev, u32 id)
+{
+	return SRAM_MEMORY_WINDOW_BASE + (0x2000 * id);
+}
+
+/* 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
+	 */
+};
+EXPORT_SYMBOL(sof_skl_ops);
+
+const struct sof_intel_dsp_desc skl_chip_info = {
+	.cores_num = 2,
+	.init_core_mask = 1,
+	.host_managed_cores_mask = GENMASK(1, 0),
+	.ipc_req = HDA_DSP_REG_HIPCI,
+	.ipc_req_mask = HDA_DSP_REG_HIPCI_BUSY,
+	.ipc_ack = HDA_DSP_REG_HIPCIE,
+	.ipc_ack_mask = HDA_DSP_REG_HIPCIE_DONE,
+	.ipc_ctl = HDA_DSP_REG_HIPCCTL,
+	.rom_status_reg = HDA_DSP_SRAM_REG_ROM_STATUS_SKL,
+	.rom_init_timeout	= 300,
+	.check_ipc_irq	= hda_dsp_check_ipc_irq,
+	.hw_ip_version = SOF_INTEL_CAVS_1_5,
+};
+EXPORT_SYMBOL_NS(skl_chip_info, SND_SOC_SOF_INTEL_HDA_COMMON);