linux-stable/sound/soc/sof
Arnd Bergmann c5a61db9bf
ASoC: SOF: fix intel-soundwire link failure
My randconfig build setup ran into a rare build failure with

CONFIG_SND_SOC_SOF_INTEL_SOUNDWIRE_LINK_BASELINE=y
CONFIG_SND_SOC_SOF_INTEL_SOUNDWIRE=m
CONFIG_SOUNDWIRE=y
CONFIG_SOUNDWIRE_INTEL=m
CONFIG_SND_SOC_SOF_HDA=y
CONFIG_SND_SOC_SOF_INTEL_TGL=y

x86_64-linux-ld: sound/soc/sof/intel/hda.o: in function `hda_init_caps':
hda.c:(.text+0x691): undefined reference to `sdw_intel_cnl_hw_ops'
x86_64-linux-ld: hda.c:(.text+0x6f2): undefined reference to `sdw_intel_probe'
x86_64-linux-ld: sound/soc/sof/intel/hda.o: in function `hda_sdw_startup':
hda.c:(.text+0x1c40): undefined reference to `sdw_intel_startup'
x86_64-linux-ld: sound/soc/sof/intel/hda.o: in function `hda_sdw_process_wakeen':
hda.c:(.text+0x1cb6): undefined reference to `sdw_intel_process_wakeen_event'
x86_64-linux-ld: sound/soc/sof/intel/hda.o: in function `hda_dsp_interrupt_thread':
hda.c:(.text+0x1d67): undefined reference to `sdw_intel_thread'
x86_64-linux-ld: sound/soc/sof/intel/hda.o: in function `hda_dsp_remove':
hda.c:(.text+0x2655): undefined reference to `sdw_intel_exit'

My best understanding is that the definition of
SND_SOC_SOF_INTEL_SOUNDWIRE_LINK_BASELINE was intended to avoid this
problem, but got it wrong for the SND_SOC_SOF_INTEL_SOUNDWIRE=m case,
where the 'select' is meant to set SOUNDWIRE_INTEL to the value of
SND_SOC_SOF_INTEL_SOUNDWIRE_LINK_BASELINE rather than the intersection of
SND_SOC_SOF_INTEL_SOUNDWIRE_LINK_BASELINE and SND_SOC_SOF_INTEL_SOUNDWIRE.

Change the condition to check for SND_SOC_SOF_INTEL_SOUNDWIRE to be a
boolean rather than a tristate expression in order to propagate this
as intended.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Link: https://lore.kernel.org/r/20230202102247.806749-1-arnd@kernel.org
Signed-off-by: Mark Brown <broonie@kernel.org>
2023-02-03 12:03:58 +00:00
..
amd ASoC: SOF: Prepare set_stream_data_offset for compress API 2023-01-17 13:37:52 +00:00
imx ASoC: SOF: imx8ulp: add missing of_node_put() in imx8ulp_probe() 2022-08-24 12:21:28 +01:00
intel ASoC: SOF: fix intel-soundwire link failure 2023-02-03 12:03:58 +00:00
mediatek ASoC: SOF: Prepare ipc_msg_data to be used with compress API 2023-01-17 13:37:51 +00:00
xtensa
compress.c ASoC: SOF: compress: Set compress data offset 2023-01-17 13:37:54 +00:00
control.c ASoC: SOF: control: Extend the optionality of IPC ops to IPC as well 2022-12-25 23:32:33 +00:00
core.c ASoC: SOF: Introduce struct snd_sof_pipeline 2023-01-27 12:14:08 +00:00
debug.c ASoC: SOF: Add FW state to debugfs 2022-12-21 12:11:51 +00:00
iomem-utils.c ASoC: SOF: Split up utils.c into sof-utils and iomem-utils 2022-02-10 15:19:04 +00:00
ipc.c ASoC: SOF: client: Add sof_client_ipc_set_get_data() 2022-10-31 13:20:20 +00:00
ipc3-control.c ASoC: SOF: Protect swidget->use_count with mutex for kcontrol access race 2023-01-27 12:14:12 +00:00
ipc3-dtrace.c ASoC: SOF: ipc3-dtrace: remove use of __func__ in dev_dbg 2022-06-17 10:46:41 +01:00
ipc3-loader.c ASoC: SOF: Introduce container struct for SOF firmware 2022-10-21 13:04:54 +01:00
ipc3-pcm.c ASoC: SOF: Prepare set_stream_data_offset for compress API 2023-01-17 13:37:52 +00:00
ipc3-priv.h ASoC: SOF: Modify the host trace_init parameter list to include dmab 2022-05-19 16:44:17 +01:00
ipc3-topology.c ASoC: SOF: Protect swidget->use_count with mutex for kcontrol access race 2023-01-27 12:14:12 +00:00
ipc3.c ASoC: SOF: Prepare ipc_msg_data to be used with compress API 2023-01-17 13:37:51 +00:00
ipc4-control.c ASoC: SOF: Protect swidget->use_count with mutex for kcontrol access race 2023-01-27 12:14:12 +00:00
ipc4-loader.c ASoC: SOF: ipc4-loader: get max pipeline number 2022-11-09 13:44:18 +00:00
ipc4-mtrace.c ASoC: SOF: ipc4-mtrace: protect per-core nodes against multiple open 2022-10-18 21:17:21 +01:00
ipc4-pcm.c ASoC: SOF: ipc4-pcm: Do not run the trigger pipelines if no spipe is stored 2023-01-27 12:14:13 +00:00
ipc4-priv.h ASoC: SOF: ipc4-topology: Protect pipeline free with mutex 2023-01-27 12:14:11 +00:00
ipc4-topology.c ASoC: SOF: ipc4-topology: Protect pipeline free with mutex 2023-01-27 12:14:11 +00:00
ipc4-topology.h ASoC: SOF: ipc4-pcm: Use the PCM stream's pipeline_info during trigger 2023-01-27 12:14:07 +00:00
ipc4.c ASoC: SOF: ipc4-topology: Protect pipeline free with mutex 2023-01-27 12:14:11 +00:00
Kconfig ASoC: SOF: Drop obsolete dependency on COMPILE_TEST 2022-11-28 13:04:35 +00:00
loader.c ASoC: SOF: loader: Remove the query_fw_configuration ops 2022-10-21 13:05:10 +01:00
Makefile ASoC: SOF: IPC4: probes: Implement IPC4 ops for probes client device 2022-10-31 13:20:22 +00:00
nocodec.c ASoC: SOF: nocodec: Drop empty platform remove function 2022-12-25 23:32:55 +00:00
ops.c ASoC: SOF: Switch to IPC generic firmware tracing 2022-05-19 16:44:15 +01:00
ops.h ASoC: SOF: Prepare set_stream_data_offset for compress API 2023-01-17 13:37:52 +00:00
pcm.c ASoC: SOF: pcm: do not free widgets during suspend trigger 2023-01-27 12:14:02 +00:00
pm.c ASoC: Merge up 6.2 fixes 2023-01-18 15:33:51 +00:00
sof-acpi-dev.c ASoC: SOF: add IPC-dependent file names 2022-04-19 12:03:34 +01:00
sof-acpi-dev.h
sof-audio.c ASoC: SOF: Protect swidget->use_count with mutex for kcontrol access race 2023-01-27 12:14:12 +00:00
sof-audio.h ASoC: SOF: Protect swidget->use_count with mutex for kcontrol access race 2023-01-27 12:14:12 +00:00
sof-client-ipc-flood-test.c ASoC: SOF: sof-client-ipc-flood-test: use pm_runtime_resume_and_get() 2022-05-19 16:44:29 +01:00
sof-client-ipc-msg-injector.c ASoC: SOF: ipc-msg-injector: fix copy in sof_msg_inject_ipc4_dfs_write() 2022-07-14 13:26:37 +01:00
sof-client-probes-ipc3.c ASoC: SOF: probes: Separate IPC3 operations to a separate file 2022-10-31 13:20:18 +00:00
sof-client-probes-ipc4.c ASoC: SOF: IPC4: probes: Implement IPC4 ops for probes client device 2022-10-31 13:20:22 +00:00
sof-client-probes.c ASoC: SOF: probes: Check ops before memory allocation 2022-11-17 13:58:43 +00:00
sof-client-probes.h ASoC: SOF: IPC4: probes: Implement IPC4 ops for probes client device 2022-10-31 13:20:22 +00:00
sof-client.c ASoC: SOF: client: Add sof_client_ipc4_find_module() function 2022-10-31 13:20:21 +00:00
sof-client.h ASoC: SOF: client: Add sof_client_ipc4_find_module() function 2022-10-31 13:20:21 +00:00
sof-of-dev.c ASoC: SOF: add IPC-dependent file names 2022-04-19 12:03:34 +01:00
sof-of-dev.h ASoC: SOF: Introduce function sof_of_machine_select 2022-08-23 18:22:29 +01:00
sof-pci-dev.c ASoC: SOF: Add path definition for external firmware libraries 2022-10-21 13:05:03 +01:00
sof-pci-dev.h
sof-priv.h ASoC: SOF: Introduce struct snd_sof_pipeline 2023-01-27 12:14:08 +00:00
sof-utils.c ASoC: SOF: remove unneeded dev_vdbg 2022-09-19 15:44:06 +01:00
sof-utils.h ASoC: SOF: Split up utils.c into sof-utils and iomem-utils 2022-02-10 15:19:04 +00:00
stream-ipc.c ASoC: SOF: Add support for compress API for stream data/offset 2023-01-17 13:37:53 +00:00
topology.c ASoC: sof: use helper function 2023-01-31 11:05:05 +00:00
trace.c ASoC: SOF: trace: No need to check for op pointer in sof_fw_trace_free() 2022-12-25 23:32:39 +00:00