Unverified Commit 285880a2 authored by Daniel Baluta's avatar Daniel Baluta Committed by Mark Brown
Browse files

ASoC: SOF: Make creation of machine device from SOF core optional 



Currently, SOF probes machine drivers by creating a platform device
and passing the machine description as private data.

This is driven by the ACPI restrictions. Ideally, ACPI tables
should contain the description for the machine driver. This is
not possible because ACPI tables are frozen and used on multiple
OS-es (e.g Windows).

In the case of Device Tree we don't have this restriction, so we
choose to probe the machine drivers by creating a DT node as is
the standard ALSA way.

This patch makes the probing of machine drivers from SOF
core optional allowing for Device Tree platforms to decouple
the SOF core from machine driver probing.

Along with this, it also consolidates the machine driver selection
for Intel platforms by defining optional ops for selecting the machine
driver based on the ACPI match for HDA and non-HDA platforms and
setting the mach params.

Signed-off-by: default avatarDaniel Baluta <daniel.baluta@nxp.com>
Signed-off-by: default avatarRanjani Sridharan <ranjani.sridharan@linux.intel.com>
Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20191204211556.12671-11-pierre-louis.bossart@linux.intel.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 80acdd4f

sound/soc/sof/core.c

+3 −56
Original line number Diff line number Diff line
@@ -92,47 +92,9 @@ void snd_sof_get_status(struct snd_sof_dev *sdev, u32 panic_code, 
}

EXPORT_SYMBOL(snd_sof_get_status);



/*

 * SOF Driver enumeration.

 */

static int sof_machine_check(struct snd_sof_dev *sdev)

{

	struct snd_sof_pdata *plat_data = sdev->pdata;

#if IS_ENABLED(CONFIG_SND_SOC_SOF_NOCODEC)

	struct snd_soc_acpi_mach *machine;

	int ret;

#endif



	if (plat_data->machine)

		return 0;



#if !IS_ENABLED(CONFIG_SND_SOC_SOF_NOCODEC)

	dev_err(sdev->dev, "error: no matching ASoC machine driver found - aborting probe\n");

	return -ENODEV;

#else

	/* fallback to nocodec mode */

	dev_warn(sdev->dev, "No ASoC machine driver found - using nocodec\n");

	machine = devm_kzalloc(sdev->dev, sizeof(*machine), GFP_KERNEL);

	if (!machine)

		return -ENOMEM;



	ret = sof_nocodec_setup(sdev->dev, plat_data, machine,

				plat_data->desc, plat_data->desc->ops);

	if (ret < 0)

		return ret;



	plat_data->machine = machine;



	return 0;

#endif

}



static int sof_probe_continue(struct snd_sof_dev *sdev)

{

	struct snd_sof_pdata *plat_data = sdev->pdata;

	const char *drv_name;

	const void *mach;

	int size;

	int ret;



	/* probe the DSP hardware */
@@ -218,22 +180,9 @@ static int sof_probe_continue(struct snd_sof_dev *sdev) 
		goto fw_run_err;

	}



	drv_name = plat_data->machine->drv_name;

	mach = (const void *)plat_data->machine;

	size = sizeof(*plat_data->machine);



	/* register machine driver, pass machine info as pdata */

	plat_data->pdev_mach =

		platform_device_register_data(sdev->dev, drv_name,

					      PLATFORM_DEVID_NONE, mach, size);



	if (IS_ERR(plat_data->pdev_mach)) {

		ret = PTR_ERR(plat_data->pdev_mach);

	ret = snd_sof_machine_register(sdev, plat_data);

	if (ret < 0)

		goto fw_run_err;

	}



	dev_dbg(sdev->dev, "created machine %s\n",

		dev_name(&plat_data->pdev_mach->dev));



	/*

	 * Some platforms in SOF, ex: BYT, may not have their platform PM
@@ -363,9 +312,7 @@ int snd_sof_device_remove(struct device *dev) 
	 * will remove the component driver and unload the topology

	 * before freeing the snd_card.

	 */

	if (!IS_ERR_OR_NULL(pdata->pdev_mach))

		platform_device_unregister(pdata->pdev_mach);



	snd_sof_machine_unregister(sdev, pdata);

	/*

	 * Unregistering the machine driver results in unloading the topology.

	 * Some widgets, ex: scheduler, attempt to power down the core they are

sound/soc/sof/intel/apl.c

+7 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 


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

#include "hda.h"

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



static const struct snd_sof_debugfs_map apl_dsp_debugfs[] = {

	{"hda", HDA_DSP_HDA_BAR, 0, 0x4000, SOF_DEBUGFS_ACCESS_ALWAYS},
@@ -52,6 +53,12 @@ const struct snd_sof_dsp_ops sof_apl_ops = { 
	.ipc_msg_data	= hda_ipc_msg_data,

	.ipc_pcm_params	= hda_ipc_pcm_params,



	/* machine driver */

	.machine_select = hda_machine_select,

	.machine_register = sof_machine_register,

	.machine_unregister = sof_machine_unregister,

	.set_mach_params = hda_set_mach_params,



	/* debug */

	.debug_map	= apl_dsp_debugfs,

	.debug_map_count	= ARRAY_SIZE(apl_dsp_debugfs),

sound/soc/sof/intel/bdw.c

+33 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
#include <sound/sof/xtensa.h>

#include "../ops.h"

#include "shim.h"

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



/* BARs */

#define BDW_DSP_BAR 0
@@ -536,6 +537,32 @@ static int bdw_probe(struct snd_sof_dev *sdev) 
	return ret;

}



static void bdw_machine_select(struct snd_sof_dev *sdev)

{

	struct snd_sof_pdata *sof_pdata = sdev->pdata;

	const struct sof_dev_desc *desc = sof_pdata->desc;

	struct snd_soc_acpi_mach *mach;



	mach = snd_soc_acpi_find_machine(desc->machines);

	if (!mach) {

		dev_warn(sdev->dev, "warning: No matching ASoC machine driver found\n");

		return;

	}



	sof_pdata->tplg_filename = mach->sof_tplg_filename;

	mach->mach_params.acpi_ipc_irq_index = desc->irqindex_host_ipc;

	sof_pdata->machine = mach;

}



static void bdw_set_mach_params(const struct snd_soc_acpi_mach *mach,

				struct device *dev)

{

	struct snd_soc_acpi_mach_params *mach_params;



	mach_params = (struct snd_soc_acpi_mach_params *)&mach->mach_params;

	mach_params->platform = dev_name(dev);

}



/* Broadwell DAIs */

static struct snd_soc_dai_driver bdw_dai[] = {

{
@@ -574,6 +601,12 @@ const struct snd_sof_dsp_ops sof_bdw_ops = { 
	.ipc_msg_data	= intel_ipc_msg_data,

	.ipc_pcm_params	= intel_ipc_pcm_params,



	/* machine driver */

	.machine_select = bdw_machine_select,

	.machine_register = sof_machine_register,

	.machine_unregister = sof_machine_unregister,

	.set_mach_params = bdw_set_mach_params,



	/* debug */

	.debug_map  = bdw_debugfs,

	.debug_map_count    = ARRAY_SIZE(bdw_debugfs),

sound/soc/sof/intel/byt.c

+45 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
#include <sound/sof/xtensa.h>

#include "../ops.h"

#include "shim.h"

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



/* DSP memories */

#define IRAM_OFFSET		0x0C0000
@@ -382,6 +383,32 @@ static int byt_reset(struct snd_sof_dev *sdev) 
	return 0;

}



static void byt_machine_select(struct snd_sof_dev *sdev)

{

	struct snd_sof_pdata *sof_pdata = sdev->pdata;

	const struct sof_dev_desc *desc = sof_pdata->desc;

	struct snd_soc_acpi_mach *mach;



	mach = snd_soc_acpi_find_machine(desc->machines);

	if (!mach) {

		dev_warn(sdev->dev, "warning: No matching ASoC machine driver found\n");

		return;

	}



	sof_pdata->tplg_filename = mach->sof_tplg_filename;

	mach->mach_params.acpi_ipc_irq_index = desc->irqindex_host_ipc;

	sof_pdata->machine = mach;

}



static void byt_set_mach_params(const struct snd_soc_acpi_mach *mach,

				struct device *dev)

{

	struct snd_soc_acpi_mach_params *mach_params;



	mach_params = (struct snd_soc_acpi_mach_params *)&mach->mach_params;

	mach_params->platform = dev_name(dev);

}



/* Baytrail DAIs */

static struct snd_soc_dai_driver byt_dai[] = {

{
@@ -514,6 +541,12 @@ const struct snd_sof_dsp_ops sof_tng_ops = { 
	.ipc_msg_data	= intel_ipc_msg_data,

	.ipc_pcm_params	= intel_ipc_pcm_params,



	/* machine driver */

	.machine_select = byt_machine_select,

	.machine_register = sof_machine_register,

	.machine_unregister = sof_machine_unregister,

	.set_mach_params = byt_set_mach_params,



	/* debug */

	.debug_map	= byt_debugfs,

	.debug_map_count	= ARRAY_SIZE(byt_debugfs),
@@ -682,6 +715,12 @@ const struct snd_sof_dsp_ops sof_byt_ops = { 
	.ipc_msg_data	= intel_ipc_msg_data,

	.ipc_pcm_params	= intel_ipc_pcm_params,



	/* machine driver */

	.machine_select = byt_machine_select,

	.machine_register = sof_machine_register,

	.machine_unregister = sof_machine_unregister,

	.set_mach_params = byt_set_mach_params,



	/* debug */

	.debug_map	= byt_debugfs,

	.debug_map_count	= ARRAY_SIZE(byt_debugfs),
@@ -748,6 +787,12 @@ const struct snd_sof_dsp_ops sof_cht_ops = { 
	.ipc_msg_data	= intel_ipc_msg_data,

	.ipc_pcm_params	= intel_ipc_pcm_params,



	/* machine driver */

	.machine_select = byt_machine_select,

	.machine_register = sof_machine_register,

	.machine_unregister = sof_machine_unregister,

	.set_mach_params = byt_set_mach_params,



	/* debug */

	.debug_map	= cht_debugfs,

	.debug_map_count	= ARRAY_SIZE(cht_debugfs),

sound/soc/sof/intel/cnl.c

+7 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
#include "../ops.h"

#include "hda.h"

#include "hda-ipc.h"

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



static const struct snd_sof_debugfs_map cnl_dsp_debugfs[] = {

	{"hda", HDA_DSP_HDA_BAR, 0, 0x4000, SOF_DEBUGFS_ACCESS_ALWAYS},
@@ -238,6 +239,12 @@ const struct snd_sof_dsp_ops sof_cnl_ops = { 
	.ipc_msg_data	= hda_ipc_msg_data,

	.ipc_pcm_params	= hda_ipc_pcm_params,



	/* machine driver */

	.machine_select = hda_machine_select,

	.machine_register = sof_machine_register,

	.machine_unregister = sof_machine_unregister,

	.set_mach_params = hda_set_mach_params,



	/* debug */

	.debug_map	= cnl_dsp_debugfs,

	.debug_map_count	= ARRAY_SIZE(cnl_dsp_debugfs),