X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=lib%2Flibrte_power%2Frte_power.c;h=6b7722727550014c738b46a54c3bc8b5f642a4ca;hb=c49197ff29fbd67e19a927683b7100dba602718d;hp=d8a12c2c0a50487475ff890f2af57fa17af2c46a;hpb=369991d997e4abdee355e19ffbb41a4d246cafa2;p=dpdk.git

diff --git a/lib/librte_power/rte_power.c b/lib/librte_power/rte_power.c
index d8a12c2c0a..6b77227275 100644
--- a/lib/librte_power/rte_power.c
+++ b/lib/librte_power/rte_power.c
@@ -2,16 +2,17 @@
  * Copyright(c) 2010-2014 Intel Corporation
  */
 
-#include <rte_atomic.h>
+#include <rte_spinlock.h>
 
 #include "rte_power.h"
-#include "rte_power_acpi_cpufreq.h"
-#include "rte_power_kvm_vm.h"
-#include "rte_power_common.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;
 
-volatile uint32_t global_env_cfg_status = 0;
+static rte_spinlock_t global_env_cfg_lock = RTE_SPINLOCK_INITIALIZER;
 
 /* function pointers */
 rte_power_freqs_t rte_power_freqs  = NULL;
@@ -24,51 +25,98 @@ rte_power_freq_change_t rte_power_freq_min = NULL;
 rte_power_freq_change_t rte_power_turbo_status;
 rte_power_freq_change_t rte_power_freq_enable_turbo;
 rte_power_freq_change_t rte_power_freq_disable_turbo;
+rte_power_get_capabilities_t rte_power_get_capabilities;
+
+static void
+reset_power_function_ptrs(void)
+{
+	rte_power_freqs  = NULL;
+	rte_power_get_freq = NULL;
+	rte_power_set_freq = NULL;
+	rte_power_freq_up = NULL;
+	rte_power_freq_down = NULL;
+	rte_power_freq_max = NULL;
+	rte_power_freq_min = NULL;
+	rte_power_turbo_status = NULL;
+	rte_power_freq_enable_turbo = NULL;
+	rte_power_freq_disable_turbo = NULL;
+	rte_power_get_capabilities = NULL;
+}
 
 int
 rte_power_set_env(enum power_management_env env)
 {
-	if (rte_atomic32_cmpset(&global_env_cfg_status, 0, 1) == 0) {
-		return 0;
+	rte_spinlock_lock(&global_env_cfg_lock);
+
+	if (global_default_env != PM_ENV_NOT_SET) {
+		RTE_LOG(ERR, POWER, "Power Management Environment already set.\n");
+		rte_spinlock_unlock(&global_env_cfg_lock);
+		return -1;
 	}
+
+	int ret = 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;
+		rte_power_get_capabilities = power_acpi_get_capabilities;
 	} 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;
-		rte_power_set_freq = rte_power_kvm_vm_set_freq;
-		rte_power_freq_up = rte_power_kvm_vm_freq_up;
-		rte_power_freq_down = rte_power_kvm_vm_freq_down;
-		rte_power_freq_min = rte_power_kvm_vm_freq_min;
-		rte_power_freq_max = rte_power_kvm_vm_freq_max;
-		rte_power_turbo_status = rte_power_kvm_vm_turbo_status;
-		rte_power_freq_enable_turbo = rte_power_kvm_vm_enable_turbo;
-		rte_power_freq_disable_turbo = rte_power_kvm_vm_disable_turbo;
+		rte_power_freqs = power_kvm_vm_freqs;
+		rte_power_get_freq = power_kvm_vm_get_freq;
+		rte_power_set_freq = power_kvm_vm_set_freq;
+		rte_power_freq_up = power_kvm_vm_freq_up;
+		rte_power_freq_down = power_kvm_vm_freq_down;
+		rte_power_freq_min = power_kvm_vm_freq_min;
+		rte_power_freq_max = power_kvm_vm_freq_max;
+		rte_power_turbo_status = power_kvm_vm_turbo_status;
+		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);
-		rte_power_unset_env();
-		return -1;
+		ret = -1;
 	}
-	global_default_env = env;
-	return 0;
 
+	if (ret == 0)
+		global_default_env = env;
+	else {
+		global_default_env = PM_ENV_NOT_SET;
+		reset_power_function_ptrs();
+	}
+
+	rte_spinlock_unlock(&global_env_cfg_lock);
+	return ret;
 }
 
 void
 rte_power_unset_env(void)
 {
-	if (rte_atomic32_cmpset(&global_env_cfg_status, 1, 0) != 0)
-		global_default_env = PM_ENV_NOT_SET;
+	rte_spinlock_lock(&global_env_cfg_lock);
+	global_default_env = PM_ENV_NOT_SET;
+	reset_power_function_ptrs();
+	rte_spinlock_unlock(&global_env_cfg_lock);
 }
 
 enum power_management_env
@@ -77,27 +125,38 @@ rte_power_get_env(void) {
 }
 
 int
-rte_power_init(unsigned lcore_id)
+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);
-	}
-	if (global_default_env == PM_ENV_KVM_VM) {
-		return rte_power_kvm_vm_init(lcore_id);
+	switch (global_default_env) {
+	case PM_ENV_ACPI_CPUFREQ:
+		return power_acpi_cpufreq_init(lcore_id);
+	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");
-	ret = rte_power_acpi_cpufreq_init(lcore_id);
+	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 = rte_power_kvm_vm_init(lcore_id);
+	ret = power_kvm_vm_init(lcore_id);
 	if (ret == 0) {
 		rte_power_set_env(PM_ENV_KVM_VM);
 		goto out;
@@ -109,15 +168,19 @@ out:
 }
 
 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);
-	if (global_default_env == PM_ENV_KVM_VM)
-		return rte_power_kvm_vm_exit(lcore_id);
+	switch (global_default_env) {
+	case PM_ENV_ACPI_CPUFREQ:
+		return power_acpi_cpufreq_exit(lcore_id);
+	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;
 
 }