Received: by 2002:a05:7412:ba23:b0:fa:4c10:6cad with SMTP id jp35csp934102rdb; Fri, 19 Jan 2024 03:27:34 -0800 (PST) X-Google-Smtp-Source: AGHT+IH1OPFVlASwZSfbFNzvxzI9pDIDPbkePXqV5K3zUlQ1/LMvtoEvfscPIqTgFtNZtKWdzZtG X-Received: by 2002:a05:6a00:1a88:b0:6db:c7d8:1e1a with SMTP id e8-20020a056a001a8800b006dbc7d81e1amr104441pfv.24.1705663653747; Fri, 19 Jan 2024 03:27:33 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1705663653; cv=pass; d=google.com; s=arc-20160816; b=qelG0y2tg8iuoUNZH9rzYmeHcJrbhTIfsAFqPUtMnUgHsxFdmQL/awQ5yVcjHKUyzJ XTOwmjpOxOxwQ+L3Bf+Xz4L5DX54ezPdg381fFvZ8l2iQs2vgO+L+hiphjOn3Za8uWkm gxyDdWx+2KzYVZb3Q2s93Cs72cQW53f9Q67mweXlmrIGZnl0sCYA0NrxscXRmHFuSh+Q Yf840ourxT+icE/GYmkMS6Hb38G+UVutGvioKggz9tdfVa9/v7HlPE7F2DGI2JbDbB1T QD3o6ntNm3E7GmD2r3hdazYzDcc078pke2W4YHiyh+cDjwYyMLOhTyPwl2BtXImiQC2l TKsg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:message-id:date:subject:cc:to :from:dkim-signature; bh=TOKr7agFy2yPpy7NOBtZVqTbcHPIriLL0LxHL/cP+To=; fh=KKP8zTcQJ3oaRk5kFpZOVuVwNJRF3rULozot/hU/FVs=; b=gY6pFqXXdxQlNVgRhS45IdhhwMpC9ppYjZ/aqGKnAebqkW86oJtazld80wo6OC/+tB kfpxul8sNLT8hhNCyvuWkQmk55fbNvKsTGDgoeUEuPPLsdxR6T47mXHn2M5NRU2BX454 H4Vw4aZnR6X1t3lpQuLu1PUme3JaOCpVd1Rt4icOgW6OrWXQFRjsPUr+2LvYh3PVkR7H xV8JHf/nJ6drgIQ1qdhId42RxJuhCRpYDFSKgYwYsdEY4fnM831SqxEbbEZl1i+Rt/sM JAzX6MlCETjNpnpvKnrW7pGK8HAxoCJFYVDfQOfhAcmLntJ+MSkbtm9SDf7LW7YpnVfg 4fOQ== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=gGfAHRBx; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-31090-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-31090-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from sy.mirrors.kernel.org (sy.mirrors.kernel.org. [2604:1380:40f1:3f00::1]) by mx.google.com with ESMTPS id a16-20020a62d410000000b006d99fca81d2si5353454pfh.382.2024.01.19.03.27.33 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Jan 2024 03:27:33 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-31090-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) client-ip=2604:1380:40f1:3f00::1; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=gGfAHRBx; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-31090-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-31090-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sy.mirrors.kernel.org (Postfix) with ESMTPS id A6E12B22778 for ; Fri, 19 Jan 2024 11:27:32 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 5E4C94D116; Fri, 19 Jan 2024 11:26:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="gGfAHRBx" 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 7F91D4CB45; Fri, 19 Jan 2024 11:26:55 +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=1705663615; cv=none; b=FZXWoIIEz8+u1mLoQcdOMa18HQNYzN5geheifyFRmFViNnzrimSjfEPO9adMEXityl7XarBMILf+d5OuAf/KFWgNODYKEXkIDnj2HIq1A1LIFMtbzxATEw3gMkuf/GkPMaa/hHEVEnmpRSQYj2sh+2BS2rkWkYQuRCxzS7OVAg0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705663615; c=relaxed/simple; bh=y9EPfighvp9gn9o7ZscqDXm0oHny+oVmp15fgxEog1o=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=Dfy9NTTV4L20o+O2GWeiMXxlfAc5630jE9V/3zf5neDk5rqUzZCEHD+EXCJWFfBluFvXOdIHU+alJBavCfRh9cEyYFYUpxVq1UW/ZjV8RFzXm5U3kkDLygh4bjAmAKeAlAqjkh3Bn7M5M3rX3pOaIj6N3IhBrxE21AXR0UmXrLQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=gGfAHRBx; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id 206BCC43399; Fri, 19 Jan 2024 11:26:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1705663615; bh=y9EPfighvp9gn9o7ZscqDXm0oHny+oVmp15fgxEog1o=; h=From:To:Cc:Subject:Date:From; b=gGfAHRBx8Lb62/FK3+Fx3zmG65nnbsJABDrtacTayzigkckOAOcxVq1QvX5Hekq3d 4v0DqHZtGqUfeKnO5JBP19sPunVQsO8jA6Q5arFCQoyfofZzuBdShLTU7ATW7eJSVk UzLP4o5WAVioJ5arXvwGiGs/B2e42g7mb4fnkDFGC/8XDoeyFZkZWresnJ51PXY90R Fk+XJgJxvLZYXhtvlyosF/zVbaAG3kB8O0+hSyKAkhGbdYUQ7DGvb3lq2+liGcmPP4 RISQV/JDq2EsVlIFLPX20S8pXuxC1eA8gJ7Tlq6G7hrEFMxHv0isBdD9TmPRmvZ4hV VB098w5sX7qXA== Received: from johan by xi.lan with local (Exim 4.96.2) (envelope-from ) id 1rQn1b-0001xH-08; Fri, 19 Jan 2024 12:27:03 +0100 From: Johan Hovold To: Mark Brown Cc: Srinivas Kandagatla , Banajit Goswami , Liam Girdwood , Jaroslav Kysela , Takashi Iwai , alsa-devel@alsa-project.org, linux-sound@vger.kernel.org, linux-kernel@vger.kernel.org, Johan Hovold Subject: [PATCH v4 0/4] ASoC: qcom: volume fixes and codec cleanups Date: Fri, 19 Jan 2024 12:24:16 +0100 Message-ID: <20240119112420.7446-1-johan+linaro@kernel.org> X-Mailer: git-send-email 2.41.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit To reduce the risk of speaker damage the PA gain needs to be limited on machines like the Lenovo Thinkpad X13s until we have active speaker protection in place. Limit the gain to the current default setting provided by the UCM configuration which most user have so far been using (due to a bug in the configuration files which prevented hardware volume control [1]). The wsa883x PA volume control also turned out to be broken, which meant that the default setting used by UCM configuration is actually the lowest level (-3 dB). With the codec driver fixed, hardware volume control also works as expected. Note that the new wsa884x driver most likely suffers from a similar bug, I'll send a fix for that once I've got that confirmed. Included is also a related fix for the LPASS WSA macro driver, which was changing the digital gain setting behind the back of user space and which can result in excessive (or too low) digital gain. There are further Qualcomm codec drivers that similarly appear to manipulate various gain settings, but on closer inspection it turns out that they only write back the current settings. Tests reveal that these writes are indeed needed for any prior updates to take effect (at least for the WSA and RX macros). Johan [1] https://github.com/alsa-project/alsa-ucm-conf/pull/382 Changes in v4 - keep the full PA volume control range and only fix the exported dB values - use a combined -3 dB machine limit as limiting just the PA volume confuses PulseAudio - drop the PA gain initialisation which is no longer needed Changes in v3 - fix the wsa883x PA volume control and update the machine limits accordingly Changes in v2 - keep the volume register write on power-on in lpass-wsa-macro - drop the other patches removing volume register writes on DAPM events - only drop the constant-zero gain offsets in wcd9335 Johan Hovold (4): ASoC: codecs: wsa883x: fix PA volume control ASoC: qcom: sc8280xp: limit speaker volumes ASoC: codecs: lpass-wsa-macro: fix compander volume hack ASoC: codecs: wcd9335: drop unused gain hack remnant sound/soc/codecs/lpass-wsa-macro.c | 7 ------- sound/soc/codecs/wcd9335.c | 4 ---- sound/soc/codecs/wsa883x.c | 6 +++++- sound/soc/qcom/sc8280xp.c | 12 +++++++----- 4 files changed, 12 insertions(+), 17 deletions(-) -- 2.41.0