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: 13505237 Received: from mail-oo1-f46.google.com (mail-oo1-f46.google.com [209.85.161.46]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6AFC91095A for ; Wed, 27 Dec 2023 09:05:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=chromium.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="KfAID2nW" Received: by mail-oo1-f46.google.com with SMTP id 006d021491bc7-59489ce4ce6so827385eaf.2 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=vger.kernel.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=KfAID2nWp+FAo6dxzCwLnz/w2gW8KRKjCIr5eMjma6da9w9VCc/laWdEbB7FuwAuI2 2SgsjHjgc05nLLFraxCutTIFz/CC7kQ3Qt8enL2t575/hUF3E/h7AV2khjoBn2LNQ47m S/qjbG/+sHDZs5K5FTbHlGuI0oiWI7qoGN6Gs= 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=jj1NB+vKOrJrZVi2U2yaxrnRQLTzFzIfgKo4v7P+etW2WQCKM/xaIetVnF5ockfe6b fdtWCHWjrZHwMFI0CJCnC+9JA8y3UH2MuOFknl91s0A3bgVlMr3b7UVRRT8UmLlw0uiM e+DHQ3dj1goF6OCgx2xx08NpbCBcgwkIIJqYFI6656FSTbSands5JZlWrFogXGyid/YI lZLhYayi/usShcReUGHQCmolwy4n0jtW5NXzEoK3DxuqNguOTo8Klhmik9hbpAzWOMRf 67qS7gaSJbsvNzHsJBHKqzKgbtvkop4BY4X4iALV160zcP5IHqFIPCluNLqDd3LjEg9y firg== X-Gm-Message-State: AOJu0Yxe2sa4gOs/IH2Oi5M7TqBpV53Dj62cwVV4xUFUyPPOVf07QpjL 9v1YpTCBTuH+pm7W/BjkI6yLqohqRX3D 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 Precedence: bulk X-Mailing-List: linux-clk@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 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: 13505238 Received: from mail-pf1-f177.google.com (mail-pf1-f177.google.com [209.85.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 59C1024B2A for ; Wed, 27 Dec 2023 09:05:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=chromium.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="eDIFHZLL" Received: by mail-pf1-f177.google.com with SMTP id d2e1a72fcca58-6d9b51093a0so1702817b3a.0 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=vger.kernel.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=eDIFHZLL0FxF5QSvJLxK1ALZKQCI/hE75enT1/3GkrZ/L/8nII7yLLlHhm/sgoExEB 08K8nohMfsKziIn/MCqY82WE+dGuMjhMPw+4IIS7I5Z4GfLX2alWhfgYGggSbPKDtIwm Kr5O3lh3AJQqpPr5H4/aKgrvGcST5NzJ4oFdo= 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=t5vioOmKvhtf1bTijJSqY61cgFqUAtT6QXJZQvuUug2LhDrrok+BvIVsDp81PBMUf5 63200mTQmMl0XJOzNVjThOk3bv9gvxbGUgMPk8xI4iH4o+kAC0H3yhcYvD0kv8T3tC9Z GxzUjW/1gKRFZrtKodNMENI8HLyX04kjujgwNRHmzMsZ479R9L8ZSUgswWhvc8akKKXA 6x+MlRkYKd2vOcszu4tLFIJ5I/BiiF2NreDKPjPFBNBU3Ymq8yYxO7mxo6kv+7MxOqhE rccbv0sWlaqvOmrKbLwoTsz/PIFBumn2UlDHYcfyXh469cYY3Q5WiPLRvzmcREeePepH YoWg== X-Gm-Message-State: AOJu0YykmqIB83R+docefoj0LsfzBe/FNE2JAmzD6SAbgKtwbBwOcN4h +8LtnK3PRsjah/Kk9IRtuubcmcacBuTa 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> Precedence: bulk X-Mailing-List: linux-clk@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 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[] = {