From patchwork Mon Dec 4 12:47:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Srinivas Kandagatla X-Patchwork-Id: 173278 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:bcd1:0:b0:403:3b70:6f57 with SMTP id r17csp2735789vqy; Mon, 4 Dec 2023 04:47:53 -0800 (PST) X-Google-Smtp-Source: AGHT+IFaGORiRD7YadGxKMjRStbnvY4g4WYXHcvl4kXGDTIgFZpB15dECUXDU9q7heTOKaZhEnjv X-Received: by 2002:a17:902:c952:b0:1d0:bcb2:b905 with SMTP id i18-20020a170902c95200b001d0bcb2b905mr177227pla.121.1701694072866; Mon, 04 Dec 2023 04:47:52 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701694072; cv=none; d=google.com; s=arc-20160816; b=gfXjszm5NR4I76urwpwhoeayfa/bqZjFn5ka/M3jeo1hn9YaHlw+fwYt5t2nlWUGZl ekVf6EiT24JmVHsuSv4uYLKgaENls9iDbFJL+P9WuD8Hb+WBOGcZR7B+1aV+1iFq4TYL TH6OYUOpw9lX+/oOPD8NvqDaIjt3U/fKIMk8lVM6l5D7MIo69lDQz3SJxGCN59xN+2om zjDltJ+Dlyhkw6z01TTXbraR02s9PPsmAcbOcz8/inJ/FskzRqpPw+JSJtbmes4jPKNH uu6tc+3kltFhKU5H6bZN+jkaS+0lxf04/XHQjZks72l5yH1ZypkB+jpDn1y0R+k5ab2P GR9g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=+ziVbN5ZTP69p6FxRTQ/DrNWjlcr9menHHHhzgnVhU0=; fh=tKMKhgl5y3qWFLA4WbTOKHpRmq3iK42KyhZj04F1xWA=; b=xTA+IORkw2YuH37S9/zcOq8HUzZMDzJam02sD6Bw6xSzazfSoBq+f78BpBf9gFRnU/ OCjeNFN5KNJbw939E1hMyDcRb0qiNY7SE2x/kjSmjueKY6Hb2EwUkJ+UbIBvoIBKfi6V 60Tdb2LqsSkFO94ahKbiE7ustlCi29oFBuzEnxvFuxx1IdtaZV8CNUYpHVeWJTcwegMM xnRiQ6RL0YaY6lGYewGDgh+gbkNCTa5ZPkElmcWO9bOvcdu3tkAzCKLvgzkNDoZKHKfX 2tGsPwW5+ang9iTw5HY3YzBwLYpgcg/fYXac/sIhhVus3AWck7P/VrLJVs3DMHdUHZI4 HsfA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=oaxeCEda; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from morse.vger.email (morse.vger.email. [23.128.96.31]) by mx.google.com with ESMTPS id s20-20020a170902b19400b001d0a6c4e2d4si1542944plr.610.2023.12.04.04.47.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Dec 2023 04:47:52 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 as permitted sender) client-ip=23.128.96.31; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=oaxeCEda; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by morse.vger.email (Postfix) with ESMTP id B98E8805000C; Mon, 4 Dec 2023 04:47:49 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at morse.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1343916AbjLDMri (ORCPT + 99 others); Mon, 4 Dec 2023 07:47:38 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49268 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233215AbjLDMrh (ORCPT ); Mon, 4 Dec 2023 07:47:37 -0500 Received: from mail-ed1-x52d.google.com (mail-ed1-x52d.google.com [IPv6:2a00:1450:4864:20::52d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 86AA7A9 for ; Mon, 4 Dec 2023 04:47:43 -0800 (PST) Received: by mail-ed1-x52d.google.com with SMTP id 4fb4d7f45d1cf-54ca43031d1so1245447a12.0 for ; Mon, 04 Dec 2023 04:47:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1701694062; x=1702298862; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=+ziVbN5ZTP69p6FxRTQ/DrNWjlcr9menHHHhzgnVhU0=; b=oaxeCEdai59i2UFpX60wj06AWKEDDInfc+sS6P/buF+nKMxpHtCcGsOvMzr3t1DVUi mx/PEgtgzSoMLJ+jeVRDBWCtDE9+tDmstiWpi2EfTb9j4miy5OSmpBx6X2AWbjKqNpWG ZbM8OODMkuvE5yNutRRs9NvBm8q9OKyrcVDVDeOGYfxyT5y1UIjFPz4ZNackzTc7qXW8 adS4yOJMxN8BcmpoaPlrdEDnMWN+aVy2QZdTDccTFWI+PSGXm5mehX3NqXrNLn/QJxZ2 lwUsAZcuZ7W4YjdVuIkaA7/BtDoO6sOFa0VrjKuDZRauepryWj86Hqn/BailDq+8A154 0Avw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701694062; x=1702298862; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=+ziVbN5ZTP69p6FxRTQ/DrNWjlcr9menHHHhzgnVhU0=; b=hPuDDLRpn4hsvQu4EsKLidgOXo+qIR01m4BGA/jWvBIrJqvnpWFJ4uNCmbjbvUPRy+ rh+ZhbYn81GevZtQkk9A8S1Oc7nfJJf4kfMTVNgfL0CYGvN4r1HFX+/Uj3unvbN5Hl/t OUdZ5Uu9/wAAKkyQnXh8FwCD3CG2uoJnf4mbyz4Wd1CP8vMdeWDeYLJNa4/EHFyFXv6V CrWaxvknNpAyTGLNKuBerb/BaGyZ8zacIpm3Tvg7KtBlVKAuwVzDjoO6/as0sH7Gj5tR q9Hqc42aucO78wo9NN3swteSuGW34YHBZrft3IaMabo22CC7HfwkYpUpI8hTFc/X4ooU 3xJg== X-Gm-Message-State: AOJu0Yy0lRbzbS8iWC1KGMX6JtRCGghICeRHdxnDWSEDvf38VH4SZt+Z 4VDhxJoNubBHKNvJ/u1MoTCOkw== X-Received: by 2002:a50:d59a:0:b0:54c:4837:903c with SMTP id v26-20020a50d59a000000b0054c4837903cmr3836618edi.52.1701694062023; Mon, 04 Dec 2023 04:47:42 -0800 (PST) Received: from localhost.localdomain ([5.133.47.210]) by smtp.gmail.com with ESMTPSA id dc15-20020a056402310f00b0054ced65bd26sm457017edb.41.2023.12.04.04.47.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Dec 2023 04:47:41 -0800 (PST) From: srinivas.kandagatla@linaro.org To: broonie@kernel.org, alsa-devel@alsa-project.org Cc: perex@perex.cz, tiwai@suse.com, linux-sound@vger.kernel.org, linux-kernel@vger.kernel.org, johan+linaro@kernel.org, Srinivas Kandagatla Subject: [PATCH 1/2] ASoC: ops: add correct range check for limiting volume Date: Mon, 4 Dec 2023 12:47:35 +0000 Message-Id: <20231204124736.132185-2-srinivas.kandagatla@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20231204124736.132185-1-srinivas.kandagatla@linaro.org> References: <20231204124736.132185-1-srinivas.kandagatla@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on morse.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (morse.vger.email [0.0.0.0]); Mon, 04 Dec 2023 04:47:49 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1784355564516711691 X-GMAIL-MSGID: 1784355564516711691 From: Srinivas Kandagatla Volume can have ranges that start with negative values, ex: -84dB to +40dB. Apply correct range check in snd_soc_limit_volume before setting the platform_max. Without this patch, for example setting a 0dB limit on a volume range of -84dB to +40dB would fail. Signed-off-by: Srinivas Kandagatla Tested-by: Johan Hovold Reviewed-by: Johan Hovold --- sound/soc/soc-ops.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/soc-ops.c b/sound/soc/soc-ops.c index 55b009d3c681..2d25748ca706 100644 --- a/sound/soc/soc-ops.c +++ b/sound/soc/soc-ops.c @@ -661,7 +661,7 @@ int snd_soc_limit_volume(struct snd_soc_card *card, kctl = snd_soc_card_get_kcontrol(card, name); if (kctl) { struct soc_mixer_control *mc = (struct soc_mixer_control *)kctl->private_value; - if (max <= mc->max) { + if (max <= mc->max - mc->min) { mc->platform_max = max; ret = 0; } From patchwork Mon Dec 4 12:47:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Srinivas Kandagatla X-Patchwork-Id: 173279 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:bcd1:0:b0:403:3b70:6f57 with SMTP id r17csp2735804vqy; Mon, 4 Dec 2023 04:47:55 -0800 (PST) X-Google-Smtp-Source: AGHT+IGk4mO9arLMsqYvVOKutWmMFSbj+V2W2h2Q2T9LxtTB/Fk2MtCQbJjmq53doLhRijEgvG/T X-Received: by 2002:a17:90a:7847:b0:286:52d6:fa88 with SMTP id y7-20020a17090a784700b0028652d6fa88mr3931077pjl.22.1701694075153; Mon, 04 Dec 2023 04:47:55 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701694075; cv=none; d=google.com; s=arc-20160816; b=RZ6/moUG0ERCRglEh6ceHM+Lr9JX9YnI3kVvZTFaUwa7WmnjxFlCFEupa7IYpF5Dwn nwUOwl/B4n178IORpNBhXNp6sFvSGG9xiqrteRisQdLWNOgOMpGN7qrm4xkYRKg9zq1x DDaXYbmKSpshdnK96yuLBHKLEA87rH6H5VkdBO/5zYZQlIWp4sja+jedQOmcI3g1I+9I RVRahxJuPw7aNZleW5U5VigJwuFUTP0CbSrXJqYns+16byOwciKHOcHkmfQZSSIV7X0l 6OUAFfCti1LeHaXgR5m82njsF1EzDO6q1bVorVJIq5pNhLLGGa6bLDaihYV+f1FM95d/ IIgg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=KY0JnJRKpd3/EUynN0UwcoxBlBhaBotyx7RxLf0wHWk=; fh=tKMKhgl5y3qWFLA4WbTOKHpRmq3iK42KyhZj04F1xWA=; b=RBVcWGg+9xWN0Ib159z0ccO1THpdkawNrd137IPAzmHHrhdGqmATCjRK1hquLQ0HoZ pnDHDcm9ZgtCmxseQeSCHUgSJgHurHj6CjbxAGB231uNRjy6o4Zh6T1f6EJBYyFlSdZj i4/UJk77kyWAbdqFHnC5j8f34I6bmzjp2YS3HHMr2pL6AU/ZKrayGgJvMEzm9zBwPLBy SkIZ/+26ToSTKbDqoATWpkZtTuNvqGdcnTddJ6Ypl3We7vloFy0YLVxQBtICdQTOpSUU OPYbtRZK4V9jNW3qF8y5b/uOUgcDd8Anef9mTJgeUhi9sxWr3caTiOLnQi+hpK0ULQIs F0/A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=WxFUILUg; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id kk14-20020a17090b4a0e00b00286ab6324f5si1830202pjb.23.2023.12.04.04.47.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Dec 2023 04:47:55 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=WxFUILUg; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id EF9ED80A264E; Mon, 4 Dec 2023 04:47:53 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1343948AbjLDMrl (ORCPT + 99 others); Mon, 4 Dec 2023 07:47:41 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49284 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1343931AbjLDMri (ORCPT ); Mon, 4 Dec 2023 07:47:38 -0500 Received: from mail-ed1-x52e.google.com (mail-ed1-x52e.google.com [IPv6:2a00:1450:4864:20::52e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BBD0AAA for ; Mon, 4 Dec 2023 04:47:44 -0800 (PST) Received: by mail-ed1-x52e.google.com with SMTP id 4fb4d7f45d1cf-54bfd4546fbso5393828a12.1 for ; Mon, 04 Dec 2023 04:47:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1701694063; x=1702298863; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=KY0JnJRKpd3/EUynN0UwcoxBlBhaBotyx7RxLf0wHWk=; b=WxFUILUg9AlH39Y2EB9mtJahq3vrhq/0j2+JHA2WeUFVB/LtnhfAJJ6nRyCnFjGPpq BhXtUVYhlZ5Sctx4Jf5xJG9kNB1uhew7yHFhboABHNdA9G6ritHPu+7MyG2S0hMh7rA9 AwroFr7K940CJq4OKdWBdtYC0AjjyENd5/IHGtq6Yjsan9cNv+IjayLquw1iPCpv/aee dtzIN8IBwrImDDCb8s4iKTKA2JT20iNBuC2qDj6lbMWjZbhizaAhvauTUotVGSe86eHD giq6/GlbCED9cuEJY21EL25GlMokfTByfuXlceuYWtHd2261n6fkp7+BaSOk1Q+y+Tzv oV3Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701694063; x=1702298863; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=KY0JnJRKpd3/EUynN0UwcoxBlBhaBotyx7RxLf0wHWk=; b=oh13hUHnfAtrSK2989pMFroXDl+Br6pk2Rt1YMrW0C3WrzVHMNLLMG2GwIQs4kjFVL rrlK0Wtyke8XQNVz7D0+yBB4NQq9ATl6AsStl4yxgXsnSwN9Icb+4I31wuQLrzVV2Nn8 e/tdV7TqXq3R8VmDaYQoPaK2mlH1AAreJmcJTilmNACCm7vwKHhDhwp6paomE6pRU/ND wHkGpUrjdOgOsKbWFJBqoHIZVjEu3dx1PWkljYf6agQPLZ+SG2GSX14uABsvA4bEHipB 5/uhupbM63Cnk2QPQ+uFtc+8s5h4xKGsHOUqRTZnxn63l0IlhGqAePLr8I96WKdUOnMZ RQNA== X-Gm-Message-State: AOJu0YzFPXqvlEJl22IOX7BSYf96sL2VffWssiGPOYsuzaUL/Z9is3+i htEcYee0p3VS8iArMePdjRPYDw== X-Received: by 2002:a05:6402:17dc:b0:54c:a21b:8088 with SMTP id s28-20020a05640217dc00b0054ca21b8088mr1192577edy.63.1701694063127; Mon, 04 Dec 2023 04:47:43 -0800 (PST) Received: from localhost.localdomain ([5.133.47.210]) by smtp.gmail.com with ESMTPSA id dc15-20020a056402310f00b0054ced65bd26sm457017edb.41.2023.12.04.04.47.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Dec 2023 04:47:42 -0800 (PST) From: srinivas.kandagatla@linaro.org To: broonie@kernel.org, alsa-devel@alsa-project.org Cc: perex@perex.cz, tiwai@suse.com, linux-sound@vger.kernel.org, linux-kernel@vger.kernel.org, johan+linaro@kernel.org, Srinivas Kandagatla Subject: [PATCH 2/2] ASoC: qcom: sc8280xp: Limit speaker digital volumes Date: Mon, 4 Dec 2023 12:47:36 +0000 Message-Id: <20231204124736.132185-3-srinivas.kandagatla@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20231204124736.132185-1-srinivas.kandagatla@linaro.org> References: <20231204124736.132185-1-srinivas.kandagatla@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Mon, 04 Dec 2023 04:47:54 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1784355566509541186 X-GMAIL-MSGID: 1784355566509541186 From: Srinivas Kandagatla Limit the speaker digital gains to 0dB so that the users will not damage them. Currently there is a limit in UCM, but this does not stop the user form changing the digital gains from command line. So limit this in driver which makes the speakers more safer without active speaker protection in place. Signed-off-by: Srinivas Kandagatla Reviewed-by: Johan Hovold Tested-by: Johan Hovold --- sound/soc/qcom/sc8280xp.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/sound/soc/qcom/sc8280xp.c b/sound/soc/qcom/sc8280xp.c index 249a43e1dee3..1e8f9452cd28 100644 --- a/sound/soc/qcom/sc8280xp.c +++ b/sound/soc/qcom/sc8280xp.c @@ -25,6 +25,23 @@ struct sc8280xp_snd_data { static int sc8280xp_snd_init(struct snd_soc_pcm_runtime *rtd) { struct sc8280xp_snd_data *data = snd_soc_card_get_drvdata(rtd->card); + struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(rtd, 0); + struct snd_soc_card *card = rtd->card; + + switch (cpu_dai->id) { + case WSA_CODEC_DMA_RX_0: + case WSA_CODEC_DMA_RX_1: + /* + * set limit of 0dB on Digital Volume for Speakers, + * this can prevent damage of speakers to some extent without + * active speaker protection + */ + snd_soc_limit_volume(card, "WSA_RX0 Digital Volume", 84); + snd_soc_limit_volume(card, "WSA_RX1 Digital Volume", 84); + break; + default: + break; + } return qcom_snd_wcd_jack_setup(rtd, &data->jack, &data->jack_setup); }