ASoC: SOF: Intel: Add support for MeteorLake (MTL)
authorBard Liao <yung-chuan.liao@linux.intel.com>
Wed, 15 Jun 2022 08:43:48 +0000 (16:43 +0800)
committerMark Brown <broonie@kernel.org>
Wed, 15 Jun 2022 08:56:57 +0000 (09:56 +0100)
Add platform abstraction for the Meteor Lake platform.

This platform has significant differences compared to the TGL/ADL
generation: it relies on new hardware using the code name 'ACE' and
only supports the INTEL_IPC4 protocol and firmware architecture based
on the Zephyr RTOS

Co-developed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Reviewed-by: Péter Ujfalusi <peter.ujfalusi@linux.intel.com>
Reviewed-by: Rander Wang <rander.wang@intel.com>
Link: https://lore.kernel.org/r/20220615084348.3489-3-yung-chuan.liao@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
include/linux/soundwire/sdw_intel.h
sound/soc/sof/intel/Kconfig
sound/soc/sof/intel/Makefile
sound/soc/sof/intel/hda.h
sound/soc/sof/intel/mtl.c [new file with mode: 0644]
sound/soc/sof/intel/mtl.h [new file with mode: 0644]
sound/soc/sof/intel/pci-mtl.c [new file with mode: 0644]
sound/soc/sof/intel/shim.h

index 67e0d3e750b5c90884c3e03cd63be024fab50a3c..b5b489ea1aefea2f0e3bbae260fcaed7b2f1577d 100644 (file)
@@ -9,6 +9,8 @@
 
 #define SDW_SHIM_BASE                  0x2C000
 #define SDW_ALH_BASE                   0x2C800
+#define SDW_SHIM_BASE_ACE              0x38000
+#define SDW_ALH_BASE_ACE               0x24000
 #define SDW_LINK_BASE                  0x30000
 #define SDW_LINK_SIZE                  0x10000
 
index 80cdc3788bbed608073cd64f5eebdd9670aeaf53..3f54678e810baacfdaf8a9ee054b4eb0c7b1406e 100644 (file)
@@ -221,6 +221,22 @@ config SND_SOC_SOF_ALDERLAKE
          Say Y if you have such a device.
          If unsure select "N".
 
+config SND_SOC_SOF_INTEL_MTL
+       tristate
+       select SND_SOC_SOF_HDA_COMMON
+       select SND_SOC_SOF_INTEL_SOUNDWIRE_LINK_BASELINE
+       select SND_SOC_SOF_INTEL_IPC4
+
+config SND_SOC_SOF_METEORLAKE
+       tristate "SOF support for Meteorlake"
+       default SND_SOC_SOF_PCI
+       select SND_SOC_SOF_INTEL_MTL
+       help
+         This adds support for Sound Open Firmware for Intel(R) platforms
+         using the Meteorlake processors.
+         Say Y if you have such a device.
+         If unsure select "N".
+
 config SND_SOC_SOF_HDA_COMMON
        tristate
        select SND_SOC_SOF_INTEL_COMMON
index b9d51dc39ffa6a3c415d20f850613a246e0e3f81..a079159bb2f024e3c58184f8ee6cf0552caa16a9 100644 (file)
@@ -6,7 +6,7 @@ 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 \
-                                apl.o cnl.o tgl.o icl.o hda-common-ops.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
@@ -24,9 +24,11 @@ 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
 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_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
 obj-$(CONFIG_SND_SOC_SOF_INTEL_TGL) += snd-sof-pci-intel-tgl.o
+obj-$(CONFIG_SND_SOC_SOF_INTEL_MTL) += snd-sof-pci-intel-mtl.o
index 8b7f3c07d4785a562da94086ac1e9beede52a51a..a3118499e34fc741d1ce700a8a94f5b3756ae125 100644 (file)
@@ -714,6 +714,8 @@ extern struct snd_sof_dsp_ops sof_tgl_ops;
 int sof_tgl_ops_init(struct snd_sof_dev *sdev);
 extern struct snd_sof_dsp_ops sof_icl_ops;
 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 apl_chip_info;
 extern const struct sof_intel_dsp_desc cnl_chip_info;
@@ -723,6 +725,7 @@ extern const struct sof_intel_dsp_desc tglh_chip_info;
 extern const struct sof_intel_dsp_desc ehl_chip_info;
 extern const struct sof_intel_dsp_desc jsl_chip_info;
 extern const struct sof_intel_dsp_desc adls_chip_info;
+extern const struct sof_intel_dsp_desc mtl_chip_info;
 
 /* Probes support */
 #if IS_ENABLED(CONFIG_SND_SOC_SOF_HDA_PROBES)
diff --git a/sound/soc/sof/intel/mtl.c b/sound/soc/sof/intel/mtl.c
new file mode 100644 (file)
index 0000000..37be77b
--- /dev/null
@@ -0,0 +1,800 @@
+// SPDX-License-Identifier: (GPL-2.0-only OR BSD-3-Clause)
+//
+// Copyright(c) 2022 Intel Corporation. All rights reserved.
+//
+// Authors: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
+//
+
+/*
+ * Hardware interface for audio DSP on Meteorlake.
+ */
+
+#include <linux/firmware.h>
+#include <sound/sof/ipc4/header.h>
+#include "../ipc4-priv.h"
+#include "../ops.h"
+#include "hda.h"
+#include "hda-ipc.h"
+#include "../sof-audio.h"
+#include "mtl.h"
+
+static const struct snd_sof_debugfs_map mtl_dsp_debugfs[] = {
+       {"hda", HDA_DSP_HDA_BAR, 0, 0x4000, SOF_DEBUGFS_ACCESS_ALWAYS},
+       {"pp", HDA_DSP_PP_BAR,  0, 0x1000, SOF_DEBUGFS_ACCESS_ALWAYS},
+       {"dsp", HDA_DSP_BAR,  0, 0x10000, SOF_DEBUGFS_ACCESS_ALWAYS},
+};
+
+static void mtl_ipc_host_done(struct snd_sof_dev *sdev)
+{
+       /*
+        * clear busy interrupt to tell dsp controller this interrupt has been accepted,
+        * not trigger it again
+        */
+       snd_sof_dsp_update_bits_forced(sdev, HDA_DSP_BAR, MTL_DSP_REG_HFIPCXTDR,
+                                      MTL_DSP_REG_HFIPCXTDR_BUSY, MTL_DSP_REG_HFIPCXTDR_BUSY);
+       /*
+        * clear busy bit to ack dsp the msg has been processed and send reply msg to dsp
+        */
+       snd_sof_dsp_update_bits_forced(sdev, HDA_DSP_BAR, MTL_DSP_REG_HFIPCXTDA,
+                                      MTL_DSP_REG_HFIPCXTDA_BUSY, 0);
+}
+
+static void mtl_ipc_dsp_done(struct snd_sof_dev *sdev)
+{
+       /*
+        * set DONE bit - tell DSP we have received the reply msg from DSP, and processed it,
+        * don't send more reply to host
+        */
+       snd_sof_dsp_update_bits_forced(sdev, HDA_DSP_BAR, MTL_DSP_REG_HFIPCXIDA,
+                                      MTL_DSP_REG_HFIPCXIDA_DONE, MTL_DSP_REG_HFIPCXIDA_DONE);
+
+       /* unmask Done interrupt */
+       snd_sof_dsp_update_bits(sdev, HDA_DSP_BAR, MTL_DSP_REG_HFIPCXCTL,
+                               MTL_DSP_REG_HFIPCXCTL_DONE, MTL_DSP_REG_HFIPCXCTL_DONE);
+}
+
+/* Check if an IPC IRQ occurred */
+static bool mtl_dsp_check_ipc_irq(struct snd_sof_dev *sdev)
+{
+       u32 irq_status;
+       u32 hfintipptr;
+
+       /* read Interrupt IP Pointer */
+       hfintipptr = snd_sof_dsp_read(sdev, HDA_DSP_BAR, MTL_HFINTIPPTR) & MTL_HFINTIPPTR_PTR_MASK;
+       irq_status = snd_sof_dsp_read(sdev, HDA_DSP_BAR, hfintipptr + MTL_DSP_IRQSTS);
+
+       dev_vdbg(sdev->dev, "irq handler: irq_status:0x%x\n", irq_status);
+
+       if (irq_status != U32_MAX && (irq_status & MTL_DSP_IRQSTS_IPC))
+               return true;
+
+       return false;
+}
+
+/* Check if an SDW IRQ occurred */
+static bool mtl_dsp_check_sdw_irq(struct snd_sof_dev *sdev)
+{
+       u32 irq_status;
+       u32 hfintipptr;
+
+       /* read Interrupt IP Pointer */
+       hfintipptr = snd_sof_dsp_read(sdev, HDA_DSP_BAR, MTL_HFINTIPPTR) & MTL_HFINTIPPTR_PTR_MASK;
+       irq_status = snd_sof_dsp_read(sdev, HDA_DSP_BAR, hfintipptr + MTL_DSP_IRQSTS);
+
+       if (irq_status != U32_MAX && (irq_status & MTL_DSP_IRQSTS_SDW))
+               return true;
+
+       return false;
+}
+
+static int mtl_ipc_send_msg(struct snd_sof_dev *sdev, struct snd_sof_ipc_msg *msg)
+{
+       struct sof_ipc4_msg *msg_data = msg->msg_data;
+
+       /* send the message via mailbox */
+       if (msg_data->data_size)
+               sof_mailbox_write(sdev, sdev->host_box.offset, msg_data->data_ptr,
+                                 msg_data->data_size);
+
+       snd_sof_dsp_write(sdev, HDA_DSP_BAR, MTL_DSP_REG_HFIPCXIDDY,
+                         msg_data->extension);
+       snd_sof_dsp_write(sdev, HDA_DSP_BAR, MTL_DSP_REG_HFIPCXIDR,
+                         msg_data->primary | MTL_DSP_REG_HFIPCXIDR_BUSY);
+
+       return 0;
+}
+
+static void mtl_enable_ipc_interrupts(struct snd_sof_dev *sdev)
+{
+       struct sof_intel_hda_dev *hda = sdev->pdata->hw_pdata;
+       const struct sof_intel_dsp_desc *chip = hda->desc;
+
+       /* enable IPC DONE and BUSY interrupts */
+       snd_sof_dsp_update_bits(sdev, HDA_DSP_BAR, chip->ipc_ctl,
+                               MTL_DSP_REG_HFIPCXCTL_BUSY | MTL_DSP_REG_HFIPCXCTL_DONE,
+                               MTL_DSP_REG_HFIPCXCTL_BUSY | MTL_DSP_REG_HFIPCXCTL_DONE);
+}
+
+static void mtl_disable_ipc_interrupts(struct snd_sof_dev *sdev)
+{
+       struct sof_intel_hda_dev *hda = sdev->pdata->hw_pdata;
+       const struct sof_intel_dsp_desc *chip = hda->desc;
+
+       /* disable IPC DONE and BUSY interrupts */
+       snd_sof_dsp_update_bits(sdev, HDA_DSP_BAR, chip->ipc_ctl,
+                               MTL_DSP_REG_HFIPCXCTL_BUSY | MTL_DSP_REG_HFIPCXCTL_DONE, 0);
+}
+
+static int mtl_enable_interrupts(struct snd_sof_dev *sdev)
+{
+       u32 hfintipptr;
+       u32 irqinten;
+       u32 host_ipc;
+       u32 hipcie;
+       int ret;
+
+       /* read Interrupt IP Pointer */
+       hfintipptr = snd_sof_dsp_read(sdev, HDA_DSP_BAR, MTL_HFINTIPPTR) & MTL_HFINTIPPTR_PTR_MASK;
+
+       /* Enable Host IPC and SOUNDWIRE */
+       snd_sof_dsp_update_bits(sdev, HDA_DSP_BAR, hfintipptr,
+                               MTL_IRQ_INTEN_L_HOST_IPC_MASK | MTL_IRQ_INTEN_L_SOUNDWIRE_MASK,
+                               MTL_IRQ_INTEN_L_HOST_IPC_MASK | MTL_IRQ_INTEN_L_SOUNDWIRE_MASK);
+
+       /* check if operation was successful */
+       host_ipc = MTL_IRQ_INTEN_L_HOST_IPC_MASK | MTL_IRQ_INTEN_L_SOUNDWIRE_MASK;
+       irqinten = snd_sof_dsp_read(sdev, HDA_DSP_BAR, hfintipptr);
+       ret = snd_sof_dsp_read_poll_timeout(sdev, HDA_DSP_BAR, hfintipptr, irqinten,
+                                           (irqinten & host_ipc) == host_ipc,
+                                           HDA_DSP_REG_POLL_INTERVAL_US, HDA_DSP_RESET_TIMEOUT_US);
+       if (ret < 0) {
+               dev_err(sdev->dev, "failed to enable Host IPC and/or SOUNDWIRE\n");
+               return ret;
+       }
+
+       /* Set Host IPC interrupt enable */
+       snd_sof_dsp_update_bits(sdev, HDA_DSP_BAR, MTL_DSP_REG_HfHIPCIE,
+                               MTL_DSP_REG_HfHIPCIE_IE_MASK, MTL_DSP_REG_HfHIPCIE_IE_MASK);
+
+       /* check if operation was successful */
+       host_ipc = MTL_DSP_REG_HfHIPCIE_IE_MASK;
+       hipcie = snd_sof_dsp_read(sdev, HDA_DSP_BAR, MTL_DSP_REG_HfHIPCIE);
+       ret = snd_sof_dsp_read_poll_timeout(sdev, HDA_DSP_BAR, MTL_DSP_REG_HfHIPCIE, hipcie,
+                                           (hipcie & host_ipc) == host_ipc,
+                                           HDA_DSP_REG_POLL_INTERVAL_US, HDA_DSP_RESET_TIMEOUT_US);
+       if (ret < 0) {
+               dev_err(sdev->dev, "failed to set Host IPC interrupt enable\n");
+               return ret;
+       }
+
+       snd_sof_dsp_update_bits(sdev, HDA_DSP_BAR, MTL_DSP_REG_HfSNDWIE,
+                               MTL_DSP_REG_HfSNDWIE_IE_MASK, MTL_DSP_REG_HfSNDWIE_IE_MASK);
+       host_ipc = MTL_DSP_REG_HfSNDWIE_IE_MASK;
+       hipcie = snd_sof_dsp_read(sdev, HDA_DSP_BAR, MTL_DSP_REG_HfSNDWIE);
+       ret = snd_sof_dsp_read_poll_timeout(sdev, HDA_DSP_BAR, MTL_DSP_REG_HfSNDWIE, hipcie,
+                                           (hipcie & host_ipc) == host_ipc,
+                                           HDA_DSP_REG_POLL_INTERVAL_US, HDA_DSP_RESET_TIMEOUT_US);
+       if (ret < 0)
+               dev_err(sdev->dev, "failed to set SoundWire IPC interrupt enable\n");
+
+       return ret;
+}
+
+static int mtl_disable_interrupts(struct snd_sof_dev *sdev)
+{
+       u32 hfintipptr;
+       u32 irqinten;
+       u32 host_ipc;
+       u32 hipcie;
+       int ret1;
+       int ret;
+
+       /* read Interrupt IP Pointer */
+       hfintipptr = snd_sof_dsp_read(sdev, HDA_DSP_BAR, MTL_HFINTIPPTR) & MTL_HFINTIPPTR_PTR_MASK;
+
+       /* Disable Host IPC and SOUNDWIRE */
+       snd_sof_dsp_update_bits(sdev, HDA_DSP_BAR, hfintipptr,
+                               MTL_IRQ_INTEN_L_HOST_IPC_MASK | MTL_IRQ_INTEN_L_SOUNDWIRE_MASK, 0);
+
+       /* check if operation was successful */
+       host_ipc = MTL_IRQ_INTEN_L_HOST_IPC_MASK | MTL_IRQ_INTEN_L_SOUNDWIRE_MASK;
+       irqinten = snd_sof_dsp_read(sdev, HDA_DSP_BAR, hfintipptr);
+       ret = snd_sof_dsp_read_poll_timeout(sdev, HDA_DSP_BAR, hfintipptr, irqinten,
+                                           (irqinten & host_ipc) == 0,
+                                           HDA_DSP_REG_POLL_INTERVAL_US, HDA_DSP_RESET_TIMEOUT_US);
+       /* Continue to disable other interrupts when error happens */
+       if (ret < 0)
+               dev_err(sdev->dev, "failed to disable Host IPC and SoundWire\n");
+
+       /* Set Host IPC interrupt disable */
+       snd_sof_dsp_update_bits(sdev, HDA_DSP_BAR, MTL_DSP_REG_HfHIPCIE,
+                               MTL_DSP_REG_HfHIPCIE_IE_MASK, 0);
+
+       /* check if operation was successful */
+       host_ipc = MTL_DSP_REG_HfHIPCIE_IE_MASK;
+       hipcie = snd_sof_dsp_read(sdev, HDA_DSP_BAR, MTL_DSP_REG_HfHIPCIE);
+       ret1 = snd_sof_dsp_read_poll_timeout(sdev, HDA_DSP_BAR, MTL_DSP_REG_HfHIPCIE, hipcie,
+                                            (hipcie & host_ipc) == 0,
+                                            HDA_DSP_REG_POLL_INTERVAL_US,
+                                            HDA_DSP_RESET_TIMEOUT_US);
+       if (ret1 < 0) {
+               dev_err(sdev->dev, "failed to set Host IPC interrupt disable\n");
+               if (!ret)
+                       ret = ret1;
+       }
+
+       /* Set SoundWire IPC interrupt disable */
+       snd_sof_dsp_update_bits(sdev, HDA_DSP_BAR, MTL_DSP_REG_HfSNDWIE,
+                               MTL_DSP_REG_HfSNDWIE_IE_MASK, 0);
+       host_ipc = MTL_DSP_REG_HfSNDWIE_IE_MASK;
+       hipcie = snd_sof_dsp_read(sdev, HDA_DSP_BAR, MTL_DSP_REG_HfSNDWIE);
+       ret1 = snd_sof_dsp_read_poll_timeout(sdev, HDA_DSP_BAR, MTL_DSP_REG_HfSNDWIE, hipcie,
+                                            (hipcie & host_ipc) == 0,
+                                            HDA_DSP_REG_POLL_INTERVAL_US,
+                                            HDA_DSP_RESET_TIMEOUT_US);
+       if (ret1 < 0) {
+               dev_err(sdev->dev, "failed to set SoundWire IPC interrupt disable\n");
+               if (!ret)
+                       ret = ret1;
+       }
+
+       return ret;
+}
+
+/* pre fw run operations */
+static int mtl_dsp_pre_fw_run(struct snd_sof_dev *sdev)
+{
+       u32 dsphfpwrsts;
+       u32 dsphfdsscs;
+       u32 cpa;
+       u32 pgs;
+       int ret;
+
+       /* Set the DSP subsystem power on */
+       snd_sof_dsp_update_bits(sdev, HDA_DSP_BAR, MTL_HFDSSCS,
+                               MTL_HFDSSCS_SPA_MASK, MTL_HFDSSCS_SPA_MASK);
+
+       /* Wait for unstable CPA read (1 then 0 then 1) just after setting SPA bit */
+       usleep_range(1000, 1010);
+
+       /* poll with timeout to check if operation successful */
+       cpa = MTL_HFDSSCS_CPA_MASK;
+       dsphfdsscs = snd_sof_dsp_read(sdev, HDA_DSP_BAR, MTL_HFDSSCS);
+       ret = snd_sof_dsp_read_poll_timeout(sdev, HDA_DSP_BAR, MTL_HFDSSCS, dsphfdsscs,
+                                           (dsphfdsscs & cpa) == cpa, HDA_DSP_REG_POLL_INTERVAL_US,
+                                           HDA_DSP_RESET_TIMEOUT_US);
+       if (ret < 0) {
+               dev_err(sdev->dev, "failed to enable DSP subsystem\n");
+               return ret;
+       }
+
+       /* Power up gated-DSP-0 domain in order to access the DSP shim register block. */
+       snd_sof_dsp_update_bits(sdev, HDA_DSP_BAR, MTL_HFPWRCTL,
+                               MTL_HFPWRCTL_WPDSPHPXPG, MTL_HFPWRCTL_WPDSPHPXPG);
+
+       usleep_range(1000, 1010);
+
+       /* poll with timeout to check if operation successful */
+       pgs = MTL_HFPWRSTS_DSPHPXPGS_MASK;
+       dsphfpwrsts = snd_sof_dsp_read(sdev, HDA_DSP_BAR, MTL_HFPWRSTS);
+       ret = snd_sof_dsp_read_poll_timeout(sdev, HDA_DSP_BAR, MTL_HFPWRSTS, dsphfpwrsts,
+                                           (dsphfpwrsts & pgs) == pgs,
+                                           HDA_DSP_REG_POLL_INTERVAL_US,
+                                           HDA_DSP_RESET_TIMEOUT_US);
+       if (ret < 0)
+               dev_err(sdev->dev, "failed to power up gated DSP domain\n");
+
+       /* make sure SoundWire is not power-gated */
+       snd_sof_dsp_update_bits(sdev, HDA_DSP_HDA_BAR, MTL_HFPWRCTL,
+                               MTL_HfPWRCTL_WPIOXPG(1), MTL_HfPWRCTL_WPIOXPG(1));
+       return ret;
+}
+
+static int mtl_dsp_post_fw_run(struct snd_sof_dev *sdev)
+{
+       int ret;
+
+       if (sdev->first_boot) {
+               struct sof_intel_hda_dev *hdev = sdev->pdata->hw_pdata;
+
+               ret = hda_sdw_startup(sdev);
+               if (ret < 0) {
+                       dev_err(sdev->dev, "could not startup SoundWire links\n");
+                       return ret;
+               }
+
+               /* Check if IMR boot is usable */
+               if (!sof_debug_check_flag(SOF_DBG_IGNORE_D3_PERSISTENT))
+                       hdev->imrboot_supported = true;
+       }
+
+       hda_sdw_int_enable(sdev, true);
+       return 0;
+}
+
+static void mtl_dsp_dump(struct snd_sof_dev *sdev, u32 flags)
+{
+       char *level = (flags & SOF_DBG_DUMP_OPTIONAL) ? KERN_DEBUG : KERN_ERR;
+       u32 romdbgsts;
+       u32 romdbgerr;
+       u32 fwsts;
+       u32 fwlec;
+
+       fwsts = snd_sof_dsp_read(sdev, HDA_DSP_BAR, MTL_DSP_ROM_STS);
+       fwlec = snd_sof_dsp_read(sdev, HDA_DSP_BAR, MTL_DSP_ROM_ERROR);
+       romdbgsts = snd_sof_dsp_read(sdev, HDA_DSP_BAR, MTL_DSP_REG_HFFLGPXQWY);
+       romdbgerr = snd_sof_dsp_read(sdev, HDA_DSP_BAR, MTL_DSP_REG_HFFLGPXQWY_ERROR);
+
+       dev_err(sdev->dev, "ROM status: %#x, ROM error: %#x\n", fwsts, fwlec);
+       dev_err(sdev->dev, "ROM debug status: %#x, ROM debug error: %#x\n", romdbgsts,
+               romdbgerr);
+       romdbgsts = snd_sof_dsp_read(sdev, HDA_DSP_BAR, MTL_DSP_REG_HFFLGPXQWY + 0x8 * 3);
+       dev_printk(level, sdev->dev, "ROM feature bit%s enabled\n",
+                  romdbgsts & BIT(24) ? "" : " not");
+}
+
+static bool mtl_dsp_primary_core_is_enabled(struct snd_sof_dev *sdev)
+{
+       int val;
+
+       val = snd_sof_dsp_read(sdev, HDA_DSP_BAR, MTL_DSP2CXCTL_PRIMARY_CORE);
+       if (val != U32_MAX && val & MTL_DSP2CXCTL_PRIMARY_CORE_CPA_MASK)
+               return true;
+
+       return false;
+}
+
+static int mtl_dsp_core_power_up(struct snd_sof_dev *sdev, int core)
+{
+       unsigned int cpa;
+       u32 dspcxctl;
+       int ret;
+
+       /* Only the primary core can be powered up by the host */
+       if (core != SOF_DSP_PRIMARY_CORE || mtl_dsp_primary_core_is_enabled(sdev))
+               return 0;
+
+       /* Program the owner of the IP & shim registers (10: Host CPU) */
+       snd_sof_dsp_update_bits(sdev, HDA_DSP_BAR, MTL_DSP2CXCTL_PRIMARY_CORE,
+                               MTL_DSP2CXCTL_PRIMARY_CORE_OSEL,
+                               0x2 << MTL_DSP2CXCTL_PRIMARY_CORE_OSEL_SHIFT);
+
+       /* enable SPA bit */
+       snd_sof_dsp_update_bits(sdev, HDA_DSP_BAR, MTL_DSP2CXCTL_PRIMARY_CORE,
+                               MTL_DSP2CXCTL_PRIMARY_CORE_SPA_MASK,
+                               MTL_DSP2CXCTL_PRIMARY_CORE_SPA_MASK);
+
+       /* Wait for unstable CPA read (1 then 0 then 1) just after setting SPA bit */
+       usleep_range(1000, 1010);
+
+       /* poll with timeout to check if operation successful */
+       cpa = MTL_DSP2CXCTL_PRIMARY_CORE_CPA_MASK;
+       ret = snd_sof_dsp_read_poll_timeout(sdev, HDA_DSP_BAR, MTL_DSP2CXCTL_PRIMARY_CORE, dspcxctl,
+                                           (dspcxctl & cpa) == cpa, HDA_DSP_REG_POLL_INTERVAL_US,
+                                           HDA_DSP_RESET_TIMEOUT_US);
+       if (ret < 0) {
+               dev_err(sdev->dev, "%s: timeout on MTL_DSP2CXCTL_PRIMARY_CORE read\n",
+                       __func__);
+               return ret;
+       }
+
+       /* did core power up ? */
+       dspcxctl = snd_sof_dsp_read(sdev, HDA_DSP_BAR, MTL_DSP2CXCTL_PRIMARY_CORE);
+       if ((dspcxctl & MTL_DSP2CXCTL_PRIMARY_CORE_CPA_MASK)
+               != MTL_DSP2CXCTL_PRIMARY_CORE_CPA_MASK) {
+               dev_err(sdev->dev, "power up core failed core %d adspcs %#x\n",
+                       core, dspcxctl);
+               ret = -EIO;
+       }
+
+       return ret;
+}
+
+static int mtl_dsp_core_power_down(struct snd_sof_dev *sdev, int core)
+{
+       u32 dspcxctl;
+       int ret;
+
+       /* Only the primary core can be powered down by the host */
+       if (core != SOF_DSP_PRIMARY_CORE || !mtl_dsp_primary_core_is_enabled(sdev))
+               return 0;
+
+       /* disable SPA bit */
+       snd_sof_dsp_update_bits(sdev, HDA_DSP_BAR, MTL_DSP2CXCTL_PRIMARY_CORE,
+                               MTL_DSP2CXCTL_PRIMARY_CORE_SPA_MASK, 0);
+
+       /* Wait for unstable CPA read (1 then 0 then 1) just after setting SPA bit */
+       usleep_range(1000, 1010);
+
+       ret = snd_sof_dsp_read_poll_timeout(sdev, HDA_DSP_BAR, MTL_DSP2CXCTL_PRIMARY_CORE, dspcxctl,
+                                           !(dspcxctl & MTL_DSP2CXCTL_PRIMARY_CORE_CPA_MASK),
+                                           HDA_DSP_REG_POLL_INTERVAL_US,
+                                           HDA_DSP_PD_TIMEOUT * USEC_PER_MSEC);
+       if (ret < 0)
+               dev_err(sdev->dev, "failed to power down primary core\n");
+
+       return ret;
+}
+
+static int mtl_dsp_cl_init(struct snd_sof_dev *sdev, int stream_tag, bool imr_boot)
+{
+       struct sof_intel_hda_dev *hda = sdev->pdata->hw_pdata;
+       const struct sof_intel_dsp_desc *chip = hda->desc;
+       unsigned int status;
+       u32 ipc_hdr;
+       int ret;
+
+       /* step 1: purge FW request */
+       ipc_hdr = chip->ipc_req_mask | HDA_DSP_ROM_IPC_CONTROL;
+       if (!imr_boot)
+               ipc_hdr |= HDA_DSP_ROM_IPC_PURGE_FW | ((stream_tag - 1) << 9);
+
+       snd_sof_dsp_write(sdev, HDA_DSP_BAR, chip->ipc_req, ipc_hdr);
+
+       /* step 2: power up primary core */
+       ret = mtl_dsp_core_power_up(sdev, SOF_DSP_PRIMARY_CORE);
+       if (ret < 0) {
+               if (hda->boot_iteration == HDA_FW_BOOT_ATTEMPTS)
+                       dev_err(sdev->dev, "dsp core 0/1 power up failed\n");
+               goto err;
+       }
+
+       dev_dbg(sdev->dev, "Primary core power up successful\n");
+
+       /* step 3: wait for IPC DONE bit from ROM */
+       ret = snd_sof_dsp_read_poll_timeout(sdev, HDA_DSP_BAR, chip->ipc_ack, status,
+                                           ((status & chip->ipc_ack_mask) == chip->ipc_ack_mask),
+                                           HDA_DSP_REG_POLL_INTERVAL_US, MTL_DSP_PURGE_TIMEOUT_US);
+       if (ret < 0) {
+               if (hda->boot_iteration == HDA_FW_BOOT_ATTEMPTS)
+                       dev_err(sdev->dev, "timeout waiting for purge IPC done\n");
+               goto err;
+       }
+
+       /* set DONE bit to clear the reply IPC message */
+       snd_sof_dsp_update_bits_forced(sdev, HDA_DSP_BAR, chip->ipc_ack, chip->ipc_ack_mask,
+                                      chip->ipc_ack_mask);
+
+       /* step 4: enable interrupts */
+       ret = mtl_enable_interrupts(sdev);
+       if (ret < 0) {
+               if (hda->boot_iteration == HDA_FW_BOOT_ATTEMPTS)
+                       dev_err(sdev->dev, "%s: failed to enable interrupts\n", __func__);
+               goto err;
+       }
+
+       mtl_enable_ipc_interrupts(sdev);
+
+       /*
+        * ACE workaround: don't wait for ROM INIT.
+        * The platform cannot catch ROM_INIT_DONE because of a very short
+        * timing window. Follow the recommendations and skip this part.
+        */
+
+       return 0;
+
+err:
+       snd_sof_dsp_dbg_dump(sdev, "MTL DSP init fail", 0);
+       mtl_dsp_core_power_down(sdev, SOF_DSP_PRIMARY_CORE);
+       return ret;
+}
+
+static irqreturn_t mtl_ipc_irq_thread(int irq, void *context)
+{
+       struct sof_ipc4_msg notification_data = {{ 0 }};
+       struct snd_sof_dev *sdev = context;
+       bool ipc_irq = false;
+       u32 hipcida;
+       u32 hipctdr;
+
+       hipcida = snd_sof_dsp_read(sdev, HDA_DSP_BAR, MTL_DSP_REG_HFIPCXIDA);
+
+       /* reply message from DSP */
+       if (hipcida & MTL_DSP_REG_HFIPCXIDA_DONE) {
+               /* DSP received the message */
+               snd_sof_dsp_update_bits(sdev, HDA_DSP_BAR, MTL_DSP_REG_HFIPCXCTL,
+                                       MTL_DSP_REG_HFIPCXCTL_DONE, 0);
+
+               mtl_ipc_dsp_done(sdev);
+
+               ipc_irq = true;
+       }
+
+       hipctdr = snd_sof_dsp_read(sdev, HDA_DSP_BAR, MTL_DSP_REG_HFIPCXTDR);
+       if (hipctdr & MTL_DSP_REG_HFIPCXTDR_BUSY) {
+               /* Message from DSP (reply or notification) */
+               u32 extension = snd_sof_dsp_read(sdev, HDA_DSP_BAR, MTL_DSP_REG_HFIPCXTDDY);
+               u32 primary = hipctdr & MTL_DSP_REG_HFIPCXTDR_MSG_MASK;
+
+               /*
+                * ACE fw sends a new fw ipc message to host to
+                * notify the status of the last host ipc message
+                */
+               if (primary & SOF_IPC4_MSG_DIR_MASK) {
+                       /* Reply received */
+                       struct sof_ipc4_msg *data = sdev->ipc->msg.reply_data;
+
+                       data->primary = primary;
+                       data->extension = extension;
+
+                       spin_lock_irq(&sdev->ipc_lock);
+
+                       snd_sof_ipc_get_reply(sdev);
+                       snd_sof_ipc_reply(sdev, data->primary);
+
+                       spin_unlock_irq(&sdev->ipc_lock);
+               } else {
+                       /* Notification received */
+                       notification_data.primary = primary;
+                       notification_data.extension = extension;
+
+                       sdev->ipc->msg.rx_data = &notification_data;
+                       snd_sof_ipc_msgs_rx(sdev);
+                       sdev->ipc->msg.rx_data = NULL;
+               }
+
+               mtl_ipc_host_done(sdev);
+
+               ipc_irq = true;
+       }
+
+       if (!ipc_irq) {
+               /* This interrupt is not shared so no need to return IRQ_NONE. */
+               dev_dbg_ratelimited(sdev->dev, "%s nothing to do in IPC IRQ thread\n",
+                                   __func__);
+       }
+
+       return IRQ_HANDLED;
+}
+
+static int mtl_dsp_ipc_get_mailbox_offset(struct snd_sof_dev *sdev)
+{
+       return MTL_DSP_MBOX_UPLINK_OFFSET;
+}
+
+static int mtl_dsp_ipc_get_window_offset(struct snd_sof_dev *sdev, u32 id)
+{
+       return MTL_SRAM_WINDOW_OFFSET(id);
+}
+
+static int mtl_suspend(struct snd_sof_dev *sdev, bool runtime_suspend)
+{
+       struct sof_intel_hda_dev *hda = sdev->pdata->hw_pdata;
+       const struct sof_intel_dsp_desc *chip = hda->desc;
+#if IS_ENABLED(CONFIG_SND_SOC_SOF_HDA)
+       struct hdac_bus *bus = sof_to_bus(sdev);
+#endif
+       u32 dsphfdsscs;
+       u32 cpa;
+       int ret;
+       int i;
+
+       mtl_disable_ipc_interrupts(sdev);
+       ret = mtl_disable_interrupts(sdev);
+       if (ret)
+               return ret;
+
+#if IS_ENABLED(CONFIG_SND_SOC_SOF_HDA)
+       hda_codec_jack_wake_enable(sdev, runtime_suspend);
+       /* power down all hda link */
+       snd_hdac_ext_bus_link_power_down_all(bus);
+#endif
+       snd_sof_dsp_update_bits(sdev, HDA_DSP_BAR, MTL_HFPWRCTL,
+                               MTL_HFPWRCTL_WPDSPHPXPG, 0);
+
+       /* Set the DSP subsystem power down */
+       snd_sof_dsp_update_bits(sdev, HDA_DSP_BAR, MTL_HFDSSCS,
+                               MTL_HFDSSCS_SPA_MASK, 0);
+
+       /* Wait for unstable CPA read (1 then 0 then 1) just after setting SPA bit */
+       usleep_range(1000, 1010);
+
+       /* poll with timeout to check if operation successful */
+       cpa = MTL_HFDSSCS_CPA_MASK;
+       dsphfdsscs = snd_sof_dsp_read(sdev, HDA_DSP_BAR, MTL_HFDSSCS);
+       ret = snd_sof_dsp_read_poll_timeout(sdev, HDA_DSP_BAR, MTL_HFDSSCS, dsphfdsscs,
+                                           (dsphfdsscs & cpa) == 0, HDA_DSP_REG_POLL_INTERVAL_US,
+                                       HDA_DSP_RESET_TIMEOUT_US);
+       if (ret < 0)
+               dev_err(sdev->dev, "failed to disable DSP subsystem\n");
+
+       /* reset ref counts for all cores */
+       for (i = 0; i < chip->cores_num; i++)
+               sdev->dsp_core_ref_count[i] = 0;
+
+       /* TODO: need to reset controller? */
+
+       /* display codec can be powered off after link reset */
+       hda_codec_i915_display_power(sdev, false);
+
+       return 0;
+}
+
+static int mtl_dsp_suspend(struct snd_sof_dev *sdev, u32 target_state)
+{
+       const struct sof_dsp_power_state target_dsp_state = {
+               .state = target_state,
+               .substate = target_state == SOF_DSP_PM_D0 ?
+                               SOF_HDA_DSP_PM_D0I3 : 0,
+       };
+       int ret;
+
+       ret = mtl_suspend(sdev, false);
+       if (ret < 0)
+               return ret;
+
+       return snd_sof_dsp_set_power_state(sdev, &target_dsp_state);
+}
+
+static int mtl_dsp_runtime_suspend(struct snd_sof_dev *sdev)
+{
+       const struct sof_dsp_power_state target_state = {
+               .state = SOF_DSP_PM_D3,
+       };
+       int ret;
+
+       ret = mtl_suspend(sdev, true);
+       if (ret < 0)
+               return ret;
+
+       return snd_sof_dsp_set_power_state(sdev, &target_state);
+}
+
+static int mtl_resume(struct snd_sof_dev *sdev, bool runtime_resume)
+{
+#if IS_ENABLED(CONFIG_SND_SOC_SOF_HDA)
+       struct hdac_bus *bus = sof_to_bus(sdev);
+       struct hdac_ext_link *hlink = NULL;
+#endif
+
+       /* display codec must be powered before link reset */
+       hda_codec_i915_display_power(sdev, true);
+
+#if IS_ENABLED(CONFIG_SND_SOC_SOF_HDA)
+       /* check jack status */
+       if (runtime_resume) {
+               hda_codec_jack_wake_enable(sdev, false);
+               if (sdev->system_suspend_target == SOF_SUSPEND_NONE)
+                       hda_codec_jack_check(sdev);
+       }
+
+       /* turn off the links that were off before suspend */
+       list_for_each_entry(hlink, &bus->hlink_list, list) {
+               if (!hlink->ref_count)
+                       snd_hdac_ext_bus_link_power_down(hlink);
+       }
+
+       /* check dma status and clean up CORB/RIRB buffers */
+       if (!bus->cmd_dma_state)
+               snd_hdac_bus_stop_cmd_io(bus);
+#endif
+
+       return 0;
+}
+
+static int mtl_dsp_resume(struct snd_sof_dev *sdev)
+{
+       const struct sof_dsp_power_state target_state = {
+               .state = SOF_DSP_PM_D0,
+               .substate = SOF_HDA_DSP_PM_D0I0,
+       };
+       int ret;
+
+       ret = mtl_resume(sdev, false);
+       if (ret < 0)
+               return ret;
+
+       return snd_sof_dsp_set_power_state(sdev, &target_state);
+}
+
+static int mtl_dsp_runtime_resume(struct snd_sof_dev *sdev)
+{
+       const struct sof_dsp_power_state target_state = {
+               .state = SOF_DSP_PM_D0,
+       };
+       int ret;
+
+       ret = mtl_resume(sdev, true);
+       if (ret < 0)
+               return ret;
+
+       return snd_sof_dsp_set_power_state(sdev, &target_state);
+}
+
+static void mtl_ipc_dump(struct snd_sof_dev *sdev)
+{
+       u32 hipcctl;
+       u32 hipcida;
+       u32 hipctdr;
+
+       /* read IPC status */
+       hipcida = snd_sof_dsp_read(sdev, HDA_DSP_BAR, MTL_DSP_REG_HFIPCXIDA);
+       hipcctl = snd_sof_dsp_read(sdev, HDA_DSP_BAR, MTL_DSP_REG_HFIPCXCTL);
+       hipctdr = snd_sof_dsp_read(sdev, HDA_DSP_BAR, MTL_DSP_REG_HFIPCXTDR);
+
+       /* dump the IPC regs */
+       /* TODO: parse the raw msg */
+       dev_err(sdev->dev,
+               "error: host status 0x%8.8x dsp status 0x%8.8x mask 0x%8.8x\n",
+               hipcida, hipctdr, hipcctl);
+}
+
+/* Meteorlake ops */
+struct snd_sof_dsp_ops sof_mtl_ops;
+EXPORT_SYMBOL_NS(sof_mtl_ops, SND_SOC_SOF_INTEL_HDA_COMMON);
+
+int sof_mtl_ops_init(struct snd_sof_dev *sdev)
+{
+       struct sof_ipc4_fw_data *ipc4_data;
+
+       /* common defaults */
+       memcpy(&sof_mtl_ops, &sof_hda_common_ops, sizeof(struct snd_sof_dsp_ops));
+
+       /* shutdown */
+       sof_mtl_ops.shutdown = hda_dsp_shutdown;
+
+       /* doorbell */
+       sof_mtl_ops.irq_thread = mtl_ipc_irq_thread;
+
+       /* ipc */
+       sof_mtl_ops.send_msg = mtl_ipc_send_msg;
+       sof_mtl_ops.get_mailbox_offset = mtl_dsp_ipc_get_mailbox_offset;
+       sof_mtl_ops.get_window_offset = mtl_dsp_ipc_get_window_offset;
+
+       /* debug */
+       sof_mtl_ops.debug_map = mtl_dsp_debugfs;
+       sof_mtl_ops.debug_map_count = ARRAY_SIZE(mtl_dsp_debugfs);
+       sof_mtl_ops.dbg_dump = mtl_dsp_dump;
+       sof_mtl_ops.ipc_dump = mtl_ipc_dump;
+
+       /* pre/post fw run */
+       sof_mtl_ops.pre_fw_run = mtl_dsp_pre_fw_run;
+       sof_mtl_ops.post_fw_run = mtl_dsp_post_fw_run;
+
+       /* parse platform specific extended manifest */
+       sof_mtl_ops.parse_platform_ext_manifest = NULL;
+
+       /* dsp core get/put */
+       /* TODO: add core_get and core_put */
+
+       /* PM */
+       sof_mtl_ops.suspend = mtl_dsp_suspend;
+       sof_mtl_ops.resume = mtl_dsp_resume;
+       sof_mtl_ops.runtime_suspend = mtl_dsp_runtime_suspend;
+       sof_mtl_ops.runtime_resume = mtl_dsp_runtime_resume;
+
+       sdev->private = devm_kzalloc(sdev->dev, sizeof(struct sof_ipc4_fw_data), GFP_KERNEL);
+       if (!sdev->private)
+               return -ENOMEM;
+
+       ipc4_data = sdev->private;
+       ipc4_data->manifest_fw_hdr_offset = SOF_MAN4_FW_HDR_OFFSET;
+
+       /* set DAI ops */
+       hda_set_dai_drv_ops(sdev, &sof_mtl_ops);
+
+       return 0;
+};
+EXPORT_SYMBOL_NS(sof_mtl_ops_init, SND_SOC_SOF_INTEL_HDA_COMMON);
+
+const struct sof_intel_dsp_desc mtl_chip_info = {
+       .cores_num = 3,
+       .init_core_mask = BIT(0),
+       .host_managed_cores_mask = BIT(0),
+       .ipc_req = MTL_DSP_REG_HFIPCXIDR,
+       .ipc_req_mask = MTL_DSP_REG_HFIPCXIDR_BUSY,
+       .ipc_ack = MTL_DSP_REG_HFIPCXIDA,
+       .ipc_ack_mask = MTL_DSP_REG_HFIPCXIDA_DONE,
+       .ipc_ctl = MTL_DSP_REG_HFIPCXCTL,
+       .rom_status_reg = MTL_DSP_ROM_STS,
+       .rom_init_timeout       = 300,
+       .ssp_count = ICL_SSP_COUNT,
+       .ssp_base_offset = CNL_SSP_BASE_OFFSET,
+       .sdw_shim_base = SDW_SHIM_BASE_ACE,
+       .sdw_alh_base = SDW_ALH_BASE_ACE,
+       .check_sdw_irq = mtl_dsp_check_sdw_irq,
+       .check_ipc_irq = mtl_dsp_check_ipc_irq,
+       .cl_init = mtl_dsp_cl_init,
+       .hw_ip_version = SOF_INTEL_ACE_1_0,
+};
+EXPORT_SYMBOL_NS(mtl_chip_info, SND_SOC_SOF_INTEL_HDA_COMMON);
diff --git a/sound/soc/sof/intel/mtl.h b/sound/soc/sof/intel/mtl.h
new file mode 100644 (file)
index 0000000..788bf0e
--- /dev/null
@@ -0,0 +1,76 @@
+/* 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) 2020-2022 Intel Corporation. All rights reserved.
+ */
+
+/* DSP Registers */
+#define MTL_HFDSSCS                    0x1000
+#define MTL_HFDSSCS_SPA_MASK           BIT(16)
+#define MTL_HFDSSCS_CPA_MASK           BIT(24)
+#define MTL_HFSNDWIE                   0x114C
+#define MTL_HFPWRCTL                   0x1D18
+#define MTL_HfPWRCTL_WPIOXPG(x)                BIT((x) + 8)
+#define MTL_HFPWRCTL_WPDSPHPXPG                BIT(0)
+#define MTL_HFPWRSTS                   0x1D1C
+#define MTL_HFPWRSTS_DSPHPXPGS_MASK    BIT(0)
+#define MTL_HFINTIPPTR                 0x1108
+#define MTL_IRQ_INTEN_L_HOST_IPC_MASK  BIT(0)
+#define MTL_IRQ_INTEN_L_SOUNDWIRE_MASK BIT(6)
+#define MTL_HFINTIPPTR_PTR_MASK                GENMASK(20, 0)
+
+#define MTL_DSP2CXCAP_PRIMARY_CORE     0x178D00
+#define MTL_DSP2CXCTL_PRIMARY_CORE     0x178D04
+#define MTL_DSP2CXCTL_PRIMARY_CORE_SPA_MASK BIT(0)
+#define MTL_DSP2CXCTL_PRIMARY_CORE_CPA_MASK BIT(8)
+#define MTL_DSP2CXCTL_PRIMARY_CORE_OSEL GENMASK(25, 24)
+#define MTL_DSP2CXCTL_PRIMARY_CORE_OSEL_SHIFT 24
+
+/* IPC Registers */
+#define MTL_DSP_REG_HFIPCXTDR          0x73200
+#define MTL_DSP_REG_HFIPCXTDR_BUSY     BIT(31)
+#define MTL_DSP_REG_HFIPCXTDR_MSG_MASK GENMASK(30, 0)
+#define MTL_DSP_REG_HFIPCXTDA          0x73204
+#define MTL_DSP_REG_HFIPCXTDA_BUSY     BIT(31)
+#define MTL_DSP_REG_HFIPCXIDR          0x73210
+#define MTL_DSP_REG_HFIPCXIDR_BUSY     BIT(31)
+#define MTL_DSP_REG_HFIPCXIDR_MSG_MASK GENMASK(30, 0)
+#define MTL_DSP_REG_HFIPCXIDA          0x73214
+#define MTL_DSP_REG_HFIPCXIDA_DONE     BIT(31)
+#define MTL_DSP_REG_HFIPCXIDA_MSG_MASK GENMASK(30, 0)
+#define MTL_DSP_REG_HFIPCXCTL          0x73228
+#define MTL_DSP_REG_HFIPCXCTL_BUSY     BIT(0)
+#define MTL_DSP_REG_HFIPCXCTL_DONE     BIT(1)
+#define MTL_DSP_REG_HFIPCXTDDY         0x73300
+#define MTL_DSP_REG_HFIPCXIDDY         0x73380
+#define MTL_DSP_REG_HfHIPCIE           0x1140
+#define MTL_DSP_REG_HfHIPCIE_IE_MASK   BIT(0)
+#define MTL_DSP_REG_HfSNDWIE           0x114C
+#define MTL_DSP_REG_HfSNDWIE_IE_MASK   GENMASK(3, 0)
+
+#define MTL_DSP_IRQSTS                 0x20
+#define MTL_DSP_IRQSTS_IPC             BIT(0)
+#define MTL_DSP_IRQSTS_SDW             BIT(6)
+
+#define MTL_DSP_PURGE_TIMEOUT_US       20000000 /* 20s */
+#define MTL_DSP_REG_POLL_INTERVAL_US   10      /* 10 us */
+
+/* Memory windows */
+#define MTL_SRAM_WINDOW_OFFSET(x)      (0x180000 + 0x8000 * (x))
+
+#define MTL_DSP_MBOX_UPLINK_OFFSET     (MTL_SRAM_WINDOW_OFFSET(0) + 0x1000)
+#define MTL_DSP_MBOX_UPLINK_SIZE       0x1000
+#define MTL_DSP_MBOX_DOWNLINK_OFFSET   MTL_SRAM_WINDOW_OFFSET(1)
+#define MTL_DSP_MBOX_DOWNLINK_SIZE     0x1000
+
+/* FW registers */
+#define MTL_DSP_ROM_STS                        MTL_SRAM_WINDOW_OFFSET(0) /* ROM status */
+#define MTL_DSP_ROM_ERROR              (MTL_SRAM_WINDOW_OFFSET(0) + 0x4) /* ROM error code */
+
+#define MTL_DSP_REG_HFFLGPXQWY         0x163200 /* ROM debug status */
+#define MTL_DSP_REG_HFFLGPXQWY_ERROR   0x163204 /* ROM debug error code */
+#define MTL_DSP_REG_HfIMRIS1           0x162088
+#define MTL_DSP_REG_HfIMRIS1_IU_MASK   BIT(0)
+
diff --git a/sound/soc/sof/intel/pci-mtl.c b/sound/soc/sof/intel/pci-mtl.c
new file mode 100644 (file)
index 0000000..899b00d
--- /dev/null
@@ -0,0 +1,71 @@
+// 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.
+//
+// Author: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
+//
+
+#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"
+#include "mtl.h"
+
+static const struct sof_dev_desc mtl_desc = {
+       .use_acpi_target_states = true,
+       .machines               = snd_soc_acpi_intel_mtl_machines,
+       .alt_machines           = snd_soc_acpi_intel_mtl_sdw_machines,
+       .resindex_lpe_base      = 0,
+       .resindex_pcicfg_base   = -1,
+       .resindex_imr_base      = -1,
+       .irqindex_host_ipc      = -1,
+       .chip_info = &mtl_chip_info,
+       .ipc_supported_mask     = BIT(SOF_INTEL_IPC4),
+       .ipc_default            = SOF_INTEL_IPC4,
+       .default_fw_path = {
+               [SOF_INTEL_IPC4] = "intel/sof-ipc4/mtl",
+       },
+       .default_tplg_path = {
+               [SOF_INTEL_IPC4] = "intel/sof-ace-tplg",
+       },
+       .default_fw_filename = {
+               [SOF_INTEL_IPC4] = "dsp_basefw.bin",
+       },
+       .nocodec_tplg_filename = "sof-mtl-nocodec.tplg",
+       .ops = &sof_mtl_ops,
+       .ops_init = sof_mtl_ops_init,
+};
+
+/* PCI IDs */
+static const struct pci_device_id sof_pci_ids[] = {
+       { PCI_DEVICE(0x8086, 0x7E28), /* MTL */
+               .driver_data = (unsigned long)&mtl_desc},
+       { 0, }
+};
+MODULE_DEVICE_TABLE(pci, sof_pci_ids);
+
+/* pci_driver definition */
+static struct pci_driver snd_sof_pci_intel_mtl_driver = {
+       .name = "sof-audio-pci-intel-mtl",
+       .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_mtl_driver);
+
+MODULE_LICENSE("Dual BSD/GPL");
+MODULE_IMPORT_NS(SND_SOC_SOF_INTEL_HDA_COMMON);
+MODULE_IMPORT_NS(SND_SOC_SOF_PCI_DEV);
index 371991fa474f0d420c42b5c182d3d2c561d2446c..638159bee864515e93c75829cff7561b4c36c814 100644 (file)
@@ -20,6 +20,7 @@ enum sof_intel_hw_ip_version {
        SOF_INTEL_CAVS_1_8,     /* CannonLake, CometLake, CoffeeLake */
        SOF_INTEL_CAVS_2_0,     /* IceLake, JasperLake */
        SOF_INTEL_CAVS_2_5,     /* TigerLake, AlderLake */
+       SOF_INTEL_ACE_1_0,      /* MeteorLake */
 };
 
 /*