Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/cpupowerutils (4d8a93c7) · Commits · e / devices / android_kernel_teracube_2e

CREDITS

+16 −1

Original line number	Diff line number	Diff line
		@@ -504,7 +504,7 @@ N: Dominik Brodowski
		E: linux@brodo.de
		W: http://www.brodo.de/
		P: 1024D/725B37C6 190F 3E77 9C89 3B6D BECD 46EE 67C3 0308 725B 37C6
		D: parts of CPUFreq code, ACPI bugfixes
		D: parts of CPUFreq code, ACPI bugfixes, PCMCIA rewrite, cpufrequtils
		S: Tuebingen, Germany

		N: Andries Brouwer
		@@ -857,6 +857,10 @@ S: One Dell Way
		S: Round Rock, TX 78682
		S: USA

		N: Mattia Dongili
		E: malattia@gmail.com
		D: cpufrequtils (precursor to cpupowerutils)

		N: Ben Dooks
		E: ben-linux@fluff.org
		E: ben@simtec.co.uk
		@@ -1883,6 +1887,11 @@ S: Kruislaan 419
		S: 1098 VA Amsterdam
		S: The Netherlands

		N: Goran Koruga
		E: korugag@siol.net
		D: cpufrequtils (precursor to cpupowerutils)
		S: Slovenia

		N: Jiri Kosina
		E: jikos@jikos.cz
		E: jkosina@suse.cz
		@@ -2916,6 +2925,12 @@ S: Schlossbergring 9
		S: 79098 Freiburg
		S: Germany

		N: Thomas Renninger
		E: trenn@suse.de
		D: cpupowerutils
		S: SUSE Linux GmbH
		S: Germany

		N: Joerg Reuter
		E: jreuter@yaina.de
		W: http://yaina.de/jreuter/

MAINTAINERS

+6 −0

Original line number	Diff line number	Diff line
		@@ -1925,6 +1925,12 @@ S: Maintained
		F: arch/x86/kernel/cpuid.c
		F: arch/x86/kernel/msr.c

		CPU POWER MONITORING SUBSYSTEM
		M: Dominik Brodowski <linux@dominikbrodowski.net>
		M: Thomas Renninger <trenn@suse.de>
		S: Maintained
		F: tools/power/cpupower

		CPUSETS
		M: Paul Menage <menage@google.com>
		W: http://www.bullopensource.org/cpuset/

tools/power/cpupower/.gitignore

0 → 100644

+22 −0

Original line number	Diff line number	Diff line
		.libs
		libcpupower.so
		libcpupower.so.0
		libcpupower.so.0.0.0
		build/ccdv
		cpufreq-info
		cpufreq-set
		cpufreq-aperf
		lib/.libs
		lib/cpufreq.lo
		lib/cpufreq.o
		lib/proc.lo
		lib/proc.o
		lib/sysfs.lo
		lib/sysfs.o
		po/cpupowerutils.pot
		po/*.gmo
		utils/cpufreq-info.o
		utils/cpufreq-set.o
		utils/cpufreq-aperf.o
		cpupower
		bench/cpufreq-bench

tools/power/cpupower/Makefile

0 → 100644

+279 −0

Original line number	Diff line number	Diff line
		# Makefile for cpupower
		#
		# Copyright (C) 2005,2006 Dominik Brodowski <linux@dominikbrodowski.net>
		#
		# Based largely on the Makefile for udev by:
		#
		# Copyright (C) 2003,2004 Greg Kroah-Hartman <greg@kroah.com>
		#
		# This program is free software; you can redistribute it and/or modify
		# it under the terms of the GNU General Public License as published by
		# the Free Software Foundation; version 2 of the License.
		#
		# This program is distributed in the hope that it will be useful,
		# but WITHOUT ANY WARRANTY; without even the implied warranty of
		# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
		# General Public License for more details.
		#
		# You should have received a copy of the GNU General Public License
		# along with this program; if not, write to the Free Software
		# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
		#

		# --- CONFIGURATION BEGIN ---

		# Set the following to `true' to make a unstripped, unoptimized
		# binary. Leave this set to `false' for production use.
		DEBUG ?= false

		# make the build silent. Set this to something else to make it noisy again.
		V ?= false

		# Internationalization support (output in different languages).
		# Requires gettext.
		NLS ?= true

		# Set the following to 'true' to build/install the
		# cpufreq-bench benchmarking tool
		CPUFRQ_BENCH ?= true

		# Prefix to the directories we're installing to
		DESTDIR ?=

		# --- CONFIGURATION END ---



		# Package-related definitions. Distributions can modify the version
		# and _should_ modify the PACKAGE_BUGREPORT definition

		VERSION= $(shell ./utils/version-gen.sh)
		LIB_MAJ= 0.0.0
		LIB_MIN= 0

		PACKAGE = cpupower
		PACKAGE_BUGREPORT = cpufreq@vger.kernel.org
		LANGUAGES = de fr it cs pt


		# Directory definitions. These are default and most probably
		# do not need to be changed. Please note that DESTDIR is
		# added in front of any of them

		bindir ?= /usr/bin
		sbindir ?= /usr/sbin
		mandir ?= /usr/man
		includedir ?= /usr/include
		libdir ?= /usr/lib
		localedir ?= /usr/share/locale
		docdir ?= /usr/share/doc/packages/cpupower
		confdir ?= /etc/

		# Toolchain: what tools do we use, and what options do they need:

		CP = cp -fpR
		INSTALL = /usr/bin/install -c
		INSTALL_PROGRAM = ${INSTALL}
		INSTALL_DATA = ${INSTALL} -m 644
		INSTALL_SCRIPT = ${INSTALL_PROGRAM}

		# If you are running a cross compiler, you may want to set this
		# to something more interesting, like "arm-linux-". If you want
		# to compile vs uClibc, that can be done here as well.
		CROSS = #/usr/i386-linux-uclibc/usr/bin/i386-uclibc-
		CC = $(CROSS)gcc
		LD = $(CROSS)gcc
		AR = $(CROSS)ar
		STRIP = $(CROSS)strip
		RANLIB = $(CROSS)ranlib
		HOSTCC = gcc


		# Now we set up the build system
		#

		# set up PWD so that older versions of make will work with our build.
		PWD = $(shell pwd)

		GMO_FILES = ${shell for HLANG in ${LANGUAGES}; do echo po/$$HLANG.gmo; done;}

		export CROSS CC AR STRIP RANLIB CFLAGS LDFLAGS LIB_OBJS

		# check if compiler option is supported
		cc-supports = ${shell if $(CC) ${1} -S -o /dev/null -xc /dev/null > /dev/null 2>&1; then echo "$(1)"; fi;}

		# use '-Os' optimization if available, else use -O2
		OPTIMIZATION := $(call cc-supports,-Os,-O2)

		WARNINGS := -Wall -Wchar-subscripts -Wpointer-arith -Wsign-compare
		WARNINGS += $(call cc-supports,-Wno-pointer-sign)
		WARNINGS += $(call cc-supports,-Wdeclaration-after-statement)
		WARNINGS += -Wshadow

		CFLAGS += -DVERSION=\"$(VERSION)\" -DPACKAGE=\"$(PACKAGE)\" \
		-DPACKAGE_BUGREPORT=\"$(PACKAGE_BUGREPORT)\" -D_GNU_SOURCE

		UTIL_OBJS = utils/helpers/amd.o utils/helpers/topology.o utils/helpers/msr.o \
		utils/helpers/sysfs.o utils/helpers/misc.o utils/helpers/cpuid.o \
		utils/helpers/pci.o utils/helpers/bitmask.o \
		utils/idle_monitor/nhm_idle.o utils/idle_monitor/snb_idle.o \
		utils/idle_monitor/amd_fam14h_idle.o utils/idle_monitor/cpuidle_sysfs.o \
		utils/idle_monitor/mperf_monitor.o utils/idle_monitor/cpupower-monitor.o \
		utils/cpupower.o utils/cpufreq-info.o utils/cpufreq-set.o \
		utils/cpupower-set.o utils/cpupower-info.o utils/cpuidle-info.o

		UTIL_HEADERS = utils/helpers/helpers.h utils/idle_monitor/cpupower-monitor.h \
		utils/helpers/bitmask.h \
		utils/idle_monitor/idle_monitors.h utils/idle_monitor/idle_monitors.def

		UTIL_SRC := $(UTIL_OBJS:.o=.c)

		LIB_HEADERS = lib/cpufreq.h lib/sysfs.h
		LIB_SRC = lib/cpufreq.c lib/sysfs.c
		LIB_OBJS = lib/cpufreq.o lib/sysfs.o

		CFLAGS += -pipe

		ifeq ($(strip $(NLS)),true)
		INSTALL_NLS += install-gmo
		COMPILE_NLS += create-gmo
		endif

		ifeq ($(strip $(CPUFRQ_BENCH)),true)
		INSTALL_BENCH += install-bench
		COMPILE_BENCH += compile-bench
		endif

		CFLAGS += $(WARNINGS)

		ifeq ($(strip $(V)),false)
		QUIET=@
		ECHO=@echo
		else
		QUIET=
		ECHO=@\#
		endif
		export QUIET ECHO

		# if DEBUG is enabled, then we do not strip or optimize
		ifeq ($(strip $(DEBUG)),true)
		CFLAGS += -O1 -g -DDEBUG
		STRIPCMD = /bin/true -Since_we_are_debugging
		else
		CFLAGS += $(OPTIMIZATION) -fomit-frame-pointer
		STRIPCMD = $(STRIP) -s --remove-section=.note --remove-section=.comment
		endif


		# the actual make rules

		all: libcpupower cpupower $(COMPILE_NLS) $(COMPILE_BENCH)

		lib/%.o: $(LIB_SRC) $(LIB_HEADERS)
		$(ECHO) " CC " $@
		$(QUIET) $(CC) $(CFLAGS) -fPIC -o $@ -c lib/$*.c

		libcpupower.so.$(LIB_MAJ): $(LIB_OBJS)
		$(ECHO) " LD " $@
		$(QUIET) $(CC) -shared $(CFLAGS) $(LDFLAGS) -o $@ \
		-Wl,-soname,libcpupower.so.$(LIB_MIN) $(LIB_OBJS)
		@ln -sf $@ libcpupower.so
		@ln -sf $@ libcpupower.so.$(LIB_MIN)

		libcpupower: libcpupower.so.$(LIB_MAJ)

		# Let all .o files depend on its .c file and all headers
		# Might be worth to put this into utils/Makefile at some point of time
		$(UTIL_OBJS): $(UTIL_HEADERS)

		.c.o:
		$(ECHO) " CC " $@
		$(QUIET) $(CC) $(CFLAGS) -I./lib -I ./utils -o $@ -c $*.c

		cpupower: $(UTIL_OBJS) libcpupower.so.$(LIB_MAJ)
		$(ECHO) " CC " $@
		$(QUIET) $(CC) $(CFLAGS) $(LDFLAGS) -lcpupower -lrt -lpci -L. -o $@ $(UTIL_OBJS)
		$(QUIET) $(STRIPCMD) $@

		po/$(PACKAGE).pot: $(UTIL_SRC)
		$(ECHO) " GETTEXT " $@
		$(QUIET) xgettext --default-domain=$(PACKAGE) --add-comments \
		--keyword=_ --keyword=N_ $(UTIL_SRC) && \
		test -f $(PACKAGE).po && \
		mv -f $(PACKAGE).po po/$(PACKAGE).pot

		po/%.gmo: po/%.po
		$(ECHO) " MSGFMT " $@
		$(QUIET) msgfmt -o $@ po/$*.po

		create-gmo: ${GMO_FILES}

		update-po: po/$(PACKAGE).pot
		$(ECHO) " MSGMRG " $@
		$(QUIET) @for HLANG in $(LANGUAGES); do \
		echo -n "Updating $$HLANG "; \
		if msgmerge po/$$HLANG.po po/$(PACKAGE).pot -o \
		po/$$HLANG.new.po; then \
		mv -f po/$$HLANG.new.po po/$$HLANG.po; \
		else \
		echo "msgmerge for $$HLANG failed!"; \
		rm -f po/$$HLANG.new.po; \
		fi; \
		done;

		compile-bench: libcpupower.so.$(LIB_MAJ)
		@V=$(V) confdir=$(confdir) $(MAKE) -C bench

		clean:
		-find . $ -not -type d $ -and $ -name '~' -o -name '.[oas]' $ -type f -print \
		\| xargs rm -f
		-rm -f $(UTIL_BINS)
		-rm -f $(IDLE_OBJS)
		-rm -f cpupower
		-rm -f libcpupower.so*
		-rm -rf po/.gmo po/.pot
		$(MAKE) -C bench clean


		install-lib:
		$(INSTALL) -d $(DESTDIR)${libdir}
		$(CP) libcpupower.so* $(DESTDIR)${libdir}/
		$(INSTALL) -d $(DESTDIR)${includedir}
		$(INSTALL_DATA) lib/cpufreq.h $(DESTDIR)${includedir}/cpufreq.h

		install-tools:
		$(INSTALL) -d $(DESTDIR)${bindir}
		$(INSTALL_PROGRAM) cpupower $(DESTDIR)${bindir}

		install-man:
		$(INSTALL_DATA) -D man/cpupower.1 $(DESTDIR)${mandir}/man1/cpupower.1
		$(INSTALL_DATA) -D man/cpupower-frequency-set.1 $(DESTDIR)${mandir}/man1/cpupower-frequency-set.1
		$(INSTALL_DATA) -D man/cpupower-frequency-info.1 $(DESTDIR)${mandir}/man1/cpupower-frequency-info.1
		$(INSTALL_DATA) -D man/cpupower-set.1 $(DESTDIR)${mandir}/man1/cpupower-set.1
		$(INSTALL_DATA) -D man/cpupower-info.1 $(DESTDIR)${mandir}/man1/cpupower-info.1
		$(INSTALL_DATA) -D man/cpupower-monitor.1 $(DESTDIR)${mandir}/man1/cpupower-monitor.1

		install-gmo:
		$(INSTALL) -d $(DESTDIR)${localedir}
		for HLANG in $(LANGUAGES); do \
		echo '$(INSTALL_DATA) -D po/$$HLANG.gmo $(DESTDIR)${localedir}/$$HLANG/LC_MESSAGES/cpupower.mo'; \
		$(INSTALL_DATA) -D po/$$HLANG.gmo $(DESTDIR)${localedir}/$$HLANG/LC_MESSAGES/cpupower.mo; \
		done;

		install-bench:
		@#DESTDIR must be set from outside to survive
		@sbindir=$(sbindir) bindir=$(bindir) docdir=$(docdir) confdir=$(confdir) $(MAKE) -C bench install

		install: all install-lib install-tools install-man $(INSTALL_NLS) $(INSTALL_BENCH)

		uninstall:
		- rm -f $(DESTDIR)${libdir}/libcpupower.*
		- rm -f $(DESTDIR)${includedir}/cpufreq.h
		- rm -f $(DESTDIR)${bindir}/utils/cpupower
		- rm -f $(DESTDIR)${mandir}/man1/cpufreq-set.1
		- rm -f $(DESTDIR)${mandir}/man1/cpufreq-info.1
		- for HLANG in $(LANGUAGES); do \
		rm -f $(DESTDIR)${localedir}/$$HLANG/LC_MESSAGES/cpupower.mo; \
		done;

		.PHONY: all utils libcpupower update-po create-gmo install-lib install-tools install-man install-gmo install uninstall clean

tools/power/cpupower/README

0 → 100644

+49 −0

Original line number	Diff line number	Diff line
		The cpufrequtils package (homepage:
		http://www.kernel.org/pub/linux/utils/kernel/cpufreq/cpufrequtils.html )
		consists of the following elements:

		requirements
		------------

		On x86 pciutils is needed at runtime (-lpci).
		For compilation pciutils-devel (pci/pci.h) and a gcc version
		providing cpuid.h is needed.
		For both it's not explicitly checked for (yet).


		libcpufreq
		----------

		"libcpufreq" is a library which offers a unified access method for userspace
		tools and programs to the cpufreq core and drivers in the Linux kernel. This
		allows for code reduction in userspace tools, a clean implementation of
		the interaction to the cpufreq core, and support for both the sysfs and proc
		interfaces [depending on configuration, see below].


		compilation and installation
		----------------------------

		make
		su
		make install

		should suffice on most systems. It builds default libcpufreq,
		cpufreq-set and cpufreq-info files and installs them in /usr/lib and
		/usr/bin, respectively. If you want to set up the paths differently and/or
		want to configure the package to your specific needs, you need to open
		"Makefile" with an editor of your choice and edit the block marked
		CONFIGURATION.


		THANKS
		------
		Many thanks to Mattia Dongili who wrote the autotoolization and
		libtoolization, the manpages and the italian language file for cpufrequtils;
		to Dave Jones for his feedback and his dump_psb tool; to Bruno Ducrot for his
		powernow-k8-decode and intel_gsic tools as well as the french language file;
		and to various others commenting on the previous (pre-)releases of
		cpufrequtils.


		Dominik Brodowski