From patchwork Mon Jan 22 18:18:15 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Hovold X-Patchwork-Id: 19277 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:2bc4:b0:101:a8e8:374 with SMTP id hx4csp2769557dyb; Mon, 22 Jan 2024 10:52:21 -0800 (PST) X-Google-Smtp-Source: AGHT+IHWFg87AzDfm1Gq1541pflVpP0e6kQ4U2Isf6FEZYeGGrZP7tAJpy6wFFPu6MxsOJa/VbwS X-Received: by 2002:a05:622a:14d0:b0:42a:3176:5ed9 with SMTP id u16-20020a05622a14d000b0042a31765ed9mr6836199qtx.17.1705949541397; Mon, 22 Jan 2024 10:52:21 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1705949541; cv=pass; d=google.com; s=arc-20160816; b=DxytdaPaAmkx4oLZv3vywsHHiSxm5qVMhP5VIM1S2n2cv4xj2BEEIy6/bxFXb7pJq0 zSlwotQ0qHC/ieru+D3PlG6pyAxAwLjXFELY8GanqFf/LTFhQOIByFDfMXTFyZyCdRDx PHynavNN4yiirTu3lxpgmUIcqOHLT+Wll+K84Cmat/JVZfQ9iamKmfeNN/IuZBIO6o1+ QYeYBW7j3gfoWOElJXDXwFYpO2aKdbRonxcSQlX7gB5LDCptNIszDqRJS9Oae1udN/ta Wu+m+PElAD+Rr/ov0Jtkx4tgAGzT2AswODES/8tU/ZUmCiHvppgEUQuiish8sZV/njOS N5sQ== 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=PVt/GuJyZYw5o/1Kjo8OTYv90IAWdoV6EynZfAN6Ay8=; fh=KKP8zTcQJ3oaRk5kFpZOVuVwNJRF3rULozot/hU/FVs=; b=GdjyXE0VPcsZ2DEALaG9hWH0AdM/hTSE8TUWmUGqhBn3fvGMRclqrVyXDIttu2xsnI 26M7P5T3ryJagfnMR05OXDfYmRQDmmGCfJnCMdVBDWtVo+CpJJWFocga+Jv0iEZeQeNl 9wpxurNQ85itQzY3nMrtPeKVnvShsUkHWn3ubpsmCneD3gzTdAb6D+DifIdf5hAJddnA 86uK5GyrPOOEaWzfdFkdY0Q1WJ2b4ZUKdbBv9v08mmM+uOVBmKNxHok0hCSI4qdRQZhZ sMXD/Rt1esjufNW0oTAdAj3WgGIsoPY3VP/+9rhOZiyhwF+qMErunsSKhqrx/4aF3fTh RFtQ== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=b+9POOsO; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-33959-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-33959-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [2604:1380:45d1:ec00::1]) by mx.google.com with ESMTPS id q9-20020a05622a04c900b00429f1d32437si6143361qtx.280.2024.01.22.10.52.21 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Jan 2024 10:52:21 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-33959-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=b+9POOsO; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-33959-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-33959-ouuuleilei=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 ny.mirrors.kernel.org (Postfix) with ESMTPS id 2DFCD1C21F89 for ; Mon, 22 Jan 2024 18:52:21 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id A3BF658AB1; Mon, 22 Jan 2024 18:18:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="b+9POOsO" 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 EDB403DBAB; Mon, 22 Jan 2024 18:18:27 +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=1705947508; cv=none; b=eymvS3bEDGni/SRDK8wLV/2Ub9xPT9G+XZxYqE+kfkeoCOjanVH9WL83ihOYnERio3AWBJntLozDKbHIT1Wt/FezPlbsC0umdxyiUck31di8L6wobdb2CCZbMlajEKVevyYPkXdm8ZoTbOFi8uxxh/+EkQC64rq5AZLw0PeFAPk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705947508; c=relaxed/simple; bh=7miscXNSOMprQJwxQIJJr4/Ytf2DqWNxzA6Kigr9MWg=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=csIR0UzzsXvqmIIAXPdM/4hpUs4NwgcnGpaJkBDBeMT/CJJOqyR+wX6BiIALSq2AVfdK6FLCv9tEK9d8eZrIqEGG0a/2m7NFf4VW2rKsy/wVbJoNBQQs4zodx2MdXBui0NID3qNeaXO2uUX95D1Azr6c8DqRvpz/9tVZoHUjRC8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=b+9POOsO; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id C1CCDC43390; Mon, 22 Jan 2024 18:18:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1705947507; bh=7miscXNSOMprQJwxQIJJr4/Ytf2DqWNxzA6Kigr9MWg=; h=From:To:Cc:Subject:Date:From; b=b+9POOsOeQjtUvXuCNigCJf2HSOkXYPLOWg/HE+CRt/c26e2TW5wTHa4FHl3M4tIf e46SSMKSvD4XGNYdTCsa0Qwkoi8jpOAqd+VRud/WfsEGwMS/x3j8+XP/cVVyEVZJ/6 GG+ICMsaaw3YL0alwVkUEI8wt/Jt9vOmVZyEoiK3tvE1dZCI4pEFnLWxja/juLRnhS YhZ+IVRQVXhpNt/urMtl5gPV8++M8rx6SBMrsMcWBC7HsVZif7u6Sp7gtCgtDxQPdL z0+yDXOKMbZ6roSrUO6wYmyb421yoIpQataUcPoo1JveBaQ9QFsXVCYAaq5FTthQf/ 0D33ILfewDsBg== Received: from johan by xi.lan with local (Exim 4.97.1) (envelope-from ) id 1rRysa-0000000013R-12Hg; Mon, 22 Jan 2024 19:18:40 +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 v5 0/4] ASoC: qcom: volume fixes and codec cleanups Date: Mon, 22 Jan 2024 19:18:15 +0100 Message-ID: <20240122181819.4038-1-johan+linaro@kernel.org> X-Mailer: git-send-email 2.43.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1788817746064476880 X-GMAIL-MSGID: 1788817746064476880 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 v5 - rebase on v6.8-rc1 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(-)