#include <errno.h>
#include <inttypes.h>
-#include <rte_memcpy.h>
#include <rte_atomic.h>
+#include <rte_memcpy.h>
+#include <rte_memory.h>
+#include <rte_string_fns.h>
#include "power_pstate_cpufreq.h"
#include "power_common.h"
#define FOPEN_OR_ERR_RET(f, retval) do { \
if ((f) == NULL) { \
- RTE_LOG(ERR, POWER, "File not openned\n"); \
+ RTE_LOG(ERR, POWER, "File not opened\n"); \
return retval; \
} \
} while (0)
"/sys/devices/system/cpu/cpu%u/cpufreq/cpuinfo_max_freq"
#define POWER_SYSFILE_BASE_MIN_FREQ \
"/sys/devices/system/cpu/cpu%u/cpufreq/cpuinfo_min_freq"
+#define POWER_SYSFILE_BASE_FREQ \
+ "/sys/devices/system/cpu/cpu%u/cpufreq/base_frequency"
+#define POWER_PSTATE_DRIVER "intel_pstate"
#define POWER_MSR_PATH "/dev/cpu/%u/msr"
/*
uint32_t curr_idx; /**< Freq index in freqs array */
uint32_t non_turbo_max_ratio; /**< Non Turbo Max ratio */
uint32_t sys_max_freq; /**< system wide max freq */
+ uint32_t core_base_freq; /**< core base freq */
volatile uint32_t state; /**< Power in use state */
uint16_t turbo_available; /**< Turbo Boost available */
uint16_t turbo_enable; /**< Turbo Boost enable/disable */
+ uint16_t priority_core; /**< High Performance core */
} __rte_cache_aligned;
static int
power_init_for_setting_freq(struct pstate_power_info *pi)
{
- FILE *f_min, *f_max;
+ FILE *f_min, *f_max, *f_base;
char fullpath_min[PATH_MAX];
char fullpath_max[PATH_MAX];
+ char fullpath_base[PATH_MAX];
+ char buf_base[BUFSIZ];
+ char *s_base;
+ uint32_t base_ratio = 0;
uint64_t max_non_turbo = 0;
+ int ret_val = 0;
snprintf(fullpath_min, sizeof(fullpath_min), POWER_SYSFILE_MIN_FREQ,
pi->lcore_id);
pi->f_cur_min = f_min;
pi->f_cur_max = f_max;
+ snprintf(fullpath_base, sizeof(fullpath_base), POWER_SYSFILE_BASE_FREQ,
+ pi->lcore_id);
+
+ f_base = fopen(fullpath_base, "r");
+ if (f_base == NULL) {
+ /* No sysfs base_frequency, that's OK, continue without */
+ base_ratio = 0;
+ } else {
+ s_base = fgets(buf_base, sizeof(buf_base), f_base);
+ FOPS_OR_NULL_GOTO(s_base, out);
+
+ buf_base[BUFSIZ-1] = '\0';
+ if (strlen(buf_base))
+ /* Strip off terminating '\n' */
+ strtok(buf_base, "\n");
+
+ base_ratio = strtoul(buf_base, NULL, POWER_CONVERT_TO_DECIMAL)
+ / BUS_FREQ;
+ }
+
/* Add MSR read to detect turbo status */
- if (power_rdmsr(PLATFORM_INFO, &max_non_turbo, pi->lcore_id) < 0)
- return -1;
+ if (power_rdmsr(PLATFORM_INFO, &max_non_turbo, pi->lcore_id) < 0) {
+ ret_val = -1;
+ goto out;
+ }
max_non_turbo = (max_non_turbo&NON_TURBO_MASK)>>NON_TURBO_OFFSET;
pi->non_turbo_max_ratio = max_non_turbo;
- return 0;
+ /*
+ * If base_frequency is reported as greater than the maximum
+ * non-turbo frequency, then mark it as a high priority core.
+ */
+ if (base_ratio > max_non_turbo)
+ pi->priority_core = 1;
+ else
+ pi->priority_core = 0;
+ pi->core_base_freq = base_ratio * BUS_FREQ;
+
+out:
+ if (f_base != NULL)
+ fclose(f_base);
+ return ret_val;
}
static int
}
/* Turbo is available and enabled, first freq bucket is sys max freq */
- if (pi->turbo_available && pi->turbo_enable && (idx == 0))
- target_freq = pi->sys_max_freq;
- else
+ if (pi->turbo_available && idx == 0) {
+ if (pi->turbo_enable)
+ target_freq = pi->sys_max_freq;
+ else {
+ RTE_LOG(ERR, POWER, "Turbo is off, frequency can't be scaled up more %u\n",
+ pi->lcore_id);
+ return -1;
+ }
+ } else
target_freq = pi->freqs[idx];
/* Decrease freq, the min freq should be updated first */
return -1;
}
- POWER_DEBUG_TRACE("Freqency '%u' to be set for lcore %u\n",
+ POWER_DEBUG_TRACE("Frequency '%u' to be set for lcore %u\n",
target_freq, pi->lcore_id);
fflush(pi->f_cur_min);
return -1;
}
- POWER_DEBUG_TRACE("Freqency '%u' to be set for lcore %u\n",
+ POWER_DEBUG_TRACE("Frequency '%u' to be set for lcore %u\n",
target_freq, pi->lcore_id);
fflush(pi->f_cur_max);
goto out;
}
/* Save the original governor */
- snprintf(pi->governor_ori, sizeof(pi->governor_ori), "%s", buf);
+ strlcpy(pi->governor_ori, buf, sizeof(pi->governor_ori));
/* Write 'performance' to the governor */
val = fseek(f, 0, SEEK_SET);
pi->sys_max_freq = sys_max_freq;
- base_max_freq = pi->non_turbo_max_ratio * BUS_FREQ;
+ if (pi->priority_core == 1)
+ base_max_freq = pi->core_base_freq;
+ else
+ base_max_freq = pi->non_turbo_max_ratio * BUS_FREQ;
POWER_DEBUG_TRACE("sys min %u, sys max %u, base_max %u\n",
sys_min_freq,
return ret;
}
+int
+power_pstate_cpufreq_check_supported(void)
+{
+ return cpufreq_check_scaling_driver(POWER_PSTATE_DRIVER);
+}
+
int
power_pstate_cpufreq_init(unsigned int lcore_id)
{
}
pi = &lcore_power_info[lcore_id];
- if (pi->curr_idx == 0)
+ if (pi->curr_idx == 0 ||
+ (pi->curr_idx == 1 && pi->turbo_available && !pi->turbo_enable))
return 0;
/* Frequencies in the array are from high to low. */
pi->turbo_enable = 0;
+ if (pi->turbo_available && pi->curr_idx <= 1) {
+ /* Try to set freq to max by default coming out of turbo */
+ if (power_pstate_cpufreq_freq_max(lcore_id) < 0) {
+ RTE_LOG(ERR, POWER,
+ "Failed to set frequency of lcore %u to max\n",
+ lcore_id);
+ return -1;
+ }
+ }
return 0;
}
pi = &lcore_power_info[lcore_id];
caps->capabilities = 0;
caps->turbo = !!(pi->turbo_available);
+ caps->priority = pi->priority_core;
return 0;
}
git.droids-corp.org / dpdk.git / blobdiff