Skip to content

Commit b489235

Browse files
0xB0Dandersson
authored andcommitted
clk: qcom: Support attaching GDSCs to multiple parents
When a clock-controller lists multiple power-domains we need make each GDSC a subdomain of each of the clock-controller's listed power-domains. GDSCs without an explicitly defined parent should be a subdomain of each of the clock-controller's listed power-domains. GDSCs with an explicitly defined parent should attach only to the parent GDSC and not the listed power-domains. Any votes will trickle through the hierarchy up to the external power-domains. ======================================== :: arch/arm64/boot/dts/example.dtsi :: ======================================== clockcc: clock-controller@0 { compat ="qcom,example-clockcc"; power-domains = <&pd_a, &pd_b>; } ======================================== :: drivers/clk/qcom/example-clockcc.c :: ======================================== static struct gdsc parent_gdsc = { .pd = { .name = "parent_gdsc", }, }; static struct gdsc child0_gdsc = { .pd = { .name = "child0_gdsc", }, .parent = &parent_gdsc.pd, }; static struct gdsc child1_gdsc = { .pd = { .name = "child1_gdsc", }, .parent = &parent_gdsc.pd, }; ======================================== :: power-subdomains :: ======================================== pm-domain::pd_a └── pm-subdomain::clockcc::parent_gdsc ├── pm-subdomain::clockcc::child0_gdsc └── pm-subdomain::clockcc::child1_gdsc pm-domain::pd_b └── pm-subdomain::clockcc::parent_gdsc ├── pm-subdomain::clockcc::child1_gdsc └── pm-subdomain::clockcc::child2_gdsc The performance states will percolate through the pm-domain hierarchy to the domains that handle the relevant states. Signed-off-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org> Link: https://lore.kernel.org/r/20250117-b4-linux-next-24-11-18-clock-multiple-power-domains-v10-4-13f2bb656dad@linaro.org Signed-off-by: Bjorn Andersson <andersson@kernel.org>
1 parent ed5a0d0 commit b489235

3 files changed

Lines changed: 37 additions & 0 deletions

File tree

drivers/clk/qcom/common.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -323,6 +323,7 @@ int qcom_cc_really_probe(struct device *dev,
323323
scd->dev = dev;
324324
scd->scs = desc->gdscs;
325325
scd->num = desc->num_gdscs;
326+
scd->pd_list = cc->pd_list;
326327
ret = gdsc_register(scd, &reset->rcdev, regmap);
327328
if (ret)
328329
return ret;

drivers/clk/qcom/gdsc.c

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -506,6 +506,36 @@ static int gdsc_init(struct gdsc *sc)
506506
return ret;
507507
}
508508

509+
static int gdsc_add_subdomain_list(struct dev_pm_domain_list *pd_list,
510+
struct generic_pm_domain *subdomain)
511+
{
512+
int i, ret;
513+
514+
for (i = 0; i < pd_list->num_pds; i++) {
515+
struct device *dev = pd_list->pd_devs[i];
516+
struct generic_pm_domain *genpd = pd_to_genpd(dev->pm_domain);
517+
518+
ret = pm_genpd_add_subdomain(genpd, subdomain);
519+
if (ret)
520+
return ret;
521+
}
522+
523+
return 0;
524+
}
525+
526+
static void gdsc_remove_subdomain_list(struct dev_pm_domain_list *pd_list,
527+
struct generic_pm_domain *subdomain)
528+
{
529+
int i;
530+
531+
for (i = 0; i < pd_list->num_pds; i++) {
532+
struct device *dev = pd_list->pd_devs[i];
533+
struct generic_pm_domain *genpd = pd_to_genpd(dev->pm_domain);
534+
535+
pm_genpd_remove_subdomain(genpd, subdomain);
536+
}
537+
}
538+
509539
static void gdsc_pm_subdomain_remove(struct gdsc_desc *desc, size_t num)
510540
{
511541
struct device *dev = desc->dev;
@@ -520,6 +550,8 @@ static void gdsc_pm_subdomain_remove(struct gdsc_desc *desc, size_t num)
520550
pm_genpd_remove_subdomain(scs[i]->parent, &scs[i]->pd);
521551
else if (!IS_ERR_OR_NULL(dev->pm_domain))
522552
pm_genpd_remove_subdomain(pd_to_genpd(dev->pm_domain), &scs[i]->pd);
553+
else if (desc->pd_list)
554+
gdsc_remove_subdomain_list(desc->pd_list, &scs[i]->pd);
523555
}
524556
}
525557

@@ -575,6 +607,9 @@ int gdsc_register(struct gdsc_desc *desc,
575607
ret = pm_genpd_add_subdomain(scs[i]->parent, &scs[i]->pd);
576608
else if (!IS_ERR_OR_NULL(dev->pm_domain))
577609
ret = pm_genpd_add_subdomain(pd_to_genpd(dev->pm_domain), &scs[i]->pd);
610+
else if (desc->pd_list)
611+
ret = gdsc_add_subdomain_list(desc->pd_list, &scs[i]->pd);
612+
578613
if (ret)
579614
goto err_pm_subdomain_remove;
580615
}

drivers/clk/qcom/gdsc.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@ struct gdsc_desc {
8080
struct device *dev;
8181
struct gdsc **scs;
8282
size_t num;
83+
struct dev_pm_domain_list *pd_list;
8384
};
8485

8586
#ifdef CONFIG_QCOM_GDSC

0 commit comments

Comments
 (0)