Unverified Commit 25293be4 authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: Intel: avs: Update machine board card names 

Merge series from Amadeusz Sławiński <amadeuszx.slawinski@linux.intel.com>:

As discussed in user bug report [1] & [2], it was identified that HDA
card provides wrong FE device numbers to be used with UCM, at the same
time it was requested that we change card names to better names.

This patchset does that, by adding option for going back to old
behaviour in first patch. Using existing way of enumerating FEs from
topology in second patch. Then setting new names in all cards while
providing fallback to old name. Only exception is probe card, which is
used for debug purposes only, where we just directly rename card.

Do note that patch 2, will require updated topologies if topology
exposes more than 1 FE on card. Old topologies didn't assign id field
and it defaulted to 0, however when we use this field by setting
snd_soc_component_driver::use_dai_pcm_id field, we need topologies with
distinct values in FEs. Necessary changes are provided in avsdk and
avs-topology-xml repositories ([4] & [5]). linux-firmware update will
follow as soon as this changeset is merged.

[1]
Link: https://bugzilla.kernel.org/show_bug.cgi?id=219654
[2]
Link: https://github.com/alsa-project/alsa-ucm-conf/pull/499
[3]
Link: https://lore.kernel.org/linux-sound/20250127144445.2739017-1-amadeuszx.slawinski@linux.intel.com/
[4]
https://github.com/thesofproject/avsdk/commit/a879c8ae4ba7be53b8ed528da1361a8c62475b6e
[5]
https://github.com/thesofproject/avs-topology-xml/commit/9b94d52cbc5c1e07c8d9503c86329cd62ea4c9e7
https://github.com/thesofproject/avs-topology-xml/commit/bdbc8d6ba9ea6db67daed9cbbaed3c23ff112ecb
parents 4c035fab 93fa44f8

sound/soc/intel/avs/avs.h

+1 −1
Original line number Diff line number Diff line
@@ -340,7 +340,7 @@ struct avs_soc_component { 
extern const struct snd_soc_dai_ops avs_dai_fe_ops;



int avs_soc_component_register(struct device *dev, const char *name,

			       const struct snd_soc_component_driver *drv,

			       struct snd_soc_component_driver *drv,

			       struct snd_soc_dai_driver *cpu_dais, int num_cpu_dais);

int avs_dmic_platform_register(struct avs_dev *adev, const char *name);

int avs_i2s_platform_register(struct avs_dev *adev, const char *name, unsigned long port_mask,

sound/soc/intel/avs/board_selection.c

+33 −4
Original line number Diff line number Diff line
@@ -17,11 +17,16 @@ 
#include <sound/soc-acpi.h>

#include <sound/soc-component.h>

#include "avs.h"

#include "utils.h"



static bool i2s_test;

module_param(i2s_test, bool, 0444);

MODULE_PARM_DESC(i2s_test, "Probe I2S test-board and skip all other I2S boards");



bool obsolete_card_names = IS_ENABLED(CONFIG_SND_SOC_INTEL_AVS_CARDNAME_OBSOLETE);

module_param_named(obsolete_card_names, obsolete_card_names, bool, 0444);

MODULE_PARM_DESC(obsolete_card_names, "Use obsolete card names 0=no, 1=yes");



static const struct dmi_system_id kbl_dmi_table[] = {

	{

		.matches = {
@@ -141,7 +146,7 @@ static struct snd_soc_acpi_mach avs_kbl_i2s_machines[] = { 
		.mach_params = {

			.i2s_link_mask = AVS_SSP(0),

		},

		.pdata = (unsigned long[]){ 0x2, 0, 0, 0, 0, 0 }, /* SSP0 TDMs */

		.pdata = (struct avs_mach_pdata[]){ { .tdms = (unsigned long[]){ 0x2 } } },

		.tplg_filename = "rt5514-tplg.bin",

	},

	{
@@ -202,7 +207,9 @@ static struct snd_soc_acpi_mach avs_apl_i2s_machines[] = { 
		.mach_params = {

			.i2s_link_mask = AVS_SSP_RANGE(0, 5),

		},

		.pdata = (unsigned long[]){ 0x1, 0x1, 0x14, 0x1, 0x1, 0x1 }, /* SSP2 TDMs */

		.pdata = (struct avs_mach_pdata[]){ {

			.tdms = (unsigned long[]){ 0x1, 0x1, 0x14, 0x1, 0x1, 0x1 }

		} },

		.tplg_filename = "tdf8532-tplg.bin",

	},

	{
@@ -445,6 +452,7 @@ static int avs_register_dmic_board(struct avs_dev *adev) 
{

	struct platform_device *codec, *board;

	struct snd_soc_acpi_mach mach = {{0}};

	struct avs_mach_pdata *pdata;

	int ret;



	if (!acpi_nhlt_find_endpoint(ACPI_NHLT_LINKTYPE_PDM, -1, -1, -1)) {
@@ -468,6 +476,11 @@ static int avs_register_dmic_board(struct avs_dev *adev) 
	if (ret < 0)

		return ret;



	pdata = devm_kzalloc(adev->dev, sizeof(*pdata), GFP_KERNEL);

	if (!pdata)

		return -ENOMEM;

	pdata->obsolete_card_names = obsolete_card_names;

	mach.pdata = pdata;

	mach.tplg_filename = "dmic-tplg.bin";

	mach.mach_params.platform = "dmic-platform";
@@ -490,6 +503,7 @@ static int avs_register_dmic_board(struct avs_dev *adev) 
static int avs_register_i2s_board(struct avs_dev *adev, struct snd_soc_acpi_mach *mach)

{

	struct platform_device *board;

	struct avs_mach_pdata *pdata;

	int num_ssps;

	char *name;

	int ret;
@@ -507,7 +521,15 @@ static int avs_register_i2s_board(struct avs_dev *adev, struct snd_soc_acpi_mach 
	if (!name)

		return -ENOMEM;



	ret = avs_i2s_platform_register(adev, name, mach->mach_params.i2s_link_mask, mach->pdata);

	pdata = mach->pdata;

	if (!pdata)

		pdata = devm_kzalloc(adev->dev, sizeof(*pdata), GFP_KERNEL);

	if (!pdata)

		return -ENOMEM;

	pdata->obsolete_card_names = obsolete_card_names;

	mach->pdata = pdata;



	ret = avs_i2s_platform_register(adev, name, mach->mach_params.i2s_link_mask, pdata->tdms);

	if (ret < 0)

		return ret;
@@ -584,6 +606,7 @@ static int avs_register_hda_board(struct avs_dev *adev, struct hda_codec *codec) 
{

	struct snd_soc_acpi_mach mach = {{0}};

	struct platform_device *board;

	struct avs_mach_pdata *pdata;

	struct hdac_device *hdev = &codec->core;

	char *pname;

	int ret, id;
@@ -592,11 +615,17 @@ static int avs_register_hda_board(struct avs_dev *adev, struct hda_codec *codec) 
	if (!pname)

		return -ENOMEM;



	pdata = devm_kzalloc(adev->dev, sizeof(*pdata), GFP_KERNEL);

	if (!pdata)

		return -ENOMEM;

	pdata->obsolete_card_names = obsolete_card_names;

	pdata->codec = codec;



	ret = avs_hda_platform_register(adev, pname);

	if (ret < 0)

		return ret;



	mach.pdata = codec;

	mach.pdata = pdata;

	mach.mach_params.platform = pname;

	mach.tplg_filename = devm_kasprintf(adev->dev, GFP_KERNEL, "hda-%08x-tplg.bin",

					    hdev->vendor_id);

sound/soc/intel/avs/boards/Kconfig

+8 −0
Original line number Diff line number Diff line
@@ -4,6 +4,14 @@ menu "Intel AVS Machine drivers" 


comment "Available DSP configurations"



config SND_SOC_INTEL_AVS_CARDNAME_OBSOLETE

	bool "Use obsolete card names"

	default n

	help

	  Use obsolete names for some of avs cards. This option should be

	  used if your system depends on old card names, for example having

	  not up to date UCM files.



config SND_SOC_INTEL_AVS_MACH_DA7219

	tristate "da7219 I2S board"

	depends on I2C

sound/soc/intel/avs/boards/da7219.c

+8 −1
Original line number Diff line number Diff line
@@ -214,6 +214,7 @@ static int avs_da7219_probe(struct platform_device *pdev) 
{

	struct snd_soc_dai_link *dai_link;

	struct snd_soc_acpi_mach *mach;

	struct avs_mach_pdata *pdata;

	struct snd_soc_card *card;

	struct snd_soc_jack *jack;

	struct device *dev = &pdev->dev;
@@ -222,6 +223,7 @@ static int avs_da7219_probe(struct platform_device *pdev) 


	mach = dev_get_platdata(dev);

	pname = mach->mach_params.platform;

	pdata = mach->pdata;



	ret = avs_mach_get_ssp_tdm(dev, mach, &ssp_port, &tdm_slot);

	if (ret)
@@ -238,7 +240,12 @@ static int avs_da7219_probe(struct platform_device *pdev) 
	if (!jack || !card)

		return -ENOMEM;



	if (pdata->obsolete_card_names) {

		card->name = "avs_da7219";

	} else {

		card->driver_name = "avs_da7219";

		card->long_name = card->name = "AVS I2S DA7219";

	}

	card->dev = dev;

	card->owner = THIS_MODULE;

	card->dai_link = dai_link;

sound/soc/intel/avs/boards/dmic.c

+9 −1
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 
#include <linux/module.h>

#include <sound/soc.h>

#include <sound/soc-acpi.h>

#include "../utils.h"



SND_SOC_DAILINK_DEF(dmic_pin, DAILINK_COMP_ARRAY(COMP_CPU("DMIC Pin")));

SND_SOC_DAILINK_DEF(dmic_wov_pin, DAILINK_COMP_ARRAY(COMP_CPU("DMIC WoV Pin")));
@@ -49,17 +50,24 @@ static const struct snd_soc_dapm_route card_routes[] = { 
static int avs_dmic_probe(struct platform_device *pdev)

{

	struct snd_soc_acpi_mach *mach;

	struct avs_mach_pdata *pdata;

	struct snd_soc_card *card;

	struct device *dev = &pdev->dev;

	int ret;



	mach = dev_get_platdata(dev);

	pdata = mach->pdata;



	card = devm_kzalloc(dev, sizeof(*card), GFP_KERNEL);

	if (!card)

		return -ENOMEM;



	if (pdata->obsolete_card_names) {

		card->name = "avs_dmic";

	} else {

		card->driver_name = "avs_dmic";

		card->long_name = card->name = "AVS DMIC";

	}

	card->dev = dev;

	card->owner = THIS_MODULE;

	card->dai_link = card_dai_links;