From patchwork Tue Jan 2 08:12:52 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pin-yen Lin X-Patchwork-Id: 13508883 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 816EFC46CD2 for ; Tue, 2 Jan 2024 08:14:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-ID:Date:Subject:Cc :To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=vTkwX9WhkSEmAXIQKQjQRVd8deXFB6s8fQR1fxFQEHU=; b=oJdiRfvw7rtv7V IcCD4IXBNAkKH8mccBQbgDh5Z19ayP6b2ec+6v2fr9KCauWCxAlj0iULNjh5oK/KyoH5kzmYmf+He +s68wyqcXeo7qxXD+D2ZjSLImGgCIw5eMOMgLfsIiSwCwZdI5g3eXOetBo3rpctGx6TtSrSIfIhwv doIHmIQiZ/jHHeSH4EWJ6FqB/UvakLerLT7EHJ+2qGovXzKp4NwniL3ljhLBYjfGO8ncfwo+HE/8b m0kI9chIqCpM0GLX7ZO6BhpJRVp2MN98Roa3dEoMhWTBWgKrh8DDTqaMbSrJ1dywsjZSIyauvkFz3 YyKL9cCXcU465aRTmXeA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1rKZul-007Jhf-1G; Tue, 02 Jan 2024 08:14:19 +0000 Received: from mail-pj1-x1035.google.com ([2607:f8b0:4864:20::1035]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1rKZuh-007Jf1-34 for linux-arm-kernel@lists.infradead.org; Tue, 02 Jan 2024 08:14:17 +0000 Received: by mail-pj1-x1035.google.com with SMTP id 98e67ed59e1d1-28bc870c540so7087393a91.2 for ; Tue, 02 Jan 2024 00:14:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1704183252; x=1704788052; darn=lists.infradead.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=Ewhpw6ZAnNzCIn1VG/yRZaJv/xa5pFyIuSfBXvMExEo=; b=QDHmm4O9M/0yzH+hB20g0pIgiUk6gOwmvHYGZyJgHJa1wQyqVL72T7TFeilJmBQABU I3OjjL6MbI1mvS0oWFW82WFiawopxR/7J3l+SCtPhTYyA8zApcT4vYPXMLSiyMSNmiwb 5056F4VnrboY7Gg7UIHuomf+i5q358dvajJ1o= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704183252; x=1704788052; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=Ewhpw6ZAnNzCIn1VG/yRZaJv/xa5pFyIuSfBXvMExEo=; b=HJot6yB4DTjlUgeEJeKYVmKMHdqhhxvTLz2uQUxYt7g8moI/EyMbHx+5Ft31PKmWHC 5tKPw1P26a8dApcIH75vOScdUMMgj/ja0/hiXXDLrKdW4IJvcfSKOGSmOZqqPbnCTC/o 1rld6RTeJRBJpUWt7Goq9FhlxpuV4etMtYZHxP8IdVdNKkJnwgwjKsLiuUshy3kQzdfQ gi17IyRJplAM19Aa/3SRMVhgeNpnyNWP22oBZRuySa1kC3MaivonL3wS88SNCncQ4sqY orPxu53o4OIeV+JlSYlhrdo8xPbssPj/OpoGCUU5MzQHgLI4yyiArwYSES8oPrW1y+4S 8zaQ== X-Gm-Message-State: AOJu0YwoIwE3bEzktKRR9CZiGvh1Bl0/D7oKqtOPq9GGTYDtm5px+lrl 91AGZISD0gYJgqZaqLO+rilvdBfj/0gq X-Google-Smtp-Source: AGHT+IEZy7xdt3Zuu7m2G7MMoLHQEboW6KOxEkZD0l5bHyMFOempt/8HuzkEt7JOM2A6v2c4UhVBmQ== X-Received: by 2002:a17:90a:7023:b0:28b:96ba:806a with SMTP id f32-20020a17090a702300b0028b96ba806amr7610238pjk.88.1704183252177; Tue, 02 Jan 2024 00:14:12 -0800 (PST) Received: from treapking.tpe.corp.google.com ([2401:fa00:1:10:232c:f04:85bb:a34c]) by smtp.gmail.com with ESMTPSA id f3-20020a17090a638300b0028c8149ac6esm12640074pjj.42.2024.01.02.00.14.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Jan 2024 00:14:11 -0800 (PST) From: Pin-yen Lin To: Michael Turquette , Stephen Boyd , Matthias Brugger , AngeloGioacchino Del Regno Cc: Pin-yen Lin , Chen-Yu Tsai , linux-arm-kernel@lists.infradead.org, linux-clk@vger.kernel.org, linux-kernel@vger.kernel.org, Weiyi Lu , linux-mediatek@lists.infradead.org Subject: [PATCH v2 1/2] clk: mediatek: Introduce need_pm_runtime to mtk_clk_desc Date: Tue, 2 Jan 2024 16:12:52 +0800 Message-ID: <20240102081402.1226795-1-treapking@chromium.org> X-Mailer: git-send-email 2.43.0.472.g3155946c3a-goog MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240102_001416_016347_B7D32B4A X-CRM114-Status: GOOD ( 16.89 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Introduce a new need_pm_runtime variable to mtk_clk_desc to indicate this clock needs a runtime PM get on the clock controller during the probing stage. Signed-off-by: Pin-yen Lin --- Changes in v2: - Fix the order of error handling - Update the commit message and add a comment before the runtime PM call drivers/clk/mediatek/clk-mtk.c | 15 +++++++++++++++ drivers/clk/mediatek/clk-mtk.h | 2 ++ 2 files changed, 17 insertions(+) diff --git a/drivers/clk/mediatek/clk-mtk.c b/drivers/clk/mediatek/clk-mtk.c index 2e55368dc4d8..c31e535909c8 100644 --- a/drivers/clk/mediatek/clk-mtk.c +++ b/drivers/clk/mediatek/clk-mtk.c @@ -13,6 +13,7 @@ #include #include #include +#include #include #include "clk-mtk.h" @@ -494,6 +495,14 @@ static int __mtk_clk_simple_probe(struct platform_device *pdev, return IS_ERR(base) ? PTR_ERR(base) : -ENOMEM; } + + if (mcd->need_runtime_pm) { + devm_pm_runtime_enable(&pdev->dev); + 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; @@ -574,6 +583,9 @@ static int __mtk_clk_simple_probe(struct platform_device *pdev, goto unregister_clks; } + if (mcd->need_runtime_pm) + pm_runtime_put(&pdev->dev); + return r; unregister_clks: @@ -604,6 +616,9 @@ static int __mtk_clk_simple_probe(struct platform_device *pdev, free_base: if (mcd->shared_io && base) iounmap(base); + + if (mcd->need_runtime_pm) + pm_runtime_put(&pdev->dev); return r; } diff --git a/drivers/clk/mediatek/clk-mtk.h b/drivers/clk/mediatek/clk-mtk.h index 22096501a60a..c17fe1c2d732 100644 --- a/drivers/clk/mediatek/clk-mtk.h +++ b/drivers/clk/mediatek/clk-mtk.h @@ -237,6 +237,8 @@ struct mtk_clk_desc { int (*clk_notifier_func)(struct device *dev, struct clk *clk); unsigned int mfg_clk_idx; + + bool need_runtime_pm; }; int mtk_clk_pdev_probe(struct platform_device *pdev); From patchwork Tue Jan 2 08:12:53 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pin-yen Lin X-Patchwork-Id: 13508884 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id F40BCC47079 for ; Tue, 2 Jan 2024 08:14:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=QVndRwMxzS0GlWZ7Wl0+47Snnd3jJ2qY/UQ6bFz52P0=; b=AMCX1iQxl1LTKS Bw+HeW47k/RQNkuiBJTwy8NihOPXX3b1gkl0IOa+ir3ThSyWnR2I/yaYiyWvKZrHlsR1/b6UNLupw 7hN9nJ2+RYtjenQuHWJhkspUvtFjkgZQnJgUSi8NeYg3/pIK4Qa/n7LJCT9inFXRFV/kDvFI8nr7E CtoRONNXOMUvnM/5q8EL7fQ/1GDX1XZS7VrQNmbbbhtPwP/TX0lrLc3sS3zsT2kUdxEW5sPM/3L82 7sO22WB7jelOC+O60ZRxJ1AKkhT5DHVgNB3wipCqoS8lFMdz1Xct+WRQ33uDn98r7hOtH/9+juUD7 ubBERmYhAyNTkKVno4WA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1rKZun-007Jiq-3B; Tue, 02 Jan 2024 08:14:21 +0000 Received: from mail-pj1-x1036.google.com ([2607:f8b0:4864:20::1036]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1rKZui-007Jfr-1h for linux-arm-kernel@lists.infradead.org; Tue, 02 Jan 2024 08:14:18 +0000 Received: by mail-pj1-x1036.google.com with SMTP id 98e67ed59e1d1-28cb3bc3fe7so1520295a91.1 for ; Tue, 02 Jan 2024 00:14:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1704183254; x=1704788054; darn=lists.infradead.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=PajgPkTBW3iluxw6UIGchSAnGs+6/xnB8PBfDDEr3ic=; b=PSAUG20//ffekE0e9P12QDxnCFND3DS9e98hfaZqR2HpKzl64tSnDLcjtpzml2OSdN UVKdie/VkRk35YMMc/NKB6mTurZYJovwmdKfo9nVgJSYYTqLo7lVai/sT0vecrYmVQYx dIKKbzzsPby+yOR74H6rP/CD3JYbbFAdL3ln0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704183254; x=1704788054; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=PajgPkTBW3iluxw6UIGchSAnGs+6/xnB8PBfDDEr3ic=; b=Xxwj/GpB59ECLbnW14GN7SXoPRzjqAPTSy75s+4pdb2qVhkFt/PbeqPIf9gMFt/HFL JsQW/QXXZzqYmvINc9fg9R/SWbr5Ap56CceWrrQmGR76Xb78wLS68dl0jy96ygH8zZDD FL+qwsM7HQATvE1fOHSMCfPWdefVuO0bwQ/P5wgWY4r3+f4pcBEuQ0LmdXvrAVJtuEN5 4SpW4mwVDul+4dquR6w5lbSkWkmMSKxgQH8rPk9LvKaUK1rQunh6JIjE3+3cQ4D9Hc3Q jDTclPi/rzt0q3/acxpZINA14sr3aEQLx99vgYiXr9/O+WlMeqa8Zyw5QALhOQmsqnQp fdrg== X-Gm-Message-State: AOJu0YxToVHJ8Rmis3rlqWW+pV2ne8fAQu6LdwDBvKSwZg8S5P3kKPSa VKjYMJKHT4SQFgV2nm4/L+gw1sTOpaI1w2fouXJ15FQVQw== X-Google-Smtp-Source: AGHT+IHM8m/BePVX0/O3CWysvzAhUtnB/CIoZmU5nwbrD+ulhjtycO32Co8Ei+LLUe/a9ppmi+uE8A== X-Received: by 2002:a17:90a:1506:b0:28b:efda:98da with SMTP id l6-20020a17090a150600b0028befda98damr20446795pja.17.1704183254545; Tue, 02 Jan 2024 00:14:14 -0800 (PST) Received: from treapking.tpe.corp.google.com ([2401:fa00:1:10:232c:f04:85bb:a34c]) by smtp.gmail.com with ESMTPSA id f3-20020a17090a638300b0028c8149ac6esm12640074pjj.42.2024.01.02.00.14.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Jan 2024 00:14:14 -0800 (PST) From: Pin-yen Lin To: Michael Turquette , Stephen Boyd , Matthias Brugger , AngeloGioacchino Del Regno Cc: Pin-yen Lin , Chen-Yu Tsai , linux-arm-kernel@lists.infradead.org, linux-clk@vger.kernel.org, linux-kernel@vger.kernel.org, Weiyi Lu , linux-mediatek@lists.infradead.org Subject: [PATCH v2 2/2] clk: mediatek: mt8183: Enable need_runtime_pm on mt8183-mfgcfg Date: Tue, 2 Jan 2024 16:12:53 +0800 Message-ID: <20240102081402.1226795-2-treapking@chromium.org> X-Mailer: git-send-email 2.43.0.472.g3155946c3a-goog In-Reply-To: <20240102081402.1226795-1-treapking@chromium.org> References: <20240102081402.1226795-1-treapking@chromium.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240102_001416_563329_E55BC7BE X-CRM114-Status: GOOD ( 12.15 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org mt8183-mfgcfg has a mutual dependency with genpd during the probing stage, so enable need_runtim_pm to prevent 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. Fixes: acddfc2c261b ("clk: mediatek: Add MT8183 clock support") Signed-off-by: Pin-yen Lin --- (no changes since v1) drivers/clk/mediatek/clk-mt8183-mfgcfg.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/clk/mediatek/clk-mt8183-mfgcfg.c b/drivers/clk/mediatek/clk-mt8183-mfgcfg.c index ba504e19d420..62d876e150e1 100644 --- a/drivers/clk/mediatek/clk-mt8183-mfgcfg.c +++ b/drivers/clk/mediatek/clk-mt8183-mfgcfg.c @@ -29,6 +29,7 @@ static const struct mtk_gate mfg_clks[] = { static const struct mtk_clk_desc mfg_desc = { .clks = mfg_clks, .num_clks = ARRAY_SIZE(mfg_clks), + .need_runtime_pm = true, }; static const struct of_device_id of_match_clk_mt8183_mfg[] = {