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]> --- lib/power/rte_power_uncore.c | 44 +++++++++++++++++++++++++++++++----- 1 file changed, 38 insertions(+), 6 deletions(-) diff --git a/lib/power/rte_power_uncore.c b/lib/power/rte_power_uncore.c index e26919acce..a5d080e09e 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> @@ -47,6 +48,37 @@ rte_power_register_uncore_ops(struct rte_power_uncore_ops *driver_ops) return 0; } +static uint32_t rte_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 rte_power_probe_uncore_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) { + global_uncore_env = + rte_power_uncore_driver_name2env(ops->name); + 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) @@ -61,12 +93,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 = rte_power_probe_uncore_driver(); + if (ret) + 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
