mirror of
https://github.com/torvalds/linux.git
synced 2025-04-12 16:47:42 +00:00

Commit 2f7b1d8b5505 ("clk: mediatek: Do a runtime PM get on controllers during probe") enabled runtime PM for all mediatek clock controllers, but this introduced an issue on the resume path. If a device resumes earlier than the clock controller and calls clk_prepare() when runtime PM is enabled on the controller, it will end up calling clk_pm_runtime_get(). But the subsequent pm_runtime_resume_and_get() call will fail because the runtime PM is temporarily disabled during suspend. To workaround this, introduce a need_runtime_pm flag and only enable it on mt8183-mfgcfg, which is the driver that observed deadlock previously. Hopefully mt8183-cfgcfg won't run into the issue at the resume stage because the GPU should have stopped rendering before the system calls suspend. Fixes: 2f7b1d8b5505 ("clk: mediatek: Do a runtime PM get on controllers during probe") Signed-off-by: Pin-yen Lin <treapking@chromium.org> Link: https://lore.kernel.org/r/20240613120357.1043342-1-treapking@chromium.org Signed-off-by: Stephen Boyd <sboyd@kernel.org>
55 lines
1.3 KiB
C
55 lines
1.3 KiB
C
// SPDX-License-Identifier: GPL-2.0
|
|
//
|
|
// Copyright (c) 2018 MediaTek Inc.
|
|
// Author: Weiyi Lu <weiyi.lu@mediatek.com>
|
|
|
|
#include <linux/clk-provider.h>
|
|
#include <linux/platform_device.h>
|
|
#include <linux/pm_runtime.h>
|
|
|
|
#include "clk-mtk.h"
|
|
#include "clk-gate.h"
|
|
|
|
#include <dt-bindings/clock/mt8183-clk.h>
|
|
|
|
static const struct mtk_gate_regs mfg_cg_regs = {
|
|
.set_ofs = 0x4,
|
|
.clr_ofs = 0x8,
|
|
.sta_ofs = 0x0,
|
|
};
|
|
|
|
#define GATE_MFG(_id, _name, _parent, _shift) \
|
|
GATE_MTK_FLAGS(_id, _name, _parent, &mfg_cg_regs, _shift, \
|
|
&mtk_clk_gate_ops_setclr, CLK_SET_RATE_PARENT)
|
|
|
|
static const struct mtk_gate mfg_clks[] = {
|
|
GATE_MFG(CLK_MFG_BG3D, "mfg_bg3d", "mfg_sel", 0)
|
|
};
|
|
|
|
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[] = {
|
|
{
|
|
.compatible = "mediatek,mt8183-mfgcfg",
|
|
.data = &mfg_desc,
|
|
}, {
|
|
/* sentinel */
|
|
}
|
|
};
|
|
MODULE_DEVICE_TABLE(of, of_match_clk_mt8183_mfg);
|
|
|
|
static struct platform_driver clk_mt8183_mfg_drv = {
|
|
.probe = mtk_clk_simple_probe,
|
|
.remove_new = mtk_clk_simple_remove,
|
|
.driver = {
|
|
.name = "clk-mt8183-mfg",
|
|
.of_match_table = of_match_clk_mt8183_mfg,
|
|
},
|
|
};
|
|
module_platform_driver(clk_mt8183_mfg_drv);
|
|
MODULE_LICENSE("GPL");
|