[PATCH] pmdomain:rockchip: Fix init genpd as GENPD_STATE_ON before regulator ready
Chaoyi Chen
chaoyi.chen at rock-chips.com
Sun Dec 7 19:17:56 PST 2025
On 12/5/2025 2:47 PM, Frank Zhang wrote:
> RK3588_PD_NPU initialize as GENPD_STATE_ON before regulator ready.
> rknn_iommu initlized success and suspend RK3588_PD_NPU. When rocket
> driver register, it will resume rknn_iommu.
>
> If regulator is still not ready at this point, rknn_iommu resume fail,
> pm runtime status will be error: -EPROBE_DEFER.
>
> This patch check regulator when pmdomain init, if regulator is not ready
> or not enabled, power off pmdomain. Consumer device can power on it's
> pmdomain after regulator ready
>
> Signed-off-by: Frank Zhang <rmxpzlb at gmail.com>
> ---
> drivers/pmdomain/rockchip/pm-domains.c | 14 ++++++++++++++
> 1 file changed, 14 insertions(+)
>
> diff --git a/drivers/pmdomain/rockchip/pm-domains.c b/drivers/pmdomain/rockchip/pm-domains.c
> index 1955c6d453e4..bc69f5d840e6 100644
> --- a/drivers/pmdomain/rockchip/pm-domains.c
> +++ b/drivers/pmdomain/rockchip/pm-domains.c
> @@ -659,6 +659,11 @@ static int rockchip_pd_power(struct rockchip_pm_domain *pd, bool power_on)
> return ret;
> }
>
> +static bool rockchip_pd_regulator_is_enabled(struct rockchip_pm_domain *pd)
> +{
> + return IS_ERR_OR_NULL(pd->supply) ? false : regulator_is_enabled(pd->supply);
> +}
> +
> static int rockchip_pd_regulator_disable(struct rockchip_pm_domain *pd)
> {
> return IS_ERR_OR_NULL(pd->supply) ? 0 : regulator_disable(pd->supply);
> @@ -861,6 +866,15 @@ static int rockchip_pm_add_one_domain(struct rockchip_pmu *pmu,
> pd->genpd.name = pd->info->name;
> else
> pd->genpd.name = kbasename(node->full_name);
> +
> + if (pd->info->need_regulator) {
> + if (IS_ERR_OR_NULL(pd->supply))
> + pd->supply = devm_of_regulator_get(pmu->dev, pd->node, "domain");
> +
> + if (!rockchip_pd_regulator_is_enabled(pd))
> + rockchip_pd_power(pd, false);
> + }
> +
> pd->genpd.power_off = rockchip_pd_power_off;
> pd->genpd.power_on = rockchip_pd_power_on;
> pd->genpd.attach_dev = rockchip_pd_attach_dev;
>
@Quentin, Could you please try this patch? This should resolve the
problem you're currently facing where the NPU fails to work in
built-in module.
Tested-by: Chaoyi Chen <chaoyi.chen at rock-chips.com>
--
Best,
Chaoyi
More information about the Linux-rockchip
mailing list