* [PATCH v2 1/4] pmdomain: imx8m-blk-ctrl: Remove the power notifier on probe failure
2026-11-22 9:59 [PATCH v2 0/4] pmdomain: imx: Keep the domains left on by the bootloader Dario Binacchi
@ 2026-11-22 9:59 ` Dario Binacchi
2026-11-22 9:59 ` [PATCH v2 2/4] pmdomain: imx: gpcv2: Keep the domains left on by the bootloader Dario Binacchi
` (2 subsequent siblings)
3 siblings, 0 replies; 7+ messages in thread
From: Dario Binacchi @ 2026-11-22 9:59 UTC (permalink / raw)
To: Ulf Hansson
Cc: michael, linux-amarula, Lucas Stach, Peng Fan, Dario Binacchi,
Fabio Estevam, Frank Li, Kees Cook, Marek Vasut, Ming Qian,
Pengutronix Kernel Team, Sascha Hauer, Shawn Guo, Xu Yang,
bui duc phuc, imx, linux-arm-kernel, linux-pm
If devm_of_platform_populate() fails, the probe returns leaving the
power notifier registered on the bus power domain, while the memory
holding it is released. Remove it.
Fixes: 9cb6d1b39a8f ("soc: imx: imx8m-blk-ctrl: Scan subnodes and bind drivers to them")
Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
---
Changes in v2:
- New patch
drivers/pmdomain/imx/imx8m-blk-ctrl.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/pmdomain/imx/imx8m-blk-ctrl.c b/drivers/pmdomain/imx/imx8m-blk-ctrl.c
index 9df933a7a238..7d6735728d8c 100644
--- a/drivers/pmdomain/imx/imx8m-blk-ctrl.c
+++ b/drivers/pmdomain/imx/imx8m-blk-ctrl.c
@@ -345,10 +345,12 @@ static int imx8m_blk_ctrl_probe(struct platform_device *pdev)
ret = devm_of_platform_populate(dev);
if (ret)
- goto cleanup_provider;
+ goto cleanup_notifier;
return 0;
+cleanup_notifier:
+ dev_pm_genpd_remove_notifier(bc->bus_power_dev);
cleanup_provider:
of_genpd_del_provider(dev->of_node);
cleanup_pds:
--
2.43.0
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH v2 2/4] pmdomain: imx: gpcv2: Keep the domains left on by the bootloader
2026-11-22 9:59 [PATCH v2 0/4] pmdomain: imx: Keep the domains left on by the bootloader Dario Binacchi
2026-11-22 9:59 ` [PATCH v2 1/4] pmdomain: imx8m-blk-ctrl: Remove the power notifier on probe failure Dario Binacchi
@ 2026-11-22 9:59 ` Dario Binacchi
2026-11-22 10:12 ` sashiko-bot
2026-11-22 9:59 ` [PATCH v2 3/4] pmdomain: imx8m-blk-ctrl: " Dario Binacchi
2026-11-22 9:59 ` [PATCH v2 4/4] pmdomain: imx8m-blk-ctrl: Hold boot-on domain clocks until sync_state Dario Binacchi
3 siblings, 1 reply; 7+ messages in thread
From: Dario Binacchi @ 2026-11-22 9:59 UTC (permalink / raw)
To: Ulf Hansson
Cc: michael, linux-amarula, Lucas Stach, Peng Fan, Dario Binacchi,
Fabio Estevam, Frank Li, Jacky Bai, Pengutronix Kernel Team,
Rafael J. Wysocki, Sascha Hauer, bui duc phuc, imx,
linux-arm-kernel, linux-pm
The PGC domains are all registered as off, so a domain left on by the
bootloader, e.g. DISPMIX to show a splash screen, is powered up again
by its first consumer. On the i.MX8MN this turns the display off and
hangs the system.
The GPC does not report the power state of a domain, but the ADB400
bridge acknowledges the power-up handshake only while the domain is
powered. Use it to register as on the domains left on by the
bootloader.
Co-developed-by: Michael Trimarchi <michael@amarulasolutions.com>
Signed-off-by: Michael Trimarchi <michael@amarulasolutions.com>
Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
---
Changes in v2:
- Release the resources of the domains left on when the driver is
removed
drivers/pmdomain/imx/gpcv2.c | 77 +++++++++++++++++++++++++++++++++++-
1 file changed, 75 insertions(+), 2 deletions(-)
diff --git a/drivers/pmdomain/imx/gpcv2.c b/drivers/pmdomain/imx/gpcv2.c
index 6a54ee734514..71e551f0471d 100644
--- a/drivers/pmdomain/imx/gpcv2.c
+++ b/drivers/pmdomain/imx/gpcv2.c
@@ -292,6 +292,7 @@ struct imx_pgc_domain {
const int voltage;
const bool keep_clocks;
+ bool boot_on; /* Left on by the bootloader */
struct device *dev;
unsigned int pgc_sw_pup_reg;
@@ -488,6 +489,8 @@ static int imx_pgc_power_down(struct generic_pm_domain *genpd)
pm_runtime_put_sync_suspend(domain->dev);
+ domain->boot_on = false;
+
return 0;
out_clk_disable:
@@ -1315,9 +1318,27 @@ static const struct imx_pgc_domain_data imx8mn_pgc_domain_data = {
.pgc_regs = &imx7_pgc_regs,
};
+/*
+ * The GPC does not report the power state of a domain, but the ADB400
+ * acknowledges the power-up handshake only while the domain is powered.
+ */
+static bool imx_pgc_domain_is_on(struct imx_pgc_domain *domain)
+{
+ u32 val;
+
+ if (!domain->bits.hskack)
+ return false;
+
+ if (regmap_read(domain->regmap, domain->regs->hsk, &val))
+ return false;
+
+ return (val & domain->bits.hskack) == domain->bits.hskack;
+}
+
static int imx_pgc_domain_probe(struct platform_device *pdev)
{
struct imx_pgc_domain *domain = pdev->dev.platform_data;
+ bool init_off;
int ret;
domain->dev = &pdev->dev;
@@ -1348,12 +1369,44 @@ static int imx_pgc_domain_probe(struct platform_device *pdev)
regmap_update_bits(domain->regmap, domain->regs->map,
domain->bits.map, domain->bits.map);
- ret = pm_genpd_init(&domain->genpd, NULL, true);
+ init_off = !imx_pgc_domain_is_on(domain);
+ ret = pm_genpd_init(&domain->genpd, NULL, init_off);
if (ret) {
dev_err_probe(domain->dev, ret, "Failed to init power domain\n");
goto out_domain_unmap;
}
+ /* Balance the first imx_pgc_power_down() */
+ if (!init_off) {
+ ret = pm_runtime_resume_and_get(domain->dev);
+ if (ret < 0) {
+ dev_err_probe(domain->dev, ret,
+ "Failed to resume domain\n");
+ goto out_genpd_remove;
+ }
+
+ if (!IS_ERR(domain->regulator)) {
+ ret = regulator_enable(domain->regulator);
+ if (ret) {
+ dev_err_probe(domain->dev, ret,
+ "Failed to enable domain's regulator\n");
+ goto out_put_pm;
+ }
+ }
+
+ if (domain->keep_clocks) {
+ ret = clk_bulk_prepare_enable(domain->num_clks,
+ domain->clks);
+ if (ret) {
+ dev_err_probe(domain->dev, ret,
+ "Failed to enable domain's clocks\n");
+ goto out_regulator_disable;
+ }
+ }
+
+ domain->boot_on = true;
+ }
+
if (IS_ENABLED(CONFIG_LOCKDEP) &&
of_property_present(domain->dev->of_node, "power-domains"))
lockdep_set_subclass(&domain->genpd.mlock, 1);
@@ -1362,11 +1415,20 @@ static int imx_pgc_domain_probe(struct platform_device *pdev)
&domain->genpd);
if (ret) {
dev_err_probe(domain->dev, ret, "Failed to add genpd provider\n");
- goto out_genpd_remove;
+ goto out_clk_disable;
}
return 0;
+out_clk_disable:
+ if (!init_off && domain->keep_clocks)
+ clk_bulk_disable_unprepare(domain->num_clks, domain->clks);
+out_regulator_disable:
+ if (!init_off && !IS_ERR(domain->regulator))
+ regulator_disable(domain->regulator);
+out_put_pm:
+ if (!init_off)
+ pm_runtime_put(domain->dev);
out_genpd_remove:
pm_genpd_remove(&domain->genpd);
out_domain_unmap:
@@ -1385,6 +1447,17 @@ static void imx_pgc_domain_remove(struct platform_device *pdev)
of_genpd_del_provider(domain->dev->of_node);
pm_genpd_remove(&domain->genpd);
+ if (domain->boot_on) {
+ if (domain->keep_clocks)
+ clk_bulk_disable_unprepare(domain->num_clks,
+ domain->clks);
+
+ if (!IS_ERR(domain->regulator))
+ regulator_disable(domain->regulator);
+
+ pm_runtime_put_sync(domain->dev);
+ }
+
if (domain->bits.map)
regmap_update_bits(domain->regmap, domain->regs->map,
domain->bits.map, 0);
--
2.43.0
^ permalink raw reply related [flat|nested] 7+ messages in thread* Re: [PATCH v2 2/4] pmdomain: imx: gpcv2: Keep the domains left on by the bootloader
2026-11-22 9:59 ` [PATCH v2 2/4] pmdomain: imx: gpcv2: Keep the domains left on by the bootloader Dario Binacchi
@ 2026-11-22 10:12 ` sashiko-bot
0 siblings, 0 replies; 7+ messages in thread
From: sashiko-bot @ 2026-11-22 10:12 UTC (permalink / raw)
To: Dario Binacchi; +Cc: imx, Frank.Li
Thank you for your contribution! Sashiko AI review found 1 potential
issue to consider:
- [Medium] pmdomain: imx: gpcv2: async pm_runtime_put() before disable
in probe()
--
commit bc7dd5905cdf54cdef1c1603983c4dca7eef08f7
Author: Dario Binacchi <dario.binacchi@amarulasolutions.com>
pmdomain: imx: gpcv2: Keep the domains left on by the bootloader
This commit checks the ADB400 power-up handshake acknowledge bit during
probe to detect domains left on by the bootloader and registers them as
active in genpd while acquiring their runtime PM, regulator, and clock
resources.
> diff --git a/drivers/pmdomain/imx/gpcv2.c b/drivers/pmdomain/imx/gpcv2.c
> index 6a54ee7345146..71e551f0471d2 100644
> --- a/drivers/pmdomain/imx/gpcv2.c
> +++ b/drivers/pmdomain/imx/gpcv2.c
[ ... ]
> @@ -1362,11 +1415,20 @@ static int imx_pgc_domain_probe(struct platform_device *pdev)
> &domain->genpd);
> if (ret) {
> dev_err_probe(domain->dev, ret, "Failed to add genpd provider\n");
> - goto out_genpd_remove;
> + goto out_clk_disable;
> }
>
> return 0;
>
> +out_clk_disable:
> + if (!init_off && domain->keep_clocks)
> + clk_bulk_disable_unprepare(domain->num_clks, domain->clks);
> +out_regulator_disable:
> + if (!init_off && !IS_ERR(domain->regulator))
> + regulator_disable(domain->regulator);
> +out_put_pm:
> + if (!init_off)
> + pm_runtime_put(domain->dev);
> out_genpd_remove:
> pm_genpd_remove(&domain->genpd);
> out_domain_unmap:
[Severity: Medium]
Should out_put_pm use pm_runtime_put_sync(domain->dev) like
imx_pgc_domain_remove() does?
pm_runtime_put() queues an asynchronous runtime suspend work item that is
immediately canceled by the following pm_runtime_disable() call under
out_domain_unmap. If regulator_enable(), clk_bulk_prepare_enable(), or
of_genpd_add_provider_simple() fails on a boot-on domain, domain->dev is
left in RPM_ACTIVE and leaks the active reference on its parent device and
any parent power domain.
--
Sashiko AI review · https://sashiko.dev/#/patchset/20261122095927.2631909-1-dario.binacchi@amarulasolutions.com?part=2
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH v2 3/4] pmdomain: imx8m-blk-ctrl: Keep the domains left on by the bootloader
2026-11-22 9:59 [PATCH v2 0/4] pmdomain: imx: Keep the domains left on by the bootloader Dario Binacchi
2026-11-22 9:59 ` [PATCH v2 1/4] pmdomain: imx8m-blk-ctrl: Remove the power notifier on probe failure Dario Binacchi
2026-11-22 9:59 ` [PATCH v2 2/4] pmdomain: imx: gpcv2: Keep the domains left on by the bootloader Dario Binacchi
@ 2026-11-22 9:59 ` Dario Binacchi
2026-11-22 10:20 ` sashiko-bot
2026-11-22 9:59 ` [PATCH v2 4/4] pmdomain: imx8m-blk-ctrl: Hold boot-on domain clocks until sync_state Dario Binacchi
3 siblings, 1 reply; 7+ messages in thread
From: Dario Binacchi @ 2026-11-22 9:59 UTC (permalink / raw)
To: Ulf Hansson
Cc: michael, linux-amarula, Lucas Stach, Peng Fan, Dario Binacchi,
Fabio Estevam, Frank Li, Kees Cook, Ming Qian,
Pengutronix Kernel Team, Sascha Hauer, Xu Yang, bui duc phuc, imx,
linux-arm-kernel, linux-pm
The blk-ctrl domains are all registered as off, so a domain left on by
the bootloader is powered up again by its first consumer. On the
i.MX8MN this resets the display pipeline set up by U-Boot to show a
splash screen.
Read the state of the domains from the blk-ctrl registers and register
as on the ones left on by the bootloader.
Enable this only for the i.MX8MN DISP blk-ctrl, as on other blk-ctrls
(e.g. the i.MX8MP VPUMIX) the registers do not reset to 0.
Co-developed-by: Michael Trimarchi <michael@amarulasolutions.com>
Signed-off-by: Michael Trimarchi <michael@amarulasolutions.com>
Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
---
Changes in v2:
- Take the references once the probe can no longer be deferred
- Clear the boot-on state when the domain is powered off
- Release the references when the driver is removed
drivers/pmdomain/imx/imx8m-blk-ctrl.c | 96 ++++++++++++++++++++++++++-
1 file changed, 94 insertions(+), 2 deletions(-)
diff --git a/drivers/pmdomain/imx/imx8m-blk-ctrl.c b/drivers/pmdomain/imx/imx8m-blk-ctrl.c
index 7d6735728d8c..5ab201eefeb3 100644
--- a/drivers/pmdomain/imx/imx8m-blk-ctrl.c
+++ b/drivers/pmdomain/imx/imx8m-blk-ctrl.c
@@ -83,10 +83,13 @@ struct imx8m_blk_ctrl_domain {
struct device *power_dev;
struct imx8m_blk_ctrl *bc;
int num_paths;
+ bool boot_on; /* Left on by the bootloader */
};
struct imx8m_blk_ctrl_data {
int max_reg;
+ /* SFT_RSTN and CLK_EN reset to 0, so a domain left on can be detected */
+ bool boot_state_readable;
notifier_fn_t power_notifier_fn;
const struct imx8m_blk_ctrl_domain_data *domains;
int num_domains;
@@ -187,11 +190,80 @@ static int imx8m_blk_ctrl_power_off(struct generic_pm_domain *genpd)
/* allow bus domain to suspend */
pm_runtime_put(bc->bus_power_dev);
+ domain->boot_on = false;
+
return 0;
}
static struct lock_class_key blk_ctrl_genpd_lock_class;
+/*
+ * A domain left on by the bootloader has its resets deasserted and its
+ * clocks enabled. The registers can only be read if the bus domain is
+ * on, so a domain is considered off whenever the bus domain is off.
+ */
+static bool imx8m_blk_ctrl_is_off(struct imx8m_blk_ctrl *bc,
+ const struct imx8m_blk_ctrl_data *bc_data,
+ const struct imx8m_blk_ctrl_domain_data *data)
+{
+ u32 rst, clk, mipi = 0;
+
+ if (!bc_data->boot_state_readable ||
+ !dev_pm_genpd_is_on(bc->bus_power_dev))
+ return true;
+
+ if (regmap_read(bc->regmap, BLK_SFT_RSTN, &rst) ||
+ regmap_read(bc->regmap, BLK_CLK_EN, &clk))
+ return true;
+
+ if (data->mipi_phy_rst_mask &&
+ regmap_read(bc->regmap, BLK_MIPI_RESET_DIV, &mipi))
+ return true;
+
+ return (rst & data->rst_mask) != data->rst_mask ||
+ (clk & data->clk_mask) != data->clk_mask ||
+ (mipi & data->mipi_phy_rst_mask) != data->mipi_phy_rst_mask;
+}
+
+/* Take the references of imx8m_blk_ctrl_power_on() for a domain left on */
+static int imx8m_blk_ctrl_get_boot_on(struct imx8m_blk_ctrl_domain *domain)
+{
+ struct imx8m_blk_ctrl *bc = domain->bc;
+ int ret;
+
+ if (!domain->boot_on)
+ return 0;
+
+ ret = pm_runtime_resume_and_get(bc->bus_power_dev);
+ if (ret < 0) {
+ dev_err(bc->dev, "failed to power up bus domain\n");
+ return ret;
+ }
+
+ ret = pm_runtime_resume_and_get(domain->power_dev);
+ if (ret < 0) {
+ dev_err(bc->dev, "failed to power up peripheral domain\n");
+ pm_runtime_put(bc->bus_power_dev);
+ return ret;
+ }
+
+ if (icc_bulk_set_bw(domain->num_paths, domain->paths))
+ dev_err(bc->dev, "failed to set icc bw\n");
+
+ return 0;
+}
+
+static void imx8m_blk_ctrl_put_boot_on(struct imx8m_blk_ctrl_domain *domain)
+{
+ if (!domain->boot_on)
+ return;
+
+ /* Sync, to power down the bus domain before its notifier is removed */
+ pm_runtime_put_sync(domain->power_dev);
+ pm_runtime_put_sync(domain->bc->bus_power_dev);
+ domain->boot_on = false;
+}
+
static int imx8m_blk_ctrl_probe(struct platform_device *pdev)
{
const struct imx8m_blk_ctrl_data *bc_data;
@@ -199,6 +271,7 @@ static int imx8m_blk_ctrl_probe(struct platform_device *pdev)
struct imx8m_blk_ctrl *bc;
void __iomem *base;
int i, ret;
+ bool init_off;
struct regmap_config regmap_config = {
.reg_bits = 32,
@@ -303,7 +376,8 @@ static int imx8m_blk_ctrl_probe(struct platform_device *pdev)
domain->genpd.power_off = imx8m_blk_ctrl_power_off;
domain->bc = bc;
- ret = pm_genpd_init(&domain->genpd, NULL, true);
+ init_off = imx8m_blk_ctrl_is_off(bc, bc_data, data);
+ ret = pm_genpd_init(&domain->genpd, NULL, init_off);
if (ret) {
dev_err_probe(dev, ret,
"failed to init power domain \"%s\"\n",
@@ -312,6 +386,8 @@ static int imx8m_blk_ctrl_probe(struct platform_device *pdev)
goto cleanup_pds;
}
+ domain->boot_on = !init_off;
+
/*
* We use runtime PM to trigger power on/off of the upstream GPC
* domain, as a strict hierarchical parent/child power domain
@@ -328,10 +404,20 @@ static int imx8m_blk_ctrl_probe(struct platform_device *pdev)
bc->onecell_data.domains[i] = &domain->genpd;
}
+ /*
+ * The probe can no longer be deferred. Releasing these references
+ * would power down the domains left on by the bootloader.
+ */
+ for (i = 0; i < bc_data->num_domains; i++) {
+ ret = imx8m_blk_ctrl_get_boot_on(&bc->domains[i]);
+ if (ret)
+ goto cleanup_boot_on;
+ }
+
ret = of_genpd_add_provider_onecell(dev->of_node, &bc->onecell_data);
if (ret) {
dev_err_probe(dev, ret, "failed to add power domain provider\n");
- goto cleanup_pds;
+ goto cleanup_boot_on;
}
bc->power_nb.notifier_call = bc_data->power_notifier_fn;
@@ -353,6 +439,10 @@ static int imx8m_blk_ctrl_probe(struct platform_device *pdev)
dev_pm_genpd_remove_notifier(bc->bus_power_dev);
cleanup_provider:
of_genpd_del_provider(dev->of_node);
+cleanup_boot_on:
+ while (i--)
+ imx8m_blk_ctrl_put_boot_on(&bc->domains[i]);
+ i = bc_data->num_domains;
cleanup_pds:
for (i--; i >= 0; i--) {
pm_genpd_remove(&bc->domains[i].genpd);
@@ -374,6 +464,7 @@ static void imx8m_blk_ctrl_remove(struct platform_device *pdev)
for (i = 0; i < bc->onecell_data.num_domains; i++) {
struct imx8m_blk_ctrl_domain *domain = &bc->domains[i];
+ imx8m_blk_ctrl_put_boot_on(domain);
pm_genpd_remove(&domain->genpd);
dev_pm_domain_detach(domain->power_dev, true);
}
@@ -709,6 +800,7 @@ static const struct imx8m_blk_ctrl_domain_data imx8mn_disp_blk_ctl_domain_data[]
static const struct imx8m_blk_ctrl_data imx8mn_disp_blk_ctl_dev_data = {
.max_reg = 0x84,
+ .boot_state_readable = true,
.power_notifier_fn = imx8mn_disp_power_notifier,
.domains = imx8mn_disp_blk_ctl_domain_data,
.num_domains = ARRAY_SIZE(imx8mn_disp_blk_ctl_domain_data),
--
2.43.0
^ permalink raw reply related [flat|nested] 7+ messages in thread* Re: [PATCH v2 3/4] pmdomain: imx8m-blk-ctrl: Keep the domains left on by the bootloader
2026-11-22 9:59 ` [PATCH v2 3/4] pmdomain: imx8m-blk-ctrl: " Dario Binacchi
@ 2026-11-22 10:20 ` sashiko-bot
0 siblings, 0 replies; 7+ messages in thread
From: sashiko-bot @ 2026-11-22 10:20 UTC (permalink / raw)
To: Dario Binacchi; +Cc: imx, Frank.Li
Thank you for your contribution! Sashiko AI review found 2 potential
issues to consider:
- [High] pmdomain: imx8m-blk-ctrl: unlocked bus domain check in
imx8m_blk_ctrl_is_off()
- [Medium] pmdomain: imx8m-blk-ctrl: put_boot_on() races with genpd
power_off_work
--
commit c08d94b261d674a0f3a8ba6bcb7abe4442f21fa6
Author: Dario Binacchi <dario.binacchi@amarulasolutions.com>
pmdomain: imx8m-blk-ctrl: Keep the domains left on by the bootloader
This commit reads the blk-ctrl registers at probe time on supported SoCs
(i.MX8MN DISP) to keep power domains left on by the bootloader active
until their consumers release them.
> diff --git a/drivers/pmdomain/imx/imx8m-blk-ctrl.c b/drivers/pmdomain/imx/imx8m-blk-ctrl.c
> index 7d6735728d8c6..5ab201eefeb38 100644
> --- a/drivers/pmdomain/imx/imx8m-blk-ctrl.c
> +++ b/drivers/pmdomain/imx/imx8m-blk-ctrl.c
[ ... ]
> @@ -187,11 +190,80 @@ static int imx8m_blk_ctrl_power_off(struct generic_pm_domain *genpd)
> /* allow bus domain to suspend */
> pm_runtime_put(bc->bus_power_dev);
>
> + domain->boot_on = false;
> +
> return 0;
> }
>
> static struct lock_class_key blk_ctrl_genpd_lock_class;
>
> +/*
> + * A domain left on by the bootloader has its resets deasserted and its
> + * clocks enabled. The registers can only be read if the bus domain is
> + * on, so a domain is considered off whenever the bus domain is off.
> + */
> +static bool imx8m_blk_ctrl_is_off(struct imx8m_blk_ctrl *bc,
> + const struct imx8m_blk_ctrl_data *bc_data,
> + const struct imx8m_blk_ctrl_domain_data *data)
> +{
> + u32 rst, clk, mipi = 0;
> +
> + if (!bc_data->boot_state_readable ||
> + !dev_pm_genpd_is_on(bc->bus_power_dev))
> + return true;
> +
> + if (regmap_read(bc->regmap, BLK_SFT_RSTN, &rst) ||
> + regmap_read(bc->regmap, BLK_CLK_EN, &clk))
> + return true;
> +
> + if (data->mipi_phy_rst_mask &&
> + regmap_read(bc->regmap, BLK_MIPI_RESET_DIV, &mipi))
> + return true;
> +
> + return (rst & data->rst_mask) != data->rst_mask ||
> + (clk & data->clk_mask) != data->clk_mask ||
> + (mipi & data->mipi_phy_rst_mask) != data->mipi_phy_rst_mask;
> +}
[Severity: High]
Can the upstream bus domain (pgc_dispmix) power down asynchronously on
pm_wq between dev_pm_genpd_is_on(bc->bus_power_dev) and the regmap_read()
calls?
dev_pm_genpd_is_on() drops the genpd lock before returning, and no
runtime PM reference is held on bc->bus_power_dev during the domain loop
in imx8m_blk_ctrl_probe(). If DISPMIX was off at boot, an earlier probe
of a child domain such as pgc_mipi powers pgc_dispmix on with
PD_FLAG_ATTACH_POWER_ON, and dev_pm_domain_attach_by_name() in
imx8m_blk_ctrl_probe() queues pgc_dispmix->power_off_work on pm_wq right
before imx8m_blk_ctrl_is_off() runs:
CPU0 kworker (pm_wq)
imx8m_blk_ctrl_probe()
dev_pm_domain_attach_by_name()
genpd_queue_power_off_work()
imx8m_blk_ctrl_is_off()
dev_pm_genpd_is_on() -> true
genpd_power_off_work_fn()
imx_pgc_power_down(pgc_dispmix)
regmap_read(bc->regmap, ...) <-- MMIO read with DISPMIX powered off
Reading the disp_blk_ctrl registers after DISPMIX and its
DISP_AXI_ROOT/DISP_APB_ROOT clocks are disabled causes a bus hang or
synchronous external abort during boot.
> +
> +/* Take the references of imx8m_blk_ctrl_power_on() for a domain left on */
> +static int imx8m_blk_ctrl_get_boot_on(struct imx8m_blk_ctrl_domain *domain)
> +{
> + struct imx8m_blk_ctrl *bc = domain->bc;
> + int ret;
> +
> + if (!domain->boot_on)
> + return 0;
> +
> + ret = pm_runtime_resume_and_get(bc->bus_power_dev);
> + if (ret < 0) {
> + dev_err(bc->dev, "failed to power up bus domain\n");
> + return ret;
> + }
> +
> + ret = pm_runtime_resume_and_get(domain->power_dev);
> + if (ret < 0) {
> + dev_err(bc->dev, "failed to power up peripheral domain\n");
> + pm_runtime_put(bc->bus_power_dev);
> + return ret;
> + }
> +
> + if (icc_bulk_set_bw(domain->num_paths, domain->paths))
> + dev_err(bc->dev, "failed to set icc bw\n");
> +
> + return 0;
> +}
> +
> +static void imx8m_blk_ctrl_put_boot_on(struct imx8m_blk_ctrl_domain *domain)
> +{
> + if (!domain->boot_on)
> + return;
> +
> + /* Sync, to power down the bus domain before its notifier is removed */
> + pm_runtime_put_sync(domain->power_dev);
> + pm_runtime_put_sync(domain->bc->bus_power_dev);
> + domain->boot_on = false;
> +}
[ ... ]
> @@ -353,6 +439,10 @@ static int imx8m_blk_ctrl_probe(struct platform_device *pdev)
> dev_pm_genpd_remove_notifier(bc->bus_power_dev);
> cleanup_provider:
> of_genpd_del_provider(dev->of_node);
> +cleanup_boot_on:
> + while (i--)
> + imx8m_blk_ctrl_put_boot_on(&bc->domains[i]);
> + i = bc_data->num_domains;
> cleanup_pds:
> for (i--; i >= 0; i--) {
> pm_genpd_remove(&bc->domains[i].genpd);
> @@ -374,6 +464,7 @@ static void imx8m_blk_ctrl_remove(struct platform_device *pdev)
> for (i = 0; i < bc->onecell_data.num_domains; i++) {
> struct imx8m_blk_ctrl_domain *domain = &bc->domains[i];
>
> + imx8m_blk_ctrl_put_boot_on(domain);
> pm_genpd_remove(&domain->genpd);
> dev_pm_domain_detach(domain->power_dev, true);
> }
[Severity: Medium]
Can imx8m_blk_ctrl_put_boot_on() race with domain->genpd.power_off_work
when called before pm_genpd_remove()?
Both imx8m_blk_ctrl_remove() and the cleanup_boot_on path in
imx8m_blk_ctrl_probe() call imx8m_blk_ctrl_put_boot_on() before
pm_genpd_remove() cancels power_off_work, without taking genpd_lock or
transitioning domain->genpd.status to GENPD_STATE_OFF. If power_off_work
was queued on pm_wq (for example by genpd_power_off_unused() or when a
consumer detaches), both paths drop the same runtime PM references:
CPU0 kworker (pm_wq)
imx8m_blk_ctrl_remove()
imx8m_blk_ctrl_put_boot_on(domain)
pm_runtime_put_sync(power_dev)
pm_runtime_put_sync(bus_power_dev)
domain->boot_on = false
pm_genpd_remove(&domain->genpd)
cancel_work_sync(&power_off_work)
genpd_power_off_work_fn()
genpd_power_off()
imx8m_blk_ctrl_power_off()
regmap_clear_bits(...)
pm_runtime_put(power_dev)
pm_runtime_put(bus_power_dev)
<-- double put & MMIO while
bus_power_dev is off
Calling pm_genpd_remove(&domain->genpd) before
imx8m_blk_ctrl_put_boot_on(domain) (matching imx_pgc_domain_remove() in
drivers/pmdomain/imx/gpcv2.c) ensures power_off_work is flushed before
checking domain->boot_on.
--
Sashiko AI review · https://sashiko.dev/#/patchset/20261122095927.2631909-1-dario.binacchi@amarulasolutions.com?part=3
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH v2 4/4] pmdomain: imx8m-blk-ctrl: Hold boot-on domain clocks until sync_state
2026-11-22 9:59 [PATCH v2 0/4] pmdomain: imx: Keep the domains left on by the bootloader Dario Binacchi
` (2 preceding siblings ...)
2026-11-22 9:59 ` [PATCH v2 3/4] pmdomain: imx8m-blk-ctrl: " Dario Binacchi
@ 2026-11-22 9:59 ` Dario Binacchi
3 siblings, 0 replies; 7+ messages in thread
From: Dario Binacchi @ 2026-11-22 9:59 UTC (permalink / raw)
To: Ulf Hansson
Cc: michael, linux-amarula, Lucas Stach, Peng Fan, Dario Binacchi,
Fabio Estevam, Frank Li, Kees Cook, Ming Qian,
Pengutronix Kernel Team, Sascha Hauer, Uwe Kleine-König,
bui duc phuc, imx, linux-arm-kernel, linux-pm
The clocks of a domain left on by the bootloader have no user until
its consumers probe, so they are gated when the unused clocks are
disabled. On the i.MX8MN, with the LCDIF driver built as a module,
this stops the pixel clock of the U-Boot splash screen long before
the DRM driver probes.
Keep the clocks of these domains enabled until sync_state, i.e. until
all the consumers of the blk-ctrl have probed.
Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
---
Changes in v2:
- Rebase on the changes of the previous patch
drivers/pmdomain/imx/imx8m-blk-ctrl.c | 32 +++++++++++++++++++++++++++
1 file changed, 32 insertions(+)
diff --git a/drivers/pmdomain/imx/imx8m-blk-ctrl.c b/drivers/pmdomain/imx/imx8m-blk-ctrl.c
index 5ab201eefeb3..bc69e7336526 100644
--- a/drivers/pmdomain/imx/imx8m-blk-ctrl.c
+++ b/drivers/pmdomain/imx/imx8m-blk-ctrl.c
@@ -84,6 +84,7 @@ struct imx8m_blk_ctrl_domain {
struct imx8m_blk_ctrl *bc;
int num_paths;
bool boot_on; /* Left on by the bootloader */
+ bool boot_clks_held; /* Until sync_state */
};
struct imx8m_blk_ctrl_data {
@@ -250,11 +251,29 @@ static int imx8m_blk_ctrl_get_boot_on(struct imx8m_blk_ctrl_domain *domain)
if (icc_bulk_set_bw(domain->num_paths, domain->paths))
dev_err(bc->dev, "failed to set icc bw\n");
+ /* Nobody else holds the clocks until the consumers probe */
+ if (clk_bulk_prepare_enable(domain->data->num_clks, domain->clks))
+ dev_warn(bc->dev, "failed to enable clocks of \"%s\"\n",
+ domain->data->name);
+ else
+ domain->boot_clks_held = true;
+
return 0;
}
+static void imx8m_blk_ctrl_put_boot_clks(struct imx8m_blk_ctrl_domain *domain)
+{
+ if (!domain->boot_clks_held)
+ return;
+
+ clk_bulk_disable_unprepare(domain->data->num_clks, domain->clks);
+ domain->boot_clks_held = false;
+}
+
static void imx8m_blk_ctrl_put_boot_on(struct imx8m_blk_ctrl_domain *domain)
{
+ imx8m_blk_ctrl_put_boot_clks(domain);
+
if (!domain->boot_on)
return;
@@ -1045,11 +1064,24 @@ static const struct of_device_id imx8m_blk_ctrl_of_match[] = {
};
MODULE_DEVICE_TABLE(of, imx8m_blk_ctrl_of_match);
+static void imx8m_blk_ctrl_sync_state(struct device *dev)
+{
+ struct imx8m_blk_ctrl *bc = dev_get_drvdata(dev);
+ int i;
+
+ /* This replaces the genpd provider sync_state */
+ of_genpd_sync_state(dev->of_node);
+
+ for (i = 0; i < bc->onecell_data.num_domains; i++)
+ imx8m_blk_ctrl_put_boot_clks(&bc->domains[i]);
+}
+
static struct platform_driver imx8m_blk_ctrl_driver = {
.probe = imx8m_blk_ctrl_probe,
.remove = imx8m_blk_ctrl_remove,
.driver = {
.name = "imx8m-blk-ctrl",
+ .sync_state = imx8m_blk_ctrl_sync_state,
.pm = &imx8m_blk_ctrl_pm_ops,
.of_match_table = imx8m_blk_ctrl_of_match,
.suppress_bind_attrs = true,
--
2.43.0
^ permalink raw reply related [flat|nested] 7+ messages in thread