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=1795024260; b=nrSEvqE4I1x88za4HXF5hB7Li4B+tWBdyYzs1jmXInw/hcSIW/8pPHG8er+0KUZg+hPQ pzTgMaBB73/xUivxykekxArbdOX1WUAt+DGN1RzYSGF9TZw2DNcfg+/QlGJDjMeIxYn+L iEjNIBtedn/gMBTUEsQYzQ76Bx2AANXURxjwzZu6MzEAim7ZV2A3bCLy8D26LAY7pVwZS 8ByWSBPv7/HPXg+VK5dsRhUOSFsCsls3YA7W6lwuZU4Q4GtSlYfqcjKIOHiq0zsiUfb1V dtL7gJgw/tCjo8qMEyeRukMBo9rd5lQNTmQ33OEL1P6Zbl7X/FUhY6hEv/VKKyPO1mQ== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795024260; 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=fPLw+tbwyqtuipxt0reC1jRxDstheok+VsEQahw5J48=; b=mlThIqi29lNxH5AWFM92viAUYGzqYsXrKhk6T10QdVRcEW9Ft9dG1+df/ty/i93y6LaN m8Bgt9O8wabKSHm1Ki1PxLhQgs1L01ljKyCT4UG9RkRzURhexw8aGTsgdhQ/PtMQe5UEI jbPBl0ocmoWXdrui0EoPolMVlMAGOhGC8dXJtHdYYr10CvaDsIIx+oT8F19s8nvwumpV1 TdTtZybL8UxcVTiqHJVdvE3LgKALM654Kwes4QAyr4rRlSeOo86aQvJTow7/HOGT6VgGt 9mcRc2j7DJro4VoUpUmFwUzoUMjlPsOytoWId/vc7yS6lk1MHxNaaptG8vFl0ssRoDQ== 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=n2rvZj6X; 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 4C5CE606A31C; Wed, 18 Nov 2026 17:51:00 +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=n2rvZj6X Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9961A1F000C5; Wed, 18 Nov 2026 17:50:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1795024260; bh=fPLw+tbwyqtuipxt0reC1jRxDstheok+VsEQahw5J48=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=n2rvZj6Xfdk8XNrGLpeOL4+wOou8a6baUyVg2z7JVEmqTE3cFrbcxhtyePrMQ0okZ WI/AnQQC1rI6nryq4nK62wLKUNLCIZLRMxr5hEaGfMBZCyAhAZHY0XNzAj0Nps3h8H fLsBTx7Jb5XLqp9+NKVTZK5sA96yNfnFu4u1SdB0= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Malathi A , Andy Shevchenko , Sasha Levin Subject: [PATCH 6.18 0663/2151] serial: 8250_uniphier: Use devm_clk_get_enabled() Date: Wed, 18 Nov 2026 15:39:58 +0100 Message-ID: <20261118150145.986013921@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261118150121.603863898@linuxfoundation.org> References: <20261118150121.603863898@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore X-Mailing-List: stable@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Malathi A [ Upstream commit 790aacba3fdfd3a227cdd5e4952c596ed66a0ed8 ] uniphier_uart_probe() enables priv->clk by hand and is then responsible for disabling it again on every error path. It misses one: when uart_read_port_properties() fails the function returns directly, leaving the clock prepared and enabled. The neighbouring path, taken when serial8250_register_8250_port() fails, does call clk_disable_unprepare(), which shows the leak is an oversight rather than intent. Rather than adding another manual unwind, switch to devm_clk_get_enabled() so the clock is released by devres. That removes the error path entirely, along with the explicit disables in the register failure path and in uniphier_uart_remove(). The clock is still disabled and re-enabled by hand across system sleep, which stays balanced: only SET_SYSTEM_SLEEP_PM_OPS is used, so the device cannot be unbound while suspended and devres always sees an enabled clock at detach. Found by smatch: drivers/tty/serial/8250/8250_uniphier.c:232 uniphier_uart_probe() warn: 'priv->clk' from clk_prepare_enable() not released on lines: 205. Fixes: 26e8349c0d76 ("serial: 8250_uniphier: Switch to use uart_read_port_properties()") Signed-off-by: Malathi A Reviewed-by: Andy Shevchenko Link: https://patch.msgid.link/20260917040511.103232-1-malathi.a2000@gmail.com Signed-off-by: Greg Kroah-Hartman Signed-off-by: Sasha Levin --- drivers/tty/serial/8250/8250_uniphier.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/drivers/tty/serial/8250/8250_uniphier.c b/drivers/tty/serial/8250/8250_uniphier.c index e3db60bf50c93..6fffac12277ac 100644 --- a/drivers/tty/serial/8250/8250_uniphier.c +++ b/drivers/tty/serial/8250/8250_uniphier.c @@ -180,16 +180,12 @@ static int uniphier_uart_probe(struct platform_device *pdev) memset(&up, 0, sizeof(up)); - priv->clk = devm_clk_get(dev, NULL); + priv->clk = devm_clk_get_enabled(dev, NULL); if (IS_ERR(priv->clk)) { - dev_err(dev, "failed to get clock\n"); + dev_err(dev, "failed to get and enable clock\n"); return PTR_ERR(priv->clk); } - ret = clk_prepare_enable(priv->clk); - if (ret) - return ret; - up.port.uartclk = clk_get_rate(priv->clk); spin_lock_init(&priv->atomic_write_lock); @@ -222,7 +218,6 @@ static int uniphier_uart_probe(struct platform_device *pdev) ret = serial8250_register_8250_port(&up); if (ret < 0) { dev_err(dev, "failed to register 8250 port\n"); - clk_disable_unprepare(priv->clk); return ret; } priv->line = ret; @@ -237,7 +232,6 @@ static void uniphier_uart_remove(struct platform_device *pdev) struct uniphier8250_priv *priv = platform_get_drvdata(pdev); serial8250_unregister_port(priv->line); - clk_disable_unprepare(priv->clk); } static int __maybe_unused uniphier_uart_suspend(struct device *dev) -- 2.53.0