[PATCH] pmdomain: rockchip: fix domain check in rockchip_pm_add_one_domain()

[Ulf Hansson]

On Sun, Sep 20, 2026 at 8:00 PM Sergey Shtylyov <s.shtylyov at auroraos.dev> wrote:
>
> In rockchip_pm_add_one_domain(), there's the check (most probably for
> the case where the "reg" prop has an unexpected value?) which doesn't
> make much sense as the variable pd_info will be NULL iff pmu->info->
> domain_info is NULL and the variable id is 0.  What does make sense
> there is checking pd_info->pwr_mask and pd_info->req_mask which (as
> seems to follow from the code) can't both be 0 for a valid domain...
>
> Found by Linux Verification Center (linuxtesting.org) with the Svace
> static analysis tool.
>
> Fixes: 7c696693a4f5 ("soc: rockchip: power-domain: Add power domain driver")
> Signed-off-by: Sergey Shtylyov <s.shtylyov at auroraos.dev>

Applied for next, but without the fixes tag, thanks!

Note, that I am dropping the fixes tag because if there was a real
problem, we would require yet another fix on top to get the
corresponding domain declaration to be correct. Yet, the patch is
useful as is!

Kind regards
Uffe


>
> ---
> This patch is against the fixes branch of Ulf Hansson's linux-pm.git repo.
>
>  drivers/pmdomain/rockchip/pm-domains.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/pmdomain/rockchip/pm-domains.c b/drivers/pmdomain/rockchip/pm-domains.c
> index ba66ae719428..69792e2b215b 100644
> --- a/drivers/pmdomain/rockchip/pm-domains.c
> +++ b/drivers/pmdomain/rockchip/pm-domains.c
> @@ -809,7 +809,7 @@ static int rockchip_pm_add_one_domain(struct rockchip_pmu *pmu,
>                 return 0;
>
>         pd_info = &pmu->info->domain_info[id];
> -       if (!pd_info) {
> +       if (!pd_info->pwr_mask && !pd_info->req_mask) {
>                 dev_err(pmu->dev, "%pOFn: undefined domain id %d\n",
>                         node, id);
>                 return -EINVAL;
> --
> 2.55.0