From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1795058747; b=rp31IXl+PdtwlCEZCu7h4+PbQcIGNhs6G7LumwpZ19tXl3Q89H0v9pZcmofSaCA/3DW5 vTJ107SxYfdTB/zqFesAOeQ+/Y/QSqoTE6/FQAyIW0wZ4yzEdL3nhCBeb/cgeRmBQplmF 5mJcFiopjfkyKnGiNQOF83rPShrtTl36HCabEoddg0Kfg1jmi5LeGJrk3xVCr4+kDo7av 7Tyc52Hulp+OHB8CmFEag9TFx7TC/tfoyPriMB4mdRLD0yWYiKBzJitL6u5VYzgF9TkzZ mXXjLI8EGHaxeetMMUhJVoTFHKunBpWCQX5qJtUnOThxCuF69m3uoXJrpWWs8QhW0Ug== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795058747; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:User-Agent:X-stable:X-Patchwork-Hint: MIME-Version:Content-Transfer-Encoding; bh=IhXh4CFuUGtLL5v4qarYpbwdiK9wPUrp1LhLbysmFF4=; b=OU4YmUH43M+bYu5pYlEy9RoBlELD1eFnWD1531dbKMEaq3S3xH/eqGrfhTQif77l9hMV t07IihX0kp559WNPO+op1KEFBWuw9UZ92Tnm8Tmv4vGodR/8hTQBjtt4oMMzgWOtcSVRB 8c2msRG76nEWj5j8zZbM2ibDLRO0opm0TIihqiXIt658HVyMhy0gGi+FuPKC82ZCJtaRL ySuUpuYnLdC+g/EFdp8Q7zHx7514BaenwFu3cadjdynsFNZ4e93ewy9+xs3CIy6jLDLwu PFlQKsuQyw/VhRLlr9P14J95CYjukLGpLHlQU0T1AKTIdIFXqMvR/e6VxaFu9EljNGQ== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=slEgeT1t; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A64AE606A320; Thu, 19 Nov 2026 03:25:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=slEgeT1t Received: by smtp.kernel.org (Postfix) with ESMTPSA id 092F81F000C4; Thu, 19 Nov 2026 03:25:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1795058747; bh=IhXh4CFuUGtLL5v4qarYpbwdiK9wPUrp1LhLbysmFF4=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=slEgeT1t6IT1qn8oAeKA+K061hLGrCo+UO8KJHMn0sX2a/ga70gcpMnTOrEADD64R P4yuSO/OpV4xDQWwyH8AJNYvP4cQGsFmobl6LundBcyMQuC5TmNWQ//8PebTbZ+KGk lVVmnOgUUA6AYX3Bu7yfzIcDJgla2/cmzVpVBVTQ= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Peter Ujfalusi , Mark Brown , Sasha Levin Subject: [PATCH 5.10 0596/1848] ASoC: hdac_hda: Keep runtime PM state in sync across codec remove/probe Date: Wed, 18 Nov 2026 15:43:54 +0100 Message-ID: <20261118145940.326648736@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261118145911.150052362@linuxfoundation.org> References: <20261118145911.150052362@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore X-Mailing-List: patches@lists.linux.dev List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.10-stable review patch. If anyone has any objections, please let me know. ------------------ From: Peter Ujfalusi [ Upstream commit 99203e8d8968def973e82bb712ea959c6a46c16e ] After the codec has been removed, its runtime PM status is RPM_SUSPENDED while hdac_hda_codec_probe() powers the codec up via snd_hda_codec_device_new(). The pm_runtime_put()/snd_hda_power_down() calls on probe and registration then see an already suspended device, the codec suspend callback is not called and the codec, its HDA link and the codec_powered bit stay set, preventing the controller from runtime suspending. The remove has a similar problem with the codec link accounting: hdac_hda_codec_remove() drops the link reference taken in probe without looking at the runtime PM state of the codec. If the codec was already runtime suspended, the link reference has been dropped by the codec suspend callback and the remove drops it a second time. Resume the codec in hdac_hda_codec_remove() before disabling runtime PM so that the link reference and the codec_powered bit are always in the same state as after the probe, and mark the device active on probe once the codec has been powered up. Finally mark the codec device suspended at the end of the remove. Its runtime PM is disabled at this point and if only the ASoC card is unbound (e.g. by unbinding the machine driver), a following system suspend would otherwise call the runtime suspend callback on the already cleaned up codec via pm_runtime_force_suspend(). This is a followup patch to address Sashiko reports. Link: https://lore.kernel.org/linux-sound/20261027083840.28813-4-peter.ujfalusi@linux.intel.com/ Fixes: c3ec8ac82105 ("ASoC: hdac_hda: fix memleak on module unload") Cc: stable@vger.kernel.org Signed-off-by: Peter Ujfalusi Link: https://patch.msgid.link/20261027144655.31988-1-peter.ujfalusi@linux.intel.com Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- sound/soc/codecs/hdac_hda.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/sound/soc/codecs/hdac_hda.c b/sound/soc/codecs/hdac_hda.c index 02936e5f8f64a..b113b33133e88 100644 --- a/sound/soc/codecs/hdac_hda.c +++ b/sound/soc/codecs/hdac_hda.c @@ -481,6 +481,9 @@ static int hdac_hda_codec_probe(struct snd_soc_component *component) snd_hdac_display_power(hdev->bus, HDA_CODEC_IDX_CONTROLLER, false); + /* The codec is in D0, the status is RPM_SUSPENDED after a previous unbind */ + pm_runtime_set_active(&hdev->dev); + /* match for forbid call in snd_hda_codec_device_new() */ pm_runtime_allow(&hdev->dev); @@ -520,6 +523,12 @@ static void hdac_hda_codec_remove(struct snd_soc_component *component) return; } + /* + * Resume the codec to have its link reference (dropped below) and + * codec_powered bit in the same state as after the probe. + */ + pm_runtime_get_sync(&hdev->dev); + /* prevent runtime PM callbacks while the link and the codec are torn down */ pm_runtime_disable(&hdev->dev); snd_hdac_ext_bus_link_put(hdev->bus, hlink); @@ -531,6 +540,9 @@ static void hdac_hda_codec_remove(struct snd_soc_component *component) /* Balances the disable above, cleanup_for_unbind keeps runtime PM disabled */ pm_runtime_enable(&hdev->dev); + pm_runtime_put_noidle(&hdev->dev); + /* The codec is cleaned up, system suspend must skip it from now on */ + pm_runtime_set_suspended(&hdev->dev); } static const struct snd_soc_dapm_route hdac_hda_dapm_routes[] = { -- 2.53.0