Skip to content

Commit 787c511

Browse files
ujfalusiranj063
authored andcommitted
ASoC: SOF: Intel: add support for Nova Lake NVL
Add support for Nova Lake (NVL). The core count for NVL is different compared to NVL-S (4 vs 2) Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
1 parent 063e495 commit 787c511

3 files changed

Lines changed: 56 additions & 0 deletions

File tree

sound/soc/sof/intel/hda.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -947,6 +947,7 @@ extern const struct sof_intel_dsp_desc arl_s_chip_info;
947947
extern const struct sof_intel_dsp_desc lnl_chip_info;
948948
extern const struct sof_intel_dsp_desc ptl_chip_info;
949949
extern const struct sof_intel_dsp_desc wcl_chip_info;
950+
extern const struct sof_intel_dsp_desc nvl_chip_info;
950951
extern const struct sof_intel_dsp_desc nvl_s_chip_info;
951952

952953
/* Probes support */

sound/soc/sof/intel/nvl.c

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,30 @@ int sof_nvl_set_ops(struct snd_sof_dev *sdev, struct snd_sof_dsp_ops *dsp_ops)
2626
};
2727
EXPORT_SYMBOL_NS(sof_nvl_set_ops, "SND_SOC_SOF_INTEL_NVL");
2828

29+
const struct sof_intel_dsp_desc nvl_chip_info = {
30+
.cores_num = 4,
31+
.init_core_mask = BIT(0),
32+
.host_managed_cores_mask = BIT(0),
33+
.ipc_req = MTL_DSP_REG_HFIPCXIDR,
34+
.ipc_req_mask = MTL_DSP_REG_HFIPCXIDR_BUSY,
35+
.ipc_ack = MTL_DSP_REG_HFIPCXIDA,
36+
.ipc_ack_mask = MTL_DSP_REG_HFIPCXIDA_DONE,
37+
.ipc_ctl = MTL_DSP_REG_HFIPCXCTL,
38+
.rom_status_reg = LNL_DSP_REG_HFDSC,
39+
.rom_init_timeout = 300,
40+
.ssp_count = MTL_SSP_COUNT,
41+
.d0i3_offset = MTL_HDA_VS_D0I3C,
42+
.read_sdw_lcount = hda_sdw_check_lcount_ext,
43+
.check_sdw_irq = lnl_dsp_check_sdw_irq,
44+
.check_sdw_wakeen_irq = lnl_sdw_check_wakeen_irq,
45+
.sdw_process_wakeen = hda_sdw_process_wakeen_common,
46+
.check_ipc_irq = mtl_dsp_check_ipc_irq,
47+
.cl_init = mtl_dsp_cl_init,
48+
.power_down_dsp = mtl_power_down_dsp,
49+
.disable_interrupts = lnl_dsp_disable_interrupts,
50+
.hw_ip_version = SOF_INTEL_ACE_4_0,
51+
};
52+
2953
const struct sof_intel_dsp_desc nvl_s_chip_info = {
3054
.cores_num = 2,
3155
.init_core_mask = BIT(0),

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

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,36 @@ static int sof_nvl_ops_init(struct snd_sof_dev *sdev)
2626
return sof_nvl_set_ops(sdev, &sof_nvl_ops);
2727
}
2828

29+
static const struct sof_dev_desc nvl_desc = {
30+
.use_acpi_target_states = true,
31+
.machines = snd_soc_acpi_intel_nvl_machines,
32+
.alt_machines = snd_soc_acpi_intel_nvl_sdw_machines,
33+
.resindex_lpe_base = 0,
34+
.resindex_pcicfg_base = -1,
35+
.resindex_imr_base = -1,
36+
.irqindex_host_ipc = -1,
37+
.chip_info = &nvl_chip_info,
38+
.ipc_supported_mask = BIT(SOF_IPC_TYPE_4),
39+
.ipc_default = SOF_IPC_TYPE_4,
40+
.dspless_mode_supported = true,
41+
.on_demand_dsp_boot = true,
42+
.default_fw_path = {
43+
[SOF_IPC_TYPE_4] = "intel/sof-ipc4/nvl",
44+
},
45+
.default_lib_path = {
46+
[SOF_IPC_TYPE_4] = "intel/sof-ipc4-lib/nvl",
47+
},
48+
.default_tplg_path = {
49+
[SOF_IPC_TYPE_4] = "intel/sof-ipc4-tplg",
50+
},
51+
.default_fw_filename = {
52+
[SOF_IPC_TYPE_4] = "sof-nvl.ri",
53+
},
54+
.nocodec_tplg_filename = "sof-nvl-nocodec.tplg",
55+
.ops = &sof_nvl_ops,
56+
.ops_init = sof_nvl_ops_init,
57+
};
58+
2959
static const struct sof_dev_desc nvl_s_desc = {
3060
.use_acpi_target_states = true,
3161
.machines = snd_soc_acpi_intel_nvl_machines,
@@ -58,6 +88,7 @@ static const struct sof_dev_desc nvl_s_desc = {
5888

5989
/* PCI IDs */
6090
static const struct pci_device_id sof_pci_ids[] = {
91+
{ PCI_DEVICE_DATA(INTEL, HDA_NVL, &nvl_desc) }, /* NVL */
6192
{ PCI_DEVICE_DATA(INTEL, HDA_NVL_S, &nvl_s_desc) }, /* NVL-S */
6293
{ 0, }
6394
};

0 commit comments

Comments
 (0)