From: Kory Maincent (Dent Project) <kory.maincent@xxxxxxxxxxx> Introduce PSE power domain support in preparation for future port priority features. Multiple PSE PIs are grouped under a PSE power domain, which defines the available power budget. This setup allows the system to check whether activating a port would exceed the budget, helping prevent over-budget states. Signed-off-by: Kory Maincent <kory.maincent@xxxxxxxxxxx> --- Changes in v2: - new patch. --- drivers/net/pse-pd/pse_core.c | 121 ++++++++++++++++++++++++++++++++++++++++++ include/linux/pse-pd/pse.h | 2 + 2 files changed, 123 insertions(+) diff --git a/drivers/net/pse-pd/pse_core.c b/drivers/net/pse-pd/pse_core.c index 712cb2d9c7c4..13f6ddcfca10 100644 --- a/drivers/net/pse-pd/pse_core.c +++ b/drivers/net/pse-pd/pse_core.c @@ -15,6 +15,7 @@ static DEFINE_MUTEX(pse_list_mutex); static LIST_HEAD(pse_controller_list); static DEFINE_IDA(pse_ida); +static DEFINE_XARRAY_ALLOC(pse_pw_d_map); /** * struct pse_control - a PSE control @@ -35,6 +36,12 @@ struct pse_control { struct phy_device *attached_phydev; }; +struct pse_power_domain { + int id; + struct regulator *supply; + int pw_budget; +}; + static int of_load_single_pse_pi_pairset(struct device_node *node, struct pse_pi *pi, int pairset_num) @@ -431,6 +438,115 @@ devm_pse_pi_regulator_register(struct pse_controller_dev *pcdev, return 0; } +static void pse_flush_pw_ds(struct pse_controller_dev *pcdev) +{ + struct pse_power_domain *pw_d; + int i; + + for (i = 0; i < pcdev->nr_lines; i++) { + pw_d = xa_load(&pse_pw_d_map, pcdev->pi[i].pw_d->id); + if (pw_d) { + regulator_put(pw_d->supply); + xa_erase(&pse_pw_d_map, pw_d->id); + } + } +} + +static struct pse_power_domain *devm_pse_alloc_pw_d(struct device *dev) +{ + struct pse_power_domain *pw_d; + int index, ret; + + pw_d = devm_kzalloc(dev, sizeof(*pw_d), GFP_KERNEL); + if (!pw_d) + return ERR_PTR(-ENOMEM); + + ret = xa_alloc(&pse_pw_d_map, &index, pw_d, xa_limit_31b, GFP_KERNEL); + if (ret) + return ERR_PTR(ret); + + pw_d->id = index; + return pw_d; +} + +static int pse_get_power_budget(struct regulator *supply) +{ + int ret, uV; + s64 tmp_64; + + ret = regulator_get_voltage(supply); + if (ret < 0) + return ret; + + uV = ret; + ret = regulator_get_power_budget(supply); + if (ret < 0) + return ret; + + tmp_64 = ret; + tmp_64 *= uV; + /* mW = uV * uA / 1000000000 */ + return DIV_ROUND_CLOSEST_ULL(tmp_64, 1000000000); +} + +static int pse_register_pw_ds(struct pse_controller_dev *pcdev) +{ + int i, ret; + + for (i = 0; i < pcdev->nr_lines; i++) { + struct regulator_dev *rdev = pcdev->pi[i].rdev; + struct pse_power_domain *pw_d; + struct regulator *supply; + bool present = false; + unsigned long index; + int pw_budget; + + /* No regulator or regulator parent supply registered. + * We need a regulator parent to register a PSE power domain + */ + if (!rdev || !rdev->supply) + continue; + + xa_for_each(&pse_pw_d_map, index, pw_d) { + /* Power supply already registered as a PSE power + * domain. + */ + if (pw_d->supply == rdev->supply) { + present = true; + pcdev->pi[i].pw_d = pw_d; + break; + } + } + if (present) + break; + + ret = pse_get_power_budget(rdev->supply); + if (ret < 0) { + dev_warn(pcdev->dev, + "can't read power budget from PI %d, no power domain will be associated\n", + i); + continue; + } + pw_budget = ret; + + pw_d = devm_pse_alloc_pw_d(pcdev->dev); + if (IS_ERR_OR_NULL(pw_d)) + return PTR_ERR(pw_d); + + pw_d->pw_budget = pw_budget; + supply = regulator_get(pcdev->dev, rdev->supply_name); + if (IS_ERR(supply)) { + xa_erase(&pse_pw_d_map, pw_d->id); + return PTR_ERR(supply); + } + + pw_d->supply = rdev->supply; + pcdev->pi[i].pw_d = pw_d; + } + + return 0; +} + /** * pse_controller_register - register a PSE controller device * @pcdev: a pointer to the initialized PSE controller device @@ -489,6 +605,10 @@ int pse_controller_register(struct pse_controller_dev *pcdev) goto free_pse_ida; } + ret = pse_register_pw_ds(pcdev); + if (ret) + goto free_pse_ida; + mutex_lock(&pse_list_mutex); list_add(&pcdev->list, &pse_controller_list); mutex_unlock(&pse_list_mutex); @@ -508,6 +628,7 @@ EXPORT_SYMBOL_GPL(pse_controller_register); void pse_controller_unregister(struct pse_controller_dev *pcdev) { pse_release_pis(pcdev); + pse_flush_pw_ds(pcdev); ida_free(&pse_ida, pcdev->id); mutex_lock(&pse_list_mutex); list_del(&pcdev->list); diff --git a/include/linux/pse-pd/pse.h b/include/linux/pse-pd/pse.h index ce8737c2219a..3b35dc0f8dc3 100644 --- a/include/linux/pse-pd/pse.h +++ b/include/linux/pse-pd/pse.h @@ -138,12 +138,14 @@ struct pse_pi_pairset { * @np: device node pointer of the PSE PI node * @rdev: regulator represented by the PSE PI * @admin_state_enabled: PI enabled state + * @pw_d: Power domain of the PSE PI */ struct pse_pi { struct pse_pi_pairset pairset[2]; struct device_node *np; struct regulator_dev *rdev; bool admin_state_enabled; + struct pse_power_domain *pw_d; }; /** -- 2.34.1