From d676569a617fdfbf41baed9068b102d9eb151b9b Mon Sep 17 00:00:00 2001 From: Alex Kiernan Date: Fri, 31 Jan 2025 16:58:11 +0000 Subject: [PATCH] alsa-utils: Backport fix for alsa_restore_go/std Fix the label mismatch which was introduced in the transition from the temporary test rules: udevd[120]: GOTO 'alsa_restore_std' has no matching label in: '/lib/udev/rules.d/90-alsa-restore.rules' Signed-off-by: Alex Kiernan Signed-off-by: Richard Purdie --- ...restore.rules-fix-alsa_restore_go-st.patch | 42 +++++++++++++++++++ ...restore.rules-fix-AMD-acp-pdm-mach-l.patch | 35 ++++++++++++++++ .../alsa/alsa-utils_1.2.13.bb | 2 + 3 files changed, 79 insertions(+) create mode 100644 meta/recipes-multimedia/alsa/alsa-utils/0001-alsactl-90-alsa-restore.rules-fix-alsa_restore_go-st.patch create mode 100644 meta/recipes-multimedia/alsa/alsa-utils/0002-alsactl-90-alsa-restore.rules-fix-AMD-acp-pdm-mach-l.patch diff --git a/meta/recipes-multimedia/alsa/alsa-utils/0001-alsactl-90-alsa-restore.rules-fix-alsa_restore_go-st.patch b/meta/recipes-multimedia/alsa/alsa-utils/0001-alsactl-90-alsa-restore.rules-fix-alsa_restore_go-st.patch new file mode 100644 index 00000000000..ea02fdb8c52 --- /dev/null +++ b/meta/recipes-multimedia/alsa/alsa-utils/0001-alsactl-90-alsa-restore.rules-fix-alsa_restore_go-st.patch @@ -0,0 +1,42 @@ +From f90124c73edd050b24961197a4abcf17e53b41a8 Mon Sep 17 00:00:00 2001 +From: Jaroslav Kysela +Date: Thu, 14 Nov 2024 09:38:49 +0100 +Subject: [PATCH 1/2] alsactl: 90-alsa-restore.rules - fix alsa_restore_go/std + +Fix the label mismatch which was introduced in the transition from the +temporary test rules. + +Closes: https://github.com/alsa-project/alsa-utils/issues/280 +Fixes: 8116639 ("alsactl: 90-alsa-restore.rules - add support for AMD ACP digital microphone") +Signed-off-by: Jaroslav Kysela +Upstream-Status: Backport [https://github.com/alsa-project/alsa-utils/commit/f90124c73edd050b24961197a4abcf17e53b41a8] +Signed-off-by: Alex Kiernan +--- + alsactl/90-alsa-restore.rules.in | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/alsactl/90-alsa-restore.rules.in b/alsactl/90-alsa-restore.rules.in +index 85f0b15f4856..dae2ed8ccc8f 100644 +--- a/alsactl/90-alsa-restore.rules.in ++++ b/alsactl/90-alsa-restore.rules.in +@@ -3,6 +3,8 @@ + ACTION=="add", SUBSYSTEM=="sound", KERNEL=="controlC*", KERNELS!="card*",@extratest@ GOTO="alsa_restore_go" + GOTO="alsa_restore_end" + ++LABEL="alsa_restore_go" ++ + ENV{ALSA_CARD_NUMBER}="$attr{device/number}" + + # mark HDA analog card; HDMI/DP card does not have capture devices +@@ -21,7 +23,7 @@ TEST!="/run/udev/alsa-hda-analog-card", GOTO="alsa_restore_std" + IMPORT{program}="/usr/bin/cat /run/udev/alsa-hda-analog-card" + ENV{ALSA_CARD_HDA_ANALOG}!="", ENV{ALSA_CARD_NUMBER}="$env{ALSA_CARD_HDA_ANALOG}" + +-LABEL="alsa_restore_go" ++LABEL="alsa_restore_std" + TEST!="@daemonswitch@", RUN+="@sbindir@/alsactl@args@ restore $env{ALSA_CARD_NUMBER}" + TEST=="@daemonswitch@", RUN+="@sbindir@/alsactl@args@ nrestore $env{ALSA_CARD_NUMBER}" + +-- +2.25.1 + diff --git a/meta/recipes-multimedia/alsa/alsa-utils/0002-alsactl-90-alsa-restore.rules-fix-AMD-acp-pdm-mach-l.patch b/meta/recipes-multimedia/alsa/alsa-utils/0002-alsactl-90-alsa-restore.rules-fix-AMD-acp-pdm-mach-l.patch new file mode 100644 index 00000000000..2299718d14c --- /dev/null +++ b/meta/recipes-multimedia/alsa/alsa-utils/0002-alsactl-90-alsa-restore.rules-fix-AMD-acp-pdm-mach-l.patch @@ -0,0 +1,35 @@ +From 6f7ce73159c02b726a6f0fe0acff961c95e337a8 Mon Sep 17 00:00:00 2001 +From: Aaron Ma +Date: Wed, 20 Nov 2024 15:55:02 +0800 +Subject: [PATCH 2/2] alsactl: 90-alsa-restore.rules - fix AMD acp-pdm-mach + link + +The link name of AMD ACP digital microphones driver acp-pdm-mach +is acp-dmic-codec. Fix it to make UCM initialize it again. + +Closes: https://github.com/alsa-project/alsa-utils/pull/281 +Fixes: 8116639 ("alsactl: 90-alsa-restore.rules - add support for AMD ACP digital microphone") +Signed-off-by: Aaron Ma +Signed-off-by: Jaroslav Kysela +Upstream-Status: Backport [https://github.com/alsa-project/alsa-utils/commit/6f7ce73159c02b726a6f0fe0acff961c95e337a8] +Signed-off-by: Alex Kiernan +--- + alsactl/90-alsa-restore.rules.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/alsactl/90-alsa-restore.rules.in b/alsactl/90-alsa-restore.rules.in +index dae2ed8ccc8f..5db6080b0dc6 100644 +--- a/alsactl/90-alsa-restore.rules.in ++++ b/alsactl/90-alsa-restore.rules.in +@@ -14,7 +14,7 @@ DRIVERS=="snd_hda_intel", TEST=="device/pcmC$env{ALSA_CARD_NUMBER}D0p", RUN+="/b + TEST=="device/device/acp3x-dmic-capture", GOTO="alsa_hda_analog" + TEST=="device/device/acp6x-dmic-capture", GOTO="alsa_hda_analog" + TEST=="device/device/acp63-dmic-capture", GOTO="alsa_hda_analog" +-TEST=="device/device/acp-pdm-dmic", GOTO="alsa_hda_analog" ++TEST=="device/device/acp-dmic-codec", GOTO="alsa_hda_analog" + GOTO="alsa_restore_std" + + LABEL="alsa_hda_analog" +-- +2.25.1 + diff --git a/meta/recipes-multimedia/alsa/alsa-utils_1.2.13.bb b/meta/recipes-multimedia/alsa/alsa-utils_1.2.13.bb index b681922bbf8..91dcee1453f 100644 --- a/meta/recipes-multimedia/alsa/alsa-utils_1.2.13.bb +++ b/meta/recipes-multimedia/alsa/alsa-utils_1.2.13.bb @@ -25,6 +25,8 @@ PACKAGECONFIG[manpages] = "--enable-xmlto, --disable-xmlto, xmlto-native docbook # alsa-utils specified in SRC_URI due to alsa-utils-scripts recipe SRC_URI = "https://www.alsa-project.org/files/pub/utils/alsa-utils-${PV}.tar.bz2 \ + file://0001-alsactl-90-alsa-restore.rules-fix-alsa_restore_go-st.patch \ + file://0002-alsactl-90-alsa-restore.rules-fix-AMD-acp-pdm-mach-l.patch \ " SRC_URI[sha256sum] = "1702a6b1cdf9ba3e996ecbc1ddcf9171e6808f5961d503d0f27e80ee162f1daa" -- 2.47.3