From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 139A422A4DB; Mon, 2 Jun 2025 14:57:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748876243; cv=none; b=k5/hJrEDnyYP00dGz4x5OfF+M15Dm748CjBiwH/3DC0gpDhfyO6sKrbTHKtEnUTSXj7udaxW6zcyIGb/zkxx21miDEIPtsFTt6ByLmevpHgsY60MMJOBwviYjO05DmKiTmNyjewDDvndw/QC2iYCFEtccI/Z5xvwIz8hVKxc0jM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748876243; c=relaxed/simple; bh=Wy3JF6JH70jWoT3MN0ZyOmZKBo+87IZL16x7vUNcTPs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=oDtXUFvVqXFlyPIFq8V+OOyZzrK2raZ+gEu3o86Df/xoPGqslGLCekAsLdlHHRiw6bG7NJ3eaTTvIDlSUljUEWWX4toboa5Px02MeYNOYPshsezdfmoGVKq+uQLP4qHE+t+aRWWT4qghV55Xyq2iaUgDirZRWXqwWVqtBt1RNyU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=NQX2WmcT; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="NQX2WmcT" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 70E3DC4CEEB; Mon, 2 Jun 2025 14:57:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1748876242; bh=Wy3JF6JH70jWoT3MN0ZyOmZKBo+87IZL16x7vUNcTPs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NQX2WmcT4SPXyYQYlUcGk7XcURiElhe3yLA0GQjNb7M3WXDBZnnqxV5/AwkDHWPo/ hGeXa4rl7ROQ6k05FjeO/bNxfsVfxq7ojC/QYO9Y8VUbcT/TWl5tKS1sTaSeq70sGg Cokrf02EIh+J3qXGGnuSbXUtmp92Egt+Mu8DlsLE= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, =?UTF-8?q?Martin=20Povi=C5=A1er?= , Mark Brown , Sasha Levin Subject: [PATCH 5.15 115/207] ASoC: ops: Enforce platform maximum on initial value Date: Mon, 2 Jun 2025 15:48:07 +0200 Message-ID: <20250602134303.228648410@linuxfoundation.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250602134258.769974467@linuxfoundation.org> References: <20250602134258.769974467@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 5.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Martin Povišer [ Upstream commit 783db6851c1821d8b983ffb12b99c279ff64f2ee ] Lower the volume if it is violating the platform maximum at its initial value (i.e. at the time of the 'snd_soc_limit_volume' call). Signed-off-by: Martin Povišer [Cherry picked from the Asahi kernel with fixups -- broonie] Signed-off-by: Mark Brown Link: https://patch.msgid.link/20250208-asoc-volume-limit-v1-1-b98fcf4cdbad@kernel.org Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- sound/soc/soc-ops.c | 29 ++++++++++++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) diff --git a/sound/soc/soc-ops.c b/sound/soc/soc-ops.c index d8d0a26a554de..9eb4181c6697f 100644 --- a/sound/soc/soc-ops.c +++ b/sound/soc/soc-ops.c @@ -621,6 +621,33 @@ int snd_soc_get_volsw_range(struct snd_kcontrol *kcontrol, } EXPORT_SYMBOL_GPL(snd_soc_get_volsw_range); +static int snd_soc_clip_to_platform_max(struct snd_kcontrol *kctl) +{ + struct soc_mixer_control *mc = (struct soc_mixer_control *)kctl->private_value; + struct snd_ctl_elem_value uctl; + int ret; + + if (!mc->platform_max) + return 0; + + ret = kctl->get(kctl, &uctl); + if (ret < 0) + return ret; + + if (uctl.value.integer.value[0] > mc->platform_max) + uctl.value.integer.value[0] = mc->platform_max; + + if (snd_soc_volsw_is_stereo(mc) && + uctl.value.integer.value[1] > mc->platform_max) + uctl.value.integer.value[1] = mc->platform_max; + + ret = kctl->put(kctl, &uctl); + if (ret < 0) + return ret; + + return 0; +} + /** * snd_soc_limit_volume - Set new limit to an existing volume control. * @@ -645,7 +672,7 @@ int snd_soc_limit_volume(struct snd_soc_card *card, struct soc_mixer_control *mc = (struct soc_mixer_control *)kctl->private_value; if (max <= mc->max - mc->min) { mc->platform_max = max; - ret = 0; + ret = snd_soc_clip_to_platform_max(kctl); } } return ret; -- 2.39.5