diff --git a/lib/librte_power/guest_channel.c b/lib/librte_power/guest_channel.c index 0ee45bafd8..c17ea46b49 100644 --- a/lib/librte_power/guest_channel.c +++ b/lib/librte_power/guest_channel.c @@ -22,7 +22,7 @@ static int global_fds[RTE_MAX_LCORE]; int -guest_channel_host_connect(const char *path, unsigned lcore_id) +guest_channel_host_connect(const char *path, unsigned int lcore_id) { int flags, ret; struct channel_packet pkt; @@ -89,7 +89,7 @@ guest_channel_host_connect(const char *path, unsigned lcore_id) } int -guest_channel_send_msg(struct channel_packet *pkt, unsigned lcore_id) +guest_channel_send_msg(struct channel_packet *pkt, unsigned int lcore_id) { int ret, buffer_len = sizeof(*pkt); void *buffer = pkt; @@ -127,7 +127,7 @@ int rte_power_guest_channel_send_msg(struct channel_packet *pkt, void -guest_channel_host_disconnect(unsigned lcore_id) +guest_channel_host_disconnect(unsigned int lcore_id) { if (lcore_id >= RTE_MAX_LCORE) { RTE_LOG(ERR, GUEST_CHANNEL, "Channel(%u) is out of range 0...%d\n", diff --git a/lib/librte_power/guest_channel.h b/lib/librte_power/guest_channel.h index 8ea19b5921..373d398984 100644 --- a/lib/librte_power/guest_channel.h +++ b/lib/librte_power/guest_channel.h @@ -24,7 +24,7 @@ extern "C" { * - 0 on success. * - Negative on error. */ -int guest_channel_host_connect(const char *path, unsigned lcore_id); +int guest_channel_host_connect(const char *path, unsigned int lcore_id); /** * Disconnect from an already connected Virtio-Serial Endpoint. @@ -34,7 +34,7 @@ int guest_channel_host_connect(const char *path, unsigned lcore_id); * lcore_id. * */ -void guest_channel_host_disconnect(unsigned lcore_id); +void guest_channel_host_disconnect(unsigned int lcore_id); /** * Send a message contained in pkt over the Virtio-Serial to the host endpoint. @@ -50,7 +50,7 @@ void guest_channel_host_disconnect(unsigned lcore_id); * - Negative on channel not connected. * - errno on write to channel error. */ -int guest_channel_send_msg(struct channel_packet *pkt, unsigned lcore_id); +int guest_channel_send_msg(struct channel_packet *pkt, unsigned int lcore_id); /** * Send a message contained in pkt over the Virtio-Serial to the host endpoint. diff --git a/lib/librte_power/rte_power.c b/lib/librte_power/rte_power.c index d8a12c2c0a..1e6c842f70 100644 --- a/lib/librte_power/rte_power.c +++ b/lib/librte_power/rte_power.c @@ -77,7 +77,7 @@ rte_power_get_env(void) { } int -rte_power_init(unsigned lcore_id) +rte_power_init(unsigned int lcore_id) { int ret = -1; @@ -109,7 +109,7 @@ rte_power_init(unsigned lcore_id) } int -rte_power_exit(unsigned lcore_id) +rte_power_exit(unsigned int lcore_id) { if (global_default_env == PM_ENV_ACPI_CPUFREQ) return rte_power_acpi_cpufreq_exit(lcore_id); diff --git a/lib/librte_power/rte_power.h b/lib/librte_power/rte_power.h index 0b329e1ce5..b4b7357b8f 100644 --- a/lib/librte_power/rte_power.h +++ b/lib/librte_power/rte_power.h @@ -62,7 +62,7 @@ enum power_management_env rte_power_get_env(void); * - 0 on success. * - Negative on error. */ -int rte_power_init(unsigned lcore_id); +int rte_power_init(unsigned int lcore_id); /** * Exit power management on a specific lcore. This will call the environment @@ -75,7 +75,7 @@ int rte_power_init(unsigned lcore_id); * - 0 on success. * - Negative on error. */ -int rte_power_exit(unsigned lcore_id); +int rte_power_exit(unsigned int lcore_id); /** * Get the available frequencies of a specific lcore. @@ -92,7 +92,7 @@ int rte_power_exit(unsigned lcore_id); * @return * The number of available frequencies. */ -typedef uint32_t (*rte_power_freqs_t)(unsigned lcore_id, uint32_t *freqs, +typedef uint32_t (*rte_power_freqs_t)(unsigned int lcore_id, uint32_t *freqs, uint32_t num); extern rte_power_freqs_t rte_power_freqs; @@ -108,7 +108,7 @@ extern rte_power_freqs_t rte_power_freqs; * @return * The current index of available frequencies. */ -typedef uint32_t (*rte_power_get_freq_t)(unsigned lcore_id); +typedef uint32_t (*rte_power_get_freq_t)(unsigned int lcore_id); extern rte_power_get_freq_t rte_power_get_freq; @@ -128,7 +128,7 @@ extern rte_power_get_freq_t rte_power_get_freq; * - 0 on success without frequency changed. * - Negative on error. */ -typedef int (*rte_power_set_freq_t)(unsigned lcore_id, uint32_t index); +typedef int (*rte_power_set_freq_t)(unsigned int lcore_id, uint32_t index); extern rte_power_set_freq_t rte_power_set_freq; @@ -144,7 +144,7 @@ extern rte_power_set_freq_t rte_power_set_freq; * - 0 on success without frequency changed. * - Negative on error. */ -typedef int (*rte_power_freq_change_t)(unsigned lcore_id); +typedef int (*rte_power_freq_change_t)(unsigned int lcore_id); /** * Scale up the frequency of a specific lcore according to the available diff --git a/lib/librte_power/rte_power_acpi_cpufreq.c b/lib/librte_power/rte_power_acpi_cpufreq.c index 39e42be818..d31ca3c8d0 100644 --- a/lib/librte_power/rte_power_acpi_cpufreq.c +++ b/lib/librte_power/rte_power_acpi_cpufreq.c @@ -77,7 +77,7 @@ enum power_state { * Power info per lcore. */ struct rte_power_info { - unsigned lcore_id; /**< Logical core id */ + unsigned int lcore_id; /**< Logical core id */ uint32_t freqs[RTE_MAX_LCORE_FREQS]; /**< Frequency array */ uint32_t nb_freqs; /**< number of available freqs */ FILE *f; /**< FD of scaling_setspeed */ @@ -282,7 +282,7 @@ power_init_for_setting_freq(struct rte_power_info *pi) } int -rte_power_acpi_cpufreq_init(unsigned lcore_id) +rte_power_acpi_cpufreq_init(unsigned int lcore_id) { struct rte_power_info *pi; @@ -390,7 +390,7 @@ power_set_governor_original(struct rte_power_info *pi) } int -rte_power_acpi_cpufreq_exit(unsigned lcore_id) +rte_power_acpi_cpufreq_exit(unsigned int lcore_id) { 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 lcore_id) +rte_power_acpi_cpufreq_get_freq(unsigned int lcore_id) { 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 lcore_id) +rte_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 lcore_id) } int -rte_power_acpi_cpufreq_freq_up(unsigned lcore_id) +rte_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 lcore_id) } int -rte_power_acpi_cpufreq_freq_max(unsigned lcore_id) +rte_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 lcore_id) } int -rte_power_acpi_cpufreq_freq_min(unsigned lcore_id) +rte_power_acpi_cpufreq_freq_min(unsigned int lcore_id) { struct rte_power_info *pi; diff --git a/lib/librte_power/rte_power_kvm_vm.c b/lib/librte_power/rte_power_kvm_vm.c index 968a2e9c43..fa85226eac 100644 --- a/lib/librte_power/rte_power_kvm_vm.c +++ b/lib/librte_power/rte_power_kvm_vm.c @@ -17,7 +17,7 @@ static struct channel_packet pkt[CHANNEL_CMDS_MAX_VM_CHANNELS]; int -rte_power_kvm_vm_init(unsigned lcore_id) +rte_power_kvm_vm_init(unsigned int lcore_id) { if (lcore_id >= CHANNEL_CMDS_MAX_VM_CHANNELS) { RTE_LOG(ERR, POWER, "Core(%u) is out of range 0...%d\n", @@ -30,14 +30,14 @@ rte_power_kvm_vm_init(unsigned lcore_id) } int -rte_power_kvm_vm_exit(unsigned lcore_id) +rte_power_kvm_vm_exit(unsigned int lcore_id) { guest_channel_host_disconnect(lcore_id); return 0; } uint32_t -rte_power_kvm_vm_freqs(__attribute__((unused)) unsigned lcore_id, +rte_power_kvm_vm_freqs(__attribute__((unused)) unsigned int lcore_id, __attribute__((unused)) uint32_t *freqs, __attribute__((unused)) uint32_t num) { @@ -47,7 +47,7 @@ rte_power_kvm_vm_freqs(__attribute__((unused)) unsigned lcore_id, } uint32_t -rte_power_kvm_vm_get_freq(__attribute__((unused)) unsigned lcore_id) +rte_power_kvm_vm_get_freq(__attribute__((unused)) unsigned int lcore_id) { RTE_LOG(ERR, POWER, "rte_power_get_freq is not implemented " "for Virtual Machine Power Management\n"); @@ -55,7 +55,7 @@ rte_power_kvm_vm_get_freq(__attribute__((unused)) unsigned lcore_id) } int -rte_power_kvm_vm_set_freq(__attribute__((unused)) unsigned lcore_id, +rte_power_kvm_vm_set_freq(__attribute__((unused)) unsigned int lcore_id, __attribute__((unused)) uint32_t index) { RTE_LOG(ERR, POWER, "rte_power_set_freq is not implemented " @@ -64,7 +64,7 @@ rte_power_kvm_vm_set_freq(__attribute__((unused)) unsigned lcore_id, } static inline int -send_msg(unsigned lcore_id, uint32_t scale_direction) +send_msg(unsigned int lcore_id, uint32_t scale_direction) { int ret; @@ -83,25 +83,25 @@ send_msg(unsigned lcore_id, uint32_t scale_direction) } int -rte_power_kvm_vm_freq_up(unsigned lcore_id) +rte_power_kvm_vm_freq_up(unsigned int lcore_id) { return send_msg(lcore_id, CPU_POWER_SCALE_UP); } int -rte_power_kvm_vm_freq_down(unsigned lcore_id) +rte_power_kvm_vm_freq_down(unsigned int lcore_id) { return send_msg(lcore_id, CPU_POWER_SCALE_DOWN); } int -rte_power_kvm_vm_freq_max(unsigned lcore_id) +rte_power_kvm_vm_freq_max(unsigned int lcore_id) { return send_msg(lcore_id, CPU_POWER_SCALE_MAX); } int -rte_power_kvm_vm_freq_min(unsigned lcore_id) +rte_power_kvm_vm_freq_min(unsigned int lcore_id) { return send_msg(lcore_id, CPU_POWER_SCALE_MIN); } diff --git a/lib/librte_power/rte_power_kvm_vm.h b/lib/librte_power/rte_power_kvm_vm.h index 62b3bdff3c..3d50c97f08 100644 --- a/lib/librte_power/rte_power_kvm_vm.h +++ b/lib/librte_power/rte_power_kvm_vm.h @@ -29,7 +29,7 @@ extern "C" { * - 0 on success. * - Negative on error. */ -int rte_power_kvm_vm_init(unsigned lcore_id); +int rte_power_kvm_vm_init(unsigned int lcore_id); /** * Exit power management on a specific lcore. @@ -41,7 +41,7 @@ int rte_power_kvm_vm_init(unsigned lcore_id); * - 0 on success. * - Negative on error. */ -int rte_power_kvm_vm_exit(unsigned lcore_id); +int rte_power_kvm_vm_exit(unsigned int lcore_id); /** * Get the available frequencies of a specific lcore. @@ -57,7 +57,7 @@ int rte_power_kvm_vm_exit(unsigned lcore_id); * @return * -ENOTSUP */ -uint32_t rte_power_kvm_vm_freqs(unsigned lcore_id, uint32_t *freqs, +uint32_t rte_power_kvm_vm_freqs(unsigned int lcore_id, uint32_t *freqs, uint32_t num); /** @@ -70,7 +70,7 @@ uint32_t rte_power_kvm_vm_freqs(unsigned lcore_id, uint32_t *freqs, * @return * -ENOTSUP */ -uint32_t rte_power_kvm_vm_get_freq(unsigned lcore_id); +uint32_t rte_power_kvm_vm_get_freq(unsigned int lcore_id); /** * Set the new frequency for a specific lcore by indicating the index of @@ -85,7 +85,7 @@ uint32_t rte_power_kvm_vm_get_freq(unsigned lcore_id); * @return * -ENOTSUP */ -int rte_power_kvm_vm_set_freq(unsigned lcore_id, uint32_t index); +int rte_power_kvm_vm_set_freq(unsigned int lcore_id, uint32_t index); /** * Scale up the frequency of a specific lcore. This request is forwarded to the @@ -99,7 +99,7 @@ int rte_power_kvm_vm_set_freq(unsigned lcore_id, uint32_t index); * - 1 on success. * - Negative on error. */ -int rte_power_kvm_vm_freq_up(unsigned lcore_id); +int rte_power_kvm_vm_freq_up(unsigned int lcore_id); /** * Scale down the frequency of a specific lcore according to the available @@ -113,7 +113,7 @@ int rte_power_kvm_vm_freq_up(unsigned lcore_id); * - 1 on success. * - Negative on error. */ -int rte_power_kvm_vm_freq_down(unsigned lcore_id); +int rte_power_kvm_vm_freq_down(unsigned int lcore_id); /** * Scale up the frequency of a specific lcore to the highest according to the @@ -127,7 +127,7 @@ int rte_power_kvm_vm_freq_down(unsigned lcore_id); * - 1 on success. * - Negative on error. */ -int rte_power_kvm_vm_freq_max(unsigned lcore_id); +int rte_power_kvm_vm_freq_max(unsigned int lcore_id); /** * Scale down the frequency of a specific lcore to the lowest according to the @@ -141,7 +141,7 @@ int rte_power_kvm_vm_freq_max(unsigned lcore_id); * - 1 on success. * - Negative on error. */ -int rte_power_kvm_vm_freq_min(unsigned lcore_id); +int rte_power_kvm_vm_freq_min(unsigned int lcore_id); /** * It should be protected outside of this function for threadsafe.