Commit 8a49cd11 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Takashi Iwai
Browse files

ASoC: SOF: ACPI: avoid reverse module dependency 



The SOF-ACPI driver is backwards from the normal Linux model, it has a
generic driver that knows about all the specific drivers, as opposed to
having hardware specific drivers that link against a common framework.

This requires ugly Kconfig magic and leads to missed dependencies as
seen in this link error:

arm-linux-gnueabi-ld: sound/soc/sof/sof-pci-dev.o: in function `sof_acpi_probe':
sof-pci-dev.c:(.text+0x1c): undefined reference to `snd_intel_dsp_driver_probe'

Change it to use the normal probe order of starting with a specific
device in a driver, turning the sof-acpi-dev.c driver into a
library (exported symbols are name-spaced to avoid symbol pollution).

For backwards-compatibility with previous Kconfigs, the default values
for platform drivers uses the top-level ACPI configurations. The
modules were also renamed to allow for gradual transitions in test
scripts.

Co-developed-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Reviewed-by: default avatarKai Vehmanen <kai.vehmanen@linux.intel.com>
Reviewed-by: default avatarGuennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
Reviewed-by: default avatarBard Liao <bard.liao@intel.com>
Acked-by: default avatarMark Brown <broonie@kernel.org>
Acked-by: default avatarVinod Koul <vkoul@kernel.org>
Link: https://lore.kernel.org/r/20210302003125.1178419-3-pierre-louis.bossart@linux.intel.com


Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent c7929b15

sound/soc/sof/Kconfig

+5 −3
Original line number Diff line number Diff line
@@ -23,15 +23,17 @@ config SND_SOC_SOF_PCI 
config SND_SOC_SOF_ACPI

	tristate "SOF ACPI enumeration support"

	depends on ACPI || COMPILE_TEST

	select SND_SOC_SOF

	select SND_SOC_ACPI if ACPI

	select IOSF_MBI if X86 && PCI

	help

	  This adds support for ACPI enumeration. This option is required

	  to enable Intel Broadwell/Baytrail/Cherrytrail devices.

	  For backwards-compatibility with previous configurations the selection will

	  be used as default for platform-specific drivers.

	  Say Y if you need this option.

	  If unsure select "N".



config SND_SOC_SOF_ACPI_DEV

	tristate



config SND_SOC_SOF_OF

	tristate "SOF OF enumeration support"

	depends on OF || COMPILE_TEST

sound/soc/sof/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ obj-$(CONFIG_SND_SOC_SOF) += snd-sof.o 
obj-$(CONFIG_SND_SOC_SOF_NOCODEC) += snd-sof-nocodec.o





obj-$(CONFIG_SND_SOC_SOF_ACPI) += snd-sof-acpi.o

obj-$(CONFIG_SND_SOC_SOF_ACPI_DEV) += snd-sof-acpi.o

obj-$(CONFIG_SND_SOC_SOF_OF) += snd-sof-of.o

obj-$(CONFIG_SND_SOC_SOF_PCI) += snd-sof-pci.o

sound/soc/sof/intel/Kconfig

+17 −31
Original line number Diff line number Diff line
@@ -9,14 +9,6 @@ config SND_SOC_SOF_INTEL_TOPLEVEL 


if SND_SOC_SOF_INTEL_TOPLEVEL



config SND_SOC_SOF_INTEL_ACPI

	def_tristate SND_SOC_SOF_ACPI

	select SND_SOC_SOF_BAYTRAIL  if SND_SOC_SOF_BAYTRAIL_SUPPORT

	select SND_SOC_SOF_BROADWELL if SND_SOC_SOF_BROADWELL_SUPPORT

	help

	  This option is not user-selectable but automagically handled by

	  'select' statements at a higher level.



config SND_SOC_SOF_INTEL_PCI

	def_tristate SND_SOC_SOF_PCI

	select SND_SOC_SOF_MERRIFIELD  if SND_SOC_SOF_MERRIFIELD_SUPPORT
@@ -50,18 +42,25 @@ config SND_SOC_SOF_INTEL_ATOM_HIFI_EP 


config SND_SOC_SOF_INTEL_COMMON

	tristate

	select SND_SOC_SOF

	select SND_SOC_ACPI_INTEL_MATCH

	select SND_SOC_SOF_XTENSA

	select SND_SOC_INTEL_MACH

	select SND_SOC_ACPI if ACPI

	select SND_INTEL_DSP_CONFIG

	help

	  This option is not user-selectable but automagically handled by

	  'select' statements at a higher level.



if SND_SOC_SOF_INTEL_ACPI

if SND_SOC_SOF_ACPI



config SND_SOC_SOF_BAYTRAIL_SUPPORT

	bool "SOF support for Baytrail, Braswell and Cherrytrail"

config SND_SOC_SOF_BAYTRAIL

	tristate "SOF support for Baytrail, Braswell and Cherrytrail"

	default SND_SOC_SOF_ACPI

	select SND_SOC_SOF_INTEL_COMMON

	select SND_SOC_SOF_INTEL_ATOM_HIFI_EP

	select SND_SOC_SOF_ACPI_DEV

	select IOSF_MBI if X86 && PCI

	help

	  This adds support for Sound Open Firmware for Intel(R) platforms

	  using the Baytrail, Braswell or Cherrytrail processors.
@@ -75,17 +74,12 @@ config SND_SOC_SOF_BAYTRAIL_SUPPORT 
	  Say Y if you want to enable SOF on Baytrail/Cherrytrail.

	  If unsure select "N".



config SND_SOC_SOF_BAYTRAIL

	tristate

	select SND_SOC_SOF_INTEL_ATOM_HIFI_EP

	select SND_INTEL_DSP_CONFIG

	help

	  This option is not user-selectable but automagically handled by

	  'select' statements at a higher level.



config SND_SOC_SOF_BROADWELL_SUPPORT

	bool "SOF support for Broadwell"

	select SND_INTEL_DSP_CONFIG

config SND_SOC_SOF_BROADWELL

	tristate "SOF support for Broadwell"

	default SND_SOC_SOF_ACPI

	select SND_SOC_SOF_INTEL_COMMON

	select SND_SOC_SOF_INTEL_HIFI_EP_IPC

	select SND_SOC_SOF_ACPI_DEV

	help

	  This adds support for Sound Open Firmware for Intel(R) platforms

	  using the Broadwell processors.
@@ -100,15 +94,7 @@ config SND_SOC_SOF_BROADWELL_SUPPORT 
	  Say Y if you want to enable SOF on Broadwell.

	  If unsure select "N".



config SND_SOC_SOF_BROADWELL

	tristate

	select SND_SOC_SOF_INTEL_COMMON

	select SND_SOC_SOF_INTEL_HIFI_EP_IPC

	help

	  This option is not user-selectable but automagically handled by

	  'select' statements at a higher level.



endif ## SND_SOC_SOF_INTEL_ACPI

endif ## SND_SOC_SOF_ACPI



if SND_SOC_SOF_INTEL_PCI

sound/soc/sof/intel/Makefile

+4 −4
Original line number Diff line number Diff line 
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-3-Clause)



snd-sof-intel-byt-objs := byt.o

snd-sof-intel-bdw-objs := bdw.o

snd-sof-acpi-intel-byt-objs := byt.o

snd-sof-acpi-intel-bdw-objs := bdw.o



snd-sof-intel-ipc-objs := intel-ipc.o
@@ -13,8 +13,8 @@ snd-sof-intel-hda-common-$(CONFIG_SND_SOC_SOF_HDA_PROBES) += hda-compress.o 


snd-sof-intel-hda-objs := hda-codec.o



obj-$(CONFIG_SND_SOC_SOF_INTEL_ATOM_HIFI_EP) += snd-sof-intel-byt.o

obj-$(CONFIG_SND_SOC_SOF_BROADWELL) += snd-sof-intel-bdw.o

obj-$(CONFIG_SND_SOC_SOF_INTEL_ATOM_HIFI_EP) += snd-sof-acpi-intel-byt.o

obj-$(CONFIG_SND_SOC_SOF_BROADWELL) += snd-sof-acpi-intel-bdw.o

obj-$(CONFIG_SND_SOC_SOF_INTEL_HIFI_EP_IPC) += snd-sof-intel-ipc.o

obj-$(CONFIG_SND_SOC_SOF_HDA_COMMON) += snd-sof-intel-hda-common.o

obj-$(CONFIG_SND_SOC_SOF_HDA) += snd-sof-intel-hda.o

sound/soc/sof/intel/bdw.c

+63 −4
Original line number Diff line number Diff line
@@ -15,8 +15,12 @@ 
#include <linux/module.h>

#include <sound/sof.h>

#include <sound/sof/xtensa.h>

#include <sound/soc-acpi.h>

#include <sound/soc-acpi-intel-match.h>

#include <sound/intel-dsp-config.h>

#include "../ops.h"

#include "shim.h"

#include "../sof-acpi-dev.h"

#include "../sof-audio.h"



/* BARs */
@@ -590,7 +594,7 @@ static struct snd_soc_dai_driver bdw_dai[] = { 
};



/* broadwell ops */

const struct snd_sof_dsp_ops sof_bdw_ops = {

static const struct snd_sof_dsp_ops sof_bdw_ops = {

	/*Device init */

	.probe          = bdw_probe,
@@ -651,14 +655,69 @@ const struct snd_sof_dsp_ops sof_bdw_ops = { 


	.arch_ops = &sof_xtensa_arch_ops,

};

EXPORT_SYMBOL_NS(sof_bdw_ops, SND_SOC_SOF_BROADWELL);



const struct sof_intel_dsp_desc bdw_chip_info = {

static const struct sof_intel_dsp_desc bdw_chip_info = {

	.cores_num = 1,

	.host_managed_cores_mask = 1,

};

EXPORT_SYMBOL_NS(bdw_chip_info, SND_SOC_SOF_BROADWELL);



static const struct sof_dev_desc sof_acpi_broadwell_desc = {

	.machines = snd_soc_acpi_intel_broadwell_machines,

	.resindex_lpe_base = 0,

	.resindex_pcicfg_base = 1,

	.resindex_imr_base = -1,

	.irqindex_host_ipc = 0,

	.chip_info = &bdw_chip_info,

	.default_fw_path = "intel/sof",

	.default_tplg_path = "intel/sof-tplg",

	.default_fw_filename = "sof-bdw.ri",

	.nocodec_tplg_filename = "sof-bdw-nocodec.tplg",

	.ops = &sof_bdw_ops,

};



static const struct acpi_device_id sof_broadwell_match[] = {

	{ "INT3438", (unsigned long)&sof_acpi_broadwell_desc },

	{ }

};

MODULE_DEVICE_TABLE(acpi, sof_broadwell_match);



static int sof_broadwell_probe(struct platform_device *pdev)

{

	struct device *dev = &pdev->dev;

	const struct acpi_device_id *id;

	const struct sof_dev_desc *desc;

	int ret;



	id = acpi_match_device(dev->driver->acpi_match_table, dev);

	if (!id)

		return -ENODEV;



	ret = snd_intel_acpi_dsp_driver_probe(dev, id->id);

	if (ret != SND_INTEL_DSP_DRIVER_ANY && ret != SND_INTEL_DSP_DRIVER_SOF) {

		dev_dbg(dev, "SOF ACPI driver not selected, aborting probe\n");

		return -ENODEV;

	}



	desc = device_get_match_data(dev);

	if (!desc)

		return -ENODEV;



	return sof_acpi_probe(pdev, device_get_match_data(dev));

}



/* acpi_driver definition */

static struct platform_driver snd_sof_acpi_intel_bdw_driver = {

	.probe = sof_broadwell_probe,

	.remove = sof_acpi_remove,

	.driver = {

		.name = "sof-audio-acpi-intel-bdw",

		.pm = &sof_acpi_pm,

		.acpi_match_table = sof_broadwell_match,

	},

};

module_platform_driver(snd_sof_acpi_intel_bdw_driver);



MODULE_LICENSE("Dual BSD/GPL");

MODULE_IMPORT_NS(SND_SOC_SOF_INTEL_HIFI_EP_IPC);

MODULE_IMPORT_NS(SND_SOC_SOF_XTENSA);

MODULE_IMPORT_NS(SND_SOC_SOF_ACPI_DEV);