ASoC: Use DMI name in sound card long name

From: Mengdong Lin <[email protected]>

This series is based on Liam's idea to use DMI name as the sound card short name in the audio workshop. Now we add DMI info to the card long name:
- Not change the card short name, keep it simple. So the card ID won't change as well.
- Use DMI name to make the card long name.

Machine drivers can use a new API to get this feature.

In user space, when the sound server ask UCM to open a sound card, UCM will try to find the best machine-specific configuration file based on the card long name, and only if not avaiable, fallback to the default configuration file that matches the card short name.

Please see patch:
ucm: Automatically load the best config file based on the card long name

History:
v1 from RFC: Give up using a table to map DMI info to a simple string,
since we cannot maintain such a table for each machine. Just do verbatim copy of DMI info and let user space decide how to use the DMI info in card long name to find the best UCM config file.

If device driver adds a flavor string, just append it after the DMI info fields to the card long name.

v2: Exclude card name and only keep DMI name in the long name, to
save the space since the long name cannot exceed 80 characters. Trim special characters like SPACE in the long name, because UCM configuration files & directories may use the same long name and Autoconf cannot handle special characters.

v3: Also include DMI product version in the long name, since vendors
like Lenovo may only put self-explanatory name in this field.

v4: Use "-" as the separator between DMI names in the card long name,
and replace "-" in the original DMI names with "_".

Liam Girdwood (1):
ASoC: core: Add API to use DMI name in sound card long name

Mengdong Lin (1):
ASoC: Intel: Use DMI name for sound card long name in Broadwell
machine driver

 include/sound/soc.h                |   4 ++
 sound/soc/intel/boards/broadwell.c |   2 +
 sound/soc/soc-core.c               | 134 +++++++++++++++++++++++++++++++++++++
 3 files changed, 140 insertions(+)

2.5.0

From: Liam Girdwood <[email protected]>

Intel DSP platform drivers are used by many different devices but are difficult for userspace to differentiate. This patch adds an API to allow the DMI name to be used in the sound card long name, thereby helping userspace load the correct UCM configuration. Usually machine drivers uses their own name as the sound card name (short name), and leave the long name and driver name blank. This API will use the DMI info like vendor, product and board to make up the card long name. If the machine driver has already explicitly set the long name, this API will do nothing.

This patch also allows for further differentiation as many devices that share the same DMI name i.e. Minnowboards, UP boards may be configured with different codecs or firmwares. The API supports flavoring the DMI name into the card longname to provide the extra differentiation required for these devices.

For Use Case Manager (UCM) in the user space, changing card long name by this API is backward compatible, since the card name does not change. For a given sound card, even if there is no device-specific UCM configuration file that uses the card long name, UCM will fall back to load the default configuration file that uses the card name.

index 795e6c4..e4f1844 100644
@@ -497,6 +497,8 @@ void snd_soc_runtime_deactivate(struct snd_soc_pcm_runtime *rtd, int stream);
 int snd_soc_runtime_set_dai_fmt(struct snd_soc_pcm_runtime *rtd,
 	unsigned int dai_fmt);
 
+int snd_soc_set_dmi_name(struct snd_soc_card *card, const char *flavour);
+
 /* Utility functions to get clock rates from various things */
 int snd_soc_calc_frame_size(int sample_size, int channels, int tdm_slots);
 int snd_soc_params_to_frame_size(struct snd_pcm_hw_params *params);

@@ -1094,6 +1096,8 @@ struct snd_soc_card {
 	const char *name;
 	const char *long_name;
 	const char *driver_name;
+	char dmi_longname[80];
+
 	struct device *dev;
 	struct snd_card *snd_card;
 	struct module *owner;

2.5.0

The patch

ASoC: core: Add API to use DMI name in sound card long name

has been applied to the asoc tree at

git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git

All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying to this mail.

Thanks,
Mark

From: Liam Girdwood <[email protected]>
Date: Sat, 14 Jan 2017 16:13:02 +0800
Subject: [PATCH] ASoC: core: Add API to use DMI name in sound card long name

Intel DSP platform drivers are used by many different devices but are difficult for userspace to differentiate. This patch adds an API to allow the DMI name to be used in the sound card long name, thereby helping userspace load the correct UCM configuration. Usually machine drivers uses their own name as the sound card name (short name), and leave the long name and driver name blank. This API will use the DMI info like vendor, product and board to make up the card long name. If the machine driver has already explicitly set the long name, this API will do nothing.

This patch also allows for further differentiation as many devices that share the same DMI name i.e. Minnowboards, UP boards may be configured with different codecs or firmwares. The API supports flavoring the DMI name into the card longname to provide the extra differentiation required for these devices.

For Use Case Manager (UCM) in the user space, changing card long name by this API is backward compatible, since the card name does not change. For a given sound card, even if there is no device-specific UCM configuration file that uses the card long name, UCM will fall back to load the default configuration file that uses the card name.

---
 include/sound/soc.h  |   4 ++
 sound/soc/soc-core.c | 134 +++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 138 insertions(+)

index 2b502f6cc6d0..8cad99dfb78c 100644
@@ -497,6 +497,8 @@ void snd_soc_runtime_deactivate(struct snd_soc_pcm_runtime *rtd, int stream);
 int snd_soc_runtime_set_dai_fmt(struct snd_soc_pcm_runtime *rtd,
 	unsigned int dai_fmt);
 
+int snd_soc_set_dmi_name(struct snd_soc_card *card, const char *flavour);
+
 /* Utility functions to get clock rates from various things */
 int snd_soc_calc_frame_size(int sample_size, int channels, int tdm_slots);
 int snd_soc_params_to_frame_size(struct snd_pcm_hw_params *params);

@@ -1098,6 +1100,8 @@ struct snd_soc_card {
 	const char *name;
 	const char *long_name;
 	const char *driver_name;
+	char dmi_longname[80];
+
 	struct device *dev;
 	struct snd_card *snd_card;
 	struct module *owner;

2.11.0

From: Mengdong Lin <[email protected]>

Intel Broadwell machine driver will call API snd_soc_set_dmi_name() to use DMI info to make the sound card long name.

For example, here are the changed long name for two Broadwell-based machines:
Dell XPS-13(2015): DellInc.-XPS139343-01-0310JH
Intel WilsonBeach: Intel Corp.-BroadwellClientplatform-0.1-WilsonBeachSDS

They still share the same card name "broadwell-rt286".

index 5bb64d1..cda73bb 100644
@@ -266,6 +266,8 @@ static int broadwell_audio_probe(struct platform_device *pdev)
 {
 	broadwell_rt286.dev = &pdev->dev;
 
+	snd_soc_set_dmi_name(&broadwell_rt286, NULL);
+
 	return devm_snd_soc_register_card(&pdev->dev, &broadwell_rt286);
 }
 

2.5.0

I guess we'll see further patches for other machine drivers?

Yes that's the idea. At least we will convert the Skylake and Broxton ones, after the current submitted patches and DP-MST ones are merged.

Thanks

~Vinod

I had an impression that rather BYT and CHT machines require urgently this extension because there are quite lots of devices with the same component but different configurations...

Takashi

My first priority is to close on the set of known quirks and contribute them once the reworked MCLK patches are merged. We can add the DMI name at the same time for BYT/CHT.
Note that adding the name in the machine driver is only the first part required to be able to manage quirks. it'll take a bit of time to convert the existing UCM files, make use of the include mechanism and contribute them to a repository with a faster update rate than alsa-lib.