From nobody Thu Apr 2 18:47:46 2026 Received: from mail-dl1-f52.google.com (mail-dl1-f52.google.com [74.125.82.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3907B2F3C26 for ; Thu, 26 Mar 2026 23:38:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.52 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774568339; cv=none; b=FDhJQ43N7AEgWOssOrrnrtNOIAnCRa8qyII2FfyCw/6bSO1tN0BEJ4yKd8kZ7GozRvy7yuREG8ea/aU/Th3jpMPETgmB30eIOjAcS+lUlJk3fDxKG/C5CxRsYW8jxs6yWdwmZqM31XrIamlUUHZDCzepS8FIeaoiqSqmXH+kYkw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774568339; c=relaxed/simple; bh=NsyTf+Lz4jLInqeFQxOcGvLPzSh8qjZB0tzhBSzB18A=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:To:Cc; b=tn1xadSbDNSGXBlLsgaqHIVAg2jNSnWhwGXmQ1/r4CFzywJII1KjE8saf9toEvUUmt+ou38UFdvdwbc0EwCpI3fMtku72lBBs5ttuLgRtF5706ynftl3ZhZRF2z0pemCSo99LzMUBY9tj9UqSjQcb+K5+I8OaF8E6Djj6merBZc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=o1uEOcil; arc=none smtp.client-ip=74.125.82.52 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="o1uEOcil" Received: by mail-dl1-f52.google.com with SMTP id a92af1059eb24-12713e56abdso710026c88.1 for ; Thu, 26 Mar 2026 16:38:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1774568337; x=1775173137; darn=vger.kernel.org; h=cc:to:message-id:content-transfer-encoding:mime-version:subject :date:from:from:to:cc:subject:date:message-id:reply-to; bh=cKUqFmKtt8SiUUkwvcZuhZb+tpxs1zLnXQL3Vp/gXdI=; b=o1uEOcil2ye9Wcn/Q8JelKjtytgDHOOljZ+OTnDhjH5q2I52lTRLgDzIDxbVCHznfG 3J+FsTNX6Jn8cmQlxKeEHbdgNBtHZ0mIZGzuizfwSGiOmWgjZY0DBWJ+0o54QsprWoan 5ARh9Txl6aAMNyog7lOoGTbxyBPqWm5lU1X2cZ0bc7tdS2o0zF1QkR/XfcahHwZ5Vti6 BAiMjcnJNS+m60rYVD9MznkVHwyVpwEWrZ3FUqeCkr98cd5x+TKW//LTPTl/P+rTiQXo O4Rdd/T8t6jjH4V7DTumsFboXSzE5zHHVUtnYnqs0qpCI6BxBixHdBVwRHYw3287fcQ/ EWqA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774568337; x=1775173137; h=cc:to:message-id:content-transfer-encoding:mime-version:subject :date:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=cKUqFmKtt8SiUUkwvcZuhZb+tpxs1zLnXQL3Vp/gXdI=; b=RCun2CkEzSseuLsJwpj+sq5YQRB2hVcfJ0wUUCpaeLvulmVypo+1ex1EQmk0/k7OaF dgibqdlF0pSvTcy99hi+leYRaLT5dpwpki5BIm3Na+kWdX0YBVSLIPgdYsrXcCxrt5+A j3G+kwWL2oq6YFtR8H5XnM62TM7TCKMq3jpdDC9YVyVLTIfMTz1NnvG100JvZ+NDSB/E K0M2oZTXnGcvcx/Uq0ADxR0hfBpmaoIKgyycq2Du4+WZayhEmA7imdaPrI9jnCWdD/T9 FNiGawBZPtBBShePyPaA1nU+AEkCTIMKD0vWWSgR/JC3TwHnbKpZt+U8+dk44FmvhjsA jyDQ== X-Forwarded-Encrypted: i=1; AJvYcCULy1qel3bmalYu1vxztoXASVHj7RBDDWVBGDl8BmiFPiDaFNsNxjm0JJqNo0lCSd5LpX4Fl8cvpBE6LIw=@vger.kernel.org X-Gm-Message-State: AOJu0YwkD5Gj8mbCejQhR8hTiRpQINgAIElPxVO90Sy7KmxOmjZOzQEh sU8OLtGGsCdFrscZecKrTr14ZcERrUQD5vSp7p5HdUiB8VQDIQDyqk7P X-Gm-Gg: ATEYQzzqP/2GPNfMrEReGg6DcX2nZ/Tv56Hm3FfkL/TUTeG0K6AXw92ROrYnk9ABZr/ ZkZoed0OqTa/gQqilFoxMq5ygsKnCewLC288jM86MViDByu4crEOJXptqocp7NqFUDatCobHDBx xFM15z8xltX3tqeFDWSR9Kxo6xK/MHvqnPPUnspRWqB3LBivIOicgCwNcPnQO+iMHsm/ODIGJn2 e/rVUTw410skOsd7qzU7NBS/7gcOBAMCuToTY320UYhFlD5A3iBE/aVwx8XUTxZ0IiY1MxldaMy RE/Xc2nAtcAqkPFcnWYLWemLI9tXGwdnfbOzhQZh7TWHuaMpfX+b3ZKuaiEnN3QExQxySo32oQU ImW4v5/aMvFrOu5xTAUz/HsPjBZQMeR0QM4piP7KKvik1/84rdHhwwIqZ0vnqwcwUj3thRT1lpj Vu+xTVgQ+umfSDRCNlR/P7+WM9kw9ZTLSpTfY2sOBC+p3xbPFGAy7KmuneRwyzxM4z28j73jl2 X-Received: by 2002:a05:7022:1b08:b0:119:e569:f873 with SMTP id a92af1059eb24-12ab3040862mr97087c88.16.1774568337177; Thu, 26 Mar 2026 16:38:57 -0700 (PDT) Received: from [192.168.1.8] (177-4-161-78.user3p.v-tal.net.br. [177.4.161.78]) by smtp.gmail.com with ESMTPSA id a92af1059eb24-12aa725108csm3840880c88.6.2026.03.26.16.38.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 Mar 2026 16:38:56 -0700 (PDT) From: =?utf-8?q?C=C3=A1ssio_Gabriel?= Date: Thu, 26 Mar 2026 20:38:49 -0300 Subject: [PATCH] ASoC: generic: keep fallback dai_name stable across rebind Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260326-asoc-generic-fallback-dai-name-rebind-v1-1-ac9da3cbd606@gmail.com> X-B4-Tracking: v=1; b=H4sIAAAAAAAC/yXNQQrCMBCF4auUWTuQpBCLVxEXk8mkjtZUEhWh9 O5Ndfkt3v8WqFJUKpy6BYp8tOqcG+yhA75SHgU1NoMzzpveeaQ6M46S24wx0TQF4jtGUsz0ECw SNEf0/WDJ8mCOKUJrPYsk/f5+zpe/6zvchF97HNZ1A/QuOlKJAAAA X-Change-ID: 20260326-asoc-generic-fallback-dai-name-rebind-6381a1c807fd To: Mark Brown , Kuninori Morimoto , Liam Girdwood , Jaroslav Kysela , Takashi Iwai Cc: linux-sound@vger.kernel.org, linux-kernel@vger.kernel.org, =?utf-8?q?C=C3=A1ssio_Gabriel?= X-Mailer: b4 0.15.1 X-Developer-Signature: v=1; a=openpgp-sha256; l=5406; i=cassiogabrielcontato@gmail.com; h=from:subject:message-id; bh=NsyTf+Lz4jLInqeFQxOcGvLPzSh8qjZB0tzhBSzB18A=; b=owGbwMvMwCV2IdZeKur/u2bG02pJDJlHD/dZ2/rqlU49OnsdQ9nRUvfJCzj9Fj9pZudaaZ01+ VXt1JP1HaUsDGJcDLJiiiyrkxZZ7ul6cLU+boUHzBxWJpAhDFycAjCRK4wM/wusVsq/7gt9bF27 5NcMhXMv52bclzbfu2txzKJZ02xsj9xk+B/3KjuJ36uTc+mUwMuRgffvrjxc8+eU2/Pli/qfOHS qxPACAA== X-Developer-Key: i=cassiogabrielcontato@gmail.com; a=openpgp; fpr=AB62A239BC8AE0D57F5EA848D05D3F1A5AFFEE83 simple_parse_dai() and graph_util_parse_dai() first try to identify a DAI via dai_args. When that works the card can rebind without relying on dlc->dai_name. The fallback path still calls snd_soc_get_dlc(), which returns a borrowed dai_name pointer. If the CPU or codec component is unbound while the sound card stays registered, the generic card keeps that pointer and the next rebind may compare stale memory while matching the DAI. Stage the fallback result in a temporary dai_link_component and move only a card-owned copy of dai_name into the live link component. Use devm_kstrdup_const() so static names are reused and dynamic ones remain valid for the lifetime of the card device. Signed-off-by: C=C3=A1ssio Gabriel Acked-by: Kuninori Morimoto --- sound/soc/generic/simple-card-utils.c | 37 +++++++++++++++----------------= -- sound/soc/generic/simple-card.c | 39 +++++++++++++++++--------------= ---- 2 files changed, 36 insertions(+), 40 deletions(-) diff --git a/sound/soc/generic/simple-card-utils.c b/sound/soc/generic/simp= le-card-utils.c index da6353594d61..5997bb57e661 100644 --- a/sound/soc/generic/simple-card-utils.c +++ b/sound/soc/generic/simple-card-utils.c @@ -1128,7 +1128,9 @@ int graph_util_parse_dai(struct simple_util_priv *pri= v, struct device_node *ep, struct device *dev =3D simple_priv_to_dev(priv); struct device_node *node; struct of_phandle_args args =3D {}; + struct snd_soc_dai_link_component resolved_dlc =3D {}; struct snd_soc_dai *dai; + const char *fallback_dai_name; int ret; =20 if (!ep) @@ -1161,29 +1163,24 @@ int graph_util_parse_dai(struct simple_util_priv *p= riv, struct device_node *ep, args.args[0] =3D graph_get_dai_id(ep); args.args_count =3D (of_graph_get_endpoint_count(node) > 1); =20 - /* - * FIXME - * - * Here, dlc->dai_name is pointer to CPU/Codec DAI name. - * If user unbinded CPU or Codec driver, but not for Sound Card, - * dlc->dai_name is keeping unbinded CPU or Codec - * driver's pointer. - * - * If user re-bind CPU or Codec driver again, ALSA SoC will try - * to rebind Card via snd_soc_try_rebind_card(), but because of - * above reason, it might can't bind Sound Card. - * Because Sound Card is pointing to released dai_name pointer. - * - * To avoid this rebind Card issue, - * 1) It needs to alloc memory to keep dai_name eventhough - * CPU or Codec driver was unbinded, or - * 2) user need to rebind Sound Card everytime - * if he unbinded CPU or Codec. - */ - ret =3D snd_soc_get_dlc(&args, dlc); + ret =3D snd_soc_get_dlc(&args, &resolved_dlc); if (ret < 0) goto err; =20 + /* Keep fallback dai_name valid across component rebind */ + fallback_dai_name =3D resolved_dlc.dai_name; + if (fallback_dai_name) { + fallback_dai_name =3D devm_kstrdup_const(dev, fallback_dai_name, + GFP_KERNEL); + ret =3D -ENOMEM; + if (!fallback_dai_name) + goto err; + } + + dlc->of_node =3D resolved_dlc.of_node; + dlc->dai_name =3D fallback_dai_name; + dlc->dai_args =3D resolved_dlc.dai_args; + parse_dai_end: if (is_single_link) *is_single_link =3D of_graph_get_endpoint_count(node) =3D=3D 1; diff --git a/sound/soc/generic/simple-card.c b/sound/soc/generic/simple-car= d.c index 9937a991846e..7c399a9713ca 100644 --- a/sound/soc/generic/simple-card.c +++ b/sound/soc/generic/simple-card.c @@ -69,7 +69,9 @@ static int simple_parse_dai(struct simple_util_priv *priv, { struct device *dev =3D simple_priv_to_dev(priv); struct of_phandle_args args; + struct snd_soc_dai_link_component resolved_dlc =3D {}; struct snd_soc_dai *dai; + const char *fallback_dai_name; int ret; =20 if (!node) @@ -98,29 +100,26 @@ static int simple_parse_dai(struct simple_util_priv *p= riv, goto parse_dai_end; } =20 - /* - * FIXME - * - * Here, dlc->dai_name is pointer to CPU/Codec DAI name. - * If user unbinded CPU or Codec driver, but not for Sound Card, - * dlc->dai_name is keeping unbinded CPU or Codec - * driver's pointer. - * - * If user re-bind CPU or Codec driver again, ALSA SoC will try - * to rebind Card via snd_soc_try_rebind_card(), but because of - * above reason, it might can't bind Sound Card. - * Because Sound Card is pointing to released dai_name pointer. - * - * To avoid this rebind Card issue, - * 1) It needs to alloc memory to keep dai_name eventhough - * CPU or Codec driver was unbinded, or - * 2) user need to rebind Sound Card everytime - * if he unbinded CPU or Codec. - */ - ret =3D snd_soc_get_dlc(&args, dlc); + ret =3D snd_soc_get_dlc(&args, &resolved_dlc); if (ret < 0) goto end; =20 + /* Keep fallback dai_name valid across component rebind */ + fallback_dai_name =3D resolved_dlc.dai_name; + if (fallback_dai_name) { + fallback_dai_name =3D devm_kstrdup_const(dev, fallback_dai_name, + GFP_KERNEL); + ret =3D -ENOMEM; + if (!fallback_dai_name) { + of_node_put(resolved_dlc.of_node); + goto end; + } + } + + dlc->of_node =3D resolved_dlc.of_node; + dlc->dai_name =3D fallback_dai_name; + dlc->dai_args =3D resolved_dlc.dai_args; + parse_dai_end: if (is_single_link) *is_single_link =3D !args.args_count; --- base-commit: d084fd53a2fd5748d4317635b1c1a7dba7edf583 change-id: 20260326-asoc-generic-fallback-dai-name-rebind-6381a1c807fd Best regards, -- =20 C=C3=A1ssio Gabriel