d0e4a193c3
Linux-3.7 added CONFIG_BOOTPARAM_HOTPLUG_CPU0,
allowing systems to offline cpu0.
But when cpu0 is offline, cpupower monitor will not display all
processor and Mperf information:
[root@intel-skylake-dh-03 cpupower]# ./cpupower monitor
WARNING: at least one cpu is offline
|Idle_Stats
CPU | POLL | C1-S | C1E- | C3-S | C6-S | C7s- | C8-S
4| 0.00| 0.00| 0.00| 0.00| 0.90| 0.00| 96.13
1| 0.00| 0.00| 5.49| 0.00| 0.01| 0.00| 92.26
5| 0.00| 0.00| 0.00| 0.00| 0.46| 0.00| 99.50
2| 45.42| 0.00| 0.00| 0.00| 22.94| 0.00| 28.84
6| 0.00| 37.54| 0.00| 0.00| 0.00| 0.00| 0.00
3| 0.00| 0.00| 0.00| 0.00| 0.30| 0.00| 91.99
7| 0.00| 0.00| 0.00| 0.00| 4.70| 0.00| 0.70
This patch replaces the hard-coded use of cpu0 in cpupower with the
current cpu, allowing it to run without a cpu0.
After the patch is applied,
[root@intel-skylake-dh-03 cpupower]# ./cpupower monitor
WARNING: at least one cpu is offline
|Nehalem || Mperf || Idle_Stats
CPU | C3 | C6 | PC3 | PC6 || C0 | Cx | Freq || POLL | C1-S | C1E- | C3-S | C6-S | C7s- | C8-S
4| 0.01| 1.27| 0.00| 0.00|| 0.04| 99.96| 3957|| 0.00| 0.00| 0.00| 0.00| 1.43| 0.00| 98.52
1| 0.00| 98.82| 0.00| 0.00|| 0.05| 99.95| 3361|| 0.00| 0.00| 0.01| 0.00| 0.03| 0.00| 99.88
5| 0.00| 98.82| 0.00| 0.00|| 0.09| 99.91| 3917|| 0.00| 0.00| 0.00| 0.00| 99.38| 0.00| 0.50
2| 0.33| 0.00| 0.00| 0.00|| 0.00|100.00| 3890|| 0.00| 0.00| 0.00| 0.00| 0.00| 0.00|100.00
6| 0.33| 0.00| 0.00| 0.00|| 0.01| 99.99| 3903|| 0.00| 0.00| 0.00| 0.00| 0.00| 0.00| 99.99
3| 0.01| 0.71| 0.00| 0.00|| 0.06| 99.94| 3678|| 0.00| 0.00| 0.00| 0.00| 0.80| 0.00| 99.13
7| 0.01| 0.71| 0.00| 0.00|| 0.03| 99.97| 3538|| 0.00| 0.69| 11.70| 0.00| 0.00| 0.00| 87.57
There are some minor cleanups included in this patch.
Signed-off-by: Prarit Bhargava <prarit@redhat.com>
Signed-off-by: Thomas Renninger <trenn@suse.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
175 lines
5.2 KiB
C
175 lines
5.2 KiB
C
/*
|
|
* (C) 2010,2011 Thomas Renninger <trenn@suse.de>, Novell Inc.
|
|
*
|
|
* Licensed under the terms of the GNU GPL License version 2.
|
|
*
|
|
* Miscellaneous helpers which do not fit or are worth
|
|
* to put into separate headers
|
|
*/
|
|
|
|
#ifndef __CPUPOWERUTILS_HELPERS__
|
|
#define __CPUPOWERUTILS_HELPERS__
|
|
|
|
#include <libintl.h>
|
|
#include <locale.h>
|
|
|
|
#include "helpers/bitmask.h"
|
|
#include <cpupower.h>
|
|
|
|
/* Internationalization ****************************/
|
|
#ifdef NLS
|
|
|
|
#define _(String) gettext(String)
|
|
#ifndef gettext_noop
|
|
#define gettext_noop(String) String
|
|
#endif
|
|
#define N_(String) gettext_noop(String)
|
|
|
|
#else /* !NLS */
|
|
|
|
#define _(String) String
|
|
#define N_(String) String
|
|
|
|
#endif
|
|
/* Internationalization ****************************/
|
|
|
|
extern int run_as_root;
|
|
extern int base_cpu;
|
|
extern struct bitmask *cpus_chosen;
|
|
|
|
/* Global verbose (-d) stuff *********************************/
|
|
/*
|
|
* define DEBUG via global Makefile variable
|
|
* Debug output is sent to stderr, do:
|
|
* cpupower monitor 2>/tmp/debug
|
|
* to split debug output away from normal output
|
|
*/
|
|
#ifdef DEBUG
|
|
extern int be_verbose;
|
|
|
|
#define dprint(fmt, ...) { \
|
|
if (be_verbose) { \
|
|
fprintf(stderr, "%s: " fmt, \
|
|
__func__, ##__VA_ARGS__); \
|
|
} \
|
|
}
|
|
#else
|
|
static inline void dprint(const char *fmt, ...) { }
|
|
#endif
|
|
extern int be_verbose;
|
|
/* Global verbose (-v) stuff *********************************/
|
|
|
|
/* cpuid and cpuinfo helpers **************************/
|
|
enum cpupower_cpu_vendor {X86_VENDOR_UNKNOWN = 0, X86_VENDOR_INTEL,
|
|
X86_VENDOR_AMD, X86_VENDOR_MAX};
|
|
|
|
#define CPUPOWER_CAP_INV_TSC 0x00000001
|
|
#define CPUPOWER_CAP_APERF 0x00000002
|
|
#define CPUPOWER_CAP_AMD_CBP 0x00000004
|
|
#define CPUPOWER_CAP_PERF_BIAS 0x00000008
|
|
#define CPUPOWER_CAP_HAS_TURBO_RATIO 0x00000010
|
|
#define CPUPOWER_CAP_IS_SNB 0x00000020
|
|
#define CPUPOWER_CAP_INTEL_IDA 0x00000040
|
|
|
|
#define CPUPOWER_AMD_CPBDIS 0x02000000
|
|
|
|
#define MAX_HW_PSTATES 10
|
|
|
|
struct cpupower_cpu_info {
|
|
enum cpupower_cpu_vendor vendor;
|
|
unsigned int family;
|
|
unsigned int model;
|
|
unsigned int stepping;
|
|
/* CPU capabilities read out from cpuid */
|
|
unsigned long long caps;
|
|
};
|
|
|
|
/* get_cpu_info
|
|
*
|
|
* Extract CPU vendor, family, model, stepping info from /proc/cpuinfo
|
|
*
|
|
* Returns 0 on success or a negative error code
|
|
* Only used on x86, below global's struct values are zero/unknown on
|
|
* other archs
|
|
*/
|
|
extern int get_cpu_info(struct cpupower_cpu_info *cpu_info);
|
|
extern struct cpupower_cpu_info cpupower_cpu_info;
|
|
/* cpuid and cpuinfo helpers **************************/
|
|
|
|
/* X86 ONLY ****************************************/
|
|
#if defined(__i386__) || defined(__x86_64__)
|
|
|
|
#include <pci/pci.h>
|
|
|
|
/* Read/Write msr ****************************/
|
|
extern int read_msr(int cpu, unsigned int idx, unsigned long long *val);
|
|
extern int write_msr(int cpu, unsigned int idx, unsigned long long val);
|
|
|
|
extern int msr_intel_set_perf_bias(unsigned int cpu, unsigned int val);
|
|
extern int msr_intel_get_perf_bias(unsigned int cpu);
|
|
extern unsigned long long msr_intel_get_turbo_ratio(unsigned int cpu);
|
|
|
|
/* Read/Write msr ****************************/
|
|
|
|
/* PCI stuff ****************************/
|
|
extern int amd_pci_get_num_boost_states(int *active, int *states);
|
|
extern struct pci_dev *pci_acc_init(struct pci_access **pacc, int domain,
|
|
int bus, int slot, int func, int vendor,
|
|
int dev);
|
|
extern struct pci_dev *pci_slot_func_init(struct pci_access **pacc,
|
|
int slot, int func);
|
|
|
|
/* PCI stuff ****************************/
|
|
|
|
/* AMD HW pstate decoding **************************/
|
|
|
|
extern int decode_pstates(unsigned int cpu, unsigned int cpu_family,
|
|
int boost_states, unsigned long *pstates, int *no);
|
|
|
|
/* AMD HW pstate decoding **************************/
|
|
|
|
extern int cpufreq_has_boost_support(unsigned int cpu, int *support,
|
|
int *active, int * states);
|
|
/*
|
|
* CPUID functions returning a single datum
|
|
*/
|
|
unsigned int cpuid_eax(unsigned int op);
|
|
unsigned int cpuid_ebx(unsigned int op);
|
|
unsigned int cpuid_ecx(unsigned int op);
|
|
unsigned int cpuid_edx(unsigned int op);
|
|
|
|
/* cpuid and cpuinfo helpers **************************/
|
|
/* X86 ONLY ********************************************/
|
|
#else
|
|
static inline int decode_pstates(unsigned int cpu, unsigned int cpu_family,
|
|
int boost_states, unsigned long *pstates,
|
|
int *no)
|
|
{ return -1; };
|
|
|
|
static inline int read_msr(int cpu, unsigned int idx, unsigned long long *val)
|
|
{ return -1; };
|
|
static inline int write_msr(int cpu, unsigned int idx, unsigned long long val)
|
|
{ return -1; };
|
|
static inline int msr_intel_set_perf_bias(unsigned int cpu, unsigned int val)
|
|
{ return -1; };
|
|
static inline int msr_intel_get_perf_bias(unsigned int cpu)
|
|
{ return -1; };
|
|
static inline unsigned long long msr_intel_get_turbo_ratio(unsigned int cpu)
|
|
{ return 0; };
|
|
|
|
/* Read/Write msr ****************************/
|
|
|
|
static inline int cpufreq_has_boost_support(unsigned int cpu, int *support,
|
|
int *active, int * states)
|
|
{ return -1; }
|
|
|
|
/* cpuid and cpuinfo helpers **************************/
|
|
|
|
static inline unsigned int cpuid_eax(unsigned int op) { return 0; };
|
|
static inline unsigned int cpuid_ebx(unsigned int op) { return 0; };
|
|
static inline unsigned int cpuid_ecx(unsigned int op) { return 0; };
|
|
static inline unsigned int cpuid_edx(unsigned int op) { return 0; };
|
|
#endif /* defined(__i386__) || defined(__x86_64__) */
|
|
|
|
#endif /* __CPUPOWERUTILS_HELPERS__ */
|