Re: [PATCH v2] pmdomain: imx: gpc: remove all initialized power domains
From: Ulf Hansson
Date: Tue Nov 10 2026 - 06:28:08 EST
On Thu, Sep 24, 2026 at 4:25 PM Guangshuo Li <lgs201920130244@xxxxxxxxx> wrote:
>
> imx_gpc_old_dt_init() initializes all power domains described by
> of_id_data->num_domains, while imx_gpc_remove() only removes the PU and
> ARM domains.
>
> Use the match data to remove all initialized power domains in reverse
> order. Release the PU clocks after the PU domain is removed.
>
> This issue was found by manual code inspection.
>
> Fixes: 5a42d1198901 ("soc: imx: gpc: fix imx6sl gpc power domain regression")
> Cc: stable@xxxxxxxxxxxxxxx
> Signed-off-by: Guangshuo Li <lgs201920130244@xxxxxxxxx>
Applied for fixes, thanks!
Kind regards
Uffe
> ---
> v2:
> - Check the result of device_get_match_data() before using it.
> - Use an unsigned num_domains variable and a decrementing while loop,
> as suggested by Andy Shevchenko.
>
> drivers/pmdomain/imx/gpc.c | 29 +++++++++++++++++------------
> 1 file changed, 17 insertions(+), 12 deletions(-)
>
> diff --git a/drivers/pmdomain/imx/gpc.c b/drivers/pmdomain/imx/gpc.c
> index abca5f449a22..d83fb37e2297 100644
> --- a/drivers/pmdomain/imx/gpc.c
> +++ b/drivers/pmdomain/imx/gpc.c
> @@ -502,7 +502,9 @@ static int imx_gpc_probe(struct platform_device *pdev)
>
> static void imx_gpc_remove(struct platform_device *pdev)
> {
> + const struct imx_gpc_dt_data *of_id_data;
> struct device_node *pgc_node;
> + unsigned int num_domains;
> int ret;
>
> pgc_node = of_get_child_by_name(pdev->dev.of_node, "pgc");
> @@ -519,20 +521,23 @@ static void imx_gpc_remove(struct platform_device *pdev)
> if (!pgc_node) {
> of_genpd_del_provider(pdev->dev.of_node);
>
> - ret = pm_genpd_remove(&imx_gpc_domains[GPC_PGC_DOMAIN_PU].base);
> - if (ret) {
> - dev_err(&pdev->dev, "Failed to remove PU power domain (%pe)\n",
> - ERR_PTR(ret));
> + of_id_data = device_get_match_data(&pdev->dev);
> + if (!of_id_data)
> return;
> - }
> - imx_pgc_put_clocks(&imx_gpc_domains[GPC_PGC_DOMAIN_PU]);
>
> - ret = pm_genpd_remove(&imx_gpc_domains[GPC_PGC_DOMAIN_ARM].base);
> - if (ret) {
> - dev_err(&pdev->dev, "Failed to remove ARM power domain (%pe)\n",
> - ERR_PTR(ret));
> - return;
> - }
> + num_domains = of_id_data->num_domains;
> + while (num_domains--) {
> + ret = pm_genpd_remove(&imx_gpc_domains[num_domains].base);
> + if (ret) {
> + dev_err(&pdev->dev,
> + "Failed to remove %s power domain (%pe)\n",
> + imx_gpc_domains[num_domains].base.name,
> + ERR_PTR(ret));
> + return;
> + }
> +
> + if (num_domains == GPC_PGC_DOMAIN_PU)
> + imx_pgc_put_clocks(&imx_gpc_domains[num_domains]);
> }
>
> of_node_put(pgc_node);
> --
> 2.43.0
>