Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
ASoC: SOF: Use generic IPC type identifiers
Merge series from Peter Ujfalusi <peter.ujfalusi@linux.intel.com>:
Hi,
rename the IPC type defines to be more generic and intuitive:
SOF_IPC -> SOF_IPC_TYPE_3
SOF_INTEL_IPC4 -> SOF_IPC_TYPE_4
No functional change, just renaming all around.
Regards,
Peter
---
Peter Ujfalusi (9):
ASoC: SOF: Introduce generic names for IPC types
ASoC: SOF: sof-pci-dev: Update the ipc_type module parameter
description
ASoC: SOF: Kconfig: Rename SND_SOC_SOF_INTEL_IPC4 to SND_SOC_SOF_IPC4
ASoC: SOF: Use generic names for IPC types
ASoC: SOF: amd: Use generic names for IPC types
ASoC: SOF: imx: Use generic names for IPC types
ASoC: SOF: Intel: Use generic names for IPC types
ASoC: SOF: mediatek: Use generic names for IPC types
ASoC: SOF: Drop unused IPC type defines
include/sound/sof.h | 4 +-
sound/soc/sof/Kconfig | 2 +-
sound/soc/sof/Makefile | 4 +-
sound/soc/sof/amd/pci-rmb.c | 10 +-
sound/soc/sof/amd/pci-rn.c | 10 +-
sound/soc/sof/amd/pci-vangogh.c | 10 +-
sound/soc/sof/imx/imx8.c | 20 +--
sound/soc/sof/imx/imx8m.c | 10 +-
sound/soc/sof/imx/imx8ulp.c | 10 +-
sound/soc/sof/intel/Kconfig | 14 +-
sound/soc/sof/intel/apl.c | 4 +-
sound/soc/sof/intel/bdw.c | 10 +-
sound/soc/sof/intel/byt.c | 30 ++--
sound/soc/sof/intel/cnl.c | 4 +-
sound/soc/sof/intel/hda-dai-ops.c | 4 +-
sound/soc/sof/intel/hda-dai.c | 4 +-
sound/soc/sof/intel/hda-loader.c | 2 +-
sound/soc/sof/intel/hda.c | 2 +-
sound/soc/sof/intel/icl.c | 4 +-
sound/soc/sof/intel/pci-apl.c | 36 ++---
sound/soc/sof/intel/pci-cnl.c | 54 ++++----
sound/soc/sof/intel/pci-icl.c | 36 ++---
sound/soc/sof/intel/pci-lnl.c | 10 +-
sound/soc/sof/intel/pci-mtl.c | 12 +-
sound/soc/sof/intel/pci-skl.c | 20 +--
sound/soc/sof/intel/pci-tgl.c | 144 ++++++++++----------
sound/soc/sof/intel/pci-tng.c | 10 +-
sound/soc/sof/intel/tgl.c | 4 +-
sound/soc/sof/ipc.c | 6 +-
sound/soc/sof/ipc3-dtrace.c | 2 +-
sound/soc/sof/mediatek/mt8186/mt8186.c | 20 +--
sound/soc/sof/mediatek/mt8195/mt8195.c | 10 +-
sound/soc/sof/sof-acpi-dev.c | 8 +-
sound/soc/sof/sof-client-ipc-msg-injector.c | 4 +-
sound/soc/sof/sof-client-probes.c | 6 +-
sound/soc/sof/sof-client.c | 26 ++--
sound/soc/sof/sof-of-dev.c | 6 +-
sound/soc/sof/sof-pci-dev.c | 2 +-
38 files changed, 286 insertions(+), 288 deletions(-)
--
2.42.0
+286
-288
+2
-2
include/sound/sof.h
+2
-2
include/sound/sof.h
+1
-1
sound/soc/sof/Kconfig
+1
-1
sound/soc/sof/Kconfig
+2
-2
sound/soc/sof/Makefile
+2
-2
sound/soc/sof/Makefile
···
8
8
snd-sof-objs += ipc3.o ipc3-loader.o ipc3-topology.o ipc3-control.o ipc3-pcm.o\
9
9
ipc3-dtrace.o
10
10
endif
11
-
ifneq ($(CONFIG_SND_SOC_SOF_INTEL_IPC4),)
11
+
ifneq ($(CONFIG_SND_SOC_SOF_IPC4),)
12
12
snd-sof-objs += ipc4.o ipc4-loader.o ipc4-topology.o ipc4-control.o ipc4-pcm.o\
13
13
ipc4-mtrace.o
14
14
endif
···
31
31
ifneq ($(CONFIG_SND_SOC_SOF_IPC3),)
32
32
snd-sof-probes-objs += sof-client-probes-ipc3.o
33
33
endif
34
-
ifneq ($(CONFIG_SND_SOC_SOF_INTEL_IPC4),)
34
+
ifneq ($(CONFIG_SND_SOC_SOF_IPC4),)
35
35
snd-sof-probes-objs += sof-client-probes-ipc4.o
36
36
endif
37
37
+5
-5
sound/soc/sof/amd/pci-rmb.c
+5
-5
sound/soc/sof/amd/pci-rmb.c
···
47
47
.resindex_imr_base = -1,
48
48
.irqindex_host_ipc = -1,
49
49
.chip_info = &rembrandt_chip_info,
50
-
.ipc_supported_mask = BIT(SOF_IPC),
51
-
.ipc_default = SOF_IPC,
50
+
.ipc_supported_mask = BIT(SOF_IPC_TYPE_3),
51
+
.ipc_default = SOF_IPC_TYPE_3,
52
52
.default_fw_path = {
53
-
[SOF_IPC] = "amd/sof",
53
+
[SOF_IPC_TYPE_3] = "amd/sof",
54
54
},
55
55
.default_tplg_path = {
56
-
[SOF_IPC] = "amd/sof-tplg",
56
+
[SOF_IPC_TYPE_3] = "amd/sof-tplg",
57
57
},
58
58
.default_fw_filename = {
59
-
[SOF_IPC] = "sof-rmb.ri",
59
+
[SOF_IPC_TYPE_3] = "sof-rmb.ri",
60
60
},
61
61
.nocodec_tplg_filename = "sof-acp.tplg",
62
62
.ops = &sof_rembrandt_ops,
+5
-5
sound/soc/sof/amd/pci-rn.c
+5
-5
sound/soc/sof/amd/pci-rn.c
···
47
47
.resindex_imr_base = -1,
48
48
.irqindex_host_ipc = -1,
49
49
.chip_info = &renoir_chip_info,
50
-
.ipc_supported_mask = BIT(SOF_IPC),
51
-
.ipc_default = SOF_IPC,
50
+
.ipc_supported_mask = BIT(SOF_IPC_TYPE_3),
51
+
.ipc_default = SOF_IPC_TYPE_3,
52
52
.default_fw_path = {
53
-
[SOF_IPC] = "amd/sof",
53
+
[SOF_IPC_TYPE_3] = "amd/sof",
54
54
},
55
55
.default_tplg_path = {
56
-
[SOF_IPC] = "amd/sof-tplg",
56
+
[SOF_IPC_TYPE_3] = "amd/sof-tplg",
57
57
},
58
58
.default_fw_filename = {
59
-
[SOF_IPC] = "sof-rn.ri",
59
+
[SOF_IPC_TYPE_3] = "sof-rn.ri",
60
60
},
61
61
.nocodec_tplg_filename = "sof-acp.tplg",
62
62
.ops = &sof_renoir_ops,
+5
-5
sound/soc/sof/amd/pci-vangogh.c
+5
-5
sound/soc/sof/amd/pci-vangogh.c
···
45
45
.resindex_imr_base = -1,
46
46
.irqindex_host_ipc = -1,
47
47
.chip_info = &vangogh_chip_info,
48
-
.ipc_supported_mask = BIT(SOF_IPC),
49
-
.ipc_default = SOF_IPC,
48
+
.ipc_supported_mask = BIT(SOF_IPC_TYPE_3),
49
+
.ipc_default = SOF_IPC_TYPE_3,
50
50
.default_fw_path = {
51
-
[SOF_IPC] = "amd/sof",
51
+
[SOF_IPC_TYPE_3] = "amd/sof",
52
52
},
53
53
.default_tplg_path = {
54
-
[SOF_IPC] = "amd/sof-tplg",
54
+
[SOF_IPC_TYPE_3] = "amd/sof-tplg",
55
55
},
56
56
.default_fw_filename = {
57
-
[SOF_IPC] = "sof-vangogh.ri",
57
+
[SOF_IPC_TYPE_3] = "sof-vangogh.ri",
58
58
},
59
59
.nocodec_tplg_filename = "sof-acp.tplg",
60
60
.ops = &sof_vangogh_ops,
+10
-10
sound/soc/sof/imx/imx8.c
+10
-10
sound/soc/sof/imx/imx8.c
···
609
609
};
610
610
611
611
static struct sof_dev_desc sof_of_imx8qxp_desc = {
612
-
.ipc_supported_mask = BIT(SOF_IPC),
613
-
.ipc_default = SOF_IPC,
612
+
.ipc_supported_mask = BIT(SOF_IPC_TYPE_3),
613
+
.ipc_default = SOF_IPC_TYPE_3,
614
614
.default_fw_path = {
615
-
[SOF_IPC] = "imx/sof",
615
+
[SOF_IPC_TYPE_3] = "imx/sof",
616
616
},
617
617
.default_tplg_path = {
618
-
[SOF_IPC] = "imx/sof-tplg",
618
+
[SOF_IPC_TYPE_3] = "imx/sof-tplg",
619
619
},
620
620
.default_fw_filename = {
621
-
[SOF_IPC] = "sof-imx8x.ri",
621
+
[SOF_IPC_TYPE_3] = "sof-imx8x.ri",
622
622
},
623
623
.nocodec_tplg_filename = "sof-imx8-nocodec.tplg",
624
624
.ops = &sof_imx8x_ops,
625
625
};
626
626
627
627
static struct sof_dev_desc sof_of_imx8qm_desc = {
628
-
.ipc_supported_mask = BIT(SOF_IPC),
629
-
.ipc_default = SOF_IPC,
628
+
.ipc_supported_mask = BIT(SOF_IPC_TYPE_3),
629
+
.ipc_default = SOF_IPC_TYPE_3,
630
630
.default_fw_path = {
631
-
[SOF_IPC] = "imx/sof",
631
+
[SOF_IPC_TYPE_3] = "imx/sof",
632
632
},
633
633
.default_tplg_path = {
634
-
[SOF_IPC] = "imx/sof-tplg",
634
+
[SOF_IPC_TYPE_3] = "imx/sof-tplg",
635
635
},
636
636
.default_fw_filename = {
637
-
[SOF_IPC] = "sof-imx8.ri",
637
+
[SOF_IPC_TYPE_3] = "sof-imx8.ri",
638
638
},
639
639
.nocodec_tplg_filename = "sof-imx8-nocodec.tplg",
640
640
.ops = &sof_imx8_ops,
+5
-5
sound/soc/sof/imx/imx8m.c
+5
-5
sound/soc/sof/imx/imx8m.c
···
471
471
};
472
472
473
473
static struct sof_dev_desc sof_of_imx8mp_desc = {
474
-
.ipc_supported_mask = BIT(SOF_IPC),
475
-
.ipc_default = SOF_IPC,
474
+
.ipc_supported_mask = BIT(SOF_IPC_TYPE_3),
475
+
.ipc_default = SOF_IPC_TYPE_3,
476
476
.default_fw_path = {
477
-
[SOF_IPC] = "imx/sof",
477
+
[SOF_IPC_TYPE_3] = "imx/sof",
478
478
},
479
479
.default_tplg_path = {
480
-
[SOF_IPC] = "imx/sof-tplg",
480
+
[SOF_IPC_TYPE_3] = "imx/sof-tplg",
481
481
},
482
482
.default_fw_filename = {
483
-
[SOF_IPC] = "sof-imx8m.ri",
483
+
[SOF_IPC_TYPE_3] = "sof-imx8m.ri",
484
484
},
485
485
.nocodec_tplg_filename = "sof-imx8-nocodec.tplg",
486
486
.ops = &sof_imx8m_ops,
+5
-5
sound/soc/sof/imx/imx8ulp.c
+5
-5
sound/soc/sof/imx/imx8ulp.c
···
478
478
};
479
479
480
480
static struct sof_dev_desc sof_of_imx8ulp_desc = {
481
-
.ipc_supported_mask = BIT(SOF_IPC),
482
-
.ipc_default = SOF_IPC,
481
+
.ipc_supported_mask = BIT(SOF_IPC_TYPE_3),
482
+
.ipc_default = SOF_IPC_TYPE_3,
483
483
.default_fw_path = {
484
-
[SOF_IPC] = "imx/sof",
484
+
[SOF_IPC_TYPE_3] = "imx/sof",
485
485
},
486
486
.default_tplg_path = {
487
-
[SOF_IPC] = "imx/sof-tplg",
487
+
[SOF_IPC_TYPE_3] = "imx/sof-tplg",
488
488
},
489
489
.default_fw_filename = {
490
-
[SOF_IPC] = "sof-imx8ulp.ri",
490
+
[SOF_IPC_TYPE_3] = "sof-imx8ulp.ri",
491
491
},
492
492
.nocodec_tplg_filename = "sof-imx8ulp-nocodec.tplg",
493
493
.ops = &sof_imx8ulp_ops,
+7
-7
sound/soc/sof/intel/Kconfig
+7
-7
sound/soc/sof/intel/Kconfig
···
98
98
config SND_SOC_SOF_INTEL_SKL
99
99
tristate
100
100
select SND_SOC_SOF_HDA_COMMON
101
-
select SND_SOC_SOF_INTEL_IPC4
101
+
select SND_SOC_SOF_IPC4
102
102
103
103
config SND_SOC_SOF_SKYLAKE
104
104
tristate "SOF support for SkyLake"
···
124
124
tristate
125
125
select SND_SOC_SOF_HDA_COMMON
126
126
select SND_SOC_SOF_IPC3
127
-
select SND_SOC_SOF_INTEL_IPC4
127
+
select SND_SOC_SOF_IPC4
128
128
129
129
config SND_SOC_SOF_APOLLOLAKE
130
130
tristate "SOF support for Apollolake"
···
151
151
select SND_SOC_SOF_HDA_COMMON
152
152
select SND_SOC_SOF_INTEL_SOUNDWIRE_LINK_BASELINE
153
153
select SND_SOC_SOF_IPC3
154
-
select SND_SOC_SOF_INTEL_IPC4
154
+
select SND_SOC_SOF_IPC4
155
155
156
156
config SND_SOC_SOF_CANNONLAKE
157
157
tristate "SOF support for Cannonlake"
···
187
187
select SND_SOC_SOF_HDA_COMMON
188
188
select SND_SOC_SOF_INTEL_SOUNDWIRE_LINK_BASELINE
189
189
select SND_SOC_SOF_IPC3
190
-
select SND_SOC_SOF_INTEL_IPC4
190
+
select SND_SOC_SOF_IPC4
191
191
192
192
config SND_SOC_SOF_ICELAKE
193
193
tristate "SOF support for Icelake"
···
214
214
select SND_SOC_SOF_HDA_COMMON
215
215
select SND_SOC_SOF_INTEL_SOUNDWIRE_LINK_BASELINE
216
216
select SND_SOC_SOF_IPC3
217
-
select SND_SOC_SOF_INTEL_IPC4
217
+
select SND_SOC_SOF_IPC4
218
218
219
219
config SND_SOC_SOF_TIGERLAKE
220
220
tristate "SOF support for Tigerlake"
···
250
250
tristate
251
251
select SND_SOC_SOF_HDA_COMMON
252
252
select SND_SOC_SOF_INTEL_SOUNDWIRE_LINK_BASELINE
253
-
select SND_SOC_SOF_INTEL_IPC4
253
+
select SND_SOC_SOF_IPC4
254
254
255
255
config SND_SOC_SOF_METEORLAKE
256
256
tristate "SOF support for Meteorlake"
···
266
266
tristate
267
267
select SND_SOC_SOF_HDA_COMMON
268
268
select SND_SOC_SOF_INTEL_SOUNDWIRE_LINK_BASELINE
269
-
select SND_SOC_SOF_INTEL_IPC4
269
+
select SND_SOC_SOF_IPC4
270
270
271
271
config SND_SOC_SOF_LUNARLAKE
272
272
tristate "SOF support for Lunarlake"
+2
-2
sound/soc/sof/intel/apl.c
+2
-2
sound/soc/sof/intel/apl.c
···
39
39
/* probe/remove/shutdown */
40
40
sof_apl_ops.shutdown = hda_dsp_shutdown;
41
41
42
-
if (sdev->pdata->ipc_type == SOF_IPC) {
42
+
if (sdev->pdata->ipc_type == SOF_IPC_TYPE_3) {
43
43
/* doorbell */
44
44
sof_apl_ops.irq_thread = hda_dsp_ipc_irq_thread;
45
45
···
52
52
sof_apl_ops.set_power_state = hda_dsp_set_power_state_ipc3;
53
53
}
54
54
55
-
if (sdev->pdata->ipc_type == SOF_INTEL_IPC4) {
55
+
if (sdev->pdata->ipc_type == SOF_IPC_TYPE_4) {
56
56
struct sof_ipc4_fw_data *ipc4_data;
57
57
58
58
sdev->private = devm_kzalloc(sdev->dev, sizeof(*ipc4_data), GFP_KERNEL);
+5
-5
sound/soc/sof/intel/bdw.c
+5
-5
sound/soc/sof/intel/bdw.c
···
639
639
.resindex_imr_base = -1,
640
640
.irqindex_host_ipc = 0,
641
641
.chip_info = &bdw_chip_info,
642
-
.ipc_supported_mask = BIT(SOF_IPC),
643
-
.ipc_default = SOF_IPC,
642
+
.ipc_supported_mask = BIT(SOF_IPC_TYPE_3),
643
+
.ipc_default = SOF_IPC_TYPE_3,
644
644
.default_fw_path = {
645
-
[SOF_IPC] = "intel/sof",
645
+
[SOF_IPC_TYPE_3] = "intel/sof",
646
646
},
647
647
.default_tplg_path = {
648
-
[SOF_IPC] = "intel/sof-tplg",
648
+
[SOF_IPC_TYPE_3] = "intel/sof-tplg",
649
649
},
650
650
.default_fw_filename = {
651
-
[SOF_IPC] = "sof-bdw.ri",
651
+
[SOF_IPC_TYPE_3] = "sof-bdw.ri",
652
652
},
653
653
.nocodec_tplg_filename = "sof-bdw-nocodec.tplg",
654
654
.ops = &sof_bdw_ops,
+15
-15
sound/soc/sof/intel/byt.c
+15
-15
sound/soc/sof/intel/byt.c
···
374
374
.resindex_imr_base = 2,
375
375
.irqindex_host_ipc = 0,
376
376
.chip_info = &byt_chip_info,
377
-
.ipc_supported_mask = BIT(SOF_IPC),
378
-
.ipc_default = SOF_IPC,
377
+
.ipc_supported_mask = BIT(SOF_IPC_TYPE_3),
378
+
.ipc_default = SOF_IPC_TYPE_3,
379
379
.default_fw_path = {
380
-
[SOF_IPC] = "intel/sof",
380
+
[SOF_IPC_TYPE_3] = "intel/sof",
381
381
},
382
382
.default_tplg_path = {
383
-
[SOF_IPC] = "intel/sof-tplg",
383
+
[SOF_IPC_TYPE_3] = "intel/sof-tplg",
384
384
},
385
385
.default_fw_filename = {
386
-
[SOF_IPC] = "sof-byt.ri",
386
+
[SOF_IPC_TYPE_3] = "sof-byt.ri",
387
387
},
388
388
.nocodec_tplg_filename = "sof-byt-nocodec.tplg",
389
389
.ops = &sof_byt_ops,
···
396
396
.resindex_imr_base = 2,
397
397
.irqindex_host_ipc = 5,
398
398
.chip_info = &byt_chip_info,
399
-
.ipc_supported_mask = BIT(SOF_IPC),
400
-
.ipc_default = SOF_IPC,
399
+
.ipc_supported_mask = BIT(SOF_IPC_TYPE_3),
400
+
.ipc_default = SOF_IPC_TYPE_3,
401
401
.default_fw_path = {
402
-
[SOF_IPC] = "intel/sof",
402
+
[SOF_IPC_TYPE_3] = "intel/sof",
403
403
},
404
404
.default_tplg_path = {
405
-
[SOF_IPC] = "intel/sof-tplg",
405
+
[SOF_IPC_TYPE_3] = "intel/sof-tplg",
406
406
},
407
407
.default_fw_filename = {
408
-
[SOF_IPC] = "sof-byt.ri",
408
+
[SOF_IPC_TYPE_3] = "sof-byt.ri",
409
409
},
410
410
.nocodec_tplg_filename = "sof-byt-nocodec.tplg",
411
411
.ops = &sof_byt_ops,
···
418
418
.resindex_imr_base = 2,
419
419
.irqindex_host_ipc = 5,
420
420
.chip_info = &cht_chip_info,
421
-
.ipc_supported_mask = BIT(SOF_IPC),
422
-
.ipc_default = SOF_IPC,
421
+
.ipc_supported_mask = BIT(SOF_IPC_TYPE_3),
422
+
.ipc_default = SOF_IPC_TYPE_3,
423
423
.default_fw_path = {
424
-
[SOF_IPC] = "intel/sof",
424
+
[SOF_IPC_TYPE_3] = "intel/sof",
425
425
},
426
426
.default_tplg_path = {
427
-
[SOF_IPC] = "intel/sof-tplg",
427
+
[SOF_IPC_TYPE_3] = "intel/sof-tplg",
428
428
},
429
429
.default_fw_filename = {
430
-
[SOF_IPC] = "sof-cht.ri",
430
+
[SOF_IPC_TYPE_3] = "sof-cht.ri",
431
431
},
432
432
.nocodec_tplg_filename = "sof-cht-nocodec.tplg",
433
433
.ops = &sof_cht_ops,
+2
-2
sound/soc/sof/intel/cnl.c
+2
-2
sound/soc/sof/intel/cnl.c
···
386
386
sof_cnl_ops.shutdown = hda_dsp_shutdown;
387
387
388
388
/* ipc */
389
-
if (sdev->pdata->ipc_type == SOF_IPC) {
389
+
if (sdev->pdata->ipc_type == SOF_IPC_TYPE_3) {
390
390
/* doorbell */
391
391
sof_cnl_ops.irq_thread = cnl_ipc_irq_thread;
392
392
···
399
399
sof_cnl_ops.set_power_state = hda_dsp_set_power_state_ipc3;
400
400
}
401
401
402
-
if (sdev->pdata->ipc_type == SOF_INTEL_IPC4) {
402
+
if (sdev->pdata->ipc_type == SOF_IPC_TYPE_4) {
403
403
struct sof_ipc4_fw_data *ipc4_data;
404
404
405
405
sdev->private = devm_kzalloc(sdev->dev, sizeof(*ipc4_data), GFP_KERNEL);
+2
-2
sound/soc/sof/intel/hda-dai-ops.c
+2
-2
sound/soc/sof/intel/hda-dai-ops.c
···
609
609
sdai = swidget->private;
610
610
611
611
switch (sdev->pdata->ipc_type) {
612
-
case SOF_IPC:
612
+
case SOF_IPC_TYPE_3:
613
613
{
614
614
struct sof_dai_private_data *private = sdai->private;
615
615
···
617
617
return &hda_ipc3_dma_ops;
618
618
break;
619
619
}
620
-
case SOF_INTEL_IPC4:
620
+
case SOF_IPC_TYPE_4:
621
621
{
622
622
struct sof_ipc4_copier *ipc4_copier = sdai->private;
623
623
const struct sof_intel_dsp_desc *chip;
+2
-2
sound/soc/sof/intel/hda-dai.c
+2
-2
sound/soc/sof/intel/hda-dai.c
···
607
607
ssp_set_dai_drv_ops(sdev, ops);
608
608
dmic_set_dai_drv_ops(sdev, ops);
609
609
610
-
if (sdev->pdata->ipc_type == SOF_INTEL_IPC4 && !hda_use_tplg_nhlt) {
610
+
if (sdev->pdata->ipc_type == SOF_IPC_TYPE_4 && !hda_use_tplg_nhlt) {
611
611
struct sof_ipc4_fw_data *ipc4_data = sdev->private;
612
612
613
613
ipc4_data->nhlt = intel_nhlt_init(sdev->dev);
···
616
616
617
617
void hda_ops_free(struct snd_sof_dev *sdev)
618
618
{
619
-
if (sdev->pdata->ipc_type == SOF_INTEL_IPC4) {
619
+
if (sdev->pdata->ipc_type == SOF_IPC_TYPE_4) {
620
620
struct sof_ipc4_fw_data *ipc4_data = sdev->private;
621
621
622
622
if (!hda_use_tplg_nhlt)
+1
-1
sound/soc/sof/intel/hda-loader.c
+1
-1
sound/soc/sof/intel/hda-loader.c
···
643
643
/* Check if IMR boot is usable */
644
644
if (!sof_debug_check_flag(SOF_DBG_IGNORE_D3_PERSISTENT) &&
645
645
(sdev->fw_ready.flags & SOF_IPC_INFO_D3_PERSISTENT ||
646
-
sdev->pdata->ipc_type == SOF_INTEL_IPC4))
646
+
sdev->pdata->ipc_type == SOF_IPC_TYPE_4))
647
647
hdev->imrboot_supported = true;
648
648
}
649
649
+1
-1
sound/soc/sof/intel/hda.c
+1
-1
sound/soc/sof/intel/hda.c
···
718
718
hda_dsp_get_state(sdev, level);
719
719
720
720
/* The firmware register dump only available with IPC3 */
721
-
if (flags & SOF_DBG_DUMP_REGS && sdev->pdata->ipc_type == SOF_IPC) {
721
+
if (flags & SOF_DBG_DUMP_REGS && sdev->pdata->ipc_type == SOF_IPC_TYPE_3) {
722
722
u32 status = snd_sof_dsp_read(sdev, HDA_DSP_BAR, HDA_DSP_SRAM_REG_FW_STATUS);
723
723
u32 panic = snd_sof_dsp_read(sdev, HDA_DSP_BAR, HDA_DSP_SRAM_REG_FW_TRACEP);
724
724
+2
-2
sound/soc/sof/intel/icl.c
+2
-2
sound/soc/sof/intel/icl.c
···
107
107
/* probe/remove/shutdown */
108
108
sof_icl_ops.shutdown = hda_dsp_shutdown;
109
109
110
-
if (sdev->pdata->ipc_type == SOF_IPC) {
110
+
if (sdev->pdata->ipc_type == SOF_IPC_TYPE_3) {
111
111
/* doorbell */
112
112
sof_icl_ops.irq_thread = cnl_ipc_irq_thread;
113
113
···
120
120
sof_icl_ops.set_power_state = hda_dsp_set_power_state_ipc3;
121
121
}
122
122
123
-
if (sdev->pdata->ipc_type == SOF_INTEL_IPC4) {
123
+
if (sdev->pdata->ipc_type == SOF_IPC_TYPE_4) {
124
124
struct sof_ipc4_fw_data *ipc4_data;
125
125
126
126
sdev->private = devm_kzalloc(sdev->dev, sizeof(*ipc4_data), GFP_KERNEL);
+18
-18
sound/soc/sof/intel/pci-apl.c
+18
-18
sound/soc/sof/intel/pci-apl.c
···
27
27
.resindex_imr_base = -1,
28
28
.irqindex_host_ipc = -1,
29
29
.chip_info = &apl_chip_info,
30
-
.ipc_supported_mask = BIT(SOF_IPC) | BIT(SOF_INTEL_IPC4),
31
-
.ipc_default = SOF_IPC,
30
+
.ipc_supported_mask = BIT(SOF_IPC_TYPE_3) | BIT(SOF_IPC_TYPE_4),
31
+
.ipc_default = SOF_IPC_TYPE_3,
32
32
.dspless_mode_supported = true, /* Only supported for HDaudio */
33
33
.default_fw_path = {
34
-
[SOF_IPC] = "intel/sof",
35
-
[SOF_INTEL_IPC4] = "intel/avs/apl",
34
+
[SOF_IPC_TYPE_3] = "intel/sof",
35
+
[SOF_IPC_TYPE_4] = "intel/avs/apl",
36
36
},
37
37
.default_lib_path = {
38
-
[SOF_INTEL_IPC4] = "intel/avs-lib/apl",
38
+
[SOF_IPC_TYPE_4] = "intel/avs-lib/apl",
39
39
},
40
40
.default_tplg_path = {
41
-
[SOF_IPC] = "intel/sof-tplg",
42
-
[SOF_INTEL_IPC4] = "intel/avs-tplg",
41
+
[SOF_IPC_TYPE_3] = "intel/sof-tplg",
42
+
[SOF_IPC_TYPE_4] = "intel/avs-tplg",
43
43
},
44
44
.default_fw_filename = {
45
-
[SOF_IPC] = "sof-apl.ri",
46
-
[SOF_INTEL_IPC4] = "dsp_basefw.bin",
45
+
[SOF_IPC_TYPE_3] = "sof-apl.ri",
46
+
[SOF_IPC_TYPE_4] = "dsp_basefw.bin",
47
47
},
48
48
.nocodec_tplg_filename = "sof-apl-nocodec.tplg",
49
49
.ops = &sof_apl_ops,
···
59
59
.resindex_imr_base = -1,
60
60
.irqindex_host_ipc = -1,
61
61
.chip_info = &apl_chip_info,
62
-
.ipc_supported_mask = BIT(SOF_IPC) | BIT(SOF_INTEL_IPC4),
63
-
.ipc_default = SOF_IPC,
62
+
.ipc_supported_mask = BIT(SOF_IPC_TYPE_3) | BIT(SOF_IPC_TYPE_4),
63
+
.ipc_default = SOF_IPC_TYPE_3,
64
64
.dspless_mode_supported = true, /* Only supported for HDaudio */
65
65
.default_fw_path = {
66
-
[SOF_IPC] = "intel/sof",
67
-
[SOF_INTEL_IPC4] = "intel/avs/glk",
66
+
[SOF_IPC_TYPE_3] = "intel/sof",
67
+
[SOF_IPC_TYPE_4] = "intel/avs/glk",
68
68
},
69
69
.default_lib_path = {
70
-
[SOF_INTEL_IPC4] = "intel/avs-lib/glk",
70
+
[SOF_IPC_TYPE_4] = "intel/avs-lib/glk",
71
71
},
72
72
.default_tplg_path = {
73
-
[SOF_IPC] = "intel/sof-tplg",
74
-
[SOF_INTEL_IPC4] = "intel/avs-tplg",
73
+
[SOF_IPC_TYPE_3] = "intel/sof-tplg",
74
+
[SOF_IPC_TYPE_4] = "intel/avs-tplg",
75
75
},
76
76
.default_fw_filename = {
77
-
[SOF_IPC] = "sof-glk.ri",
78
-
[SOF_INTEL_IPC4] = "dsp_basefw.bin",
77
+
[SOF_IPC_TYPE_3] = "sof-glk.ri",
78
+
[SOF_IPC_TYPE_4] = "dsp_basefw.bin",
79
79
},
80
80
.nocodec_tplg_filename = "sof-glk-nocodec.tplg",
81
81
.ops = &sof_apl_ops,
+27
-27
sound/soc/sof/intel/pci-cnl.c
+27
-27
sound/soc/sof/intel/pci-cnl.c
···
28
28
.resindex_imr_base = -1,
29
29
.irqindex_host_ipc = -1,
30
30
.chip_info = &cnl_chip_info,
31
-
.ipc_supported_mask = BIT(SOF_IPC) | BIT(SOF_INTEL_IPC4),
32
-
.ipc_default = SOF_IPC,
31
+
.ipc_supported_mask = BIT(SOF_IPC_TYPE_3) | BIT(SOF_IPC_TYPE_4),
32
+
.ipc_default = SOF_IPC_TYPE_3,
33
33
.dspless_mode_supported = true, /* Only supported for HDaudio */
34
34
.default_fw_path = {
35
-
[SOF_IPC] = "intel/sof",
36
-
[SOF_INTEL_IPC4] = "intel/avs/cnl",
35
+
[SOF_IPC_TYPE_3] = "intel/sof",
36
+
[SOF_IPC_TYPE_4] = "intel/avs/cnl",
37
37
},
38
38
.default_lib_path = {
39
-
[SOF_INTEL_IPC4] = "intel/avs-lib/cnl",
39
+
[SOF_IPC_TYPE_4] = "intel/avs-lib/cnl",
40
40
},
41
41
.default_tplg_path = {
42
-
[SOF_IPC] = "intel/sof-tplg",
43
-
[SOF_INTEL_IPC4] = "intel/avs-tplg",
42
+
[SOF_IPC_TYPE_3] = "intel/sof-tplg",
43
+
[SOF_IPC_TYPE_4] = "intel/avs-tplg",
44
44
},
45
45
.default_fw_filename = {
46
-
[SOF_IPC] = "sof-cnl.ri",
47
-
[SOF_INTEL_IPC4] = "dsp_basefw.bin",
46
+
[SOF_IPC_TYPE_3] = "sof-cnl.ri",
47
+
[SOF_IPC_TYPE_4] = "dsp_basefw.bin",
48
48
},
49
49
.nocodec_tplg_filename = "sof-cnl-nocodec.tplg",
50
50
.ops = &sof_cnl_ops,
···
61
61
.resindex_imr_base = -1,
62
62
.irqindex_host_ipc = -1,
63
63
.chip_info = &cnl_chip_info,
64
-
.ipc_supported_mask = BIT(SOF_IPC) | BIT(SOF_INTEL_IPC4),
65
-
.ipc_default = SOF_IPC,
64
+
.ipc_supported_mask = BIT(SOF_IPC_TYPE_3) | BIT(SOF_IPC_TYPE_4),
65
+
.ipc_default = SOF_IPC_TYPE_3,
66
66
.dspless_mode_supported = true, /* Only supported for HDaudio */
67
67
.default_fw_path = {
68
-
[SOF_IPC] = "intel/sof",
69
-
[SOF_INTEL_IPC4] = "intel/avs/cnl",
68
+
[SOF_IPC_TYPE_3] = "intel/sof",
69
+
[SOF_IPC_TYPE_4] = "intel/avs/cnl",
70
70
},
71
71
.default_lib_path = {
72
-
[SOF_INTEL_IPC4] = "intel/avs-lib/cnl",
72
+
[SOF_IPC_TYPE_4] = "intel/avs-lib/cnl",
73
73
},
74
74
.default_tplg_path = {
75
-
[SOF_IPC] = "intel/sof-tplg",
76
-
[SOF_INTEL_IPC4] = "intel/avs-tplg",
75
+
[SOF_IPC_TYPE_3] = "intel/sof-tplg",
76
+
[SOF_IPC_TYPE_4] = "intel/avs-tplg",
77
77
},
78
78
.default_fw_filename = {
79
-
[SOF_IPC] = "sof-cfl.ri",
80
-
[SOF_INTEL_IPC4] = "dsp_basefw.bin",
79
+
[SOF_IPC_TYPE_3] = "sof-cfl.ri",
80
+
[SOF_IPC_TYPE_4] = "dsp_basefw.bin",
81
81
},
82
82
.nocodec_tplg_filename = "sof-cnl-nocodec.tplg",
83
83
.ops = &sof_cnl_ops,
···
94
94
.resindex_imr_base = -1,
95
95
.irqindex_host_ipc = -1,
96
96
.chip_info = &cnl_chip_info,
97
-
.ipc_supported_mask = BIT(SOF_IPC) | BIT(SOF_INTEL_IPC4),
98
-
.ipc_default = SOF_IPC,
97
+
.ipc_supported_mask = BIT(SOF_IPC_TYPE_3) | BIT(SOF_IPC_TYPE_4),
98
+
.ipc_default = SOF_IPC_TYPE_3,
99
99
.dspless_mode_supported = true, /* Only supported for HDaudio */
100
100
.default_fw_path = {
101
-
[SOF_IPC] = "intel/sof",
102
-
[SOF_INTEL_IPC4] = "intel/avs/cnl",
101
+
[SOF_IPC_TYPE_3] = "intel/sof",
102
+
[SOF_IPC_TYPE_4] = "intel/avs/cnl",
103
103
},
104
104
.default_lib_path = {
105
-
[SOF_INTEL_IPC4] = "intel/avs-lib/cnl",
105
+
[SOF_IPC_TYPE_4] = "intel/avs-lib/cnl",
106
106
},
107
107
.default_tplg_path = {
108
-
[SOF_IPC] = "intel/sof-tplg",
109
-
[SOF_INTEL_IPC4] = "intel/avs-tplg",
108
+
[SOF_IPC_TYPE_3] = "intel/sof-tplg",
109
+
[SOF_IPC_TYPE_4] = "intel/avs-tplg",
110
110
},
111
111
.default_fw_filename = {
112
-
[SOF_IPC] = "sof-cml.ri",
113
-
[SOF_INTEL_IPC4] = "dsp_basefw.bin",
112
+
[SOF_IPC_TYPE_3] = "sof-cml.ri",
113
+
[SOF_IPC_TYPE_4] = "dsp_basefw.bin",
114
114
},
115
115
.nocodec_tplg_filename = "sof-cnl-nocodec.tplg",
116
116
.ops = &sof_cnl_ops,
+18
-18
sound/soc/sof/intel/pci-icl.c
+18
-18
sound/soc/sof/intel/pci-icl.c
···
28
28
.resindex_imr_base = -1,
29
29
.irqindex_host_ipc = -1,
30
30
.chip_info = &icl_chip_info,
31
-
.ipc_supported_mask = BIT(SOF_IPC) | BIT(SOF_INTEL_IPC4),
32
-
.ipc_default = SOF_IPC,
31
+
.ipc_supported_mask = BIT(SOF_IPC_TYPE_3) | BIT(SOF_IPC_TYPE_4),
32
+
.ipc_default = SOF_IPC_TYPE_3,
33
33
.dspless_mode_supported = true, /* Only supported for HDaudio */
34
34
.default_fw_path = {
35
-
[SOF_IPC] = "intel/sof",
36
-
[SOF_INTEL_IPC4] = "intel/avs/icl",
35
+
[SOF_IPC_TYPE_3] = "intel/sof",
36
+
[SOF_IPC_TYPE_4] = "intel/avs/icl",
37
37
},
38
38
.default_lib_path = {
39
-
[SOF_INTEL_IPC4] = "intel/avs-lib/icl",
39
+
[SOF_IPC_TYPE_4] = "intel/avs-lib/icl",
40
40
},
41
41
.default_tplg_path = {
42
-
[SOF_IPC] = "intel/sof-tplg",
43
-
[SOF_INTEL_IPC4] = "intel/avs-tplg",
42
+
[SOF_IPC_TYPE_3] = "intel/sof-tplg",
43
+
[SOF_IPC_TYPE_4] = "intel/avs-tplg",
44
44
},
45
45
.default_fw_filename = {
46
-
[SOF_IPC] = "sof-icl.ri",
47
-
[SOF_INTEL_IPC4] = "dsp_basefw.bin",
46
+
[SOF_IPC_TYPE_3] = "sof-icl.ri",
47
+
[SOF_IPC_TYPE_4] = "dsp_basefw.bin",
48
48
},
49
49
.nocodec_tplg_filename = "sof-icl-nocodec.tplg",
50
50
.ops = &sof_icl_ops,
···
60
60
.resindex_imr_base = -1,
61
61
.irqindex_host_ipc = -1,
62
62
.chip_info = &jsl_chip_info,
63
-
.ipc_supported_mask = BIT(SOF_IPC) | BIT(SOF_INTEL_IPC4),
64
-
.ipc_default = SOF_IPC,
63
+
.ipc_supported_mask = BIT(SOF_IPC_TYPE_3) | BIT(SOF_IPC_TYPE_4),
64
+
.ipc_default = SOF_IPC_TYPE_3,
65
65
.dspless_mode_supported = true, /* Only supported for HDaudio */
66
66
.default_fw_path = {
67
-
[SOF_IPC] = "intel/sof",
68
-
[SOF_INTEL_IPC4] = "intel/avs/jsl",
67
+
[SOF_IPC_TYPE_3] = "intel/sof",
68
+
[SOF_IPC_TYPE_4] = "intel/avs/jsl",
69
69
},
70
70
.default_lib_path = {
71
-
[SOF_INTEL_IPC4] = "intel/avs-lib/jsl",
71
+
[SOF_IPC_TYPE_4] = "intel/avs-lib/jsl",
72
72
},
73
73
.default_tplg_path = {
74
-
[SOF_IPC] = "intel/sof-tplg",
75
-
[SOF_INTEL_IPC4] = "intel/avs-tplg",
74
+
[SOF_IPC_TYPE_3] = "intel/sof-tplg",
75
+
[SOF_IPC_TYPE_4] = "intel/avs-tplg",
76
76
},
77
77
.default_fw_filename = {
78
-
[SOF_IPC] = "sof-jsl.ri",
79
-
[SOF_INTEL_IPC4] = "dsp_basefw.bin",
78
+
[SOF_IPC_TYPE_3] = "sof-jsl.ri",
79
+
[SOF_IPC_TYPE_4] = "dsp_basefw.bin",
80
80
},
81
81
.nocodec_tplg_filename = "sof-jsl-nocodec.tplg",
82
82
.ops = &sof_cnl_ops,
+5
-5
sound/soc/sof/intel/pci-lnl.c
+5
-5
sound/soc/sof/intel/pci-lnl.c
···
29
29
.resindex_imr_base = -1,
30
30
.irqindex_host_ipc = -1,
31
31
.chip_info = &lnl_chip_info,
32
-
.ipc_supported_mask = BIT(SOF_INTEL_IPC4),
33
-
.ipc_default = SOF_INTEL_IPC4,
32
+
.ipc_supported_mask = BIT(SOF_IPC_TYPE_4),
33
+
.ipc_default = SOF_IPC_TYPE_4,
34
34
.dspless_mode_supported = true,
35
35
.default_fw_path = {
36
-
[SOF_INTEL_IPC4] = "intel/sof-ipc4/lnl",
36
+
[SOF_IPC_TYPE_4] = "intel/sof-ipc4/lnl",
37
37
},
38
38
.default_tplg_path = {
39
-
[SOF_INTEL_IPC4] = "intel/sof-ace-tplg",
39
+
[SOF_IPC_TYPE_4] = "intel/sof-ace-tplg",
40
40
},
41
41
.default_fw_filename = {
42
-
[SOF_INTEL_IPC4] = "sof-lnl.ri",
42
+
[SOF_IPC_TYPE_4] = "sof-lnl.ri",
43
43
},
44
44
.nocodec_tplg_filename = "sof-lnl-nocodec.tplg",
45
45
.ops = &sof_lnl_ops,
+6
-6
sound/soc/sof/intel/pci-mtl.c
+6
-6
sound/soc/sof/intel/pci-mtl.c
···
29
29
.resindex_imr_base = -1,
30
30
.irqindex_host_ipc = -1,
31
31
.chip_info = &mtl_chip_info,
32
-
.ipc_supported_mask = BIT(SOF_INTEL_IPC4),
33
-
.ipc_default = SOF_INTEL_IPC4,
32
+
.ipc_supported_mask = BIT(SOF_IPC_TYPE_4),
33
+
.ipc_default = SOF_IPC_TYPE_4,
34
34
.dspless_mode_supported = true, /* Only supported for HDaudio */
35
35
.default_fw_path = {
36
-
[SOF_INTEL_IPC4] = "intel/sof-ipc4/mtl",
36
+
[SOF_IPC_TYPE_4] = "intel/sof-ipc4/mtl",
37
37
},
38
38
.default_lib_path = {
39
-
[SOF_INTEL_IPC4] = "intel/sof-ipc4-lib/mtl",
39
+
[SOF_IPC_TYPE_4] = "intel/sof-ipc4-lib/mtl",
40
40
},
41
41
.default_tplg_path = {
42
-
[SOF_INTEL_IPC4] = "intel/sof-ace-tplg",
42
+
[SOF_IPC_TYPE_4] = "intel/sof-ace-tplg",
43
43
},
44
44
.default_fw_filename = {
45
-
[SOF_INTEL_IPC4] = "sof-mtl.ri",
45
+
[SOF_IPC_TYPE_4] = "sof-mtl.ri",
46
46
},
47
47
.nocodec_tplg_filename = "sof-mtl-nocodec.tplg",
48
48
.ops = &sof_mtl_ops,
+10
-10
sound/soc/sof/intel/pci-skl.c
+10
-10
sound/soc/sof/intel/pci-skl.c
···
24
24
.resindex_imr_base = -1,
25
25
.chip_info = &skl_chip_info,
26
26
.irqindex_host_ipc = -1,
27
-
.ipc_supported_mask = BIT(SOF_INTEL_IPC4),
28
-
.ipc_default = SOF_INTEL_IPC4,
27
+
.ipc_supported_mask = BIT(SOF_IPC_TYPE_4),
28
+
.ipc_default = SOF_IPC_TYPE_4,
29
29
.dspless_mode_supported = true, /* Only supported for HDaudio */
30
30
.default_fw_path = {
31
-
[SOF_INTEL_IPC4] = "intel/avs/skl",
31
+
[SOF_IPC_TYPE_4] = "intel/avs/skl",
32
32
},
33
33
.default_tplg_path = {
34
-
[SOF_INTEL_IPC4] = "intel/avs-tplg",
34
+
[SOF_IPC_TYPE_4] = "intel/avs-tplg",
35
35
},
36
36
.default_fw_filename = {
37
-
[SOF_INTEL_IPC4] = "dsp_basefw.bin",
37
+
[SOF_IPC_TYPE_4] = "dsp_basefw.bin",
38
38
},
39
39
.nocodec_tplg_filename = "sof-skl-nocodec.tplg",
40
40
.ops = &sof_skl_ops,
···
49
49
.resindex_imr_base = -1,
50
50
.chip_info = &skl_chip_info,
51
51
.irqindex_host_ipc = -1,
52
-
.ipc_supported_mask = BIT(SOF_INTEL_IPC4),
53
-
.ipc_default = SOF_INTEL_IPC4,
52
+
.ipc_supported_mask = BIT(SOF_IPC_TYPE_4),
53
+
.ipc_default = SOF_IPC_TYPE_4,
54
54
.dspless_mode_supported = true, /* Only supported for HDaudio */
55
55
.default_fw_path = {
56
-
[SOF_INTEL_IPC4] = "intel/avs/kbl",
56
+
[SOF_IPC_TYPE_4] = "intel/avs/kbl",
57
57
},
58
58
.default_tplg_path = {
59
-
[SOF_INTEL_IPC4] = "intel/avs-tplg",
59
+
[SOF_IPC_TYPE_4] = "intel/avs-tplg",
60
60
},
61
61
.default_fw_filename = {
62
-
[SOF_INTEL_IPC4] = "dsp_basefw.bin",
62
+
[SOF_IPC_TYPE_4] = "dsp_basefw.bin",
63
63
},
64
64
.nocodec_tplg_filename = "sof-kbl-nocodec.tplg",
65
65
.ops = &sof_skl_ops,
+72
-72
sound/soc/sof/intel/pci-tgl.c
+72
-72
sound/soc/sof/intel/pci-tgl.c
···
28
28
.resindex_imr_base = -1,
29
29
.irqindex_host_ipc = -1,
30
30
.chip_info = &tgl_chip_info,
31
-
.ipc_supported_mask = BIT(SOF_IPC) | BIT(SOF_INTEL_IPC4),
32
-
.ipc_default = SOF_IPC,
31
+
.ipc_supported_mask = BIT(SOF_IPC_TYPE_3) | BIT(SOF_IPC_TYPE_4),
32
+
.ipc_default = SOF_IPC_TYPE_3,
33
33
.dspless_mode_supported = true, /* Only supported for HDaudio */
34
34
.default_fw_path = {
35
-
[SOF_IPC] = "intel/sof",
36
-
[SOF_INTEL_IPC4] = "intel/avs/tgl",
35
+
[SOF_IPC_TYPE_3] = "intel/sof",
36
+
[SOF_IPC_TYPE_4] = "intel/avs/tgl",
37
37
},
38
38
.default_lib_path = {
39
-
[SOF_INTEL_IPC4] = "intel/avs-lib/tgl",
39
+
[SOF_IPC_TYPE_4] = "intel/avs-lib/tgl",
40
40
},
41
41
.default_tplg_path = {
42
-
[SOF_IPC] = "intel/sof-tplg",
43
-
[SOF_INTEL_IPC4] = "intel/avs-tplg",
42
+
[SOF_IPC_TYPE_3] = "intel/sof-tplg",
43
+
[SOF_IPC_TYPE_4] = "intel/avs-tplg",
44
44
},
45
45
.default_fw_filename = {
46
-
[SOF_IPC] = "sof-tgl.ri",
47
-
[SOF_INTEL_IPC4] = "dsp_basefw.bin",
46
+
[SOF_IPC_TYPE_3] = "sof-tgl.ri",
47
+
[SOF_IPC_TYPE_4] = "dsp_basefw.bin",
48
48
},
49
49
.nocodec_tplg_filename = "sof-tgl-nocodec.tplg",
50
50
.ops = &sof_tgl_ops,
···
61
61
.resindex_imr_base = -1,
62
62
.irqindex_host_ipc = -1,
63
63
.chip_info = &tglh_chip_info,
64
-
.ipc_supported_mask = BIT(SOF_IPC) | BIT(SOF_INTEL_IPC4),
65
-
.ipc_default = SOF_IPC,
64
+
.ipc_supported_mask = BIT(SOF_IPC_TYPE_3) | BIT(SOF_IPC_TYPE_4),
65
+
.ipc_default = SOF_IPC_TYPE_3,
66
66
.dspless_mode_supported = true, /* Only supported for HDaudio */
67
67
.default_fw_path = {
68
-
[SOF_IPC] = "intel/sof",
69
-
[SOF_INTEL_IPC4] = "intel/avs/tgl-h",
68
+
[SOF_IPC_TYPE_3] = "intel/sof",
69
+
[SOF_IPC_TYPE_4] = "intel/avs/tgl-h",
70
70
},
71
71
.default_lib_path = {
72
-
[SOF_INTEL_IPC4] = "intel/avs-lib/tgl-h",
72
+
[SOF_IPC_TYPE_4] = "intel/avs-lib/tgl-h",
73
73
},
74
74
.default_tplg_path = {
75
-
[SOF_IPC] = "intel/sof-tplg",
76
-
[SOF_INTEL_IPC4] = "intel/avs-tplg",
75
+
[SOF_IPC_TYPE_3] = "intel/sof-tplg",
76
+
[SOF_IPC_TYPE_4] = "intel/avs-tplg",
77
77
},
78
78
.default_fw_filename = {
79
-
[SOF_IPC] = "sof-tgl-h.ri",
80
-
[SOF_INTEL_IPC4] = "dsp_basefw.bin",
79
+
[SOF_IPC_TYPE_3] = "sof-tgl-h.ri",
80
+
[SOF_IPC_TYPE_4] = "dsp_basefw.bin",
81
81
},
82
82
.nocodec_tplg_filename = "sof-tgl-nocodec.tplg",
83
83
.ops = &sof_tgl_ops,
···
93
93
.resindex_imr_base = -1,
94
94
.irqindex_host_ipc = -1,
95
95
.chip_info = &ehl_chip_info,
96
-
.ipc_supported_mask = BIT(SOF_IPC) | BIT(SOF_INTEL_IPC4),
97
-
.ipc_default = SOF_IPC,
96
+
.ipc_supported_mask = BIT(SOF_IPC_TYPE_3) | BIT(SOF_IPC_TYPE_4),
97
+
.ipc_default = SOF_IPC_TYPE_3,
98
98
.dspless_mode_supported = true, /* Only supported for HDaudio */
99
99
.default_fw_path = {
100
-
[SOF_IPC] = "intel/sof",
101
-
[SOF_INTEL_IPC4] = "intel/avs/ehl",
100
+
[SOF_IPC_TYPE_3] = "intel/sof",
101
+
[SOF_IPC_TYPE_4] = "intel/avs/ehl",
102
102
},
103
103
.default_lib_path = {
104
-
[SOF_INTEL_IPC4] = "intel/avs-lib/ehl",
104
+
[SOF_IPC_TYPE_4] = "intel/avs-lib/ehl",
105
105
},
106
106
.default_tplg_path = {
107
-
[SOF_IPC] = "intel/sof-tplg",
108
-
[SOF_INTEL_IPC4] = "intel/avs-tplg",
107
+
[SOF_IPC_TYPE_3] = "intel/sof-tplg",
108
+
[SOF_IPC_TYPE_4] = "intel/avs-tplg",
109
109
},
110
110
.default_fw_filename = {
111
-
[SOF_IPC] = "sof-ehl.ri",
112
-
[SOF_INTEL_IPC4] = "dsp_basefw.bin",
111
+
[SOF_IPC_TYPE_3] = "sof-ehl.ri",
112
+
[SOF_IPC_TYPE_4] = "dsp_basefw.bin",
113
113
},
114
114
.nocodec_tplg_filename = "sof-ehl-nocodec.tplg",
115
115
.ops = &sof_tgl_ops,
···
126
126
.resindex_imr_base = -1,
127
127
.irqindex_host_ipc = -1,
128
128
.chip_info = &adls_chip_info,
129
-
.ipc_supported_mask = BIT(SOF_IPC) | BIT(SOF_INTEL_IPC4),
130
-
.ipc_default = SOF_IPC,
129
+
.ipc_supported_mask = BIT(SOF_IPC_TYPE_3) | BIT(SOF_IPC_TYPE_4),
130
+
.ipc_default = SOF_IPC_TYPE_3,
131
131
.dspless_mode_supported = true, /* Only supported for HDaudio */
132
132
.default_fw_path = {
133
-
[SOF_IPC] = "intel/sof",
134
-
[SOF_INTEL_IPC4] = "intel/avs/adl-s",
133
+
[SOF_IPC_TYPE_3] = "intel/sof",
134
+
[SOF_IPC_TYPE_4] = "intel/avs/adl-s",
135
135
},
136
136
.default_lib_path = {
137
-
[SOF_INTEL_IPC4] = "intel/avs-lib/adl-s",
137
+
[SOF_IPC_TYPE_4] = "intel/avs-lib/adl-s",
138
138
},
139
139
.default_tplg_path = {
140
-
[SOF_IPC] = "intel/sof-tplg",
141
-
[SOF_INTEL_IPC4] = "intel/avs-tplg",
140
+
[SOF_IPC_TYPE_3] = "intel/sof-tplg",
141
+
[SOF_IPC_TYPE_4] = "intel/avs-tplg",
142
142
},
143
143
.default_fw_filename = {
144
-
[SOF_IPC] = "sof-adl-s.ri",
145
-
[SOF_INTEL_IPC4] = "dsp_basefw.bin",
144
+
[SOF_IPC_TYPE_3] = "sof-adl-s.ri",
145
+
[SOF_IPC_TYPE_4] = "dsp_basefw.bin",
146
146
},
147
147
.nocodec_tplg_filename = "sof-adl-nocodec.tplg",
148
148
.ops = &sof_tgl_ops,
···
159
159
.resindex_imr_base = -1,
160
160
.irqindex_host_ipc = -1,
161
161
.chip_info = &tgl_chip_info,
162
-
.ipc_supported_mask = BIT(SOF_IPC) | BIT(SOF_INTEL_IPC4),
163
-
.ipc_default = SOF_IPC,
162
+
.ipc_supported_mask = BIT(SOF_IPC_TYPE_3) | BIT(SOF_IPC_TYPE_4),
163
+
.ipc_default = SOF_IPC_TYPE_3,
164
164
.dspless_mode_supported = true, /* Only supported for HDaudio */
165
165
.default_fw_path = {
166
-
[SOF_IPC] = "intel/sof",
167
-
[SOF_INTEL_IPC4] = "intel/avs/adl",
166
+
[SOF_IPC_TYPE_3] = "intel/sof",
167
+
[SOF_IPC_TYPE_4] = "intel/avs/adl",
168
168
},
169
169
.default_lib_path = {
170
-
[SOF_INTEL_IPC4] = "intel/avs-lib/adl",
170
+
[SOF_IPC_TYPE_4] = "intel/avs-lib/adl",
171
171
},
172
172
.default_tplg_path = {
173
-
[SOF_IPC] = "intel/sof-tplg",
174
-
[SOF_INTEL_IPC4] = "intel/avs-tplg",
173
+
[SOF_IPC_TYPE_3] = "intel/sof-tplg",
174
+
[SOF_IPC_TYPE_4] = "intel/avs-tplg",
175
175
},
176
176
.default_fw_filename = {
177
-
[SOF_IPC] = "sof-adl.ri",
178
-
[SOF_INTEL_IPC4] = "dsp_basefw.bin",
177
+
[SOF_IPC_TYPE_3] = "sof-adl.ri",
178
+
[SOF_IPC_TYPE_4] = "dsp_basefw.bin",
179
179
},
180
180
.nocodec_tplg_filename = "sof-adl-nocodec.tplg",
181
181
.ops = &sof_tgl_ops,
···
192
192
.resindex_imr_base = -1,
193
193
.irqindex_host_ipc = -1,
194
194
.chip_info = &tgl_chip_info,
195
-
.ipc_supported_mask = BIT(SOF_IPC) | BIT(SOF_INTEL_IPC4),
196
-
.ipc_default = SOF_IPC,
195
+
.ipc_supported_mask = BIT(SOF_IPC_TYPE_3) | BIT(SOF_IPC_TYPE_4),
196
+
.ipc_default = SOF_IPC_TYPE_3,
197
197
.dspless_mode_supported = true, /* Only supported for HDaudio */
198
198
.default_fw_path = {
199
-
[SOF_IPC] = "intel/sof",
200
-
[SOF_INTEL_IPC4] = "intel/avs/adl-n",
199
+
[SOF_IPC_TYPE_3] = "intel/sof",
200
+
[SOF_IPC_TYPE_4] = "intel/avs/adl-n",
201
201
},
202
202
.default_lib_path = {
203
-
[SOF_INTEL_IPC4] = "intel/avs-lib/adl-n",
203
+
[SOF_IPC_TYPE_4] = "intel/avs-lib/adl-n",
204
204
},
205
205
.default_tplg_path = {
206
-
[SOF_IPC] = "intel/sof-tplg",
207
-
[SOF_INTEL_IPC4] = "intel/avs-tplg",
206
+
[SOF_IPC_TYPE_3] = "intel/sof-tplg",
207
+
[SOF_IPC_TYPE_4] = "intel/avs-tplg",
208
208
},
209
209
.default_fw_filename = {
210
-
[SOF_IPC] = "sof-adl-n.ri",
211
-
[SOF_INTEL_IPC4] = "dsp_basefw.bin",
210
+
[SOF_IPC_TYPE_3] = "sof-adl-n.ri",
211
+
[SOF_IPC_TYPE_4] = "dsp_basefw.bin",
212
212
},
213
213
.nocodec_tplg_filename = "sof-adl-nocodec.tplg",
214
214
.ops = &sof_tgl_ops,
···
225
225
.resindex_imr_base = -1,
226
226
.irqindex_host_ipc = -1,
227
227
.chip_info = &adls_chip_info,
228
-
.ipc_supported_mask = BIT(SOF_IPC) | BIT(SOF_INTEL_IPC4),
229
-
.ipc_default = SOF_IPC,
228
+
.ipc_supported_mask = BIT(SOF_IPC_TYPE_3) | BIT(SOF_IPC_TYPE_4),
229
+
.ipc_default = SOF_IPC_TYPE_3,
230
230
.dspless_mode_supported = true, /* Only supported for HDaudio */
231
231
.default_fw_path = {
232
-
[SOF_IPC] = "intel/sof",
233
-
[SOF_INTEL_IPC4] = "intel/avs/rpl-s",
232
+
[SOF_IPC_TYPE_3] = "intel/sof",
233
+
[SOF_IPC_TYPE_4] = "intel/avs/rpl-s",
234
234
},
235
235
.default_lib_path = {
236
-
[SOF_INTEL_IPC4] = "intel/avs-lib/rpl-s",
236
+
[SOF_IPC_TYPE_4] = "intel/avs-lib/rpl-s",
237
237
},
238
238
.default_tplg_path = {
239
-
[SOF_IPC] = "intel/sof-tplg",
240
-
[SOF_INTEL_IPC4] = "intel/avs-tplg",
239
+
[SOF_IPC_TYPE_3] = "intel/sof-tplg",
240
+
[SOF_IPC_TYPE_4] = "intel/avs-tplg",
241
241
},
242
242
.default_fw_filename = {
243
-
[SOF_IPC] = "sof-rpl-s.ri",
244
-
[SOF_INTEL_IPC4] = "dsp_basefw.bin",
243
+
[SOF_IPC_TYPE_3] = "sof-rpl-s.ri",
244
+
[SOF_IPC_TYPE_4] = "dsp_basefw.bin",
245
245
},
246
246
.nocodec_tplg_filename = "sof-rpl-nocodec.tplg",
247
247
.ops = &sof_tgl_ops,
···
258
258
.resindex_imr_base = -1,
259
259
.irqindex_host_ipc = -1,
260
260
.chip_info = &tgl_chip_info,
261
-
.ipc_supported_mask = BIT(SOF_IPC) | BIT(SOF_INTEL_IPC4),
262
-
.ipc_default = SOF_IPC,
261
+
.ipc_supported_mask = BIT(SOF_IPC_TYPE_3) | BIT(SOF_IPC_TYPE_4),
262
+
.ipc_default = SOF_IPC_TYPE_3,
263
263
.dspless_mode_supported = true, /* Only supported for HDaudio */
264
264
.default_fw_path = {
265
-
[SOF_IPC] = "intel/sof",
266
-
[SOF_INTEL_IPC4] = "intel/avs/rpl",
265
+
[SOF_IPC_TYPE_3] = "intel/sof",
266
+
[SOF_IPC_TYPE_4] = "intel/avs/rpl",
267
267
},
268
268
.default_lib_path = {
269
-
[SOF_INTEL_IPC4] = "intel/avs-lib/rpl",
269
+
[SOF_IPC_TYPE_4] = "intel/avs-lib/rpl",
270
270
},
271
271
.default_tplg_path = {
272
-
[SOF_IPC] = "intel/sof-tplg",
273
-
[SOF_INTEL_IPC4] = "intel/avs-tplg",
272
+
[SOF_IPC_TYPE_3] = "intel/sof-tplg",
273
+
[SOF_IPC_TYPE_4] = "intel/avs-tplg",
274
274
},
275
275
.default_fw_filename = {
276
-
[SOF_IPC] = "sof-rpl.ri",
277
-
[SOF_INTEL_IPC4] = "dsp_basefw.bin",
276
+
[SOF_IPC_TYPE_3] = "sof-rpl.ri",
277
+
[SOF_IPC_TYPE_4] = "dsp_basefw.bin",
278
278
},
279
279
.nocodec_tplg_filename = "sof-rpl-nocodec.tplg",
280
280
.ops = &sof_tgl_ops,
+5
-5
sound/soc/sof/intel/pci-tng.c
+5
-5
sound/soc/sof/intel/pci-tng.c
···
208
208
.resindex_imr_base = 0,
209
209
.irqindex_host_ipc = -1,
210
210
.chip_info = &tng_chip_info,
211
-
.ipc_supported_mask = BIT(SOF_IPC),
212
-
.ipc_default = SOF_IPC,
211
+
.ipc_supported_mask = BIT(SOF_IPC_TYPE_3),
212
+
.ipc_default = SOF_IPC_TYPE_3,
213
213
.default_fw_path = {
214
-
[SOF_IPC] = "intel/sof",
214
+
[SOF_IPC_TYPE_3] = "intel/sof",
215
215
},
216
216
.default_tplg_path = {
217
-
[SOF_IPC] = "intel/sof-tplg",
217
+
[SOF_IPC_TYPE_3] = "intel/sof-tplg",
218
218
},
219
219
.default_fw_filename = {
220
-
[SOF_IPC] = "sof-byt.ri",
220
+
[SOF_IPC_TYPE_3] = "sof-byt.ri",
221
221
},
222
222
.nocodec_tplg_filename = "sof-byt.tplg",
223
223
.ops = &sof_tng_ops,
+2
-2
sound/soc/sof/intel/tgl.c
+2
-2
sound/soc/sof/intel/tgl.c
···
66
66
/* probe/remove/shutdown */
67
67
sof_tgl_ops.shutdown = hda_dsp_shutdown_dma_flush;
68
68
69
-
if (sdev->pdata->ipc_type == SOF_IPC) {
69
+
if (sdev->pdata->ipc_type == SOF_IPC_TYPE_3) {
70
70
/* doorbell */
71
71
sof_tgl_ops.irq_thread = cnl_ipc_irq_thread;
72
72
···
79
79
sof_tgl_ops.set_power_state = hda_dsp_set_power_state_ipc3;
80
80
}
81
81
82
-
if (sdev->pdata->ipc_type == SOF_INTEL_IPC4) {
82
+
if (sdev->pdata->ipc_type == SOF_IPC_TYPE_4) {
83
83
struct sof_ipc4_fw_data *ipc4_data;
84
84
85
85
sdev->private = devm_kzalloc(sdev->dev, sizeof(*ipc4_data), GFP_KERNEL);
+3
-3
sound/soc/sof/ipc.c
+3
-3
sound/soc/sof/ipc.c
···
165
165
166
166
switch (sdev->pdata->ipc_type) {
167
167
#if defined(CONFIG_SND_SOC_SOF_IPC3)
168
-
case SOF_IPC:
168
+
case SOF_IPC_TYPE_3:
169
169
ops = &ipc3_ops;
170
170
break;
171
171
#endif
172
-
#if defined(CONFIG_SND_SOC_SOF_INTEL_IPC4)
173
-
case SOF_INTEL_IPC4:
172
+
#if defined(CONFIG_SND_SOC_SOF_IPC4)
173
+
case SOF_IPC_TYPE_4:
174
174
ops = &ipc4_ops;
175
175
break;
176
176
#endif
+1
-1
sound/soc/sof/ipc3-dtrace.c
+1
-1
sound/soc/sof/ipc3-dtrace.c
+10
-10
sound/soc/sof/mediatek/mt8186/mt8186.c
+10
-10
sound/soc/sof/mediatek/mt8186/mt8186.c
···
607
607
608
608
static const struct sof_dev_desc sof_of_mt8186_desc = {
609
609
.of_machines = sof_mt8186_machs,
610
-
.ipc_supported_mask = BIT(SOF_IPC),
611
-
.ipc_default = SOF_IPC,
610
+
.ipc_supported_mask = BIT(SOF_IPC_TYPE_3),
611
+
.ipc_default = SOF_IPC_TYPE_3,
612
612
.default_fw_path = {
613
-
[SOF_IPC] = "mediatek/sof",
613
+
[SOF_IPC_TYPE_3] = "mediatek/sof",
614
614
},
615
615
.default_tplg_path = {
616
-
[SOF_IPC] = "mediatek/sof-tplg",
616
+
[SOF_IPC_TYPE_3] = "mediatek/sof-tplg",
617
617
},
618
618
.default_fw_filename = {
619
-
[SOF_IPC] = "sof-mt8186.ri",
619
+
[SOF_IPC_TYPE_3] = "sof-mt8186.ri",
620
620
},
621
621
.nocodec_tplg_filename = "sof-mt8186-nocodec.tplg",
622
622
.ops = &sof_mt8186_ops,
···
681
681
682
682
static const struct sof_dev_desc sof_of_mt8188_desc = {
683
683
.of_machines = sof_mt8188_machs,
684
-
.ipc_supported_mask = BIT(SOF_IPC),
685
-
.ipc_default = SOF_IPC,
684
+
.ipc_supported_mask = BIT(SOF_IPC_TYPE_3),
685
+
.ipc_default = SOF_IPC_TYPE_3,
686
686
.default_fw_path = {
687
-
[SOF_IPC] = "mediatek/sof",
687
+
[SOF_IPC_TYPE_3] = "mediatek/sof",
688
688
},
689
689
.default_tplg_path = {
690
-
[SOF_IPC] = "mediatek/sof-tplg",
690
+
[SOF_IPC_TYPE_3] = "mediatek/sof-tplg",
691
691
},
692
692
.default_fw_filename = {
693
-
[SOF_IPC] = "sof-mt8188.ri",
693
+
[SOF_IPC_TYPE_3] = "sof-mt8188.ri",
694
694
},
695
695
.nocodec_tplg_filename = "sof-mt8188-nocodec.tplg",
696
696
.ops = &sof_mt8188_ops,
+5
-5
sound/soc/sof/mediatek/mt8195/mt8195.c
+5
-5
sound/soc/sof/mediatek/mt8195/mt8195.c
···
635
635
636
636
static const struct sof_dev_desc sof_of_mt8195_desc = {
637
637
.of_machines = sof_mt8195_machs,
638
-
.ipc_supported_mask = BIT(SOF_IPC),
639
-
.ipc_default = SOF_IPC,
638
+
.ipc_supported_mask = BIT(SOF_IPC_TYPE_3),
639
+
.ipc_default = SOF_IPC_TYPE_3,
640
640
.default_fw_path = {
641
-
[SOF_IPC] = "mediatek/sof",
641
+
[SOF_IPC_TYPE_3] = "mediatek/sof",
642
642
},
643
643
.default_tplg_path = {
644
-
[SOF_IPC] = "mediatek/sof-tplg",
644
+
[SOF_IPC_TYPE_3] = "mediatek/sof-tplg",
645
645
},
646
646
.default_fw_filename = {
647
-
[SOF_IPC] = "sof-mt8195.ri",
647
+
[SOF_IPC_TYPE_3] = "sof-mt8195.ri",
648
648
},
649
649
.nocodec_tplg_filename = "sof-mt8195-nocodec.tplg",
650
650
.ops = &sof_mt8195_ops,
+3
-5
sound/soc/sof/sof-acpi-dev.c
+3
-5
sound/soc/sof/sof-acpi-dev.c
···
74
74
75
75
sof_pdata->desc = desc;
76
76
sof_pdata->dev = &pdev->dev;
77
-
sof_pdata->fw_filename = desc->default_fw_filename[SOF_IPC];
77
+
sof_pdata->fw_filename = desc->default_fw_filename[SOF_IPC_TYPE_3];
78
78
79
79
/* alternate fw and tplg filenames ? */
80
80
if (fw_path)
81
81
sof_pdata->fw_filename_prefix = fw_path;
82
82
else
83
-
sof_pdata->fw_filename_prefix =
84
-
sof_pdata->desc->default_fw_path[SOF_IPC];
83
+
sof_pdata->fw_filename_prefix = desc->default_fw_path[SOF_IPC_TYPE_3];
85
84
86
85
if (tplg_path)
87
86
sof_pdata->tplg_filename_prefix = tplg_path;
88
87
else
89
-
sof_pdata->tplg_filename_prefix =
90
-
sof_pdata->desc->default_tplg_path[SOF_IPC];
88
+
sof_pdata->tplg_filename_prefix = desc->default_tplg_path[SOF_IPC_TYPE_3];
91
89
92
90
/* set callback to be called on successful device probe to enable runtime_pm */
93
91
sof_pdata->sof_probe_complete = sof_acpi_probe_complete;
+2
-2
sound/soc/sof/sof-client-ipc-msg-injector.c
+2
-2
sound/soc/sof/sof-client-ipc-msg-injector.c
···
267
267
priv->max_msg_size = sof_client_get_ipc_max_payload_size(cdev);
268
268
alloc_size = priv->max_msg_size;
269
269
270
-
if (priv->ipc_type == SOF_INTEL_IPC4)
270
+
if (priv->ipc_type == SOF_IPC_TYPE_4)
271
271
alloc_size += sizeof(struct sof_ipc4_msg);
272
272
273
273
priv->tx_buffer = devm_kmalloc(dev, alloc_size, GFP_KERNEL);
···
275
275
if (!priv->tx_buffer || !priv->rx_buffer)
276
276
return -ENOMEM;
277
277
278
-
if (priv->ipc_type == SOF_INTEL_IPC4) {
278
+
if (priv->ipc_type == SOF_IPC_TYPE_4) {
279
279
struct sof_ipc4_msg *ipc4_msg;
280
280
281
281
ipc4_msg = priv->tx_buffer;
+3
-3
sound/soc/sof/sof-client-probes.c
+3
-3
sound/soc/sof/sof-client-probes.c
···
423
423
priv->host_ops = ops;
424
424
425
425
switch (sof_client_get_ipc_type(cdev)) {
426
-
#ifdef CONFIG_SND_SOC_SOF_INTEL_IPC4
427
-
case SOF_INTEL_IPC4:
426
+
#ifdef CONFIG_SND_SOC_SOF_IPC4
427
+
case SOF_IPC_TYPE_4:
428
428
priv->ipc_ops = &ipc4_probe_ops;
429
429
break;
430
430
#endif
431
431
#ifdef CONFIG_SND_SOC_SOF_IPC3
432
-
case SOF_IPC:
432
+
case SOF_IPC_TYPE_3:
433
433
priv->ipc_ops = &ipc3_probe_ops;
434
434
break;
435
435
#endif
+13
-13
sound/soc/sof/sof-client.c
+13
-13
sound/soc/sof/sof-client.c
···
75
75
int ret = 0;
76
76
int i;
77
77
78
-
if (sdev->pdata->ipc_type != SOF_IPC)
78
+
if (sdev->pdata->ipc_type != SOF_IPC_TYPE_3)
79
79
return 0;
80
80
81
81
for (i = 0; i < CONFIG_SND_SOC_SOF_DEBUG_IPC_FLOOD_TEST_NUM; i++) {
···
131
131
static int sof_register_ipc_kernel_injector(struct snd_sof_dev *sdev)
132
132
{
133
133
/* Only IPC3 supported right now */
134
-
if (sdev->pdata->ipc_type != SOF_IPC)
134
+
if (sdev->pdata->ipc_type != SOF_IPC_TYPE_3)
135
135
return 0;
136
136
137
137
return sof_client_dev_register(sdev, "kernel_injector", 0, NULL, 0);
···
287
287
int sof_client_ipc_tx_message(struct sof_client_dev *cdev, void *ipc_msg,
288
288
void *reply_data, size_t reply_bytes)
289
289
{
290
-
if (cdev->sdev->pdata->ipc_type == SOF_IPC) {
290
+
if (cdev->sdev->pdata->ipc_type == SOF_IPC_TYPE_3) {
291
291
struct sof_ipc_cmd_hdr *hdr = ipc_msg;
292
292
293
293
return sof_ipc_tx_message(cdev->sdev->ipc, ipc_msg, hdr->size,
294
294
reply_data, reply_bytes);
295
-
} else if (cdev->sdev->pdata->ipc_type == SOF_INTEL_IPC4) {
295
+
} else if (cdev->sdev->pdata->ipc_type == SOF_IPC_TYPE_4) {
296
296
struct sof_ipc4_msg *msg = ipc_msg;
297
297
298
298
return sof_ipc_tx_message(cdev->sdev->ipc, ipc_msg, msg->data_size,
···
305
305
306
306
int sof_client_ipc_rx_message(struct sof_client_dev *cdev, void *ipc_msg, void *msg_buf)
307
307
{
308
-
if (cdev->sdev->pdata->ipc_type == SOF_IPC) {
308
+
if (cdev->sdev->pdata->ipc_type == SOF_IPC_TYPE_3) {
309
309
struct sof_ipc_cmd_hdr *hdr = ipc_msg;
310
310
311
311
if (hdr->size < sizeof(hdr)) {
···
324
324
int sof_client_ipc_set_get_data(struct sof_client_dev *cdev, void *ipc_msg,
325
325
bool set)
326
326
{
327
-
if (cdev->sdev->pdata->ipc_type == SOF_IPC) {
327
+
if (cdev->sdev->pdata->ipc_type == SOF_IPC_TYPE_3) {
328
328
struct sof_ipc_cmd_hdr *hdr = ipc_msg;
329
329
330
330
return sof_ipc_set_get_data(cdev->sdev->ipc, ipc_msg, hdr->size,
331
331
set);
332
-
} else if (cdev->sdev->pdata->ipc_type == SOF_INTEL_IPC4) {
332
+
} else if (cdev->sdev->pdata->ipc_type == SOF_IPC_TYPE_4) {
333
333
struct sof_ipc4_msg *msg = ipc_msg;
334
334
335
335
return sof_ipc_set_get_data(cdev->sdev->ipc, ipc_msg,
···
340
340
}
341
341
EXPORT_SYMBOL_NS_GPL(sof_client_ipc_set_get_data, SND_SOC_SOF_CLIENT);
342
342
343
-
#ifdef CONFIG_SND_SOC_SOF_INTEL_IPC4
343
+
#ifdef CONFIG_SND_SOC_SOF_IPC4
344
344
struct sof_ipc4_fw_module *sof_client_ipc4_find_module(struct sof_client_dev *c, const guid_t *uuid)
345
345
{
346
346
struct snd_sof_dev *sdev = c->sdev;
347
347
348
-
if (sdev->pdata->ipc_type == SOF_INTEL_IPC4)
348
+
if (sdev->pdata->ipc_type == SOF_IPC_TYPE_4)
349
349
return sof_ipc4_find_module_by_uuid(sdev, uuid);
350
350
dev_err(sdev->dev, "Only supported with IPC4\n");
351
351
···
463
463
struct sof_ipc_event_entry *event;
464
464
u32 msg_type;
465
465
466
-
if (sdev->pdata->ipc_type == SOF_IPC) {
466
+
if (sdev->pdata->ipc_type == SOF_IPC_TYPE_3) {
467
467
struct sof_ipc_cmd_hdr *hdr = msg_buf;
468
468
469
469
msg_type = hdr->cmd & SOF_GLB_TYPE_MASK;
470
-
} else if (sdev->pdata->ipc_type == SOF_INTEL_IPC4) {
470
+
} else if (sdev->pdata->ipc_type == SOF_IPC_TYPE_4) {
471
471
struct sof_ipc4_msg *msg = msg_buf;
472
472
473
473
msg_type = SOF_IPC4_NOTIFICATION_TYPE_GET(msg->primary);
···
497
497
if (!callback)
498
498
return -EINVAL;
499
499
500
-
if (cdev->sdev->pdata->ipc_type == SOF_IPC) {
500
+
if (cdev->sdev->pdata->ipc_type == SOF_IPC_TYPE_3) {
501
501
if (!(ipc_msg_type & SOF_GLB_TYPE_MASK))
502
502
return -EINVAL;
503
-
} else if (cdev->sdev->pdata->ipc_type == SOF_INTEL_IPC4) {
503
+
} else if (cdev->sdev->pdata->ipc_type == SOF_IPC_TYPE_4) {
504
504
if (!(ipc_msg_type & SOF_IPC4_NOTIFICATION_TYPE_MASK))
505
505
return -EINVAL;
506
506
} else {
+3
-3
sound/soc/sof/sof-of-dev.c
+3
-3
sound/soc/sof/sof-of-dev.c
···
64
64
65
65
sof_pdata->desc = desc;
66
66
sof_pdata->dev = &pdev->dev;
67
-
sof_pdata->fw_filename = desc->default_fw_filename[SOF_IPC];
67
+
sof_pdata->fw_filename = desc->default_fw_filename[SOF_IPC_TYPE_3];
68
68
69
69
if (fw_path)
70
70
sof_pdata->fw_filename_prefix = fw_path;
71
71
else
72
-
sof_pdata->fw_filename_prefix = sof_pdata->desc->default_fw_path[SOF_IPC];
72
+
sof_pdata->fw_filename_prefix = desc->default_fw_path[SOF_IPC_TYPE_3];
73
73
74
74
if (tplg_path)
75
75
sof_pdata->tplg_filename_prefix = tplg_path;
76
76
else
77
-
sof_pdata->tplg_filename_prefix = sof_pdata->desc->default_tplg_path[SOF_IPC];
77
+
sof_pdata->tplg_filename_prefix = desc->default_tplg_path[SOF_IPC_TYPE_3];
78
78
79
79
/* set callback to be called on successful device probe to enable runtime_pm */
80
80
sof_pdata->sof_probe_complete = sof_of_probe_complete;
+1
-1
sound/soc/sof/sof-pci-dev.c
+1
-1
sound/soc/sof/sof-pci-dev.c
···
46
46
47
47
static int sof_pci_ipc_type = -1;
48
48
module_param_named(ipc_type, sof_pci_ipc_type, int, 0444);
49
-
MODULE_PARM_DESC(ipc_type, "SOF IPC type (0): SOF, (1) Intel CAVS");
49
+
MODULE_PARM_DESC(ipc_type, "Force SOF IPC type. 0 - IPC3, 1 - IPC4");
50
50
51
51
static const char *sof_dmi_override_tplg_name;
52
52
static bool sof_dmi_use_community_key;