Skip to contentSkip to conversation

Add some AMD boost state info and tiny fixes

PATCH In review Thomas Renninger 2 participants 7 messages Feb 1, 2011 – Feb 2, 2011

Subsystems (2)
Kbuild Library code
lore
Share & tools
lore

Thomas Renninger

author
#0 lore raw

cover Add some AMD boost state info and tiny fixes

I picked up Andreas' patches and finalized them.
Based on the cpupowerutils branch.
Would be great if these can get applied.

Thanks,

Thomas

Andreas Herrmann (2):
libcpupower/cpufreq-info: Add basic functions to detect AMD CPB
information
libcpupower: libcpufreq: Provide boost information also for AMD
family 12h and 15h

Thomas Renninger (2):
Make linking quiet again
cpufreq-aperf: mperf might tick faster than expected, esp on Intel

 Makefile              |   10 +++---
 lib/cpufreq.c         |    8 ++--
 lib/cpufreq.h         |    2 +-
 lib/msr.c             |   11 ------
 lib/msr.h             |    2 -
 lib/pci.c             |   89 +++++++++++++++++++++++++++++++++++++++++++++++++
 lib/pci.h             |    1 +
 utils/cpufreq-aperf.c |    5 ++-
 utils/cpufreq-info.c  |    5 ++-
 9 files changed, 107 insertions(+), 26 deletions(-)
 create mode 100644 lib/pci.c
 create mode 100644 lib/pci.h
Signature · 1 line
1.7.3.4
author
#1 lore raw

PATCH 1/4 libcpupower/cpufreq-info: Add basic functions to detect AMD CPB information

From: Andreas Herrmann <[email protected]>

To gather boost state information on AMD we need to access CPU northbridge PCI functions.

Thus this change introduces a dependency on libpci (part of pciutils and usually installed on Linux systems).

Detect whether CPB is enabled/disabled and number of boosted states.

Signed-off-by Andreas Herrmann <[email protected]>
Signed-off-by Thomas Renninger <[email protected]>
CC Dominik Brodowski <[email protected]>
CC [email protected]
CC Andreas Herrmann <[email protected]>
---
 Makefile             |    8 ++--
 lib/cpufreq.c        |    8 ++--
 lib/cpufreq.h        |    2 +-
 lib/msr.c            |   11 ------
 lib/msr.h            |    2 -
 lib/pci.c            |   89 ++++++++++++++++++++++++++++++++++++++++++++++++++
 lib/pci.h            |    1 +
 utils/cpufreq-info.c |    5 ++-
 8 files changed, 102 insertions(+), 24 deletions(-)
 create mode 100644 lib/pci.c
 create mode 100644 lib/pci.h
Makefile +4 -4
index 2cd9e83..0386f53 100644
@@ -113,9 +113,9 @@ CPPFLAGS += -DVERSION=\"$(VERSION)\" -DPACKAGE=\"$(PACKAGE)\" \
 
 UTIL_SRC = 	utils/cpufreq-info.c utils/cpufreq-set.c utils/cpufreq-aperf.c utils/cpuidle-info.c
 UTIL_BINS = 	utils/cpufreq-info utils/cpufreq-set utils/cpufreq-aperf utils/cpuidle-info
-LIB_HEADERS = 	lib/cpufreq.h lib/cpuidle.h lib/sysfs.h lib/msr.h lib/cpuid.h
-LIB_SRC = 	lib/cpufreq.c lib/cpuidle.c lib/sysfs.c lib/msr.c
-LIB_OBJS = 	lib/cpufreq.o lib/cpuidle.o lib/sysfs.o lib/msr.o
+LIB_HEADERS = 	lib/cpufreq.h lib/cpuidle.h lib/sysfs.h lib/msr.h lib/cpuid.h lib/pci.h
+LIB_SRC = 	lib/cpufreq.c lib/cpuidle.c lib/sysfs.c lib/msr.c lib/pci.c
+LIB_OBJS = 	lib/cpufreq.o lib/cpuidle.o lib/sysfs.o lib/msr.o lib/pci.o
 
 CFLAGS +=	-pipe
 

@@ -163,7 +163,7 @@ lib/%.o: $(LIB_SRC) $(LIB_HEADERS) build/ccdv
 	$(QUIET) $(CC) $(CPPFLAGS) $(CFLAGS) -fPIC -o $@ -c lib/$*.c
 
 libcpupower.so.$(LIB_MAJ): $(LIB_OBJS)
-	$(CC) -shared $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ \
+	$(CC) -shared $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ -l pci \
 		-Wl,-soname,libcpupower.so.$(LIB_MIN) $(LIB_OBJS)
 	@ln -sf $@ libcpupower.so
 	@ln -sf $@ libcpupower.so.$(LIB_MIN)
lib/cpufreq.c +4 -4
index 0b5fe9f..731d61f 100644
@@ -14,6 +14,7 @@
 #include "sysfs.h"
 #include "cpuid.h"
 #include "msr.h"
+#include "pci.h"
 
 int cpufreq_cpu_exists(unsigned int cpu)
 {

@@ -191,12 +192,12 @@ unsigned long cpufreq_get_transitions(unsigned int cpu) {
 	return (ret);
 }
 
-int cpufreq_has_boost_support(unsigned int cpu, int *support, int *active)
+int cpufreq_has_boost_support(unsigned int cpu, int *support, int *active, int * states)
 {
 	struct cpupower_cpu_info cpu_info;
 	int ret;
 
-	*support = *active = 0;
+	*support = *active = *states = 0;
 
 	ret = get_cpu_info(0, &cpu_info);
 	if (ret)

@@ -218,10 +219,9 @@ int cpufreq_has_boost_support(unsigned int cpu, int *support, int *active)
 			*support = 1;
 		else
 			return 0;
-		ret = msr_amd_boost_is_active(cpu);
+		amd_pci_get_num_boost_states(active, states);
 		if (ret <= 0)
 			return ret;
-		*active = ret;
 	}
 	return 0;
 }
lib/cpufreq.h +1 -1
index 506b6fc..378c063 100644
@@ -213,7 +213,7 @@ extern int cpufreq_set_frequency(unsigned int cpu, unsigned long target_frequenc
  * Check whether Intel's "Turbo Boost Technology" or AMD's
  * "Dynamic Speed Boost Technology" is supported and if, whether it's activated
  */
-extern int cpufreq_has_boost_support(unsigned int cpu, int *support, int *active);
+extern int cpufreq_has_boost_support(unsigned int cpu, int *support, int *active, int *states);
 
 
 #ifdef __cplusplus
lib/msr.c +0 -11
index 3b59fb5..285290f 100644
@@ -127,17 +127,6 @@ int msr_amd_get_fidvid(unsigned int cpu, uint32_t *fid, uint32_t *vid)
 	return 0;
 }
 
-int msr_amd_boost_is_active(unsigned int cpu)
-{
-	uint64_t k7_hwcr;
-	int ret;
-
-	ret = read_msr(cpu, MSR_K7_HWCR, &k7_hwcr);
-	if (ret)
-		return ret;
-	return !((k7_hwcr >> 25) & 0x1);
-}
-
 /* Intel X86 MSRs **********************************/
 int msr_intel_get_perf_status(unsigned int cpu, uint64_t perf_status)
 {
lib/msr.h +0 -2
index 6b743ce..ac44a6a 100644
@@ -6,5 +6,3 @@ extern int msr_intel_get_perf_status(unsigned int cpu, uint64_t perf_status);
 
 extern int msr_intel_has_boost_support(unsigned int cpu);
 extern int msr_intel_boost_is_active(unsigned int cpu);
-
-extern int msr_amd_boost_is_active(unsigned int cpu);
lib/pci.c new file +89 -0

89 lines not on this page · raw message

lib/pci.h new file +1 -0
new file mode 100644
index 0000000..d29df49
@@ -0,0 +1 @@
+extern int amd_pci_get_num_boost_states(int *active, int *states);
utils/cpufreq-info.c +3 -2
index 4d479f3..bb8e425 100644
@@ -290,9 +290,9 @@ static void debug_output(unsigned int cpu, unsigned int all) {
 /* --boost / -b */
 
 static int get_boost_mode(unsigned int cpu) {
-	int support, active, ret;
+	int support, active, states, ret;
 
-	ret = cpufreq_has_boost_support(cpu, &support, &active);
+	ret = cpufreq_has_boost_support(cpu, &support, &active, &states);
 	if (ret) {
 		printf(gettext ("Error while evaluating Boost Capabilities"
 				" on CPU %d -- are you root?\n"), cpu);

@@ -302,6 +302,7 @@ static int get_boost_mode(unsigned int cpu) {
 	printf(gettext ("Analyzing Boost Capabilities on CPU %d:\n"), cpu);
 	printf("Supported: %s\n", support ? "yes" : "no");
 	printf("Active: %s\n", active ? "yes" : "no");
+	printf("Boost States: %d\n", states);
 
 	return 0;
 }
Signature · 1 line
1.7.3.4
author
#2 lore raw

PATCH 2/4 Make linking quiet again

In reply to Thomas Renninger
Signed-off-by Thomas Renninger <[email protected]>
CC Dominik Brodowski <[email protected]>
CC [email protected]
---
 Makefile |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
Makefile +2 -2
index 0386f53..510b10f 100644
@@ -163,7 +163,7 @@ lib/%.o: $(LIB_SRC) $(LIB_HEADERS) build/ccdv
 	$(QUIET) $(CC) $(CPPFLAGS) $(CFLAGS) -fPIC -o $@ -c lib/$*.c
 
 libcpupower.so.$(LIB_MAJ): $(LIB_OBJS)
-	$(CC) -shared $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ -l pci \
+	$(QUIET) $(CC) -shared $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ -l pci \
 		-Wl,-soname,libcpupower.so.$(LIB_MIN) $(LIB_OBJS)
 	@ln -sf $@ libcpupower.so
 	@ln -sf $@ libcpupower.so.$(LIB_MIN)

@@ -171,7 +171,7 @@ libcpupower.so.$(LIB_MAJ): $(LIB_OBJS)
 # Still Provide the old lib, but apps should get fixed to
 # not link against it anymore
 libcpufreq.so.$(LIB_MAJ): libcpupower.so.$(LIB_MAJ)
-	$(CC) -shared $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ \
+	$(QUIET) $(CC) -shared $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ \
 		-Wl,-soname,libcpufreq.so.$(LIB_MIN) -l cpupower -L .
 	@ln -sf $@ libcpufreq.so
 	@ln -sf $@ libcpufreq.so.$(LIB_MIN)
Signature · 1 line
1.7.3.4
author
#3 lore raw

PATCH 3/4 libcpupower: libcpufreq: Provide boost information also for AMD family 12h and 15h

In reply to Thomas Renninger

From: Andreas Herrmann <[email protected]>

Signed-off-by Andreas Herrmann <[email protected]>
Signed-off-by Thomas Renninger <[email protected]>
CC Andreas Herrmann <[email protected]>
CC Dominik Brodowski <[email protected]>
CC [email protected]
---
 lib/pci.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
lib/pci.c +2 -2
index 8887aa5..83d1581 100644
@@ -66,7 +66,7 @@ int amd_pci_get_num_boost_states(int *active, int *states)
 {
 	struct pci_access *pci_acc;
 	int vendor_id = 0x1022;
-	int boost_dev_ids[2] = {0x1204, 0};
+	int boost_dev_ids[4] = {0x1204, 0x1504, 0x1704, 0};
 	struct pci_dev *device;
 	uint8_t val = 0;
 

@@ -82,7 +82,7 @@ int amd_pci_get_num_boost_states(int *active, int *states)
 		*active = 1;
 	else
 		*active = 0;
-	*states = (val >> 2) & 1;
+	*states = (val >> 2) & 7;
 
 	pci_acc_cleanup(pci_acc);
 	return 0;
Signature · 1 line
1.7.3.4
#4 lore raw

Re: [PATCH 3/4] libcpupower: libcpufreq: Provide boost information also for AMD family 12h and 15h

Thomas,

Arrgh ...

Accidentally I had forwarded you some old bogus patch. Thus the device ID for family 15h is incorrect.

The patch better should look like below patch.
(It doesn't apply on your current tree, I guess, due to different directory names)

Sorry for the hassle,

Andreas

From: Andreas Herrmann <[email protected]>
libcpupower: libcpufreq: Provide CPB information for AMD CPU family 12h and 15h

Signed-off-by Andreas Herrmann <[email protected]>
---
 lib/amdpci.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
lib/amdpci.c +2 -2
index 1463db3..41e4908 100644
@@ -48,7 +48,7 @@ static void amd_pci_nb_fini(void)
 int amd_pci_get_num_boost_states(int *active, int *states)
 {
 	uint8_t val;
-	int dev_ids[2] = {0x1204, 0};
+	int dev_ids[2] = {0x1204, 0x1604, 0x1704, 0};
 	struct pci_dev *device;
 
 	device = amd_pci_nb_init(dev_ids);

@@ -60,7 +60,7 @@ int amd_pci_get_num_boost_states(int *active, int *states)
 			*active = 1;
 		else
 			*active = 0;
-		*states = (val >> 2) & 1;
+		*states = (val >> 2) & 7;
 	}
 	amd_pci_nb_fini();
Signature · 1 line
1.7.4.rc3
author
#5 lore raw

PATCH 4/4 cpufreq-aperf: mperf might tick faster than expected, esp on Intel

In reply to Thomas Renninger
Signed-off-by Thomas Renninger <[email protected]>
CC Dominik Brodowski <[email protected]>
CC [email protected]
---
 utils/cpufreq-aperf.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
utils/cpufreq-aperf.c +4 -1
index c9461ae..ac5e3ac 100644
@@ -153,7 +153,10 @@ static int get_C_state_time(struct timeval time_diff, uint64_t mperf_diff,
 	expected_ticks = max_freq * overall_msecs;
 	*percent = (mperf_diff * 100) / expected_ticks;
 
-	cx_time = (expected_ticks - mperf_diff) / max_freq;
+	if (mperf_diff > expected_ticks)
+		cx_time = c0_time;
+	else
+		cx_time = (expected_ticks - mperf_diff) / max_freq;
 	c0_time = mperf_diff / max_freq;
 
 	CX_time->tv_sec  = cx_time / 1000;
Signature · 1 line
1.7.3.4
author
#6 lore raw

Re: [PATCH 4/4] cpufreq-aperf: mperf might tick faster than expected, esp on Intel

I sent an old/broken patch (4/4).

This one is better:

cpufreq-aperf: mperf might tick faster than expected, esp on Intel

fixes lines like that:

CPU     Average freq(KHz)  Time in C0      Time in Cx      C0 percentage
000     2601300            05 sec 004 ms   8155059272 sec 192 ms   100
Signed-off-by Thomas Renninger <[email protected]>
CC Dominik Brodowski <[email protected]>
CC [email protected]
---
 utils/cpufreq-aperf.c |    5 ++-
 6 files changed, 293 insertions(+), 211 deletions(-)
utils/cpufreq-aperf.c +4 -1
@@ -153,7 +153,10 @@ static int get_C_state_time(struct timeval time_diff, uint64_t mperf_diff,
 	expected_ticks = max_freq * overall_msecs;
 	*percent = (mperf_diff * 100) / expected_ticks;
 
-	cx_time = (expected_ticks - mperf_diff) / max_freq;
+	if (mperf_diff > expected_ticks)
+		cx_time = 0;
+	else
+		cx_time = (expected_ticks - mperf_diff) / max_freq;
 	c0_time = mperf_diff / max_freq;
 
 	CX_time->tv_sec  = cx_time / 1000;