From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj2-f13.google.com (mail-pj2-f13.google.com [74.125.227.141]) (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 D84C53CFF73 for ; Sun, 20 Sep 2026 04:56:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.227.141 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789880203; cv=none; b=HX/0evSqWCq+qHiC/9wlVFzunX9OXwkTcg2LH0RZGfKMeyoZB4WgcoeCkCzRlkWTpciphrZjeMlat98zTDxbnOcoGmmWCzko3qY3pJTk/tZkJq+1kHxXVRzsOJ5N6s02fvUBaSgBkjhzRnIEatwi4/0mH5hE71GHHmm+tzKDZiI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789880203; c=relaxed/simple; bh=orkI4Wz6NvKsu2dnhAfmTqfm8jAF2sqyShpaRHJbfnA=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=WmgN8PBoqA1eUNJPzC4FgeibJHxzmUAMEEflJUtRLSmJgSauXQqjzK7iJaSlS4TPM+nXNXF1L1Uqe5ymsQTT/FUvtRn6AXWg5AUihulG5AQUrYOJkqgmm3JfyHLOzl3RU4CPLK/bYpb7TxVTCysjQBn1v/afFxjJnQERNxJaK40= 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=q6IDRuXT; arc=none smtp.client-ip=74.125.227.141 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="q6IDRuXT" Received: by mail-pj2-f13.google.com with SMTP id d9443c01a7336-2d747ec6188so11902895ad.3 for ; Sat, 19 Sep 2026 21:56:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1789880201; x=1790485001; darn=lists.linux.dev; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=usgTFYno7+hAzGXo/yfuRjYlJhKU8fYfhaps2/4rD8k=; b=q6IDRuXTYAHBC/TQdVqiOV5CAfruCOq6ZFMpkH/onxWWk9uBt+4SIa+5Jmlwbo8CID xrymss6r56zRh2V4rXwbQRmNWARhv46rZrZbpBeqrC7GhmtD00rOUTaBCCS2Z6AYQ76D e3buRCAod54MrpRx/I/OYksIAOkz3IEQuvOKZ8pL9USNQ4CE7a7J4Lv6l1KMbekGZnAw 4zl95iSuIFKnrkPaF9OOlTkwTtcYxoA851vPnCigXdyPc4JPB0G7Px1A+ipjaRRUp1mf C+kxXCnObXQEvB2tky5tApWGhrH6pLywXqS28GfU7ETPgyixRusAFze0leBexCMH1qey dApQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1789880201; x=1790485001; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=usgTFYno7+hAzGXo/yfuRjYlJhKU8fYfhaps2/4rD8k=; b=imz+BP3GdI5DSxvk3UFm2vNrUbEdMKAnn3eelZhPGKNAZTR4+eMZwQ4mNLbtlB/Im9 FP/+6+JkViPh2GH206A/TzKgxBsmX9tMl8cqrMaHWP1VdX4IPK7g7t/Gx2ILJXzlutBP 0HIPaeEFduHZIccMk0fO+dT6tat5tB2jNH3aDfc3/GhpcZjdRTFcDXUrFozQf1cJQ4eY SkDJZCzXociBeOGND+m2n5o9mWL21wRMSYyWrGpIhZdx035QfL78jQKLCb/xUYqb1Tq3 hEALH86ELoi2GJsGZRX8IkIOdDnTNYXyfIEag9v6YewQpUmbJ6TrbgmearFzqwZSRU+x OSsw== X-Gm-Message-State: AFuF++lGbua3vX8aLnlF0sojJg7BVtlD1UmSMq7PULzfFmRPV0/klict 8dNkD6QjEJg9+1aJlxAyK0aEm8dSS6JHFYHxUWOixE6haqbeXY5fWxDN X-Gm-Gg: AYBFou1kfkZh35Ryjn9HTmLna8+2Z329NquQjialkW3NQCtc/Jth62rtMmGaXnDClGw DKac+LrQfPkowpDcrI4sxJOCHwxISfyc3Ev1hiGXfes51yarzFNIHRpne7KQLABVZBPy9jwgjSk OcPIT96EP2jKXU1Zx1vE1gxzYLSV2l2ucPPth2+3TmAt9cKbMqM74ECKj2Ts8BXSZ8lUaV9rt2N uY3oPAd/0Mw4ghs6ZoYdps43vJOTdZds+fBIBsrpLbvsvP93PsXVLfjmk/Me/Lx+kLiIveaj1Ve pUe44zcw1RQRO1703pSb8SHGuiX/zN71/s5Kt+q4LJQNRTo0z9l5rrfvlzqc7W05uXBpg6914eq UJ+bhJ6V12NMcIVqJBoYme/PXssPGz8pPrRpLUJo0GjqzWQUqowqe7EYY8HPfaOg+yv9v0sw/6u SjT9an2TxqnIeft0zNyub3otDh725T6Zf87uYs5gH6K/lhKNFP5kXAigpdKvtw22o7leHSmi2wg dJyFybF24fWi6Zv704wx1q5IXyz68EYUeE0/TAxcCZa0A2t8dJaAFl4M9aVCY0WuCNwkrSqREgR xlqYAW/9tz8JSnBQaG7auGw8UrxClymMAK47m3B2H5Js7eI= X-Received: by 2002:a17:902:e543:b0:2df:39bd:ace2 with SMTP id d9443c01a7336-2df39bdb0a4mr24798825ad.43.1789880201029; Sat, 19 Sep 2026 21:56:41 -0700 (PDT) Received: from [192.168.2.3] ([2403:581e:d87e:0:fc2d:ed31:e80e:412d]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2ddc17d712dsm16026765ad.64.2026.09.19.21.56.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 19 Sep 2026 21:56:40 -0700 (PDT) From: James Calligeros Date: Sun, 20 Sep 2026 14:53:49 +1000 Subject: [PATCH 10/28] ASoC: ops: Accept patterns in snd_soc_limit_volume Precedence: bulk X-Mailing-List: asahi@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit Message-Id: <20260920-macaudio-v1-10-741cc20a74e5@gmail.com> References: <20260920-macaudio-v1-0-741cc20a74e5@gmail.com> In-Reply-To: <20260920-macaudio-v1-0-741cc20a74e5@gmail.com> To: =?utf-8?q?Martin_Povi=C5=A1er?= , Liam Girdwood , Mark Brown , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Sven Peter , Janne Grunau , Neal Gompa , David Rhodes , Richard Fitzgerald , Jaroslav Kysela , Takashi Iwai , Ulf Hansson , Amit Kucheria , "Rafael J. Wysocki" , Lars-Peter Clausen , Vinod Koul , Matthias Brugger , AngeloGioacchino Del Regno , Shenghao Ding , Kevin Lu , Baojun Xu , Sen Wang , James Calligeros , James Schulman Cc: asahi@lists.linux.dev, linux-sound@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, patches@opensource.cirrus.com, Takashi Iwai , linux-mediatek@lists.infradead.org X-Mailer: b4 0.15.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=2816; i=jcalligeros99@gmail.com; h=from:subject:message-id; bh=giyxcaB7oPKDW7kHY6FxQFJhi2IQzFYLV+w/nh4sO8E=; b=owGbwMvMwCV2xczoYuD3ygTG02pJDFnr0xV+HF2p1seUK7lhz+75Sy6XKnK6zLlreVYmbF3Bm QOajkLxHRNZGMS4GCzFFFk2NAl5zDZiu9kvUrkXZg4rE8gQaZEGBiBgYeDLTcwrNdIx0jPVNtQz NNIx1jFi4OIUgKleG8TI8CqdbbN2+S/VoCAT3nVMDvGZ86ZkRsz6OD1eZoq/ovrURYwMV95umc5 m67PbWbG0nuv1Qp6aIJtzX5z1bYVeT724eGMZPwA= X-Developer-Key: i=jcalligeros99@gmail.com; a=openpgp; fpr=B08212489B3206D98F1479BDD43632D151F77960 From: Martin Povišer In snd_soc_limit_volume, instead of looking up a single control by name, also understand wildcard-starting patterns like '* Amp Gain Volume' to touch many controls at one. Signed-off-by: Martin Povišer Signed-off-by: James Calligeros --- sound/soc/soc-ops.c | 51 ++++++++++++++++++++++--- 1 file changed, 45 insertions(+), 6 deletions(-) diff --git a/sound/soc/soc-ops.c b/sound/soc/soc-ops.c index e572b05840b4..2f91ee7946bb 100644 --- a/sound/soc/soc-ops.c +++ b/sound/soc/soc-ops.c @@ -403,6 +403,29 @@ int snd_soc_put_volsw_sx(struct snd_kcontrol *kcontrol, } EXPORT_SYMBOL_GPL(snd_soc_put_volsw_sx); +static bool soc_control_matches(struct snd_kcontrol *kctl, + const char *pattern) +{ + const char *name = kctl->id.name; + + if (pattern[0] == '*') { + int namelen; + int patternlen; + + pattern++; + if (pattern[0] == ' ') + pattern++; + + namelen = strlen(name); + patternlen = strlen(pattern); + + if (namelen > patternlen) + name += namelen - patternlen; + } + + return !strcmp(name, pattern); +} + static int snd_soc_clip_to_platform_max(struct snd_kcontrol *kctl) { struct soc_mixer_control *mc = (struct soc_mixer_control *)kctl->private_value; @@ -445,31 +468,47 @@ static int soc_limit_volume(struct snd_kcontrol *kctl, int max) } /** - * snd_soc_limit_volume - Set new limit to an existing volume control. + * snd_soc_limit_volume - Set new limit to existing volume controls. * * @card: where to look for the control - * @name: Name of the control + * @name: name pattern * @max: new maximum limit * - * Return 0 for success, else error. + * Finds controls matching the given name (which can be either a name + * verbatim, or a pattern starting with the wildcard '*') and sets + * a platform volume limit on them. + * + * Return number of matching controls on success, else error. At least + * one control needs to match the pattern. */ int snd_soc_limit_volume(struct snd_soc_card *card, const char *name, int max) { struct snd_kcontrol *kctl; + int hits = 0; + int ret; /* Sanity check for name */ if (unlikely(!name)) return -EINVAL; - kctl = snd_soc_card_get_kcontrol(card, name); - if (!kctl) { + list_for_each_entry(kctl, &card->snd_card->controls, list) { + if (!soc_control_matches(kctl, name)) + continue; + + ret = soc_limit_volume(kctl, max); + if (ret < 0) + return ret; + hits++; + } + + if (!hits) { /* Some cards blindly add limits for multiple variants. */ dev_dbg(card->dev, "Volume limit for unknown control '%s'\n", name); return -EINVAL; } - return soc_limit_volume(kctl, max); + return hits; } EXPORT_SYMBOL_GPL(snd_soc_limit_volume); -- 2.55.0