diff mbox series

[v9,12/17] ASoC: qdsp6: audioreach: add Kconfig and Makefile

Message ID 20211006113950.10782-13-srinivas.kandagatla@linaro.org (mailing list archive)
State Superseded
Headers show
Series ASoC: qcom: Add AudioReach support | expand

Commit Message

Srinivas Kandagatla Oct. 6, 2021, 11:39 a.m. UTC 
Now that all the code for audioreach and q6apm are in at this point to be
able to compile, start adding Kconfig and Makefile changes.

Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
---
 sound/soc/qcom/Kconfig        | 4 ++++
 sound/soc/qcom/qdsp6/Makefile | 3 +++
 2 files changed, 7 insertions(+)

Comments

Mark Brown Oct. 25, 2021, 3:49 p.m. UTC | #1 
On Wed, Oct 06, 2021 at 12:39:45PM +0100, Srinivas Kandagatla wrote:
> Now that all the code for audioreach and q6apm are in at this point to be
> able to compile, start adding Kconfig and Makefile changes.

This doesn't compile with current code for arm64 defconfig:

/mnt/kernel/sound/soc/qcom/qdsp6/q6apm.c: In function 'q6apm_audio_remove':
/mnt/kernel/sound/soc/qcom/qdsp6/q6apm.c:703:2: error: too few arguments to function 'snd_soc_tplg_component_remove'
  703 |  snd_soc_tplg_component_remove(component);
      |  ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
In file included from /mnt/kernel/include/sound/soc-dapm.h:15,
                 from /mnt/kernel/include/sound/soc.h:386,
                 from /mnt/kernel/sound/soc/qcom/qdsp6/q6apm.c:15:
/mnt/kernel/include/sound/soc-topology.h:191:19: note: declared here
  191 | static inline int snd_soc_tplg_component_remove(struct snd_soc_component *comp,
      |                   ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~

This will be with the stub for !SND_SOC_TOPOLOGY, the index argument has
been removed for the actual implementation but not for the stub, the fix
is in the header.
Srinivas Kandagatla Oct. 25, 2021, 3:56 p.m. UTC | #2 
On 25/10/2021 16:49, Mark Brown wrote:
> On Wed, Oct 06, 2021 at 12:39:45PM +0100, Srinivas Kandagatla wrote:
>> Now that all the code for audioreach and q6apm are in at this point to be
>> able to compile, start adding Kconfig and Makefile changes.
> 
> This doesn't compile with current code for arm64 defconfig:
> 
> /mnt/kernel/sound/soc/qcom/qdsp6/q6apm.c: In function 'q6apm_audio_remove':
> /mnt/kernel/sound/soc/qcom/qdsp6/q6apm.c:703:2: error: too few arguments to function 'snd_soc_tplg_component_remove'
>    703 |  snd_soc_tplg_component_remove(component);
>        |  ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> In file included from /mnt/kernel/include/sound/soc-dapm.h:15,
>                   from /mnt/kernel/include/sound/soc.h:386,
>                   from /mnt/kernel/sound/soc/qcom/qdsp6/q6apm.c:15:
> /mnt/kernel/include/sound/soc-topology.h:191:19: note: declared here
>    191 | static inline int snd_soc_tplg_component_remove(struct snd_soc_component *comp,
>        |                   ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> 
> This will be with the stub for !SND_SOC_TOPOLOGY, the index argument has
> been removed for the actual implementation but not for the stub, the fix
> is in the header.
> 

This patch [1] seems to have remove the argument to 
snd_soc_tplg_component_remove() but not in the stub function.

I can send a patch to fix this

--srini

[1] 
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git/commit/include/sound/soc-topology.h?id=a5b8f71c5477f4327c66a085d9714fe298510819
Mark Brown Oct. 25, 2021, 3:57 p.m. UTC | #3 
On Mon, Oct 25, 2021 at 04:56:22PM +0100, Srinivas Kandagatla wrote:

> This patch [1] seems to have remove the argument to
> snd_soc_tplg_component_remove() but not in the stub function.

> I can send a patch to fix this

I already sent my own but forgot to CC you, sorry.
Mark Brown Oct. 25, 2021, 4:37 p.m. UTC | #4 
On Wed, Oct 06, 2021 at 12:39:45PM +0100, Srinivas Kandagatla wrote:
> Now that all the code for audioreach and q6apm are in at this point to be
> able to compile, start adding Kconfig and Makefile changes.

With the previous issue fixed this continues to break the build for
arm64 defconfig:

ERROR: modpost: "audioreach_tplg_init" [sound/soc/qcom/qdsp6/snd-q6apm.ko] undefined!
Srinivas Kandagatla Oct. 25, 2021, 5:01 p.m. UTC | #5 
On 25/10/2021 17:37, Mark Brown wrote:
> On Wed, Oct 06, 2021 at 12:39:45PM +0100, Srinivas Kandagatla wrote:
>> Now that all the code for audioreach and q6apm are in at this point to be
>> able to compile, start adding Kconfig and Makefile changes.
> 
> With the previous issue fixed this continues to break the build for
> arm64 defconfig:
> 
> ERROR: modpost: "audioreach_tplg_init" [sound/soc/qcom/qdsp6/snd-q6apm.ko] undefined!
> 
Sorry Mark, This symbol is in in 13/17 Patch.
I will resend v10 fixing this issue.

--srini
diff mbox series

Patch

diff --git a/sound/soc/qcom/Kconfig b/sound/soc/qcom/Kconfig
index cc7c1de2f1d9..5a693f83fd6c 100644
--- a/sound/soc/qcom/Kconfig
+++ b/sound/soc/qcom/Kconfig
@@ -84,6 +84,9 @@  config SND_SOC_QDSP6_ASM_DAI
 	select SND_SOC_COMPRESS
 	tristate
 
+config SND_SOC_QDSP6_APM
+	tristate
+
 config SND_SOC_QDSP6
 	tristate "SoC ALSA audio driver for QDSP6"
 	depends on QCOM_APR
@@ -97,6 +100,7 @@  config SND_SOC_QDSP6
 	select SND_SOC_QDSP6_ROUTING
 	select SND_SOC_QDSP6_ASM
 	select SND_SOC_QDSP6_ASM_DAI
+	select SND_SOC_QDSP6_APM
 	help
 	 To add support for MSM QDSP6 Soc Audio.
 	 This will enable sound soc platform specific
diff --git a/sound/soc/qcom/qdsp6/Makefile b/sound/soc/qcom/qdsp6/Makefile
index a4191d395557..1a0803d97eec 100644
--- a/sound/soc/qcom/qdsp6/Makefile
+++ b/sound/soc/qcom/qdsp6/Makefile
@@ -1,5 +1,6 @@ 
 # SPDX-License-Identifier: GPL-2.0-only
 snd-q6dsp-common-objs := q6dsp-common.o q6dsp-lpass-ports.o q6dsp-lpass-clocks.o
+snd-q6apm-objs := q6apm.o audioreach.o
 
 obj-$(CONFIG_SND_SOC_QDSP6_COMMON) += snd-q6dsp-common.o
 obj-$(CONFIG_SND_SOC_QDSP6_CORE) += q6core.o
@@ -10,3 +11,5 @@  obj-$(CONFIG_SND_SOC_QDSP6_ADM) += q6adm.o
 obj-$(CONFIG_SND_SOC_QDSP6_ROUTING) += q6routing.o
 obj-$(CONFIG_SND_SOC_QDSP6_ASM) += q6asm.o
 obj-$(CONFIG_SND_SOC_QDSP6_ASM_DAI) += q6asm-dai.o
+
+obj-$(CONFIG_SND_SOC_QDSP6_APM) += snd-q6apm.o