The power management API's were last changed in 22.11 release. Therefore remove experimental for 23.11 release.
Signed-off-by: Stephen Hemminger <step...@networkplumber.org> --- lib/power/rte_power.h | 4 --- lib/power/rte_power_guest_channel.h | 4 --- lib/power/rte_power_intel_uncore.h | 9 ------- lib/power/rte_power_pmd_mgmt.h | 40 ----------------------------- lib/power/version.map | 33 ++++++++---------------- 5 files changed, 11 insertions(+), 79 deletions(-) diff --git a/lib/power/rte_power.h b/lib/power/rte_power.h index 5e2b87c775bf..4e7560118f3b 100644 --- a/lib/power/rte_power.h +++ b/lib/power/rte_power.h @@ -24,9 +24,6 @@ enum power_management_env {PM_ENV_NOT_SET, PM_ENV_ACPI_CPUFREQ, PM_ENV_KVM_VM, PM_ENV_PSTATE_CPUFREQ, PM_ENV_CPPC_CPUFREQ}; /** - * @warning - * @b EXPERIMENTAL: this API may change, or be removed, without prior notice - * * Check if a specific power management environment type is supported on a * currently running system. * @@ -38,7 +35,6 @@ enum power_management_env {PM_ENV_NOT_SET, PM_ENV_ACPI_CPUFREQ, PM_ENV_KVM_VM, * - 0 if unsupported * - -1 if error, with rte_errno indicating reason for error. */ -__rte_experimental int rte_power_check_env_supported(enum power_management_env env); /** diff --git a/lib/power/rte_power_guest_channel.h b/lib/power/rte_power_guest_channel.h index b5de1bd24318..55b76dfc4c08 100644 --- a/lib/power/rte_power_guest_channel.h +++ b/lib/power/rte_power_guest_channel.h @@ -135,9 +135,6 @@ int rte_power_guest_channel_send_msg(struct rte_power_channel_packet *pkt, unsigned int lcore_id); /** - * @warning - * @b EXPERIMENTAL: this API may change without prior notice. - * * Receive a message contained in pkt over the Virtio-Serial * from the host endpoint. * @@ -155,7 +152,6 @@ int rte_power_guest_channel_send_msg(struct rte_power_channel_packet *pkt, * - 0 on success. * - Negative on error. */ -__rte_experimental int rte_power_guest_channel_receive_msg(void *pkt, size_t pkt_len, unsigned int lcore_id); diff --git a/lib/power/rte_power_intel_uncore.h b/lib/power/rte_power_intel_uncore.h index 0bd9f193a170..8c4a533d80c1 100644 --- a/lib/power/rte_power_intel_uncore.h +++ b/lib/power/rte_power_intel_uncore.h @@ -34,7 +34,6 @@ extern "C" { * - 0 on success. * - Negative on error. */ -__rte_experimental int rte_power_uncore_init(unsigned int pkg, unsigned int die); @@ -56,7 +55,6 @@ rte_power_uncore_init(unsigned int pkg, unsigned int die); * - 0 on success. * - Negative on error. */ -__rte_experimental int rte_power_uncore_exit(unsigned int pkg, unsigned int die); @@ -77,7 +75,6 @@ rte_power_uncore_exit(unsigned int pkg, unsigned int die); * The current index of available frequencies. * If error, it will return 'RTE_POWER_INVALID_FREQ_INDEX = (~0)'. */ -__rte_experimental uint32_t rte_power_get_uncore_freq(unsigned int pkg, unsigned int die); @@ -102,7 +99,6 @@ rte_power_get_uncore_freq(unsigned int pkg, unsigned int die); * - 0 on success without frequency changed. * - Negative on error. */ -__rte_experimental int rte_power_set_uncore_freq(unsigned int pkg, unsigned int die, uint32_t index); @@ -125,7 +121,6 @@ rte_power_set_uncore_freq(unsigned int pkg, unsigned int die, uint32_t index); * - 0 on success without frequency changed. * - Negative on error. */ -__rte_experimental int rte_power_uncore_freq_max(unsigned int pkg, unsigned int die); @@ -148,7 +143,6 @@ rte_power_uncore_freq_max(unsigned int pkg, unsigned int die); * - 0 on success without frequency changed. * - Negative on error. */ -__rte_experimental int rte_power_uncore_freq_min(unsigned int pkg, unsigned int die); @@ -168,7 +162,6 @@ rte_power_uncore_freq_min(unsigned int pkg, unsigned int die); * - The number of available index's in frequency array. * - Negative on error. */ -__rte_experimental int rte_power_uncore_get_num_freqs(unsigned int pkg, unsigned int die); @@ -182,7 +175,6 @@ rte_power_uncore_get_num_freqs(unsigned int pkg, unsigned int die); * - Zero on error. * - Number of package on system on success. */ -__rte_experimental unsigned int rte_power_uncore_get_num_pkgs(void); @@ -200,7 +192,6 @@ rte_power_uncore_get_num_pkgs(void); * - Zero on error. * - Number of dies for package on sucecss. */ -__rte_experimental unsigned int rte_power_uncore_get_num_dies(unsigned int pkg); diff --git a/lib/power/rte_power_pmd_mgmt.h b/lib/power/rte_power_pmd_mgmt.h index 0f1a2eb22eb4..456145661917 100644 --- a/lib/power/rte_power_pmd_mgmt.h +++ b/lib/power/rte_power_pmd_mgmt.h @@ -33,9 +33,6 @@ enum rte_power_pmd_mgmt_type { }; /** - * @warning - * @b EXPERIMENTAL: this API may change, or be removed, without prior notice. - * * Enable power management on a specified Ethernet device Rx queue and lcore. * * @note This function is not thread-safe. @@ -55,16 +52,12 @@ enum rte_power_pmd_mgmt_type { * 0 on success * <0 on error */ -__rte_experimental int rte_power_ethdev_pmgmt_queue_enable(unsigned int lcore_id, uint16_t port_id, uint16_t queue_id, enum rte_power_pmd_mgmt_type mode); /** - * @warning - * @b EXPERIMENTAL: this API may change, or be removed, without prior notice. - * * Disable power management on a specified Ethernet device Rx queue and lcore. * * @note This function is not thread-safe. @@ -82,42 +75,30 @@ rte_power_ethdev_pmgmt_queue_enable(unsigned int lcore_id, * 0 on success * <0 on error */ -__rte_experimental int rte_power_ethdev_pmgmt_queue_disable(unsigned int lcore_id, uint16_t port_id, uint16_t queue_id); /** - * @warning - * @b EXPERIMENTAL: this API may change, or be removed, without prior notice. - * * Set a emptypoll_max to specified value. Used to specify the number of empty * polls to wait before entering sleep state. * * @param max * The value to set emptypoll_max to. */ -__rte_experimental void rte_power_pmd_mgmt_set_emptypoll_max(unsigned int max); /** - * @warning - * @b EXPERIMENTAL: this API may change, or be removed, without prior notice. - * * Get the current value of emptypoll_max. * * @return * The current emptypoll_max value */ -__rte_experimental unsigned int rte_power_pmd_mgmt_get_emptypoll_max(void); /** - * @warning - * @b EXPERIMENTAL: this API may change, or be removed, without prior notice. - * * Set the pause_duration. Used to adjust the pause mode callback duration. * * @note Duration must be greater than zero. @@ -128,27 +109,19 @@ rte_power_pmd_mgmt_get_emptypoll_max(void); * 0 on success * <0 on error */ -__rte_experimental int rte_power_pmd_mgmt_set_pause_duration(unsigned int duration); /** - * @warning - * @b EXPERIMENTAL: this API may change, or be removed, without prior notice. - * * Get the current value of pause_duration. * * @return * The current pause_duration value. */ -__rte_experimental unsigned int rte_power_pmd_mgmt_get_pause_duration(void); /** - * @warning - * @b EXPERIMENTAL: this API may change, or be removed, without prior notice. - * * Set the min frequency to be used for frequency scaling or zero to use defaults. * * @note Supported by: Pstate mode. @@ -161,14 +134,10 @@ rte_power_pmd_mgmt_get_pause_duration(void); * 0 on success * <0 on error */ -__rte_experimental int rte_power_pmd_mgmt_set_scaling_freq_min(unsigned int lcore, unsigned int min); /** - * @warning - * @b EXPERIMENTAL: this API may change, or be removed, without prior notice. - * * Set the max frequency to be used for frequency scaling or zero to use defaults. * * @note Supported by: Pstate mode. @@ -182,14 +151,10 @@ rte_power_pmd_mgmt_set_scaling_freq_min(unsigned int lcore, unsigned int min); * 0 on success * <0 on error */ -__rte_experimental int rte_power_pmd_mgmt_set_scaling_freq_max(unsigned int lcore, unsigned int max); /** - * @warning - * @b EXPERIMENTAL: this API may change, or be removed, without prior notice. - * * Get the current configured min frequency used for frequency scaling. * * @note Supported by: Pstate mode. @@ -202,14 +167,10 @@ rte_power_pmd_mgmt_set_scaling_freq_max(unsigned int lcore, unsigned int max); * , in KiloHertz, used for frequency scaling. * <0 on error */ -__rte_experimental int rte_power_pmd_mgmt_get_scaling_freq_min(unsigned int lcore); /** - * @warning - * @b EXPERIMENTAL: this API may change, or be removed, without prior notice. - * * Get the current configured max frequency used for frequency scaling. * * @note Supported by: Pstate mode. @@ -222,7 +183,6 @@ rte_power_pmd_mgmt_get_scaling_freq_min(unsigned int lcore); * , in KiloHertz, used for frequency scaling. * <0 on error */ -__rte_experimental int rte_power_pmd_mgmt_get_scaling_freq_max(unsigned int lcore); diff --git a/lib/power/version.map b/lib/power/version.map index b8b54f768e5b..dae4bcfa0956 100644 --- a/lib/power/version.map +++ b/lib/power/version.map @@ -1,6 +1,9 @@ DPDK_24 { global: + rte_power_check_env_supported; + rte_power_ethdev_pmgmt_queue_disable; + rte_power_ethdev_pmgmt_queue_enable; rte_power_exit; rte_power_freq_disable_turbo; rte_power_freq_down; @@ -12,27 +15,10 @@ DPDK_24 { rte_power_get_capabilities; rte_power_get_env; rte_power_get_freq; + rte_power_get_uncore_freq; + rte_power_guest_channel_receive_msg; rte_power_guest_channel_send_msg; rte_power_init; - rte_power_set_env; - rte_power_set_freq; - rte_power_turbo_status; - rte_power_unset_env; - - local: *; -}; - -EXPERIMENTAL { - global: - - rte_power_check_env_supported; - rte_power_guest_channel_receive_msg; - - # added in 21.02 - rte_power_ethdev_pmgmt_queue_disable; - rte_power_ethdev_pmgmt_queue_enable; - - # added in 22.07 rte_power_pmd_mgmt_get_emptypoll_max; rte_power_pmd_mgmt_get_pause_duration; rte_power_pmd_mgmt_get_scaling_freq_max; @@ -41,10 +27,10 @@ EXPERIMENTAL { rte_power_pmd_mgmt_set_pause_duration; rte_power_pmd_mgmt_set_scaling_freq_max; rte_power_pmd_mgmt_set_scaling_freq_min; - - # added in 22.11 - rte_power_get_uncore_freq; + rte_power_set_env; + rte_power_set_freq; rte_power_set_uncore_freq; + rte_power_turbo_status; rte_power_uncore_exit; rte_power_uncore_freq_max; rte_power_uncore_freq_min; @@ -52,4 +38,7 @@ EXPERIMENTAL { rte_power_uncore_get_num_freqs; rte_power_uncore_get_num_pkgs; rte_power_uncore_init; + rte_power_unset_env; + + local: *; }; -- 2.39.2