Currently, uncore driver library just supports intel_uncore driver as default driver when user use AUTO_DETECT, which is not good to application. So it is necessary to support probing for multi-uncore drivers.
Signed-off-by: Huisong Li <[email protected]> --- doc/guides/rel_notes/release_26_07.rst | 6 ++++ lib/power/rte_power_uncore.c | 46 ++++++++++++++++++++++---- 2 files changed, 46 insertions(+), 6 deletions(-) diff --git a/doc/guides/rel_notes/release_26_07.rst b/doc/guides/rel_notes/release_26_07.rst index f012d47a4b..14436f9d7f 100644 --- a/doc/guides/rel_notes/release_26_07.rst +++ b/doc/guides/rel_notes/release_26_07.rst @@ -63,6 +63,12 @@ New Features ``rte_eal_init`` and the application is responsible for probing each device, * ``--auto-probing`` enables the initial bus probing, which is the current default behavior. +* **Supported auto-detection of uncore power driver.** + + The uncore power library now supports automatic probing of multiple + uncore drivers when using ``RTE_UNCORE_PM_ENV_AUTO_DETECT``, + instead of defaulting only to the Intel uncore driver. + Removed Items ------------- diff --git a/lib/power/rte_power_uncore.c b/lib/power/rte_power_uncore.c index 25bdb113c5..ff11f0105c 100644 --- a/lib/power/rte_power_uncore.c +++ b/lib/power/rte_power_uncore.c @@ -2,6 +2,7 @@ * Copyright(c) 2010-2014 Intel Corporation * Copyright(c) 2023 AMD Corporation */ +#include <errno.h> #include <eal_export.h> #include <rte_spinlock.h> @@ -46,6 +47,39 @@ rte_power_register_uncore_ops(struct rte_power_uncore_ops *driver_ops) return 0; } +static uint32_t power_uncore_driver_name2env(char *name) +{ + for (uint32_t i = 0; i < RTE_DIM(uncore_env_str); i++) { + if (!strcmp(name, uncore_env_str[i])) + return i; + } + + return UINT32_MAX; +} + +static int power_uncore_probe_driver(void) +{ + struct rte_power_uncore_ops *ops; + int ret; + + global_uncore_ops = NULL; + /* Use package-0 and die-0 to probe uncore driver. */ + RTE_TAILQ_FOREACH(ops, &uncore_ops_list, next) { + ret = ops->init(0, 0); + if (ret == 0) { + uint32_t env = power_uncore_driver_name2env(ops->name); + if (env == UINT32_MAX) + continue; + global_uncore_env = env; + global_uncore_ops = ops; + ops->exit(0, 0); + break; + } + } + + return global_uncore_ops ? 0 : -ENODEV; +} + RTE_EXPORT_EXPERIMENTAL_SYMBOL(rte_power_set_uncore_env, 23.11) int rte_power_set_uncore_env(enum rte_uncore_power_mgmt_env env) @@ -60,12 +94,12 @@ rte_power_set_uncore_env(enum rte_uncore_power_mgmt_env env) goto out; } - if (env == RTE_UNCORE_PM_ENV_AUTO_DETECT) - /* Currently only intel_uncore is supported. - * This will be extended with auto-detection support - * for multiple uncore implementations. - */ - env = RTE_UNCORE_PM_ENV_INTEL_UNCORE; + if (env == RTE_UNCORE_PM_ENV_AUTO_DETECT) { + ret = power_uncore_probe_driver(); + if (ret != 0) + POWER_LOG(ERR, "Probe uncore driver failed, ret = %d", ret); + goto out; + } if (env <= RTE_DIM(uncore_env_str)) { RTE_TAILQ_FOREACH(ops, &uncore_ops_list, next) -- 2.33.0
