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 1C2E631661D; Mon, 5 May 2025 22:30:54 +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=1746484254; cv=none; b=iBadtlo8MEKKTlwNfI286vc6ODxD09FZqeSF1FtTq4Myn3fpcTbeotN85j1/5/c3znqXk3cTMURcVngwUtBKxMTHXtlNa7s9ORt4r1q0PNC0pgMmU7m703ScN3skL/XSmlQ/fEwgdc/g5xMW74O0W/lpW9oeTHjHmn9IMQdIlmE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746484254; c=relaxed/simple; bh=BspxrRm5xP067Jizi0UNQpDg1zoW0UIDinj6jv2vCMg=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type; b=UFGKI2S7bs2S4Azl5cV39JqJh7Zmx/hXHRLOVDEt/BaXc9B0SD5fCeFHcgjuJUwdD6Eex0P2KGcpv3oJu5ML6o2kq+uEASeyk/FK5l2cinCjw6JOsa9hkQyx+fSguQRmM9foEVuekKmKneflQcbm6Zeh9976GkwkIH2FWU9JsxM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=fN/TF601; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="fN/TF601" Received: by smtp.kernel.org (Postfix) with ESMTPSA id D4BC1C4CEEE; Mon, 5 May 2025 22:30:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1746484253; bh=BspxrRm5xP067Jizi0UNQpDg1zoW0UIDinj6jv2vCMg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fN/TF601KC3zS6JywvwVPVdOYG1RmeqcJjbnSUZ39wTa8yCLuH4jiirCsTkxxHlMY CvuDiuN+ZDgAsSXTtGAegvKB/zXbhhVGbxAzjX1Tcu6Z1DBRwqR0Cg/VyPLfwtC7TS b9pIfScbEriZWLb6rNqhZewowvncoZgsYiajkL5wo363hFVuyr1GDdri9S+9Y06137 Ag9g4nTpfnAeI3MRjDI+djZFNq6a+yaB65A3DbM3tke9sV9CP2ZUA4FoQIpTD/XKxk c1ozXrpvfld61DdFB9h573LcdSw/frWhPvsK1JSo7yvq7MxAAjtHu3U2ufK/qJfc+Z NtqHTQeNYlpPg== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: =?UTF-8?q?Martin=20Povi=C5=A1er?= , Mark Brown , Sasha Levin , lgirdwood@gmail.com, perex@perex.cz, tiwai@suse.com, linux-sound@vger.kernel.org Subject: [PATCH AUTOSEL 6.14 414/642] ASoC: ops: Enforce platform maximum on initial value Date: Mon, 5 May 2025 18:10:30 -0400 Message-Id: <20250505221419.2672473-414-sashal@kernel.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250505221419.2672473-1-sashal@kernel.org> References: <20250505221419.2672473-1-sashal@kernel.org> 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 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.14.5 Content-Transfer-Encoding: 8bit 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 b0e4e4168f38d..fb11003d56cf6 100644 --- a/sound/soc/soc-ops.c +++ b/sound/soc/soc-ops.c @@ -639,6 +639,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. * @@ -663,7 +690,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