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 0B334143C49; Tue, 23 Apr 2024 21:45:30 +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=1713908730; cv=none; b=WV4eIsWeyxbdwxtWJfhhUFAR2VAscmDnj4kS6NQA67h0uKODHlffZMDBSyPpnpn+iYFY+clTNBmqt060x0VOxteUuV4f1j122sweVOi4DsDs26cb3E4o86Hzu2/ScjBRkRW6xSKO+BMhRumId3bK823lI6zi7D5u/gGVVxkY4wY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713908730; c=relaxed/simple; bh=Q1gfKuUkkVdHhaiqH7vyGGMTAyuYdaQhdPHmNwl8wTk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=LTapZJUyTiQL/f8ZDd5JXAXJ6mGYh1RtD1WQV6mX0AN4fD1/zElUvt3P0/o79DI9SJfkc+Z3Lnwl4Yl/eTgqbad+hBJQRV9wbCSyfbzrKH3NsDwJyi1iPABXBcWUtowTJ4RoWna0QbsuXAj95gsZ0CNAQC9SjsyVLLZKSQY8uEc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=HDM1pC6z; 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="HDM1pC6z" Received: by smtp.kernel.org (Postfix) with ESMTPSA id D642AC32781; Tue, 23 Apr 2024 21:45:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1713908729; bh=Q1gfKuUkkVdHhaiqH7vyGGMTAyuYdaQhdPHmNwl8wTk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HDM1pC6zC+7hBi5rTRrdT+i3gJa1e78cAU5zHL3E18CUeX3yH1KzXBnbdz07g28Z7 aGBOstIwsma/OJ/C7FlOn7cMXjCeplsxO1qOnhNedx7Pp/ETBIZpfk02B2txx/C1y2 fxYwW6vQh/A2eqQAFiydahsI4V0L1k8kBuMpI0K4= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Pin-yen Lin , AngeloGioacchino Del Regno , Stephen Boyd , Sasha Levin Subject: [PATCH 6.1 096/141] clk: mediatek: Do a runtime PM get on controllers during probe Date: Tue, 23 Apr 2024 14:39:24 -0700 Message-ID: <20240423213856.292052852@linuxfoundation.org> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240423213853.356988651@linuxfoundation.org> References: <20240423213853.356988651@linuxfoundation.org> User-Agent: quilt/0.67 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: Pin-yen Lin [ Upstream commit 2f7b1d8b5505efb0057cd1ab85fca206063ea4c3 ] mt8183-mfgcfg has a mutual dependency with genpd during the probing stage, which leads to a deadlock in the following call stack: CPU0: genpd_lock --> clk_prepare_lock genpd_power_off_work_fn() genpd_lock() generic_pm_domain::power_off() clk_unprepare() clk_prepare_lock() CPU1: clk_prepare_lock --> genpd_lock clk_register() __clk_core_init() clk_prepare_lock() clk_pm_runtime_get() genpd_lock() Do a runtime PM get at the probe function to make sure clk_register() won't acquire the genpd lock. Instead of only modifying mt8183-mfgcfg, do this on all mediatek clock controller probings because we don't believe this would cause any regression. Verified on MT8183 and MT8192 Chromebooks. Fixes: acddfc2c261b ("clk: mediatek: Add MT8183 clock support") Signed-off-by: Pin-yen Lin Link: https://lore.kernel.org/r/20240312115249.3341654-1-treapking@chromium.org Reviewed-by: AngeloGioacchino Del Regno Tested-by: AngeloGioacchino Del Regno Signed-off-by: Stephen Boyd Signed-off-by: Sasha Levin --- drivers/clk/mediatek/clk-mtk.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/drivers/clk/mediatek/clk-mtk.c b/drivers/clk/mediatek/clk-mtk.c index bfabd94a474a5..fa2c1b1c7dee4 100644 --- a/drivers/clk/mediatek/clk-mtk.c +++ b/drivers/clk/mediatek/clk-mtk.c @@ -14,6 +14,7 @@ #include #include #include +#include #include #include "clk-mtk.h" @@ -470,6 +471,16 @@ int mtk_clk_simple_probe(struct platform_device *pdev) return IS_ERR(base) ? PTR_ERR(base) : -ENOMEM; } + + devm_pm_runtime_enable(&pdev->dev); + /* + * Do a pm_runtime_resume_and_get() to workaround a possible + * deadlock between clk_register() and the genpd framework. + */ + r = pm_runtime_resume_and_get(&pdev->dev); + if (r) + return r; + /* Calculate how many clk_hw_onecell_data entries to allocate */ num_clks = mcd->num_clks + mcd->num_composite_clks; num_clks += mcd->num_fixed_clks + mcd->num_factor_clks; @@ -531,6 +542,8 @@ int mtk_clk_simple_probe(struct platform_device *pdev) goto unregister_clks; } + pm_runtime_put(&pdev->dev); + return r; unregister_clks: @@ -556,6 +569,8 @@ int mtk_clk_simple_probe(struct platform_device *pdev) mtk_free_clk_data(clk_data); if (mcd->shared_io && base) iounmap(base); + + pm_runtime_put(&pdev->dev); return r; } EXPORT_SYMBOL_GPL(mtk_clk_simple_probe); -- 2.43.0