X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;ds=sidebyside;f=lib%2Flibrte_power%2Frte_power.c;h=a05fbef947fef3f8207099774bc3cad2c8021280;hb=b458c2927ab416fd7becfbc740ccfa53f0dfbdd1;hp=208b791950ad80d60ac881fff275e32110081734;hpb=185109906b809007a15db1d018100dc74ec37447;p=dpdk.git

diff --git a/lib/librte_power/rte_power.c b/lib/librte_power/rte_power.c
index 208b791950..a05fbef947 100644
--- a/lib/librte_power/rte_power.c
+++ b/lib/librte_power/rte_power.c
@@ -7,6 +7,7 @@
 #include "rte_power.h"
 #include "power_acpi_cpufreq.h"
 #include "power_kvm_vm.h"
+#include "power_pstate_cpufreq.h"
 #include "power_common.h"
 
 enum power_management_env global_default_env = PM_ENV_NOT_SET;
@@ -56,6 +57,19 @@ rte_power_set_env(enum power_management_env env)
 		rte_power_freq_enable_turbo = power_kvm_vm_enable_turbo;
 		rte_power_freq_disable_turbo = power_kvm_vm_disable_turbo;
 		rte_power_get_capabilities = power_kvm_vm_get_capabilities;
+	} else if (env == PM_ENV_PSTATE_CPUFREQ) {
+		rte_power_freqs = power_pstate_cpufreq_freqs;
+		rte_power_get_freq = power_pstate_cpufreq_get_freq;
+		rte_power_set_freq = power_pstate_cpufreq_set_freq;
+		rte_power_freq_up = power_pstate_cpufreq_freq_up;
+		rte_power_freq_down = power_pstate_cpufreq_freq_down;
+		rte_power_freq_min = power_pstate_cpufreq_freq_min;
+		rte_power_freq_max = power_pstate_cpufreq_freq_max;
+		rte_power_turbo_status = power_pstate_turbo_status;
+		rte_power_freq_enable_turbo = power_pstate_enable_turbo;
+		rte_power_freq_disable_turbo = power_pstate_disable_turbo;
+		rte_power_get_capabilities = power_pstate_get_capabilities;
+
 	} else {
 		RTE_LOG(ERR, POWER, "Invalid Power Management Environment(%d) set\n",
 				env);
@@ -64,7 +78,6 @@ rte_power_set_env(enum power_management_env env)
 	}
 	global_default_env = env;
 	return 0;
-
 }
 
 void
@@ -84,21 +97,32 @@ rte_power_init(unsigned int lcore_id)
 {
 	int ret = -1;
 
-	if (global_default_env == PM_ENV_ACPI_CPUFREQ) {
+	switch (global_default_env) {
+	case PM_ENV_ACPI_CPUFREQ:
 		return power_acpi_cpufreq_init(lcore_id);
-	}
-	if (global_default_env == PM_ENV_KVM_VM) {
+	case PM_ENV_KVM_VM:
 		return power_kvm_vm_init(lcore_id);
+	case PM_ENV_PSTATE_CPUFREQ:
+		return power_pstate_cpufreq_init(lcore_id);
+	default:
+		RTE_LOG(INFO, POWER, "Env isn't set yet!\n");
 	}
+
 	/* Auto detect Environment */
-	RTE_LOG(INFO, POWER, "Attempting to initialise ACPI cpufreq power "
-			"management...\n");
+	RTE_LOG(INFO, POWER, "Attempting to initialise ACPI cpufreq power management...\n");
 	ret = power_acpi_cpufreq_init(lcore_id);
 	if (ret == 0) {
 		rte_power_set_env(PM_ENV_ACPI_CPUFREQ);
 		goto out;
 	}
 
+	RTE_LOG(INFO, POWER, "Attempting to initialise PSTAT power management...\n");
+	ret = power_pstate_cpufreq_init(lcore_id);
+	if (ret == 0) {
+		rte_power_set_env(PM_ENV_PSTATE_CPUFREQ);
+		goto out;
+	}
+
 	RTE_LOG(INFO, POWER, "Attempting to initialise VM power management...\n");
 	ret = power_kvm_vm_init(lcore_id);
 	if (ret == 0) {
@@ -114,13 +138,17 @@ out:
 int
 rte_power_exit(unsigned int lcore_id)
 {
-	if (global_default_env == PM_ENV_ACPI_CPUFREQ)
+	switch (global_default_env) {
+	case PM_ENV_ACPI_CPUFREQ:
 		return power_acpi_cpufreq_exit(lcore_id);
-	if (global_default_env == PM_ENV_KVM_VM)
+	case PM_ENV_KVM_VM:
 		return power_kvm_vm_exit(lcore_id);
+	case PM_ENV_PSTATE_CPUFREQ:
+		return power_pstate_cpufreq_exit(lcore_id);
+	default:
+		RTE_LOG(ERR, POWER, "Environment has not been set, unable to exit gracefully\n");
 
-	RTE_LOG(ERR, POWER, "Environment has not been set, unable to exit "
-				"gracefully\n");
+	}
 	return -1;
 
 }