From patchwork Wed Dec 27 09:04:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pin-yen Lin X-Patchwork-Id: 13505235 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 2ACAAC46CD2 for ; Wed, 27 Dec 2023 09:05:37 +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=MtC/OIBA1H0N9m9mMHb6XGHrq+jIX8A2X2tx9GeeN4o=; b=R6PXzAPpaf9wTJ ceDTEtvyYjRWQcQ7LgZPUkRKGGpOxO1mS0sRa+pPA+40kaM2gREUeNAD68G0UDSxsHDMQMr8zcM2L 979pM2S2PaPtwi0ovtpNz2NrsWRIXVVzyxo6o7SKEBP4qCwq6NH7mPXkcdEwcyxobViZeOAxx+1ks MSlpUBU5VynlvQtm0pmXfx9FFo4PiTNO5fEBibMYZFPLPQ0pbUPctmsRc/Anzs8+4j4yBlBK1kFAB WuGVmOvQjlo5G+Yz25C5/ymdmEJ5yR1rH6CLzlLI5N0ZkpeI/ULawb93w72XTFuNiDyO1blGJq50C ctBUWvaehpZPFYOZ3Knw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1rIPqd-00EGDZ-1e; Wed, 27 Dec 2023 09:05:07 +0000 Received: from mail-oo1-xc2e.google.com ([2607:f8b0:4864:20::c2e]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1rIPqa-00EGAK-0t for linux-arm-kernel@lists.infradead.org; Wed, 27 Dec 2023 09:05:06 +0000 Received: by mail-oo1-xc2e.google.com with SMTP id 006d021491bc7-594e14ac876so40842eaf.3 for ; Wed, 27 Dec 2023 01:05:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1703667902; x=1704272702; 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=Gh+MDHeylaYTMq4wSIWSzHh+ySX+XFDhtKTfmG0mb0s=; b=e7Ah8of1CGLJak347o+k116P5cWTQJW/zZv8+lBSSjJPCiFDfoH4MPaxCmfZpJlIUC PYFMIk33kiZtNUec0Fu7JU0sLaVO+xNaT1aK3DClF3pI6GANFn1jTuhwrAYOR/sHruzb PzB7uBQ3mDxpRswyhwcjd3KHQgY7gK0ydXOuQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703667902; x=1704272702; 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=Gh+MDHeylaYTMq4wSIWSzHh+ySX+XFDhtKTfmG0mb0s=; b=Vkp1tRZ6xfOQkmdUc7jSnJGkoWgmEOvSPJW89k5gtVgb3OqkLpEyM0aQn7pD/pNeHI UdKWUaq3fc5eskiBPvb7Ppnckks3uYOkO1xoWs8LuyLO8CMTpXTb7155LUMFxHW7/NvR hOxBSkNZZ3TNNcLptmGvuEsJxWh0i6Q5PH9PB7o9ftbw0uKL24qExJMo+iHt2zC+lmEY OH6JPKYz8WxzD/XC0wq3fGlMY40ziLk5pAAdOacLM58Tia5CDX0EkpjNkg128B867x0F zDKowH6EN6A09RMJA+zkF4Q7sUFx6yJdAetMijaiQ2BfLfkD0o9KVBjJ2cGPQ4EbGXns qdHA== X-Gm-Message-State: AOJu0YxLQ+O527kgPWtV/G0zqcY6tU55YIpLlnbYLvgUu4L99Yzs3DQR v4QI1DcY9odLXcVGdkKxpgbtcvtMwL4D X-Google-Smtp-Source: AGHT+IEvFbvN8XZ+7Xuic2F6Oo0sX73+MllnmuNUGzdCdDkF8mQnilbwHK5GFTMLGOBSORX4KEJC3w== X-Received: by 2002:a05:6358:4309:b0:173:24:b26b with SMTP id r9-20020a056358430900b001730024b26bmr4007487rwc.25.1703667902493; Wed, 27 Dec 2023 01:05:02 -0800 (PST) Received: from treapking.tpe.corp.google.com ([2401:fa00:1:10:18d2:7869:e8b9:f4e4]) by smtp.gmail.com with ESMTPSA id v22-20020a056a00149600b006d9b65d1a8esm5347701pfu.28.2023.12.27.01.05.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Dec 2023 01:05:02 -0800 (PST) From: Pin-yen Lin To: Michael Turquette , Stephen Boyd , Matthias Brugger , AngeloGioacchino Del Regno Cc: Pin-yen Lin , linux-mediatek@lists.infradead.org, linux-clk@vger.kernel.org, Chen-Yu Tsai , linux-kernel@vger.kernel.org, Weiyi Lu , linux-arm-kernel@lists.infradead.org Subject: [PATCH 1/2] clk: mediatek: Introduce need_pm_runtime to mtk_clk_desc Date: Wed, 27 Dec 2023 17:04:42 +0800 Message-ID: <20231227090448.2216295-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-20231227_010504_359321_D402703B X-CRM114-Status: GOOD ( 13.24 ) 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 during the probing stage. Signed-off-by: Pin-yen Lin --- 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 Wed Dec 27 09:04:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pin-yen Lin X-Patchwork-Id: 13505236 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 5491BC46CD4 for ; Wed, 27 Dec 2023 09:05:43 +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=jPqITxtxywlRVSqVaIPrfq3kaXbxKignhvxXKtAlBxU=; b=goCCFzyactYBNx glsPK9075V/o5OLHgFhHDFFDy4XhG8d94lBKuqgcIEbeGjGJCNRN3YoIXpeiXdn3+hVGw9kQQAf0B 2KBzXtVe8us0qjN7xI2H0+t0LQooOKS4tELH7QGXkMfC3JFaWKXdsWJujID4eEgQOob016mbLQ+jD MhAR47kLw2WYR260t9xQYGhBeH8hwWcxzwpOLn8Tnp/6zhA9UBwyUt7x2gnISsmS9HpjHDCwTCj9/ kRpOzYBTlPkPlLWGJr4p8XCNw7rnha6bSGeyMxmxP/pKOXxj5QaTcB2rz0+ZAOsNzYXW/XA9ktmDC VfyqskVk9fwcLdyVwi9g==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1rIPqm-00EGHK-16; Wed, 27 Dec 2023 09:05:16 +0000 Received: from mail-pg1-x52b.google.com ([2607:f8b0:4864:20::52b]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1rIPqc-00EGCD-2T for linux-arm-kernel@lists.infradead.org; Wed, 27 Dec 2023 09:05:08 +0000 Received: by mail-pg1-x52b.google.com with SMTP id 41be03b00d2f7-5c21e185df5so3793798a12.1 for ; Wed, 27 Dec 2023 01:05:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1703667905; x=1704272705; 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=UqybA8kGXGwS0p6VfCaZS7VsH26LSz7rBgi0KXqcQ7I=; b=nhTwADSERxNtONieOjsODqsLIwkqJjd1r/VuC5co9i3NZa9yC6fa4qvG7N/irTkE3q JrVk7JnyCAIg3yN1r1IFBpXccggU6/5OJ94XFolkGIeuSJDYnm9Y4wtnaK7EFtUsGjOt qbDHeRg1pxsHUoEKCRbgMWDbEe1TuT2F7CXg4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703667905; x=1704272705; 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=UqybA8kGXGwS0p6VfCaZS7VsH26LSz7rBgi0KXqcQ7I=; b=oHU00Xmjr+pHt9auNzGRcfV3GS+dPlsXmTBTsFL5CVYGCu3Z56npzYiVRnI+yfIQ3J frifnY8payarBRCviQmYG+kutagBVxd6QFWAKk6uretfXZ69E8P//Kbe9TMGhwihm7DH 8d6n6+lv7OXwEmhPbKhTMai2Wo98bulMsm4TZtlx0sIfBCh7oS2PqwODg/CCaTEkFJTd RFIdblBjLH/aCmwSIz59fgwfOUx8H4UsBFgJzjE/h+uLIHv4Rv9hpV1pVmCPvs21mSpV ep/NrhnsDNH8ptvjrNkd6znuMFuEPhd/ldNPluifnP6N6ZJBK3sGu+32hVxucLJVvaQr dFtQ== X-Gm-Message-State: AOJu0Yx8L42ZOK7lmFJJd68JNhP8QYjwArU0RVOvS8ItyazkE2pTsPoC tpYXt0HcNRrHHOhLPRP0oHR2od1OyGPI X-Google-Smtp-Source: AGHT+IHzLN+1pxxIuXsPLSje0l/zdsr5/VBgqdxz5v1VViJZw0E1DLI5tn6YlpQiPS6VAvJrCPbvFw== X-Received: by 2002:a05:6a20:938d:b0:196:2c8b:9f21 with SMTP id x13-20020a056a20938d00b001962c8b9f21mr200388pzh.112.1703667905699; Wed, 27 Dec 2023 01:05:05 -0800 (PST) Received: from treapking.tpe.corp.google.com ([2401:fa00:1:10:18d2:7869:e8b9:f4e4]) by smtp.gmail.com with ESMTPSA id v22-20020a056a00149600b006d9b65d1a8esm5347701pfu.28.2023.12.27.01.05.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Dec 2023 01:05:05 -0800 (PST) From: Pin-yen Lin To: Michael Turquette , Stephen Boyd , Matthias Brugger , AngeloGioacchino Del Regno Cc: Pin-yen Lin , linux-mediatek@lists.infradead.org, linux-clk@vger.kernel.org, Chen-Yu Tsai , linux-kernel@vger.kernel.org, Weiyi Lu , linux-arm-kernel@lists.infradead.org Subject: [PATCH 2/2] clk: mediatek: mt8183: Enable need_runtime_pm on mt8183-mfgcfg Date: Wed, 27 Dec 2023 17:04:43 +0800 Message-ID: <20231227090448.2216295-2-treapking@chromium.org> X-Mailer: git-send-email 2.43.0.472.g3155946c3a-goog In-Reply-To: <20231227090448.2216295-1-treapking@chromium.org> References: <20231227090448.2216295-1-treapking@chromium.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231227_010506_850110_7F0E56F4 X-CRM114-Status: GOOD ( 11.12 ) 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 --- 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[] = {