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 D3C09421898; Wed, 4 Feb 2026 15:17:00 +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=1770218220; cv=none; b=CdfOV3KU9r19q6KL03CACQdo4xlRMTstZPNV9z2lj7oFoogT6TiQ+ltiQWAflFpUsYPoUWMiLHqx6ffckHSs5PFnZ7xjicD5gwGbn5of+uxDie45XRlvuNm4/f6VoiwkSJU7L4G9V5LRNLAQ3Mqffhu5/bDDAF5/DhBcFfA+vEQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770218220; c=relaxed/simple; bh=MxGKHJiEtqPDqBrteinioS1/NY7xYjlSaNfNXAcNl1o=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=q/gotSWvuJaCWoQyUhDiUvvlwpnQAj87saeQvEXeV5QLnekM0RfNPIxKB77P/xOt/rjKfD0kDw/nA7jQq06nmdjHkftAdhmu/qBlSdMkvPrnyGYiZ+YaLLqzsd3e648N6zWRwaCaU6xk2+bPB3GjP9YKGJq8VjbUDiqH0DJE+BE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=UKOabvZ/; 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="UKOabvZ/" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5A745C19423; Wed, 4 Feb 2026 15:17:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1770218220; bh=MxGKHJiEtqPDqBrteinioS1/NY7xYjlSaNfNXAcNl1o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UKOabvZ/j5PyuG8JcFR8x6cVQcf5IPR3GwaQ5UTNFB/fujGilTR1KDFNob9kPLbeb PBOCS1CE/xNotehVVCx3gFeJeJoKeCvUCe6m5eV5TaIgJ6FVwcz0YQ2Jn9EmQo/qyb HzAz9yej0UeaKIheZ6hzAXwG/IGHqHPS0kWq5sfk= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Srinivas Kandagatla , Johan Hovold , Krzysztof Kozlowski , Srinivas Kandagatla , Mark Brown , Sasha Levin Subject: [PATCH 6.1 248/280] ASoC: codecs: wsa883x: fix unnecessary initialisation Date: Wed, 4 Feb 2026 15:40:22 +0100 Message-ID: <20260204143918.563308904@linuxfoundation.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260204143909.614719725@linuxfoundation.org> References: <20260204143909.614719725@linuxfoundation.org> User-Agent: quilt/0.69 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-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Johan Hovold [ Upstream commit 49aadf830eb048134d33ad7329d92ecff45d8dbb ] The soundwire update_status() callback may be called multiple times with the same ATTACHED status but initialisation should only be done when transitioning from UNATTACHED to ATTACHED. This avoids repeated initialisation of the codecs during boot of machines like the Lenovo ThinkPad X13s: [ 11.614523] wsa883x-codec sdw:1:0:0217:0202:00:1: WSA883X Version 1_1, Variant: WSA8835_V2 [ 11.618022] wsa883x-codec sdw:1:0:0217:0202:00:1: WSA883X Version 1_1, Variant: WSA8835_V2 [ 11.621377] wsa883x-codec sdw:1:0:0217:0202:00:1: WSA883X Version 1_1, Variant: WSA8835_V2 [ 11.624065] wsa883x-codec sdw:1:0:0217:0202:00:1: WSA883X Version 1_1, Variant: WSA8835_V2 [ 11.631382] wsa883x-codec sdw:1:0:0217:0202:00:2: WSA883X Version 1_1, Variant: WSA8835_V2 [ 11.634424] wsa883x-codec sdw:1:0:0217:0202:00:2: WSA883X Version 1_1, Variant: WSA8835_V2 Fixes: 43b8c7dc85a1 ("ASoC: codecs: add wsa883x amplifier support") Cc: stable@vger.kernel.org # 6.0 Cc: Srinivas Kandagatla Signed-off-by: Johan Hovold Reviewed-by: Krzysztof Kozlowski Reviewed-by: Srinivas Kandagatla Link: https://patch.msgid.link/20260102111413.9605-2-johan@kernel.org Signed-off-by: Mark Brown [ Adjust context ] Signed-off-by: Sasha Levin Signed-off-by: Greg Kroah-Hartman --- sound/soc/codecs/wsa883x.c | 9 +++++++++ 1 file changed, 9 insertions(+) --- a/sound/soc/codecs/wsa883x.c +++ b/sound/soc/codecs/wsa883x.c @@ -448,6 +448,7 @@ struct wsa883x_priv { int active_ports; int dev_mode; int comp_offset; + bool hw_init; }; enum { @@ -1007,6 +1008,9 @@ static int wsa883x_init(struct wsa883x_p struct regmap *regmap = wsa883x->regmap; int variant, version, ret; + if (wsa883x->hw_init) + return 0; + ret = regmap_read(regmap, WSA883X_OTP_REG_0, &variant); if (ret) return ret; @@ -1050,6 +1054,8 @@ static int wsa883x_init(struct wsa883x_p wsa883x->comp_offset); } + wsa883x->hw_init = true; + return 0; } @@ -1058,6 +1064,9 @@ static int wsa883x_update_status(struct { struct wsa883x_priv *wsa883x = dev_get_drvdata(&slave->dev); + if (status == SDW_SLAVE_UNATTACHED) + wsa883x->hw_init = false; + if (status == SDW_SLAVE_ATTACHED && slave->dev_num > 0) return wsa883x_init(wsa883x);