From d69dc8476dcb1a517505b8b505494c8c5e3cc881 Mon Sep 17 00:00:00 2001 From: Marko Kovacevic Date: Tue, 12 Dec 2017 14:03:26 +0000 Subject: [PATCH] power: clean ACPI files Rename private header file rte_power_acpi_cpufreq.c to power_acpi_cpufreq.c.This prevents the private functions from leaking into the documentation. Change any private functions from rte_ to just .Reserve the rte_ for public functions. Signed-off-by: Marko Kovacevic Acked-by: David Hunt --- lib/librte_power/Makefile | 2 +- ...er_acpi_cpufreq.c => power_acpi_cpufreq.c} | 32 +++++++++---------- ...er_acpi_cpufreq.h => power_acpi_cpufreq.h} | 28 ++++++++-------- lib/librte_power/rte_power.c | 28 ++++++++-------- 4 files changed, 45 insertions(+), 45 deletions(-) rename lib/librte_power/{rte_power_acpi_cpufreq.c => power_acpi_cpufreq.c} (94%) rename lib/librte_power/{rte_power_acpi_cpufreq.h => power_acpi_cpufreq.h} (85%) diff --git a/lib/librte_power/Makefile b/lib/librte_power/Makefile index af24daf535..686d540388 100644 --- a/lib/librte_power/Makefile +++ b/lib/librte_power/Makefile @@ -14,7 +14,7 @@ EXPORT_MAP := rte_power_version.map LIBABIVER := 1 # all source are stored in SRCS-y -SRCS-$(CONFIG_RTE_LIBRTE_POWER) := rte_power.c rte_power_acpi_cpufreq.c +SRCS-$(CONFIG_RTE_LIBRTE_POWER) := rte_power.c power_acpi_cpufreq.c SRCS-$(CONFIG_RTE_LIBRTE_POWER) += rte_power_kvm_vm.c guest_channel.c # install this header file diff --git a/lib/librte_power/rte_power_acpi_cpufreq.c b/lib/librte_power/power_acpi_cpufreq.c similarity index 94% rename from lib/librte_power/rte_power_acpi_cpufreq.c rename to lib/librte_power/power_acpi_cpufreq.c index 6c87e8e37d..bce933e920 100644 --- a/lib/librte_power/rte_power_acpi_cpufreq.c +++ b/lib/librte_power/power_acpi_cpufreq.c @@ -15,7 +15,7 @@ #include #include -#include "rte_power_acpi_cpufreq.h" +#include "power_acpi_cpufreq.h" #include "power_common.h" #ifdef RTE_LIBRTE_POWER_DEBUG @@ -282,7 +282,7 @@ out: } int -rte_power_acpi_cpufreq_init(unsigned int lcore_id) +power_acpi_cpufreq_init(unsigned int lcore_id) { struct rte_power_info *pi; @@ -323,7 +323,7 @@ rte_power_acpi_cpufreq_init(unsigned int lcore_id) } /* Set freq to max by default */ - if (rte_power_acpi_cpufreq_freq_max(lcore_id) < 0) { + if (power_acpi_cpufreq_freq_max(lcore_id) < 0) { RTE_LOG(ERR, POWER, "Cannot set frequency of lcore %u " "to max\n", lcore_id); goto fail; @@ -390,7 +390,7 @@ out: } int -rte_power_acpi_cpufreq_exit(unsigned int lcore_id) +power_acpi_cpufreq_exit(unsigned int lcore_id) { struct rte_power_info *pi; @@ -432,7 +432,7 @@ fail: } uint32_t -rte_power_acpi_cpufreq_freqs(unsigned lcore_id, uint32_t *freqs, uint32_t num) +power_acpi_cpufreq_freqs(unsigned int lcore_id, uint32_t *freqs, uint32_t num) { struct rte_power_info *pi; @@ -452,7 +452,7 @@ rte_power_acpi_cpufreq_freqs(unsigned lcore_id, uint32_t *freqs, uint32_t num) } uint32_t -rte_power_acpi_cpufreq_get_freq(unsigned int lcore_id) +power_acpi_cpufreq_get_freq(unsigned int lcore_id) { if (lcore_id >= RTE_MAX_LCORE) { RTE_LOG(ERR, POWER, "Invalid lcore ID\n"); @@ -463,7 +463,7 @@ rte_power_acpi_cpufreq_get_freq(unsigned int lcore_id) } int -rte_power_acpi_cpufreq_set_freq(unsigned lcore_id, uint32_t index) +power_acpi_cpufreq_set_freq(unsigned int lcore_id, uint32_t index) { if (lcore_id >= RTE_MAX_LCORE) { RTE_LOG(ERR, POWER, "Invalid lcore ID\n"); @@ -474,7 +474,7 @@ rte_power_acpi_cpufreq_set_freq(unsigned lcore_id, uint32_t index) } int -rte_power_acpi_cpufreq_freq_down(unsigned int lcore_id) +power_acpi_cpufreq_freq_down(unsigned int lcore_id) { struct rte_power_info *pi; @@ -492,7 +492,7 @@ rte_power_acpi_cpufreq_freq_down(unsigned int lcore_id) } int -rte_power_acpi_cpufreq_freq_up(unsigned int lcore_id) +power_acpi_cpufreq_freq_up(unsigned int lcore_id) { struct rte_power_info *pi; @@ -510,7 +510,7 @@ rte_power_acpi_cpufreq_freq_up(unsigned int lcore_id) } int -rte_power_acpi_cpufreq_freq_max(unsigned int lcore_id) +power_acpi_cpufreq_freq_max(unsigned int lcore_id) { if (lcore_id >= RTE_MAX_LCORE) { RTE_LOG(ERR, POWER, "Invalid lcore ID\n"); @@ -532,7 +532,7 @@ rte_power_acpi_cpufreq_freq_max(unsigned int lcore_id) } int -rte_power_acpi_cpufreq_freq_min(unsigned int lcore_id) +power_acpi_cpufreq_freq_min(unsigned int lcore_id) { struct rte_power_info *pi; @@ -549,7 +549,7 @@ rte_power_acpi_cpufreq_freq_min(unsigned int lcore_id) int -rte_power_acpi_turbo_status(unsigned int lcore_id) +power_acpi_turbo_status(unsigned int lcore_id) { struct rte_power_info *pi; @@ -565,7 +565,7 @@ rte_power_acpi_turbo_status(unsigned int lcore_id) int -rte_power_acpi_enable_turbo(unsigned int lcore_id) +power_acpi_enable_turbo(unsigned int lcore_id) { struct rte_power_info *pi; @@ -587,7 +587,7 @@ rte_power_acpi_enable_turbo(unsigned int lcore_id) } /* Max may have changed, so call to max function */ - if (rte_power_acpi_cpufreq_freq_max(lcore_id) < 0) { + if (power_acpi_cpufreq_freq_max(lcore_id) < 0) { RTE_LOG(ERR, POWER, "Failed to set frequency of lcore %u to max\n", lcore_id); @@ -598,7 +598,7 @@ rte_power_acpi_enable_turbo(unsigned int lcore_id) } int -rte_power_acpi_disable_turbo(unsigned int lcore_id) +power_acpi_disable_turbo(unsigned int lcore_id) { struct rte_power_info *pi; @@ -613,7 +613,7 @@ rte_power_acpi_disable_turbo(unsigned int lcore_id) if ((pi->turbo_available) && (pi->curr_idx <= 1)) { /* Try to set freq to max by default coming out of turbo */ - if (rte_power_acpi_cpufreq_freq_max(lcore_id) < 0) { + if (power_acpi_cpufreq_freq_max(lcore_id) < 0) { RTE_LOG(ERR, POWER, "Failed to set frequency of lcore %u to max\n", lcore_id); diff --git a/lib/librte_power/rte_power_acpi_cpufreq.h b/lib/librte_power/power_acpi_cpufreq.h similarity index 85% rename from lib/librte_power/rte_power_acpi_cpufreq.h rename to lib/librte_power/power_acpi_cpufreq.h index f9c93ea196..edeeb27a99 100644 --- a/lib/librte_power/rte_power_acpi_cpufreq.h +++ b/lib/librte_power/power_acpi_cpufreq.h @@ -2,8 +2,8 @@ * Copyright(c) 2010-2014 Intel Corporation */ -#ifndef _RTE_POWER_ACPI_CPUFREQ_H -#define _RTE_POWER_ACPI_CPUFREQ_H +#ifndef _POWER_ACPI_CPUFREQ_H +#define _POWER_ACPI_CPUFREQ_H /** * @file @@ -31,7 +31,7 @@ extern "C" { * - 0 on success. * - Negative on error. */ -int rte_power_acpi_cpufreq_init(unsigned lcore_id); +int power_acpi_cpufreq_init(unsigned int lcore_id); /** * Exit power management on a specific lcore. It will set the governor to which @@ -44,7 +44,7 @@ int rte_power_acpi_cpufreq_init(unsigned lcore_id); * - 0 on success. * - Negative on error. */ -int rte_power_acpi_cpufreq_exit(unsigned lcore_id); +int power_acpi_cpufreq_exit(unsigned int lcore_id); /** * Get the available frequencies of a specific lcore. The return value will be @@ -63,7 +63,7 @@ int rte_power_acpi_cpufreq_exit(unsigned lcore_id); * @return * The number of available frequencies. */ -uint32_t rte_power_acpi_cpufreq_freqs(unsigned lcore_id, uint32_t *freqs, +uint32_t power_acpi_cpufreq_freqs(unsigned int lcore_id, uint32_t *freqs, uint32_t num); /** @@ -77,7 +77,7 @@ uint32_t rte_power_acpi_cpufreq_freqs(unsigned lcore_id, uint32_t *freqs, * @return * The current index of available frequencies. */ -uint32_t rte_power_acpi_cpufreq_get_freq(unsigned lcore_id); +uint32_t power_acpi_cpufreq_get_freq(unsigned int lcore_id); /** * Set the new frequency for a specific lcore by indicating the index of @@ -94,7 +94,7 @@ uint32_t rte_power_acpi_cpufreq_get_freq(unsigned lcore_id); * - 0 on success without frequency changed. * - Negative on error. */ -int rte_power_acpi_cpufreq_set_freq(unsigned lcore_id, uint32_t index); +int power_acpi_cpufreq_set_freq(unsigned int lcore_id, uint32_t index); /** * Scale up the frequency of a specific lcore according to the available @@ -109,7 +109,7 @@ int rte_power_acpi_cpufreq_set_freq(unsigned lcore_id, uint32_t index); * - 0 on success without frequency changed. * - Negative on error. */ -int rte_power_acpi_cpufreq_freq_up(unsigned lcore_id); +int power_acpi_cpufreq_freq_up(unsigned int lcore_id); /** * Scale down the frequency of a specific lcore according to the available @@ -124,7 +124,7 @@ int rte_power_acpi_cpufreq_freq_up(unsigned lcore_id); * - 0 on success without frequency changed. * - Negative on error. */ -int rte_power_acpi_cpufreq_freq_down(unsigned lcore_id); +int power_acpi_cpufreq_freq_down(unsigned int lcore_id); /** * Scale up the frequency of a specific lcore to the highest according to the @@ -139,7 +139,7 @@ int rte_power_acpi_cpufreq_freq_down(unsigned lcore_id); * - 0 on success without frequency changed. * - Negative on error. */ -int rte_power_acpi_cpufreq_freq_max(unsigned lcore_id); +int power_acpi_cpufreq_freq_max(unsigned int lcore_id); /** * Scale down the frequency of a specific lcore to the lowest according to the @@ -154,7 +154,7 @@ int rte_power_acpi_cpufreq_freq_max(unsigned lcore_id); * - 0 on success without frequency changed. * - Negative on error. */ -int rte_power_acpi_cpufreq_freq_min(unsigned lcore_id); +int power_acpi_cpufreq_freq_min(unsigned int lcore_id); /** * Get the turbo status of a specific lcore. @@ -168,7 +168,7 @@ int rte_power_acpi_cpufreq_freq_min(unsigned lcore_id); * - 0 Turbo Boost is disabled on this lcore. * - Negative on error. */ -int rte_power_acpi_turbo_status(unsigned int lcore_id); +int power_acpi_turbo_status(unsigned int lcore_id); /** * Enable Turbo Boost on a specific lcore. @@ -181,7 +181,7 @@ int rte_power_acpi_turbo_status(unsigned int lcore_id); * - 0 Turbo Boost is enabled successfully on this lcore. * - Negative on error. */ -int rte_power_acpi_enable_turbo(unsigned int lcore_id); +int power_acpi_enable_turbo(unsigned int lcore_id); /** * Disable Turbo Boost on a specific lcore. @@ -194,7 +194,7 @@ int rte_power_acpi_enable_turbo(unsigned int lcore_id); * - 0 Turbo Boost disabled successfully on this lcore. * - Negative on error. */ -int rte_power_acpi_disable_turbo(unsigned int lcore_id); +int power_acpi_disable_turbo(unsigned int lcore_id); #ifdef __cplusplus } diff --git a/lib/librte_power/rte_power.c b/lib/librte_power/rte_power.c index 38903a7bbe..f3ded21439 100644 --- a/lib/librte_power/rte_power.c +++ b/lib/librte_power/rte_power.c @@ -5,7 +5,7 @@ #include #include "rte_power.h" -#include "rte_power_acpi_cpufreq.h" +#include "power_acpi_cpufreq.h" #include "rte_power_kvm_vm.h" #include "power_common.h" @@ -32,16 +32,16 @@ rte_power_set_env(enum power_management_env env) return 0; } if (env == PM_ENV_ACPI_CPUFREQ) { - rte_power_freqs = rte_power_acpi_cpufreq_freqs; - rte_power_get_freq = rte_power_acpi_cpufreq_get_freq; - rte_power_set_freq = rte_power_acpi_cpufreq_set_freq; - rte_power_freq_up = rte_power_acpi_cpufreq_freq_up; - rte_power_freq_down = rte_power_acpi_cpufreq_freq_down; - rte_power_freq_min = rte_power_acpi_cpufreq_freq_min; - rte_power_freq_max = rte_power_acpi_cpufreq_freq_max; - rte_power_turbo_status = rte_power_acpi_turbo_status; - rte_power_freq_enable_turbo = rte_power_acpi_enable_turbo; - rte_power_freq_disable_turbo = rte_power_acpi_disable_turbo; + rte_power_freqs = power_acpi_cpufreq_freqs; + rte_power_get_freq = power_acpi_cpufreq_get_freq; + rte_power_set_freq = power_acpi_cpufreq_set_freq; + rte_power_freq_up = power_acpi_cpufreq_freq_up; + rte_power_freq_down = power_acpi_cpufreq_freq_down; + rte_power_freq_min = power_acpi_cpufreq_freq_min; + rte_power_freq_max = power_acpi_cpufreq_freq_max; + rte_power_turbo_status = power_acpi_turbo_status; + rte_power_freq_enable_turbo = power_acpi_enable_turbo; + rte_power_freq_disable_turbo = power_acpi_disable_turbo; } else if (env == PM_ENV_KVM_VM) { rte_power_freqs = rte_power_kvm_vm_freqs; rte_power_get_freq = rte_power_kvm_vm_get_freq; @@ -82,7 +82,7 @@ rte_power_init(unsigned int lcore_id) int ret = -1; if (global_default_env == PM_ENV_ACPI_CPUFREQ) { - return rte_power_acpi_cpufreq_init(lcore_id); + return power_acpi_cpufreq_init(lcore_id); } if (global_default_env == PM_ENV_KVM_VM) { return rte_power_kvm_vm_init(lcore_id); @@ -90,7 +90,7 @@ rte_power_init(unsigned int lcore_id) /* Auto detect Environment */ RTE_LOG(INFO, POWER, "Attempting to initialise ACPI cpufreq power " "management...\n"); - ret = rte_power_acpi_cpufreq_init(lcore_id); + ret = power_acpi_cpufreq_init(lcore_id); if (ret == 0) { rte_power_set_env(PM_ENV_ACPI_CPUFREQ); goto out; @@ -112,7 +112,7 @@ int rte_power_exit(unsigned int lcore_id) { if (global_default_env == PM_ENV_ACPI_CPUFREQ) - return rte_power_acpi_cpufreq_exit(lcore_id); + return power_acpi_cpufreq_exit(lcore_id); if (global_default_env == PM_ENV_KVM_VM) return rte_power_kvm_vm_exit(lcore_id); -- 2.20.1