mbox series

[00/20] ASoC: Intel: avs: Update machine board card names

Message ID 20250407124154.1713039-1-amadeuszx.slawinski@linux.intel.com (mailing list archive)
Headers show
Series ASoC: Intel: avs: Update machine board card names | expand

Message

Amadeusz Sławiński April 7, 2025, 12:41 p.m. UTC
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

Amadeusz Sławiński (20):
  ASoC: Intel: avs: boards: Add Kconfig option for obsolete card names
  ASoC: Intel: avs: Use topology information for endpoint numbers
  ASoC: Intel: avs: boards: Change da7219 card name
  ASoC: Intel: avs: boards: Change DMIC card name
  ASoC: Intel: avs: boards: Change es8336 card name
  ASoC: Intel: avs: boards: Change hdaudio card name
  ASoC: Intel: avs: boards: Change sspX-loopback card name
  ASoC: Intel: avs: boards: Change max98357a card name
  ASoC: Intel: avs: boards: Change max98373 card name
  ASoC: Intel: avs: boards: Change max98927 card name
  ASoC: Intel: avs: boards: Change nau8825 card name
  ASoC: Intel: avs: boards: Change pcm3168a card name
  ASoC: Intel: avs: boards: Change probe card name
  ASoC: Intel: avs: boards: Change rt274 card name
  ASoC: Intel: avs: boards: Change rt286 card name
  ASoC: Intel: avs: boards: Change rt298 card name
  ASoC: Intel: avs: boards: Change rt5514 card name
  ASoC: Intel: avs: boards: Change rt5663 card name
  ASoC: Intel: avs: boards: Change rt5682 card name
  ASoC: Intel: avs: boards: Change ssm4567 card name

 sound/soc/intel/avs/avs.h              |  2 +-
 sound/soc/intel/avs/board_selection.c  | 37 +++++++++++++++++++++++---
 sound/soc/intel/avs/boards/Kconfig     |  8 ++++++
 sound/soc/intel/avs/boards/da7219.c    |  9 ++++++-
 sound/soc/intel/avs/boards/dmic.c      | 10 ++++++-
 sound/soc/intel/avs/boards/es8336.c    |  9 ++++++-
 sound/soc/intel/avs/boards/hdaudio.c   | 23 +++++++++++++---
 sound/soc/intel/avs/boards/i2s_test.c  | 13 +++++++--
 sound/soc/intel/avs/boards/max98357a.c |  9 ++++++-
 sound/soc/intel/avs/boards/max98373.c  |  9 ++++++-
 sound/soc/intel/avs/boards/max98927.c  |  9 ++++++-
 sound/soc/intel/avs/boards/nau8825.c   |  9 ++++++-
 sound/soc/intel/avs/boards/pcm3168a.c  | 14 +++++++++-
 sound/soc/intel/avs/boards/probe.c     |  3 ++-
 sound/soc/intel/avs/boards/rt274.c     |  9 ++++++-
 sound/soc/intel/avs/boards/rt286.c     |  9 ++++++-
 sound/soc/intel/avs/boards/rt298.c     |  9 ++++++-
 sound/soc/intel/avs/boards/rt5514.c    |  9 ++++++-
 sound/soc/intel/avs/boards/rt5663.c    |  9 ++++++-
 sound/soc/intel/avs/boards/rt5682.c    |  9 ++++++-
 sound/soc/intel/avs/boards/ssm4567.c   |  9 ++++++-
 sound/soc/intel/avs/pcm.c              | 13 ++++++---
 sound/soc/intel/avs/probes.c           |  2 +-
 sound/soc/intel/avs/utils.h            | 16 +++++++++--
 24 files changed, 224 insertions(+), 34 deletions(-)


base-commit: 3a0f0a4355df0240485ed62b6bd6afa5b3e689c5

Comments

Jaroslav Kysela April 7, 2025, 12:46 p.m. UTC | #1
On 07. 04. 25 14:41, Amadeusz Sławiński wrote:
> 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.

For all patches:

Acked-by: Jaroslav Kysela <perex@perex.cz>

Thanks.
Cezary Rojewski April 7, 2025, 1:42 p.m. UTC | #2
On 2025-04-07 2:41 PM, Amadeusz Sławiński wrote:
> 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.
This was quite a task :) For the entire series:

Reviewed-by: Cezary Rojewski <cezary.rojewski@intel.com>

> [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
> 
> Amadeusz Sławiński (20):
>    ASoC: Intel: avs: boards: Add Kconfig option for obsolete card names
>    ASoC: Intel: avs: Use topology information for endpoint numbers
>    ASoC: Intel: avs: boards: Change da7219 card name
>    ASoC: Intel: avs: boards: Change DMIC card name
>    ASoC: Intel: avs: boards: Change es8336 card name
>    ASoC: Intel: avs: boards: Change hdaudio card name
>    ASoC: Intel: avs: boards: Change sspX-loopback card name
>    ASoC: Intel: avs: boards: Change max98357a card name
>    ASoC: Intel: avs: boards: Change max98373 card name
>    ASoC: Intel: avs: boards: Change max98927 card name
>    ASoC: Intel: avs: boards: Change nau8825 card name
>    ASoC: Intel: avs: boards: Change pcm3168a card name
>    ASoC: Intel: avs: boards: Change probe card name
>    ASoC: Intel: avs: boards: Change rt274 card name
>    ASoC: Intel: avs: boards: Change rt286 card name
>    ASoC: Intel: avs: boards: Change rt298 card name
>    ASoC: Intel: avs: boards: Change rt5514 card name
>    ASoC: Intel: avs: boards: Change rt5663 card name
>    ASoC: Intel: avs: boards: Change rt5682 card name
>    ASoC: Intel: avs: boards: Change ssm4567 card name
> 
>   sound/soc/intel/avs/avs.h              |  2 +-
>   sound/soc/intel/avs/board_selection.c  | 37 +++++++++++++++++++++++---
>   sound/soc/intel/avs/boards/Kconfig     |  8 ++++++
>   sound/soc/intel/avs/boards/da7219.c    |  9 ++++++-
>   sound/soc/intel/avs/boards/dmic.c      | 10 ++++++-
>   sound/soc/intel/avs/boards/es8336.c    |  9 ++++++-
>   sound/soc/intel/avs/boards/hdaudio.c   | 23 +++++++++++++---
>   sound/soc/intel/avs/boards/i2s_test.c  | 13 +++++++--
>   sound/soc/intel/avs/boards/max98357a.c |  9 ++++++-
>   sound/soc/intel/avs/boards/max98373.c  |  9 ++++++-
>   sound/soc/intel/avs/boards/max98927.c  |  9 ++++++-
>   sound/soc/intel/avs/boards/nau8825.c   |  9 ++++++-
>   sound/soc/intel/avs/boards/pcm3168a.c  | 14 +++++++++-
>   sound/soc/intel/avs/boards/probe.c     |  3 ++-
>   sound/soc/intel/avs/boards/rt274.c     |  9 ++++++-
>   sound/soc/intel/avs/boards/rt286.c     |  9 ++++++-
>   sound/soc/intel/avs/boards/rt298.c     |  9 ++++++-
>   sound/soc/intel/avs/boards/rt5514.c    |  9 ++++++-
>   sound/soc/intel/avs/boards/rt5663.c    |  9 ++++++-
>   sound/soc/intel/avs/boards/rt5682.c    |  9 ++++++-
>   sound/soc/intel/avs/boards/ssm4567.c   |  9 ++++++-
>   sound/soc/intel/avs/pcm.c              | 13 ++++++---
>   sound/soc/intel/avs/probes.c           |  2 +-
>   sound/soc/intel/avs/utils.h            | 16 +++++++++--
>   24 files changed, 224 insertions(+), 34 deletions(-)
> 
> 
> base-commit: 3a0f0a4355df0240485ed62b6bd6afa5b3e689c5
Mark Brown April 8, 2025, 12:49 p.m. UTC | #3
On Mon, 07 Apr 2025 14:41:34 +0200, Amadeusz Sławiński wrote:
> 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.
> 
> [...]

Applied to

   https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next

Thanks!

[01/20] ASoC: Intel: avs: boards: Add Kconfig option for obsolete card names
        commit: 1581d5c68208a776c2df35d6e3ef232288b56f9d
[02/20] ASoC: Intel: avs: Use topology information for endpoint numbers
        commit: e3dc0351d7a0fdcde18ed1719c9149b1a656e7ec
[03/20] ASoC: Intel: avs: boards: Change da7219 card name
        commit: 958fd3ff106787c72617c106b483da96ebf040f3
[04/20] ASoC: Intel: avs: boards: Change DMIC card name
        commit: 1cfb242fc12a6e8ad84b10c65ac5bd1b507c5472
[05/20] ASoC: Intel: avs: boards: Change es8336 card name
        commit: 102d3f95e6a80bd19b623005cb2a0181533159b7
[06/20] ASoC: Intel: avs: boards: Change hdaudio card name
        commit: 65327c926e7c52487c33af7a096ec8990876d076
[07/20] ASoC: Intel: avs: boards: Change sspX-loopback card name
        commit: 71439093a066450d1392ef52c09dfb42c4a03d44
[08/20] ASoC: Intel: avs: boards: Change max98357a card name
        commit: 20d5ff6d7e35e04cc24f7953036aa75cabc72706
[09/20] ASoC: Intel: avs: boards: Change max98373 card name
        commit: e91f9a93c34f6092463fbc5e03b32312b3f87a37
[10/20] ASoC: Intel: avs: boards: Change max98927 card name
        commit: 3051c1b91c4acd99338a82c044ba25d675a41a3c
[11/20] ASoC: Intel: avs: boards: Change nau8825 card name
        commit: c0019bb4ee3ed861deea56feb8939cb9ad13926b
[12/20] ASoC: Intel: avs: boards: Change pcm3168a card name
        commit: 091614d1c571933413b9debada185c8f4daa536a
[13/20] ASoC: Intel: avs: boards: Change probe card name
        commit: c9763d849a56a16db9da235ff525f452839d29c3
[14/20] ASoC: Intel: avs: boards: Change rt274 card name
        commit: e7722ac9a88f85a4845ca1304dbe47cce01e1fc0
[15/20] ASoC: Intel: avs: boards: Change rt286 card name
        commit: ffe6a23eceb8ffe8ce23a9b23818b9a767ec9c9c
[16/20] ASoC: Intel: avs: boards: Change rt298 card name
        commit: 61881b29d6fcc67a31c1cdeae54e6687d1b20ead
[17/20] ASoC: Intel: avs: boards: Change rt5514 card name
        commit: e0e3b14080eb77759c6b11b4d14ef079ad30b911
[18/20] ASoC: Intel: avs: boards: Change rt5663 card name
        commit: f1e282c333ac6100a86f4ef3dd07c5db6ef5712a
[19/20] ASoC: Intel: avs: boards: Change rt5682 card name
        commit: 3c7115677969c6a45ccce511c15adf9ca4d61fba
[20/20] ASoC: Intel: avs: boards: Change ssm4567 card name
        commit: 93fa44f84704dfedc4fe06b89bebc8cfaa5f525b

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