net/axgbe: toggle PLL settings during rate change

[dpdk.git] / lib / power / rte_power_pmd_mgmt.c

diff --git a/lib/power/rte_power_pmd_mgmt.c b/lib/power/rte_power_pmd_mgmt.c
index 2586204..39a2b4c 100644 (file)
--- a/lib/power/rte_power_pmd_mgmt.c
+++ b/lib/power/rte_power_pmd_mgmt.c
@@ -382,8 +382,13 @@ queue_stopped(const uint16_t port_id, const uint16_t queue_id)
 {
        struct rte_eth_rxq_info qinfo;
 
-       if (rte_eth_rx_queue_info_get(port_id, queue_id, &qinfo) < 0)
-               return -1;
+       int ret = rte_eth_rx_queue_info_get(port_id, queue_id, &qinfo);
+       if (ret < 0) {
+               if (ret == -ENOTSUP)
+                       return 1;
+               else
+                       return -1;
+       }
 
        return qinfo.queue_state == RTE_ETH_QUEUE_STATE_STOPPED;
 }
@@ -534,11 +539,15 @@ rte_power_ethdev_pmgmt_queue_enable(unsigned int lcore_id, uint16_t port_id,
                clb = get_monitor_callback();
                break;
        case RTE_POWER_MGMT_TYPE_SCALE:
+               clb = clb_scale_freq;
+
+               /* we only have to check this when enabling first queue */
+               if (lcore_cfg->pwr_mgmt_state != PMD_MGMT_DISABLED)
+                       break;
                /* check if we can add a new queue */
                ret = check_scale(lcore_id);
                if (ret < 0)
                        goto end;
-               clb = clb_scale_freq;
                break;
        case RTE_POWER_MGMT_TYPE_PAUSE:
                /* figure out various time-to-tsc conversions */
@@ -633,9 +642,12 @@ rte_power_ethdev_pmgmt_queue_disable(unsigned int lcore_id,
                rte_eth_remove_rx_callback(port_id, queue_id, queue_cfg->cb);
                break;
        case RTE_POWER_MGMT_TYPE_SCALE:
-               rte_power_freq_max(lcore_id);
                rte_eth_remove_rx_callback(port_id, queue_id, queue_cfg->cb);
-               rte_power_exit(lcore_id);
+               /* disable power library on this lcore if this was last queue */
+               if (lcore_cfg->pwr_mgmt_state == PMD_MGMT_DISABLED) {
+                       rte_power_freq_max(lcore_id);
+                       rte_power_exit(lcore_id);
+               }
                break;
        }
        /*