128 files changed, 17831 insertions, 1471 deletions

diff --git a/tools/lguest/.gitignore b/tools/lguest/.gitignore
new file mode 100644
index 00000000000..115587fd5f6
--- /dev/null
+++ b/tools/lguest/.gitignore
@@ -0,0 +1 @@
+lguest
diff --git a/tools/lib/traceevent/.gitignore b/tools/lib/traceevent/.gitignore
new file mode 100644
index 00000000000..35f56be5a4c
--- /dev/null
+++ b/tools/lib/traceevent/.gitignore
@@ -0,0 +1 @@
+TRACEEVENT-CFLAGS
diff --git a/tools/perf/.gitignore b/tools/perf/.gitignore
index 416684be0ad..8f8fbc227a4 100644
--- a/tools/perf/.gitignore
+++ b/tools/perf/.gitignore
@@ -19,3 +19,7 @@ TAGS
 cscope*
 config.mak
 config.mak.autogen
+*-bison.*
+*-flex.*
+*.pyc
+*.pyo
diff --git a/tools/perf/Documentation/perf-annotate.txt b/tools/perf/Documentation/perf-annotate.txt
index 6f5a498608b..85c5f026930 100644
--- a/tools/perf/Documentation/perf-annotate.txt
+++ b/tools/perf/Documentation/perf-annotate.txt
@@ -66,6 +66,12 @@ OPTIONS
         used. This interfaces starts by centering on the line with more
         samples, TAB/UNTAB cycles through the lines with more samples.
 
+-c::
+--cpu:: Only report samples for the list of CPUs provided. Multiple CPUs can
+        be provided as a comma-separated list with no space: 0,1. Ranges of
+        CPUs are specified with -: 0-2. Default is to report samples on all
+        CPUs.
+
 SEE ALSO
 --------
 linkperf:perf-record[1], linkperf:perf-report[1]
diff --git a/tools/perf/Documentation/perf-probe.txt b/tools/perf/Documentation/perf-probe.txt
index 02bafce4b34..2780d9ce48b 100644
--- a/tools/perf/Documentation/perf-probe.txt
+++ b/tools/perf/Documentation/perf-probe.txt
@@ -34,9 +34,11 @@ OPTIONS
         Specify vmlinux path which has debuginfo (Dwarf binary).
 
 -m::
---module=MODNAME::
+--module=MODNAME|PATH::
         Specify module name in which perf-probe searches probe points
-        or lines.
+        or lines. If a path of module file is passed, perf-probe
+        treat it as an offline module (this means you can add a probe on
+        a module which has not been loaded yet).
 
 -s::
 --source=PATH::
diff --git a/tools/perf/Documentation/perf-report.txt b/tools/perf/Documentation/perf-report.txt
index 8ba03d6e539..04253c07d19 100644
--- a/tools/perf/Documentation/perf-report.txt
+++ b/tools/perf/Documentation/perf-report.txt
@@ -80,15 +80,24 @@ OPTIONS
 --dump-raw-trace::
         Dump raw trace in ASCII.
 
--g [type,min]::
+-g [type,min,order]::
 --call-graph::
-        Display call chains using type and min percent threshold.
+        Display call chains using type, min percent threshold and order.
         type can be either:
         - flat: single column, linear exposure of call chains.
         - graph: use a graph tree, displaying absolute overhead rates.
         - fractal: like graph, but displays relative rates. Each branch of
                  the tree is considered as a new profiled object. +
-        Default: fractal,0.5.
+
+        order can be either:
+        - callee: callee based call graph.
+        - caller: inverted caller based call graph.
+
+        Default: fractal,0.5,callee.
+
+-G::
+--inverted::
+        alias for inverted caller based call graph.
 
 --pretty=<key>::
         Pretty printing style.  key: normal, raw
@@ -119,6 +128,12 @@ OPTIONS
 --symfs=<directory>::
         Look for files with symbols relative to this directory.
 
+-c::
+--cpu:: Only report samples for the list of CPUs provided. Multiple CPUs can
+        be provided as a comma-separated list with no space: 0,1. Ranges of
+        CPUs are specified with -: 0-2. Default is to report samples on all
+        CPUs.
+
 SEE ALSO
 --------
 linkperf:perf-stat[1]
diff --git a/tools/perf/Documentation/perf-script.txt b/tools/perf/Documentation/perf-script.txt
index 86c87e214b1..db017867d9e 100644
--- a/tools/perf/Documentation/perf-script.txt
+++ b/tools/perf/Documentation/perf-script.txt
@@ -115,10 +115,10 @@ OPTIONS
 -f::
 --fields::
         Comma separated list of fields to print. Options are:
-        comm, tid, pid, time, cpu, event, trace, sym. Field
-        list can be prepended with the type, trace, sw or hw,
+        comm, tid, pid, time, cpu, event, trace, ip, sym, dso, addr.
+        Field list can be prepended with the type, trace, sw or hw,
         to indicate to which event type the field list applies.
-        e.g., -f sw:comm,tid,time,sym  and -f trace:time,cpu,trace
+        e.g., -f sw:comm,tid,time,ip,sym  and -f trace:time,cpu,trace
 
                 perf script -f <fields>
 
@@ -132,17 +132,17 @@ OPTIONS
         The arguments are processed in the order received. A later usage can
         reset a prior request. e.g.:
     
-                -f trace: -f comm,tid,time,sym
+                -f trace: -f comm,tid,time,ip,sym
     
         The first -f suppresses trace events (field list is ""), but then the
-        second invocation sets the fields to comm,tid,time,sym. In this case a
+        second invocation sets the fields to comm,tid,time,ip,sym. In this case a
         warning is given to the user:
     
                 "Overriding previous field request for all events."
     
         Alternativey, consider the order:
     
-                -f comm,tid,time,sym -f trace:
+                -f comm,tid,time,ip,sym -f trace:
     
         The first -f sets the fields for all events and the second -f
         suppresses trace events. The user is given a warning message about
@@ -182,6 +182,12 @@ OPTIONS
 --hide-call-graph::
         When printing symbols do not display call chain.
 
+-c::
+--cpu:: Only report samples for the list of CPUs provided. Multiple CPUs can
+        be provided as a comma-separated list with no space: 0,1. Ranges of
+        CPUs are specified with -: 0-2. Default is to report samples on all
+        CPUs.
+
 SEE ALSO
 --------
 linkperf:perf-record[1], linkperf:perf-script-perl[1],
diff --git a/tools/perf/Makefile b/tools/perf/Makefile
index 940257b5774..e9d5c271db6 100644
--- a/tools/perf/Makefile
+++ b/tools/perf/Makefile
@@ -30,6 +30,8 @@ endif
 # Define EXTRA_CFLAGS=-m64 or EXTRA_CFLAGS=-m32 as appropriate for cross-builds.
 #
 # Define NO_DWARF if you do not want debug-info analysis feature at all.
+#
+# Define WERROR=0 to disable treating any warnings as errors.
 
 $(OUTPUT)PERF-VERSION-FILE: .FORCE-PERF-VERSION-FILE
         @$(SHELL_PATH) util/PERF-VERSION-GEN $(OUTPUT)
@@ -52,7 +54,10 @@ ifeq ($(ARCH),i386)
 endif
 ifeq ($(ARCH),x86_64)
         ARCH := x86
-        IS_X86_64 := $(shell echo __x86_64__ | ${CC} -E -xc - | tail -n 1)
+        IS_X86_64 := 0
+        ifeq (, $(findstring m32,$(EXTRA_CFLAGS)))
+                IS_X86_64 := $(shell echo __x86_64__ | ${CC} -E -xc - | tail -n 1)
+        endif
         ifeq (${IS_X86_64}, 1)
                 RAW_ARCH := x86_64
                 ARCH_CFLAGS := -DARCH_X86_64
@@ -60,6 +65,11 @@ ifeq ($(ARCH),x86_64)
         endif
 endif
 
+# Treat warnings as errors unless directed not to
+ifneq ($(WERROR),0)
+        CFLAGS_WERROR := -Werror
+endif
+
 #
 # Include saner warnings here, which can catch bugs:
 #
@@ -92,7 +102,7 @@ ifndef PERF_DEBUG
   CFLAGS_OPTIMIZE = -O6
 endif
 
-CFLAGS = -fno-omit-frame-pointer -ggdb3 -Wall -Wextra -std=gnu99 -Werror $(CFLAGS_OPTIMIZE) -D_FORTIFY_SOURCE=2 $(EXTRA_WARNINGS) $(EXTRA_CFLAGS)
+CFLAGS = -fno-omit-frame-pointer -ggdb3 -Wall -Wextra -std=gnu99 $(CFLAGS_WERROR) $(CFLAGS_OPTIMIZE) -D_FORTIFY_SOURCE=2 $(EXTRA_WARNINGS) $(EXTRA_CFLAGS)
 EXTLIBS = -lpthread -lrt -lelf -lm
 ALL_CFLAGS = $(CFLAGS) -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
 ALL_LDFLAGS = $(LDFLAGS)
@@ -178,9 +188,9 @@ strip-libs = $(filter-out -l%,$(1))
 
 $(OUTPUT)python/perf.so: $(PYRF_OBJS)
         $(QUIET_GEN)CFLAGS='$(BASIC_CFLAGS)' $(PYTHON_WORD) util/setup.py \
-          --quiet build_ext \
-          --build-lib='$(OUTPUT)python' \
-          --build-temp='$(OUTPUT)python/temp'
+          --quiet build_ext; \
+        mkdir -p $(OUTPUT)python && \
+        cp $(PYTHON_EXTBUILD_LIB)perf.so $(OUTPUT)python/
 #
 # No Perl scripts right now:
 #
@@ -279,6 +289,7 @@ LIB_H += util/thread.h
 LIB_H += util/thread_map.h
 LIB_H += util/trace-event.h
 LIB_H += util/probe-finder.h
+LIB_H += util/dwarf-aux.h
 LIB_H += util/probe-event.h
 LIB_H += util/pstack.h
 LIB_H += util/cpumap.h
@@ -435,6 +446,7 @@ else
         BASIC_CFLAGS += -DDWARF_SUPPORT
         EXTLIBS += -lelf -ldw
         LIB_OBJS += $(OUTPUT)util/probe-finder.o
+        LIB_OBJS += $(OUTPUT)util/dwarf-aux.o
 endif # PERF_HAVE_DWARF_REGS
 endif # NO_DWARF
 
@@ -504,9 +516,13 @@ else
 
   PYTHON_WORD := $(call shell-wordify,$(PYTHON))
 
-  python-clean := $(PYTHON_WORD) util/setup.py clean \
-    --build-lib='$(OUTPUT)python' \
-    --build-temp='$(OUTPUT)python/temp'
+  # python extension build directories
+  PYTHON_EXTBUILD     := $(OUTPUT)python_ext_build/
+  PYTHON_EXTBUILD_LIB := $(PYTHON_EXTBUILD)lib/
+  PYTHON_EXTBUILD_TMP := $(PYTHON_EXTBUILD)tmp/
+  export PYTHON_EXTBUILD_LIB PYTHON_EXTBUILD_TMP
+
+  python-clean := rm -rf $(PYTHON_EXTBUILD) $(OUTPUT)python/perf.so
 
   ifdef NO_LIBPYTHON
     $(call disable-python)
@@ -863,6 +879,9 @@ install: all
         $(INSTALL) scripts/python/*.py -t '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/scripts/python'
         $(INSTALL) scripts/python/bin/* -t '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/scripts/python/bin'
 
+install-python_ext:
+        $(PYTHON_WORD) util/setup.py --quiet install --root='/$(DESTDIR_SQ)'
+
 install-doc:
         $(MAKE) -C Documentation install
 
@@ -890,7 +909,7 @@ quick-install-html:
 ### Cleaning rules
 
 clean:
-        $(RM) $(OUTPUT){*.o,*/*.o,*/*/*.o,*/*/*/*.o,$(LIB_FILE),perf-archive}
+        $(RM) $(LIB_OBJS) $(BUILTIN_OBJS) $(LIB_FILE) $(OUTPUT)perf-archive $(OUTPUT)perf.o $(LANG_BINDINGS)
         $(RM) $(ALL_PROGRAMS) perf
         $(RM) *.spec *.pyc *.pyo */*.pyc */*.pyo $(OUTPUT)common-cmds.h TAGS tags cscope*
         $(MAKE) -C Documentation/ clean
diff --git a/tools/perf/arch/arm/util/dwarf-regs.c b/tools/perf/arch/arm/util/dwarf-regs.c
index fff6450c8c9..e8d5c551c69 100644
--- a/tools/perf/arch/arm/util/dwarf-regs.c
+++ b/tools/perf/arch/arm/util/dwarf-regs.c
@@ -8,7 +8,10 @@
  * published by the Free Software Foundation.
  */
 
+#include <stdlib.h>
+#ifndef __UCLIBC__
 #include <libio.h>
+#endif
 #include <dwarf-regs.h>
 
 struct pt_regs_dwarfnum {
diff --git a/tools/perf/builtin-annotate.c b/tools/perf/builtin-annotate.c
index 7b139e1e7e8..555aefd7fe0 100644
--- a/tools/perf/builtin-annotate.c
+++ b/tools/perf/builtin-annotate.c
@@ -28,6 +28,8 @@
 #include "util/hist.h"
 #include "util/session.h"
 
+#include <linux/bitmap.h>
+
 static char             const *input_name = "perf.data";
 
 static bool             force, use_tui, use_stdio;
@@ -38,6 +40,9 @@ static bool		print_line;
 
 static const char *sym_hist_filter;
 
+static const char       *cpu_list;
+static DECLARE_BITMAP(cpu_bitmap, MAX_NR_CPUS);
+
 static int perf_evlist__add_sample(struct perf_evlist *evlist,
                                    struct perf_sample *sample,
                                    struct perf_evsel *evsel,
@@ -90,6 +95,9 @@ static int process_sample_event(union perf_event *event,
                 return -1;
         }
 
+        if (cpu_list && !test_bit(sample->cpu, cpu_bitmap))
+                return 0;
+
         if (!al.filtered &&
             perf_evlist__add_sample(session->evlist, sample, evsel, &al)) {
                 pr_warning("problem incrementing symbol count, "
@@ -177,6 +185,12 @@ static int __cmd_annotate(void)
         if (session == NULL)
                 return -ENOMEM;
 
+        if (cpu_list) {
+                ret = perf_session__cpu_bitmap(session, cpu_list, cpu_bitmap);
+                if (ret)
+                        goto out_delete;
+        }
+
         ret = perf_session__process_events(session, &event_ops);
         if (ret)
                 goto out_delete;
@@ -252,6 +266,7 @@ static const struct option options[] = {
                     "print matching source lines (may be slow)"),
         OPT_BOOLEAN('P', "full-paths", &full_paths,
                     "Don't shorten the displayed pathnames"),
+        OPT_STRING('c', "cpu", &cpu_list, "cpu", "list of cpus to profile"),
         OPT_END()
 };
 
diff --git a/tools/perf/builtin-lock.c b/tools/perf/builtin-lock.c
index 9ac05aafd9b..899080ace26 100644
--- a/tools/perf/builtin-lock.c
+++ b/tools/perf/builtin-lock.c
@@ -942,10 +942,10 @@ static const char *record_args[] = {
         "-f",
         "-m", "1024",
         "-c", "1",
-        "-e", "lock:lock_acquire:r",
-        "-e", "lock:lock_acquired:r",
-        "-e", "lock:lock_contended:r",
-        "-e", "lock:lock_release:r",
+        "-e", "lock:lock_acquire",
+        "-e", "lock:lock_acquired",
+        "-e", "lock:lock_contended",
+        "-e", "lock:lock_release",
 };
 
 static int __cmd_record(int argc, const char **argv)
diff --git a/tools/perf/builtin-probe.c b/tools/perf/builtin-probe.c
index 2c0e64d0b4a..710ae3d0a48 100644
--- a/tools/perf/builtin-probe.c
+++ b/tools/perf/builtin-probe.c
@@ -134,10 +134,18 @@ static int opt_show_lines(const struct option *opt __used,
 {
         int ret = 0;
 
-        if (str)
-                ret = parse_line_range_desc(str, &params.line_range);
-        INIT_LIST_HEAD(&params.line_range.line_list);
+        if (!str)
+                return 0;
+
+        if (params.show_lines) {
+                pr_warning("Warning: more than one --line options are"
+                           " detected. Only the first one is valid.\n");
+                return 0;
+        }
+
         params.show_lines = true;
+        ret = parse_line_range_desc(str, &params.line_range);
+        INIT_LIST_HEAD(&params.line_range.line_list);
 
         return ret;
 }
@@ -242,7 +250,8 @@ static const struct option options[] = {
         OPT_STRING('s', "source", &symbol_conf.source_prefix,
                    "directory", "path to kernel source"),
         OPT_STRING('m', "module", &params.target_module,
-                   "modname", "target module name"),
+                   "modname|path",
+                   "target module name (for online) or path (for offline)"),
 #endif
         OPT__DRY_RUN(&probe_event_dry_run),
         OPT_INTEGER('\0', "max-probes", &params.max_probe_points,
diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c
index 8e2c8579818..f4c3fbee4ba 100644
--- a/tools/perf/builtin-record.c
+++ b/tools/perf/builtin-record.c
@@ -30,8 +30,6 @@
 #include <sched.h>
 #include <sys/mman.h>
 
-#define FD(e, x, y) (*(int *)xyarray__entry(e->fd, x, y))
-
 enum write_mode_t {
         WRITE_FORCE,
         WRITE_APPEND
@@ -47,7 +45,7 @@ static int			freq				=   1000;
 static int                      output;
 static int                      pipe_output                     =      0;
 static const char               *output_name                    = NULL;
-static int                      group                           =      0;
+static bool                     group                           =  false;
 static int                      realtime_prio                   =      0;
 static bool                     nodelay                         =  false;
 static bool                     raw_samples                     =  false;
@@ -163,6 +161,7 @@ static void config_attr(struct perf_evsel *evsel, struct perf_evlist *evlist)
         struct perf_event_attr *attr = &evsel->attr;
         int track = !evsel->idx; /* only the first counter needs these */
 
+        attr->disabled          = 1;
         attr->inherit           = !no_inherit;
         attr->read_format       = PERF_FORMAT_TOTAL_TIME_ENABLED |
                                   PERF_FORMAT_TOTAL_TIME_RUNNING |
@@ -438,7 +437,6 @@ static void mmap_read_all(void)
 
 static int __cmd_record(int argc, const char **argv)
 {
-        int i;
         struct stat st;
         int flags;
         int err;
@@ -674,6 +672,8 @@ static int __cmd_record(int argc, const char **argv)
                 }
         }
 
+        perf_evlist__enable(evsel_list);
+
         /*
          * Let the child rip
          */
@@ -682,7 +682,6 @@ static int __cmd_record(int argc, const char **argv)
 
         for (;;) {
                 int hits = samples;
-                int thread;
 
                 mmap_read_all();
 
@@ -693,19 +692,8 @@ static int __cmd_record(int argc, const char **argv)
                         waking++;
                 }
 
-                if (done) {
-                        for (i = 0; i < evsel_list->cpus->nr; i++) {
-                                struct perf_evsel *pos;
-
-                                list_for_each_entry(pos, &evsel_list->entries, node) {
-                                        for (thread = 0;
-                                                thread < evsel_list->threads->nr;
-                                                thread++)
-                                                ioctl(FD(pos, i, thread),
-                                                        PERF_EVENT_IOC_DISABLE);
-                                }
-                        }
-                }
+                if (done)
+                        perf_evlist__disable(evsel_list);
         }
 
         if (quiet || signr == SIGUSR1)
@@ -740,7 +728,7 @@ static bool force, append_file;
 const struct option record_options[] = {
         OPT_CALLBACK('e', "event", &evsel_list, "event",
                      "event selector. use 'perf list' to list available events",
-                     parse_events),
+                     parse_events_option),
         OPT_CALLBACK(0, "filter", &evsel_list, "filter",
                      "event filter", parse_filter),
         OPT_INTEGER('p', "pid", &target_pid,
@@ -768,6 +756,8 @@ const struct option record_options[] = {
                     "child tasks do not inherit counters"),
         OPT_UINTEGER('F', "freq", &user_freq, "profile at this frequency"),
         OPT_UINTEGER('m', "mmap-pages", &mmap_pages, "number of mmap data pages"),
+        OPT_BOOLEAN(0, "group", &group,
+                    "put the counters into a counter group"),
         OPT_BOOLEAN('g', "call-graph", &call_graph,
                     "do call-graph (stack chain/backtrace) recording"),
         OPT_INCR('v', "verbose", &verbose,
diff --git a/tools/perf/builtin-report.c b/tools/perf/builtin-report.c
index 287a173523a..d7ff277bdb7 100644
--- a/tools/perf/builtin-report.c
+++ b/tools/perf/builtin-report.c
@@ -33,6 +33,8 @@
 #include "util/sort.h"
 #include "util/hist.h"
 
+#include <linux/bitmap.h>
+
 static char             const *input_name = "perf.data";
 
 static bool             force, use_tui, use_stdio;
@@ -45,9 +47,13 @@ static struct perf_read_values	show_threads_values;
 static const char       default_pretty_printing_style[] = "normal";
 static const char       *pretty_printing_style = default_pretty_printing_style;
 
-static char             callchain_default_opt[] = "fractal,0.5";
+static char             callchain_default_opt[] = "fractal,0.5,callee";
+static bool             inverted_callchain;
 static symbol_filter_t  annotate_init;
 
+static const char       *cpu_list;
+static DECLARE_BITMAP(cpu_bitmap, MAX_NR_CPUS);
+
 static int perf_session__add_hist_entry(struct perf_session *session,
                                         struct addr_location *al,
                                         struct perf_sample *sample,
@@ -116,6 +122,9 @@ static int process_sample_event(union perf_event *event,
         if (al.filtered || (hide_unresolved && al.sym == NULL))
                 return 0;
 
+        if (cpu_list && !test_bit(sample->cpu, cpu_bitmap))
+                return 0;
+
         if (al.map != NULL)
                 al.map->dso->hit = 1;
 
@@ -153,23 +162,22 @@ static int perf_session__setup_sample_type(struct perf_session *self)
 {
         if (!(self->sample_type & PERF_SAMPLE_CALLCHAIN)) {
                 if (sort__has_parent) {
-                        fprintf(stderr, "selected --sort parent, but no"
-                                        " callchain data. Did you call"
-                                        " perf record without -g?\n");
+                        ui__warning("Selected --sort parent, but no "
+                                    "callchain data. Did you call "
+                                    "'perf record' without -g?\n");
                         return -EINVAL;
                 }
                 if (symbol_conf.use_callchain) {
-                        fprintf(stderr, "selected -g but no callchain data."
-                                        " Did you call perf record without"
-                                        " -g?\n");
+                        ui__warning("Selected -g but no callchain data. Did "
+                                    "you call 'perf record' without -g?\n");
                         return -1;
                 }
         } else if (!dont_use_callchains && callchain_param.mode != CHAIN_NONE &&
                    !symbol_conf.use_callchain) {
                         symbol_conf.use_callchain = true;
                         if (callchain_register_param(&callchain_param) < 0) {
-                                fprintf(stderr, "Can't register callchain"
-                                                " params\n");
+                                ui__warning("Can't register callchain "
+                                            "params.\n");
                                 return -EINVAL;
                         }
         }
@@ -262,6 +270,12 @@ static int __cmd_report(void)
         if (session == NULL)
                 return -ENOMEM;
 
+        if (cpu_list) {
+                ret = perf_session__cpu_bitmap(session, cpu_list, cpu_bitmap);
+                if (ret)
+                        goto out_delete;
+        }
+
         if (show_threads)
                 perf_read_values_init(&show_threads_values);
 
@@ -386,13 +400,29 @@ parse_callchain_opt(const struct option *opt __used, const char *arg,
         if (!tok)
                 goto setup;
 
-        tok2 = strtok(NULL, ",");
         callchain_param.min_percent = strtod(tok, &endptr);
         if (tok == endptr)
                 return -1;
 
-        if (tok2)
+        /* get the print limit */
+        tok2 = strtok(NULL, ",");
+        if (!tok2)
+                goto setup;
+
+        if (tok2[0] != 'c') {
                 callchain_param.print_limit = strtod(tok2, &endptr);
+                tok2 = strtok(NULL, ",");
+                if (!tok2)
+                        goto setup;
+        }
+
+        /* get the call chain order */
+        if (!strcmp(tok2, "caller"))
+                callchain_param.order = ORDER_CALLER;
+        else if (!strcmp(tok2, "callee"))
+                callchain_param.order = ORDER_CALLEE;
+        else
+                return -1;
 setup:
         if (callchain_register_param(&callchain_param) < 0) {
                 fprintf(stderr, "Can't register callchain params\n");
@@ -436,9 +466,10 @@ static const struct option options[] = {
                    "regex filter to identify parent, see: '--sort parent'"),
         OPT_BOOLEAN('x', "exclude-other", &symbol_conf.exclude_other,
                     "Only display entries with parent-match"),
-        OPT_CALLBACK_DEFAULT('g', "call-graph", NULL, "output_type,min_percent",
-                     "Display callchains using output_type (graph, flat, fractal, or none) and min percent threshold. "
-                     "Default: fractal,0.5", &parse_callchain_opt, callchain_default_opt),
+        OPT_CALLBACK_DEFAULT('g', "call-graph", NULL, "output_type,min_percent, call_order",
+                     "Display callchains using output_type (graph, flat, fractal, or none) , min percent threshold and callchain order. "
+                     "Default: fractal,0.5,callee", &parse_callchain_opt, callchain_default_opt),
+        OPT_BOOLEAN('G', "inverted", &inverted_callchain, "alias for inverted call graph"),
         OPT_STRING('d', "dsos", &symbol_conf.dso_list_str, "dso[,dso...]",
                    "only consider symbols in these dsos"),
         OPT_STRING('C', "comms", &symbol_conf.comm_list_str, "comm[,comm...]",
@@ -455,6 +486,7 @@ static const struct option options[] = {
                     "Only display entries resolved to a symbol"),
         OPT_STRING(0, "symfs", &symbol_conf.symfs, "directory",
                     "Look for files with symbols relative to this directory"),
+        OPT_STRING('c', "cpu", &cpu_list, "cpu", "list of cpus to profile"),
         OPT_END()
 };
 
@@ -467,6 +499,9 @@ int cmd_report(int argc, const char **argv, const char *prefix __used)
         else if (use_tui)
                 use_browser = 1;
 
+        if (inverted_callchain)
+                callchain_param.order = ORDER_CALLER;
+
         if (strcmp(input_name, "-") != 0)
                 setup_browser(true);
         else
@@ -504,7 +539,14 @@ int cmd_report(int argc, const char **argv, const char *prefix __used)
         if (parent_pattern != default_parent_pattern) {
                 if (sort_dimension__add("parent") < 0)
                         return -1;
-                sort_parent.elide = 1;
+
+                /*
+                 * Only show the parent fields if we explicitly
+                 * sort that way. If we only use parent machinery
+                 * for filtering, we don't want it.
+                 */
+                if (!strstr(sort_order, "parent"))
+                        sort_parent.elide = 1;
         } else
                 symbol_conf.exclude_other = false;
 
diff --git a/tools/perf/builtin-sched.c b/tools/perf/builtin-sched.c
index dcfe8873c9a..5177964943e 100644
--- a/tools/perf/builtin-sched.c
+++ b/tools/perf/builtin-sched.c
@@ -1637,23 +1637,29 @@ static struct perf_event_ops event_ops = {
         .ordered_samples        = true,
 };
 
-static int read_events(void)
+static void read_events(bool destroy, struct perf_session **psession)
 {
         int err = -EINVAL;
         struct perf_session *session = perf_session__new(input_name, O_RDONLY,
                                                          0, false, &event_ops);
         if (session == NULL)
-                return -ENOMEM;
+                die("No Memory");
 
         if (perf_session__has_traces(session, "record -R")) {
                 err = perf_session__process_events(session, &event_ops);
+                if (err)
+                        die("Failed to process events, error %d", err);
+
                 nr_events      = session->hists.stats.nr_events[0];
                 nr_lost_events = session->hists.stats.total_lost;
                 nr_lost_chunks = session->hists.stats.nr_events[PERF_RECORD_LOST];
         }
 
-        perf_session__delete(session);
-        return err;
+        if (destroy)
+                perf_session__delete(session);
+
+        if (psession)
+                *psession = session;
 }
 
 static void print_bad_events(void)
@@ -1689,9 +1695,10 @@ static void print_bad_events(void)
 static void __cmd_lat(void)
 {
         struct rb_node *next;
+        struct perf_session *session;
 
         setup_pager();
-        read_events();
+        read_events(false, &session);
         sort_lat();
 
         printf("\n ---------------------------------------------------------------------------------------------------------------\n");
@@ -1717,6 +1724,7 @@ static void __cmd_lat(void)
         print_bad_events();
         printf("\n");
 
+        perf_session__delete(session);
 }
 
 static struct trace_sched_handler map_ops  = {
@@ -1731,7 +1739,7 @@ static void __cmd_map(void)
         max_cpu = sysconf(_SC_NPROCESSORS_CONF);
 
         setup_pager();
-        read_events();
+        read_events(true, NULL);
         print_bad_events();
 }
 
@@ -1744,7 +1752,7 @@ static void __cmd_replay(void)
 
         test_calibrations();
 
-        read_events();
+        read_events(true, NULL);
 
         printf("nr_run_events:        %ld\n", nr_run_events);
         printf("nr_sleep_events:      %ld\n", nr_sleep_events);
@@ -1769,7 +1777,7 @@ static void __cmd_replay(void)
 
 
 static const char * const sched_usage[] = {
-        "perf sched [<options>] {record|latency|map|replay|trace}",
+        "perf sched [<options>] {record|latency|map|replay|script}",
         NULL
 };
 
diff --git a/tools/perf/builtin-script.c b/tools/perf/builtin-script.c
index 22747de7234..09024ec2ab2 100644
--- a/tools/perf/builtin-script.c
+++ b/tools/perf/builtin-script.c
@@ -13,6 +13,7 @@
 #include "util/util.h"
 #include "util/evlist.h"
 #include "util/evsel.h"
+#include <linux/bitmap.h>
 
 static char const               *script_name;
 static char const               *generate_script_lang;
@@ -21,6 +22,8 @@ static u64			last_timestamp;
 static u64                      nr_unordered;
 extern const struct option      record_options[];
 static bool                     no_callchain;
+static const char               *cpu_list;
+static DECLARE_BITMAP(cpu_bitmap, MAX_NR_CPUS);
 
 enum perf_output_field {
         PERF_OUTPUT_COMM            = 1U << 0,
@@ -30,7 +33,10 @@ enum perf_output_field {
         PERF_OUTPUT_CPU             = 1U << 4,
         PERF_OUTPUT_EVNAME          = 1U << 5,
         PERF_OUTPUT_TRACE           = 1U << 6,
-        PERF_OUTPUT_SYM             = 1U << 7,
+        PERF_OUTPUT_IP              = 1U << 7,
+        PERF_OUTPUT_SYM             = 1U << 8,
+        PERF_OUTPUT_DSO             = 1U << 9,
+        PERF_OUTPUT_ADDR            = 1U << 10,
 };
 
 struct output_option {
@@ -44,7 +50,10 @@ struct output_option {
         {.str = "cpu",   .field = PERF_OUTPUT_CPU},
         {.str = "event", .field = PERF_OUTPUT_EVNAME},
         {.str = "trace", .field = PERF_OUTPUT_TRACE},
+        {.str = "ip",    .field = PERF_OUTPUT_IP},
         {.str = "sym",   .field = PERF_OUTPUT_SYM},
+        {.str = "dso",   .field = PERF_OUTPUT_DSO},
+        {.str = "addr",  .field = PERF_OUTPUT_ADDR},
 };
 
 /* default set to maintain compatibility with current format */
@@ -60,7 +69,8 @@ static struct {
 
                 .fields = PERF_OUTPUT_COMM | PERF_OUTPUT_TID |
                               PERF_OUTPUT_CPU | PERF_OUTPUT_TIME |
-                              PERF_OUTPUT_EVNAME | PERF_OUTPUT_SYM,
+                              PERF_OUTPUT_EVNAME | PERF_OUTPUT_IP |
+                                  PERF_OUTPUT_SYM | PERF_OUTPUT_DSO,
 
                 .invalid_fields = PERF_OUTPUT_TRACE,
         },
@@ -70,7 +80,8 @@ static struct {
 
                 .fields = PERF_OUTPUT_COMM | PERF_OUTPUT_TID |
                               PERF_OUTPUT_CPU | PERF_OUTPUT_TIME |
-                              PERF_OUTPUT_EVNAME | PERF_OUTPUT_SYM,
+                              PERF_OUTPUT_EVNAME | PERF_OUTPUT_IP |
+                                  PERF_OUTPUT_SYM | PERF_OUTPUT_DSO,
 
                 .invalid_fields = PERF_OUTPUT_TRACE,
         },
@@ -88,7 +99,8 @@ static struct {
 
                 .fields = PERF_OUTPUT_COMM | PERF_OUTPUT_TID |
                               PERF_OUTPUT_CPU | PERF_OUTPUT_TIME |
-                              PERF_OUTPUT_EVNAME | PERF_OUTPUT_SYM,
+                              PERF_OUTPUT_EVNAME | PERF_OUTPUT_IP |
+                                  PERF_OUTPUT_SYM | PERF_OUTPUT_DSO,
 
                 .invalid_fields = PERF_OUTPUT_TRACE,
         },
@@ -157,9 +169,9 @@ static int perf_evsel__check_attr(struct perf_evsel *evsel,
                 !perf_session__has_traces(session, "record -R"))
                 return -EINVAL;
 
-        if (PRINT_FIELD(SYM)) {
+        if (PRINT_FIELD(IP)) {
                 if (perf_event_attr__check_stype(attr, PERF_SAMPLE_IP, "IP",
-                                           PERF_OUTPUT_SYM))
+                                           PERF_OUTPUT_IP))
                         return -EINVAL;
 
                 if (!no_callchain &&
@@ -167,6 +179,24 @@ static int perf_evsel__check_attr(struct perf_evsel *evsel,
                         symbol_conf.use_callchain = false;
         }
 
+        if (PRINT_FIELD(ADDR) &&
+                perf_event_attr__check_stype(attr, PERF_SAMPLE_ADDR, "ADDR",
+                                       PERF_OUTPUT_ADDR))
+                return -EINVAL;
+
+        if (PRINT_FIELD(SYM) && !PRINT_FIELD(IP) && !PRINT_FIELD(ADDR)) {
+                pr_err("Display of symbols requested but neither sample IP nor "
+                           "sample address\nis selected. Hence, no addresses to convert "
+                       "to symbols.\n");
+                return -EINVAL;
+        }
+        if (PRINT_FIELD(DSO) && !PRINT_FIELD(IP) && !PRINT_FIELD(ADDR)) {
+                pr_err("Display of DSO requested but neither sample IP nor "
+                           "sample address\nis selected. Hence, no addresses to convert "
+                       "to DSO.\n");
+                return -EINVAL;
+        }
+
         if ((PRINT_FIELD(PID) || PRINT_FIELD(TID)) &&
                 perf_event_attr__check_stype(attr, PERF_SAMPLE_TID, "TID",
                                        PERF_OUTPUT_TID|PERF_OUTPUT_PID))
@@ -230,7 +260,7 @@ static void print_sample_start(struct perf_sample *sample,
         if (PRINT_FIELD(COMM)) {
                 if (latency_format)
                         printf("%8.8s ", thread->comm);
-                else if (PRINT_FIELD(SYM) && symbol_conf.use_callchain)
+                else if (PRINT_FIELD(IP) && symbol_conf.use_callchain)
                         printf("%s ", thread->comm);
                 else
                         printf("%16s ", thread->comm);
@@ -271,6 +301,63 @@ static void print_sample_start(struct perf_sample *sample,
         }
 }
 
+static bool sample_addr_correlates_sym(struct perf_event_attr *attr)
+{
+        if ((attr->type == PERF_TYPE_SOFTWARE) &&
+            ((attr->config == PERF_COUNT_SW_PAGE_FAULTS) ||
+             (attr->config == PERF_COUNT_SW_PAGE_FAULTS_MIN) ||
+             (attr->config == PERF_COUNT_SW_PAGE_FAULTS_MAJ)))
+                return true;
+
+        return false;
+}
+
+static void print_sample_addr(union perf_event *event,
+                          struct perf_sample *sample,
+                          struct perf_session *session,
+                          struct thread *thread,
+                          struct perf_event_attr *attr)
+{
+        struct addr_location al;
+        u8 cpumode = event->header.misc & PERF_RECORD_MISC_CPUMODE_MASK;
+        const char *symname, *dsoname;
+
+        printf("%16" PRIx64, sample->addr);
+
+        if (!sample_addr_correlates_sym(attr))
+                return;
+
+        thread__find_addr_map(thread, session, cpumode, MAP__FUNCTION,
+                              event->ip.pid, sample->addr, &al);
+        if (!al.map)
+                thread__find_addr_map(thread, session, cpumode, MAP__VARIABLE,
+                                      event->ip.pid, sample->addr, &al);
+
+        al.cpu = sample->cpu;
+        al.sym = NULL;
+
+        if (al.map)
+                al.sym = map__find_symbol(al.map, al.addr, NULL);
+
+        if (PRINT_FIELD(SYM)) {
+                if (al.sym && al.sym->name)
+                        symname = al.sym->name;
+                else
+                        symname = "";
+
+                printf(" %16s", symname);
+        }
+
+        if (PRINT_FIELD(DSO)) {
+                if (al.map && al.map->dso && al.map->dso->name)
+                        dsoname = al.map->dso->name;
+                else
+                        dsoname = "";
+
+                printf(" (%s)", dsoname);
+        }
+}
+
 static void process_event(union perf_event *event __unused,
                           struct perf_sample *sample,
                           struct perf_evsel *evsel,
@@ -288,12 +375,16 @@ static void process_event(union perf_event *event __unused,
                 print_trace_event(sample->cpu, sample->raw_data,
                                   sample->raw_size);
 
-        if (PRINT_FIELD(SYM)) {
+        if (PRINT_FIELD(ADDR))
+                print_sample_addr(event, sample, session, thread, attr);
+
+        if (PRINT_FIELD(IP)) {
                 if (!symbol_conf.use_callchain)
                         printf(" ");
                 else
                         printf("\n");
-                perf_session__print_symbols(event, sample, session);
+                perf_session__print_ip(event, sample, session,
+                                              PRINT_FIELD(SYM), PRINT_FIELD(DSO));
         }
 
         printf("\n");
@@ -365,6 +456,10 @@ static int process_sample_event(union perf_event *event,
                 last_timestamp = sample->time;
                 return 0;
         }
+
+        if (cpu_list && !test_bit(sample->cpu, cpu_bitmap))
+                return 0;
+
         scripting_ops->process_event(event, sample, evsel, session, thread);
 
         session->hists.stats.total_period += sample->period;
@@ -985,8 +1080,9 @@ static const struct option options[] = {
         OPT_STRING(0, "symfs", &symbol_conf.symfs, "directory",
                     "Look for files with symbols relative to this directory"),
         OPT_CALLBACK('f', "fields", NULL, "str",
-                     "comma separated output fields prepend with 'type:'. Valid types: hw,sw,trace,raw. Fields: comm,tid,pid,time,cpu,event,trace,sym",
+                     "comma separated output fields prepend with 'type:'. Valid types: hw,sw,trace,raw. Fields: comm,tid,pid,time,cpu,event,trace,ip,sym,dso,addr",
                      parse_output_fields),
+        OPT_STRING('c', "cpu", &cpu_list, "cpu", "list of cpus to profile"),
 
         OPT_END()
 };
@@ -1167,6 +1263,11 @@ int cmd_script(int argc, const char **argv, const char *prefix __used)
         if (session == NULL)
                 return -ENOMEM;
 
+        if (cpu_list) {
+                if (perf_session__cpu_bitmap(session, cpu_list, cpu_bitmap))
+                        return -1;
+        }
+
         if (!no_callchain)
                 symbol_conf.use_callchain = true;
         else
diff --git a/tools/perf/builtin-stat.c b/tools/perf/builtin-stat.c
index a9f06715e44..5deb17d9e79 100644
--- a/tools/perf/builtin-stat.c
+++ b/tools/perf/builtin-stat.c
@@ -61,6 +61,8 @@
 #include <locale.h>
 
 #define DEFAULT_SEPARATOR       " "
+#define CNTR_NOT_SUPPORTED      "<not supported>"
+#define CNTR_NOT_COUNTED        "<not counted>"
 
 static struct perf_event_attr default_attrs[] = {
 
@@ -191,6 +193,7 @@ static int			big_num_opt			=  -1;
 static const char               *cpu_list;
 static const char               *csv_sep                        = NULL;
 static bool                     csv_output                      = false;
+static bool                     group                           = false;
 
 static volatile int done = 0;
 
@@ -278,14 +281,14 @@ static int create_perf_stat_counter(struct perf_evsel *evsel)
         attr->inherit = !no_inherit;
 
         if (system_wide)
-                return perf_evsel__open_per_cpu(evsel, evsel_list->cpus, false);
+                return perf_evsel__open_per_cpu(evsel, evsel_list->cpus, group);
 
         if (target_pid == -1 && target_tid == -1) {
                 attr->disabled = 1;
                 attr->enable_on_exec = 1;
         }
 
-        return perf_evsel__open_per_thread(evsel, evsel_list->threads, false);
+        return perf_evsel__open_per_thread(evsel, evsel_list->threads, group);
 }
 
 /*
@@ -448,6 +451,7 @@ static int run_perf_stat(int argc __used, const char **argv)
                                 if (verbose)
                                         ui__warning("%s event is not supported by the kernel.\n",
                                                     event_name(counter));
+                                counter->supported = false;
                                 continue;
                         }
 
@@ -466,6 +470,7 @@ static int run_perf_stat(int argc __used, const char **argv)
                         die("Not all events could be opened.\n");
                         return -1;
                 }
+                counter->supported = true;
         }
 
         if (perf_evlist__set_filters(evsel_list)) {
@@ -513,7 +518,10 @@ static void print_noise_pct(double total, double avg)
         if (avg)
                 pct = 100.0*total/avg;
 
-        fprintf(stderr, "  ( +-%6.2f%% )", pct);
+        if (csv_output)
+                fprintf(stderr, "%s%.2f%%", csv_sep, pct);
+        else
+                fprintf(stderr, "  ( +-%6.2f%% )", pct);
 }
 
 static void print_noise(struct perf_evsel *evsel, double avg)
@@ -861,7 +869,7 @@ static void print_counter_aggr(struct perf_evsel *counter)
         if (scaled == -1) {
                 fprintf(stderr, "%*s%s%*s",
                         csv_output ? 0 : 18,
-                        "<not counted>",
+                        counter->supported ? CNTR_NOT_COUNTED : CNTR_NOT_SUPPORTED,
                         csv_sep,
                         csv_output ? 0 : -24,
                         event_name(counter));
@@ -878,13 +886,13 @@ static void print_counter_aggr(struct perf_evsel *counter)
         else
                 abs_printout(-1, counter, avg);
 
+        print_noise(counter, avg);
+
         if (csv_output) {
                 fputc('\n', stderr);
                 return;
         }
 
-        print_noise(counter, avg);
-
         if (scaled) {
                 double avg_enabled, avg_running;
 
@@ -914,7 +922,8 @@ static void print_counter(struct perf_evsel *counter)
                                 csv_output ? 0 : -4,
                                 evsel_list->cpus->map[cpu], csv_sep,
                                 csv_output ? 0 : 18,
-                                "<not counted>", csv_sep,
+                                counter->supported ? CNTR_NOT_COUNTED : CNTR_NOT_SUPPORTED,
+                                csv_sep,
                                 csv_output ? 0 : -24,
                                 event_name(counter));
 
@@ -1024,7 +1033,7 @@ static int stat__set_big_num(const struct option *opt __used,
 static const struct option options[] = {
         OPT_CALLBACK('e', "event", &evsel_list, "event",
                      "event selector. use 'perf list' to list available events",
-                     parse_events),
+                     parse_events_option),
         OPT_CALLBACK(0, "filter", &evsel_list, "filter",
                      "event filter", parse_filter),
         OPT_BOOLEAN('i', "no-inherit", &no_inherit,
@@ -1035,6 +1044,8 @@ static const struct option options[] = {
                     "stat events on existing thread id"),
         OPT_BOOLEAN('a', "all-cpus", &system_wide,
                     "system-wide collection from all CPUs"),
+        OPT_BOOLEAN('g', "group", &group,
+                    "put the counters into a counter group"),
         OPT_BOOLEAN('c', "scale", &scale,
                     "scale/normalize counters"),
         OPT_INCR('v', "verbose", &verbose,
diff --git a/tools/perf/builtin-test.c b/tools/perf/builtin-test.c
index 2da9162262b..efe696f936e 100644
--- a/tools/perf/builtin-test.c
+++ b/tools/perf/builtin-test.c
@@ -12,6 +12,7 @@
 #include "util/parse-events.h"
 #include "util/symbol.h"
 #include "util/thread_map.h"
+#include "../../include/linux/hw_breakpoint.h"
 
 static long page_size;
 
@@ -245,8 +246,8 @@ static int trace_event__id(const char *evname)
         int err = -1, fd;
 
         if (asprintf(&filename,
-                     "/sys/kernel/debug/tracing/events/syscalls/%s/id",
-                     evname) < 0)
+                     "%s/syscalls/%s/id",
+                     debugfs_path, evname) < 0)
                 return -1;
 
         fd = open(filename, O_RDONLY);
@@ -560,7 +561,7 @@ static int test__basic_mmap(void)
                 }
 
                 err = perf_event__parse_sample(event, attr.sample_type, sample_size,
-                                               false, &sample);
+                                               false, &sample, false);
                 if (err) {
                         pr_err("Can't parse sample, err = %d\n", err);
                         goto out_munmap;
@@ -600,6 +601,246 @@ out_free_threads:
 #undef nsyscalls
 }
 
+#define TEST_ASSERT_VAL(text, cond) \
+do { \
+        if (!cond) { \
+                pr_debug("FAILED %s:%d %s\n", __FILE__, __LINE__, text); \
+                return -1; \
+        } \
+} while (0)
+
+static int test__checkevent_tracepoint(struct perf_evlist *evlist)
+{
+        struct perf_evsel *evsel = list_entry(evlist->entries.next,
+                                              struct perf_evsel, node);
+
+        TEST_ASSERT_VAL("wrong number of entries", 1 == evlist->nr_entries);
+        TEST_ASSERT_VAL("wrong type", PERF_TYPE_TRACEPOINT == evsel->attr.type);
+        TEST_ASSERT_VAL("wrong sample_type",
+                (PERF_SAMPLE_RAW | PERF_SAMPLE_TIME | PERF_SAMPLE_CPU) ==
+                evsel->attr.sample_type);
+        TEST_ASSERT_VAL("wrong sample_period", 1 == evsel->attr.sample_period);
+        return 0;
+}
+
+static int test__checkevent_tracepoint_multi(struct perf_evlist *evlist)
+{
+        struct perf_evsel *evsel;
+
+        TEST_ASSERT_VAL("wrong number of entries", evlist->nr_entries > 1);
+
+        list_for_each_entry(evsel, &evlist->entries, node) {
+                TEST_ASSERT_VAL("wrong type",
+                        PERF_TYPE_TRACEPOINT == evsel->attr.type);
+                TEST_ASSERT_VAL("wrong sample_type",
+                        (PERF_SAMPLE_RAW | PERF_SAMPLE_TIME | PERF_SAMPLE_CPU)
+                        == evsel->attr.sample_type);
+                TEST_ASSERT_VAL("wrong sample_period",
+                        1 == evsel->attr.sample_period);
+        }
+        return 0;
+}
+
+static int test__checkevent_raw(struct perf_evlist *evlist)
+{
+        struct perf_evsel *evsel = list_entry(evlist->entries.next,
+                                              struct perf_evsel, node);
+
+        TEST_ASSERT_VAL("wrong number of entries", 1 == evlist->nr_entries);
+        TEST_ASSERT_VAL("wrong type", PERF_TYPE_RAW == evsel->attr.type);
+        TEST_ASSERT_VAL("wrong config", 1 == evsel->attr.config);
+        return 0;
+}
+
+static int test__checkevent_numeric(struct perf_evlist *evlist)
+{
+        struct perf_evsel *evsel = list_entry(evlist->entries.next,
+                                              struct perf_evsel, node);
+
+        TEST_ASSERT_VAL("wrong number of entries", 1 == evlist->nr_entries);
+        TEST_ASSERT_VAL("wrong type", 1 == evsel->attr.type);
+        TEST_ASSERT_VAL("wrong config", 1 == evsel->attr.config);
+        return 0;
+}
+
+static int test__checkevent_symbolic_name(struct perf_evlist *evlist)
+{
+        struct perf_evsel *evsel = list_entry(evlist->entries.next,
+                                              struct perf_evsel, node);
+
+        TEST_ASSERT_VAL("wrong number of entries", 1 == evlist->nr_entries);
+        TEST_ASSERT_VAL("wrong type", PERF_TYPE_HARDWARE == evsel->attr.type);
+        TEST_ASSERT_VAL("wrong config",
+                        PERF_COUNT_HW_INSTRUCTIONS == evsel->attr.config);
+        return 0;
+}
+
+static int test__checkevent_symbolic_alias(struct perf_evlist *evlist)
+{
+        struct perf_evsel *evsel = list_entry(evlist->entries.next,
+                                              struct perf_evsel, node);
+
+        TEST_ASSERT_VAL("wrong number of entries", 1 == evlist->nr_entries);
+        TEST_ASSERT_VAL("wrong type", PERF_TYPE_SOFTWARE == evsel->attr.type);
+        TEST_ASSERT_VAL("wrong config",
+                        PERF_COUNT_SW_PAGE_FAULTS == evsel->attr.config);
+        return 0;
+}
+
+static int test__checkevent_genhw(struct perf_evlist *evlist)
+{
+        struct perf_evsel *evsel = list_entry(evlist->entries.next,
+                                              struct perf_evsel, node);
+
+        TEST_ASSERT_VAL("wrong number of entries", 1 == evlist->nr_entries);
+        TEST_ASSERT_VAL("wrong type", PERF_TYPE_HW_CACHE == evsel->attr.type);
+        TEST_ASSERT_VAL("wrong config", (1 << 16) == evsel->attr.config);
+        return 0;
+}
+
+static int test__checkevent_breakpoint(struct perf_evlist *evlist)
+{
+        struct perf_evsel *evsel = list_entry(evlist->entries.next,
+                                              struct perf_evsel, node);
+
+        TEST_ASSERT_VAL("wrong number of entries", 1 == evlist->nr_entries);
+        TEST_ASSERT_VAL("wrong type", PERF_TYPE_BREAKPOINT == evsel->attr.type);
+        TEST_ASSERT_VAL("wrong config", 0 == evsel->attr.config);
+        TEST_ASSERT_VAL("wrong bp_type", (HW_BREAKPOINT_R | HW_BREAKPOINT_W) ==
+                                         evsel->attr.bp_type);
+        TEST_ASSERT_VAL("wrong bp_len", HW_BREAKPOINT_LEN_4 ==
+                                        evsel->attr.bp_len);
+        return 0;
+}
+
+static int test__checkevent_breakpoint_x(struct perf_evlist *evlist)
+{
+        struct perf_evsel *evsel = list_entry(evlist->entries.next,
+                                              struct perf_evsel, node);
+
+        TEST_ASSERT_VAL("wrong number of entries", 1 == evlist->nr_entries);
+        TEST_ASSERT_VAL("wrong type", PERF_TYPE_BREAKPOINT == evsel->attr.type);
+        TEST_ASSERT_VAL("wrong config", 0 == evsel->attr.config);
+        TEST_ASSERT_VAL("wrong bp_type",
+                        HW_BREAKPOINT_X == evsel->attr.bp_type);
+        TEST_ASSERT_VAL("wrong bp_len", sizeof(long) == evsel->attr.bp_len);
+        return 0;
+}
+
+static int test__checkevent_breakpoint_r(struct perf_evlist *evlist)
+{
+        struct perf_evsel *evsel = list_entry(evlist->entries.next,
+                                              struct perf_evsel, node);
+
+        TEST_ASSERT_VAL("wrong number of entries", 1 == evlist->nr_entries);
+        TEST_ASSERT_VAL("wrong type",
+                        PERF_TYPE_BREAKPOINT == evsel->attr.type);
+        TEST_ASSERT_VAL("wrong config", 0 == evsel->attr.config);
+        TEST_ASSERT_VAL("wrong bp_type",
+                        HW_BREAKPOINT_R == evsel->attr.bp_type);
+        TEST_ASSERT_VAL("wrong bp_len",
+                        HW_BREAKPOINT_LEN_4 == evsel->attr.bp_len);
+        return 0;
+}
+
+static int test__checkevent_breakpoint_w(struct perf_evlist *evlist)
+{
+        struct perf_evsel *evsel = list_entry(evlist->entries.next,
+                                              struct perf_evsel, node);
+
+        TEST_ASSERT_VAL("wrong number of entries", 1 == evlist->nr_entries);
+        TEST_ASSERT_VAL("wrong type",
+                        PERF_TYPE_BREAKPOINT == evsel->attr.type);
+        TEST_ASSERT_VAL("wrong config", 0 == evsel->attr.config);
+        TEST_ASSERT_VAL("wrong bp_type",
+                        HW_BREAKPOINT_W == evsel->attr.bp_type);
+        TEST_ASSERT_VAL("wrong bp_len",
+                        HW_BREAKPOINT_LEN_4 == evsel->attr.bp_len);
+        return 0;
+}
+
+static struct test__event_st {
+        const char *name;
+        __u32 type;
+        int (*check)(struct perf_evlist *evlist);
+} test__events[] = {
+        {
+                .name  = "syscalls:sys_enter_open",
+                .check = test__checkevent_tracepoint,
+        },
+        {
+                .name  = "syscalls:*",
+                .check = test__checkevent_tracepoint_multi,
+        },
+        {
+                .name  = "r1",
+                .check = test__checkevent_raw,
+        },
+        {
+                .name  = "1:1",
+                .check = test__checkevent_numeric,
+        },
+        {
+                .name  = "instructions",
+                .check = test__checkevent_symbolic_name,
+        },
+        {
+                .name  = "faults",
+                .check = test__checkevent_symbolic_alias,
+        },
+        {
+                .name  = "L1-dcache-load-miss",
+                .check = test__checkevent_genhw,
+        },
+        {
+                .name  = "mem:0",
+                .check = test__checkevent_breakpoint,
+        },
+        {
+                .name  = "mem:0:x",
+                .check = test__checkevent_breakpoint_x,
+        },
+        {
+                .name  = "mem:0:r",
+                .check = test__checkevent_breakpoint_r,
+        },
+        {
+                .name  = "mem:0:w",
+                .check = test__checkevent_breakpoint_w,
+        },
+};
+
+#define TEST__EVENTS_CNT (sizeof(test__events) / sizeof(struct test__event_st))
+
+static int test__parse_events(void)
+{
+        struct perf_evlist *evlist;
+        u_int i;
+        int ret = 0;
+
+        for (i = 0; i < TEST__EVENTS_CNT; i++) {
+                struct test__event_st *e = &test__events[i];
+
+                evlist = perf_evlist__new(NULL, NULL);
+                if (evlist == NULL)
+                        break;
+
+                ret = parse_events(evlist, e->name, 0);
+                if (ret) {
+                        pr_debug("failed to parse event '%s', err %d\n",
+                                 e->name, ret);
+                        break;
+                }
+
+                ret = e->check(evlist);
+                if (ret)
+                        break;
+
+                perf_evlist__delete(evlist);
+        }
+
+        return ret;
+}
 static struct test {
         const char *desc;
         int (*func)(void);
@@ -621,6 +862,10 @@ static struct test {
                 .func = test__basic_mmap,
         },
         {
+                .desc = "parse events tests",
+                .func = test__parse_events,
+        },
+        {
                 .func = NULL,
         },
 };
diff --git a/tools/perf/builtin-top.c b/tools/perf/builtin-top.c
index f2f3f4937aa..d28013b7d61 100644
--- a/tools/perf/builtin-top.c
+++ b/tools/perf/builtin-top.c
@@ -191,7 +191,8 @@ static void __zero_source_counters(struct sym_entry *syme)
         symbol__annotate_zero_histograms(sym);
 }
 
-static void record_precise_ip(struct sym_entry *syme, int counter, u64 ip)
+static void record_precise_ip(struct sym_entry *syme, struct map *map,
+                              int counter, u64 ip)
 {
         struct annotation *notes;
         struct symbol *sym;
@@ -205,8 +206,8 @@ static void record_precise_ip(struct sym_entry *syme, int counter, u64 ip)
         if (pthread_mutex_trylock(&notes->lock))
                 return;
 
-        ip = syme->map->map_ip(syme->map, ip);
-        symbol__inc_addr_samples(sym, syme->map, counter, ip);
+        ip = map->map_ip(map, ip);
+        symbol__inc_addr_samples(sym, map, counter, ip);
 
         pthread_mutex_unlock(&notes->lock);
 }
@@ -810,7 +811,7 @@ static void perf_event__process_sample(const union perf_event *event,
                 evsel = perf_evlist__id2evsel(top.evlist, sample->id);
                 assert(evsel != NULL);
                 syme->count[evsel->idx]++;
-                record_precise_ip(syme, evsel->idx, ip);
+                record_precise_ip(syme, al.map, evsel->idx, ip);
                 pthread_mutex_lock(&top.active_symbols_lock);
                 if (list_empty(&syme->node) || !syme->node.next) {
                         static bool first = true;
@@ -990,7 +991,7 @@ static const char * const top_usage[] = {
 static const struct option options[] = {
         OPT_CALLBACK('e', "event", &top.evlist, "event",
                      "event selector. use 'perf list' to list available events",
-                     parse_events),
+                     parse_events_option),
         OPT_INTEGER('c', "count", &default_interval,
                     "event period to sample"),
         OPT_INTEGER('p', "pid", &top.target_pid,
diff --git a/tools/perf/tests/vmlinux-kallsyms.c b/tools/perf/tests/vmlinux-kallsyms.c
new file mode 100644
index 00000000000..0d1cdbee2f5
--- /dev/null
+++ b/tools/perf/tests/vmlinux-kallsyms.c
@@ -0,0 +1,230 @@
+#include <linux/compiler.h>
+#include <linux/rbtree.h>
+#include <string.h>
+#include "map.h"
+#include "symbol.h"
+#include "util.h"
+#include "tests.h"
+#include "debug.h"
+#include "machine.h"
+
+static int vmlinux_matches_kallsyms_filter(struct map *map __maybe_unused,
+                                           struct symbol *sym)
+{
+        bool *visited = symbol__priv(sym);
+        *visited = true;
+        return 0;
+}
+
+int test__vmlinux_matches_kallsyms(void)
+{
+        int err = -1;
+        struct rb_node *nd;
+        struct symbol *sym;
+        struct map *kallsyms_map, *vmlinux_map;
+        struct machine kallsyms, vmlinux;
+        enum map_type type = MAP__FUNCTION;
+        struct ref_reloc_sym ref_reloc_sym = { .name = "_stext", };
+
+        /*
+         * Step 1:
+         *
+         * Init the machines that will hold kernel, modules obtained from
+         * both vmlinux + .ko files and from /proc/kallsyms split by modules.
+         */
+        machine__init(&kallsyms, "", HOST_KERNEL_ID);
+        machine__init(&vmlinux, "", HOST_KERNEL_ID);
+
+        /*
+         * Step 2:
+         *
+         * Create the kernel maps for kallsyms and the DSO where we will then
+         * load /proc/kallsyms. Also create the modules maps from /proc/modules
+         * and find the .ko files that match them in /lib/modules/`uname -r`/.
+         */
+        if (machine__create_kernel_maps(&kallsyms) < 0) {
+                pr_debug("machine__create_kernel_maps ");
+                return -1;
+        }
+
+        /*
+         * Step 3:
+         *
+         * Load and split /proc/kallsyms into multiple maps, one per module.
+         */
+        if (machine__load_kallsyms(&kallsyms, "/proc/kallsyms", type, NULL) <= 0) {
+                pr_debug("dso__load_kallsyms ");
+                goto out;
+        }
+
+        /*
+         * Step 4:
+         *
+         * kallsyms will be internally on demand sorted by name so that we can
+         * find the reference relocation * symbol, i.e. the symbol we will use
+         * to see if the running kernel was relocated by checking if it has the
+         * same value in the vmlinux file we load.
+         */
+        kallsyms_map = machine__kernel_map(&kallsyms, type);
+
+        sym = map__find_symbol_by_name(kallsyms_map, ref_reloc_sym.name, NULL);
+        if (sym == NULL) {
+                pr_debug("dso__find_symbol_by_name ");
+                goto out;
+        }
+
+        ref_reloc_sym.addr = sym->start;
+
+        /*
+         * Step 5:
+         *
+         * Now repeat step 2, this time for the vmlinux file we'll auto-locate.
+         */
+        if (machine__create_kernel_maps(&vmlinux) < 0) {
+                pr_debug("machine__create_kernel_maps ");
+                goto out;
+        }
+
+        vmlinux_map = machine__kernel_map(&vmlinux, type);
+        map__kmap(vmlinux_map)->ref_reloc_sym = &ref_reloc_sym;
+
+        /*
+         * Step 6:
+         *
+         * Locate a vmlinux file in the vmlinux path that has a buildid that
+         * matches the one of the running kernel.
+         *
+         * While doing that look if we find the ref reloc symbol, if we find it
+         * we'll have its ref_reloc_symbol.unrelocated_addr and then
+         * maps__reloc_vmlinux will notice and set proper ->[un]map_ip routines
+         * to fixup the symbols.
+         */
+        if (machine__load_vmlinux_path(&vmlinux, type,
+                                       vmlinux_matches_kallsyms_filter) <= 0) {
+                pr_debug("machine__load_vmlinux_path ");
+                goto out;
+        }
+
+        err = 0;
+        /*
+         * Step 7:
+         *
+         * Now look at the symbols in the vmlinux DSO and check if we find all of them
+         * in the kallsyms dso. For the ones that are in both, check its names and
+         * end addresses too.
+         */
+        for (nd = rb_first(&vmlinux_map->dso->symbols[type]); nd; nd = rb_next(nd)) {
+                struct symbol *pair, *first_pair;
+                bool backwards = true;
+
+                sym  = rb_entry(nd, struct symbol, rb_node);
+
+                if (sym->start == sym->end)
+                        continue;
+
+                first_pair = machine__find_kernel_symbol(&kallsyms, type, sym->start, NULL, NULL);
+                pair = first_pair;
+
+                if (pair && pair->start == sym->start) {
+next_pair:
+                        if (strcmp(sym->name, pair->name) == 0) {
+                                /*
+                                 * kallsyms don't have the symbol end, so we
+                                 * set that by using the next symbol start - 1,
+                                 * in some cases we get this up to a page
+                                 * wrong, trace_kmalloc when I was developing
+                                 * this code was one such example, 2106 bytes
+                                 * off the real size. More than that and we
+                                 * _really_ have a problem.
+                                 */
+                                s64 skew = sym->end - pair->end;
+                                if (llabs(skew) < page_size)
+                                        continue;
+
+                                pr_debug("%#" PRIx64 ": diff end addr for %s v: %#" PRIx64 " k: %#" PRIx64 "\n",
+                                         sym->start, sym->name, sym->end, pair->end);
+                        } else {
+                                struct rb_node *nnd;
+detour:
+                                nnd = backwards ? rb_prev(&pair->rb_node) :
+                                                  rb_next(&pair->rb_node);
+                                if (nnd) {
+                                        struct symbol *next = rb_entry(nnd, struct symbol, rb_node);
+
+                                        if (next->start == sym->start) {
+                                                pair = next;
+                                                goto next_pair;
+                                        }
+                                }
+
+                                if (backwards) {
+                                        backwards = false;
+                                        pair = first_pair;
+                                        goto detour;
+                                }
+
+                                pr_debug("%#" PRIx64 ": diff name v: %s k: %s\n",
+                                         sym->start, sym->name, pair->name);
+                        }
+                } else
+                        pr_debug("%#" PRIx64 ": %s not on kallsyms\n", sym->start, sym->name);
+
+                err = -1;
+        }
+
+        if (!verbose)
+                goto out;
+
+        pr_info("Maps only in vmlinux:\n");
+
+        for (nd = rb_first(&vmlinux.kmaps.maps[type]); nd; nd = rb_next(nd)) {
+                struct map *pos = rb_entry(nd, struct map, rb_node), *pair;
+                /*
+                 * If it is the kernel, kallsyms is always "[kernel.kallsyms]", while
+                 * the kernel will have the path for the vmlinux file being used,
+                 * so use the short name, less descriptive but the same ("[kernel]" in
+                 * both cases.
+                 */
+                pair = map_groups__find_by_name(&kallsyms.kmaps, type,
+                                                (pos->dso->kernel ?
+                                                        pos->dso->short_name :
+                                                        pos->dso->name));
+                if (pair)
+                        pair->priv = 1;
+                else
+                        map__fprintf(pos, stderr);
+        }
+
+        pr_info("Maps in vmlinux with a different name in kallsyms:\n");
+
+        for (nd = rb_first(&vmlinux.kmaps.maps[type]); nd; nd = rb_next(nd)) {
+                struct map *pos = rb_entry(nd, struct map, rb_node), *pair;
+
+                pair = map_groups__find(&kallsyms.kmaps, type, pos->start);
+                if (pair == NULL || pair->priv)
+                        continue;
+
+                if (pair->start == pos->start) {
+                        pair->priv = 1;
+                        pr_info(" %" PRIx64 "-%" PRIx64 " %" PRIx64 " %s in kallsyms as",
+                                pos->start, pos->end, pos->pgoff, pos->dso->name);
+                        if (pos->pgoff != pair->pgoff || pos->end != pair->end)
+                                pr_info(": \n*%" PRIx64 "-%" PRIx64 " %" PRIx64 "",
+                                        pair->start, pair->end, pair->pgoff);
+                        pr_info(" %s\n", pair->dso->name);
+                        pair->priv = 1;
+                }
+        }
+
+        pr_info("Maps only in kallsyms:\n");
+
+        for (nd = rb_first(&kallsyms.kmaps.maps[type]);
+             nd; nd = rb_next(nd)) {
+                struct map *pos = rb_entry(nd, struct map, rb_node);
+
+                if (!pos->priv)
+                        map__fprintf(pos, stderr);
+        }
+out:
+        return err;
+}
diff --git a/tools/perf/util/callchain.h b/tools/perf/util/callchain.h
index 1a79df9f739..9b4ff16cac9 100644
--- a/tools/perf/util/callchain.h
+++ b/tools/perf/util/callchain.h
@@ -14,6 +14,11 @@ enum chain_mode {
         CHAIN_GRAPH_REL
 };
 
+enum chain_order {
+        ORDER_CALLER,
+        ORDER_CALLEE
+};
+
 struct callchain_node {
         struct callchain_node   *parent;
         struct list_head        siblings;
@@ -41,6 +46,7 @@ struct callchain_param {
         u32                     print_limit;
         double                  min_percent;
         sort_chain_func_t       sort;
+        enum chain_order        order;
 };
 
 struct callchain_list {
diff --git a/tools/perf/util/config.c b/tools/perf/util/config.c
index e02d78cae70..fe02903f7d0 100644
--- a/tools/perf/util/config.c
+++ b/tools/perf/util/config.c
@@ -399,7 +399,6 @@ static int perf_config_global(void)
 int perf_config(config_fn_t fn, void *data)
 {
         int ret = 0, found = 0;
-        char *repo_config = NULL;
         const char *home = NULL;
 
         /* Setting $PERF_CONFIG makes perf read _only_ the given config file. */
@@ -414,19 +413,32 @@ int perf_config(config_fn_t fn, void *data)
         home = getenv("HOME");
         if (perf_config_global() && home) {
                 char *user_config = strdup(mkpath("%s/.perfconfig", home));
-                if (!access(user_config, R_OK)) {
-                        ret += perf_config_from_file(fn, user_config, data);
-                        found += 1;
+                struct stat st;
+
+                if (user_config == NULL) {
+                        warning("Not enough memory to process %s/.perfconfig, "
+                                "ignoring it.", home);
+                        goto out;
                 }
-                free(user_config);
-        }
 
-        repo_config = perf_pathdup("config");
-        if (!access(repo_config, R_OK)) {
-                ret += perf_config_from_file(fn, repo_config, data);
+                if (stat(user_config, &st) < 0)
+                        goto out_free;
+
+                if (st.st_uid && (st.st_uid != geteuid())) {
+                        warning("File %s not owned by current user or root, "
+                                "ignoring it.", user_config);
+                        goto out_free;
+                }
+
+                if (!st.st_size)
+                        goto out_free;
+
+                ret += perf_config_from_file(fn, user_config, data);
                 found += 1;
+out_free:
+                free(user_config);
         }
-        free(repo_config);
+out:
         if (found == 0)
                 return -1;
         return ret;
diff --git a/tools/perf/util/dwarf-aux.c b/tools/perf/util/dwarf-aux.c
new file mode 100644
index 00000000000..ee51e9b4dc0
--- /dev/null
+++ b/tools/perf/util/dwarf-aux.c
@@ -0,0 +1,843 @@
+/*
+ * dwarf-aux.c : libdw auxiliary interfaces
+ *
+ * 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; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * 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.
+ *
+ */
+
+#include <stdbool.h>
+#include "util.h"
+#include "debug.h"
+#include "dwarf-aux.h"
+
+/**
+ * cu_find_realpath - Find the realpath of the target file
+ * @cu_die: A DIE(dwarf information entry) of CU(compilation Unit)
+ * @fname:  The tail filename of the target file
+ *
+ * Find the real(long) path of @fname in @cu_die.
+ */
+const char *cu_find_realpath(Dwarf_Die *cu_die, const char *fname)
+{
+        Dwarf_Files *files;
+        size_t nfiles, i;
+        const char *src = NULL;
+        int ret;
+
+        if (!fname)
+                return NULL;
+
+        ret = dwarf_getsrcfiles(cu_die, &files, &nfiles);
+        if (ret != 0)
+                return NULL;
+
+        for (i = 0; i < nfiles; i++) {
+                src = dwarf_filesrc(files, i, NULL, NULL);
+                if (strtailcmp(src, fname) == 0)
+                        break;
+        }
+        if (i == nfiles)
+                return NULL;
+        return src;
+}
+
+/**
+ * cu_get_comp_dir - Get the path of compilation directory
+ * @cu_die: a CU DIE
+ *
+ * Get the path of compilation directory of given @cu_die.
+ * Since this depends on DW_AT_comp_dir, older gcc will not
+ * embedded it. In that case, this returns NULL.
+ */
+const char *cu_get_comp_dir(Dwarf_Die *cu_die)
+{
+        Dwarf_Attribute attr;
+        if (dwarf_attr(cu_die, DW_AT_comp_dir, &attr) == NULL)
+                return NULL;
+        return dwarf_formstring(&attr);
+}
+
+/**
+ * cu_find_lineinfo - Get a line number and file name for given address
+ * @cu_die: a CU DIE
+ * @addr: An address
+ * @fname: a pointer which returns the file name string
+ * @lineno: a pointer which returns the line number
+ *
+ * Find a line number and file name for @addr in @cu_die.
+ */
+int cu_find_lineinfo(Dwarf_Die *cu_die, unsigned long addr,
+                    const char **fname, int *lineno)
+{
+        Dwarf_Line *line;
+        Dwarf_Addr laddr;
+
+        line = dwarf_getsrc_die(cu_die, (Dwarf_Addr)addr);
+        if (line && dwarf_lineaddr(line, &laddr) == 0 &&
+            addr == (unsigned long)laddr && dwarf_lineno(line, lineno) == 0) {
+                *fname = dwarf_linesrc(line, NULL, NULL);
+                if (!*fname)
+                        /* line number is useless without filename */
+                        *lineno = 0;
+        }
+
+        return *lineno ?: -ENOENT;
+}
+
+static int __die_find_inline_cb(Dwarf_Die *die_mem, void *data);
+
+/**
+ * cu_walk_functions_at - Walk on function DIEs at given address
+ * @cu_die: A CU DIE
+ * @addr: An address
+ * @callback: A callback which called with found DIEs
+ * @data: A user data
+ *
+ * Walk on function DIEs at given @addr in @cu_die. Passed DIEs
+ * should be subprogram or inlined-subroutines.
+ */
+int cu_walk_functions_at(Dwarf_Die *cu_die, Dwarf_Addr addr,
+                    int (*callback)(Dwarf_Die *, void *), void *data)
+{
+        Dwarf_Die die_mem;
+        Dwarf_Die *sc_die;
+        int ret = -ENOENT;
+
+        /* Inlined function could be recursive. Trace it until fail */
+        for (sc_die = die_find_realfunc(cu_die, addr, &die_mem);
+             sc_die != NULL;
+             sc_die = die_find_child(sc_die, __die_find_inline_cb, &addr,
+                                     &die_mem)) {
+                ret = callback(sc_die, data);
+                if (ret)
+                        break;
+        }
+
+        return ret;
+
+}
+
+/**
+ * die_compare_name - Compare diename and tname
+ * @dw_die: a DIE
+ * @tname: a string of target name
+ *
+ * Compare the name of @dw_die and @tname. Return false if @dw_die has no name.
+ */
+bool die_compare_name(Dwarf_Die *dw_die, const char *tname)
+{
+        const char *name;
+        name = dwarf_diename(dw_die);
+        return name ? (strcmp(tname, name) == 0) : false;
+}
+
+/**
+ * die_get_call_lineno - Get callsite line number of inline-function instance
+ * @in_die: a DIE of an inlined function instance
+ *
+ * Get call-site line number of @in_die. This means from where the inline
+ * function is called.
+ */
+int die_get_call_lineno(Dwarf_Die *in_die)
+{
+        Dwarf_Attribute attr;
+        Dwarf_Word ret;
+
+        if (!dwarf_attr(in_die, DW_AT_call_line, &attr))
+                return -ENOENT;
+
+        dwarf_formudata(&attr, &ret);
+        return (int)ret;
+}
+
+/**
+ * die_get_type - Get type DIE
+ * @vr_die: a DIE of a variable
+ * @die_mem: where to store a type DIE
+ *
+ * Get a DIE of the type of given variable (@vr_die), and store
+ * it to die_mem. Return NULL if fails to get a type DIE.
+ */
+Dwarf_Die *die_get_type(Dwarf_Die *vr_die, Dwarf_Die *die_mem)
+{
+        Dwarf_Attribute attr;
+
+        if (dwarf_attr_integrate(vr_die, DW_AT_type, &attr) &&
+            dwarf_formref_die(&attr, die_mem))
+                return die_mem;
+        else
+                return NULL;
+}
+
+/* Get a type die, but skip qualifiers */
+static Dwarf_Die *__die_get_real_type(Dwarf_Die *vr_die, Dwarf_Die *die_mem)
+{
+        int tag;
+
+        do {
+                vr_die = die_get_type(vr_die, die_mem);
+                if (!vr_die)
+                        break;
+                tag = dwarf_tag(vr_die);
+        } while (tag == DW_TAG_const_type ||
+                 tag == DW_TAG_restrict_type ||
+                 tag == DW_TAG_volatile_type ||
+                 tag == DW_TAG_shared_type);
+
+        return vr_die;
+}
+
+/**
+ * die_get_real_type - Get a type die, but skip qualifiers and typedef
+ * @vr_die: a DIE of a variable
+ * @die_mem: where to store a type DIE
+ *
+ * Get a DIE of the type of given variable (@vr_die), and store
+ * it to die_mem. Return NULL if fails to get a type DIE.
+ * If the type is qualifiers (e.g. const) or typedef, this skips it
+ * and tries to find real type (structure or basic types, e.g. int).
+ */
+Dwarf_Die *die_get_real_type(Dwarf_Die *vr_die, Dwarf_Die *die_mem)
+{
+        do {
+                vr_die = __die_get_real_type(vr_die, die_mem);
+        } while (vr_die && dwarf_tag(vr_die) == DW_TAG_typedef);
+
+        return vr_die;
+}
+
+/* Get attribute and translate it as a udata */
+static int die_get_attr_udata(Dwarf_Die *tp_die, unsigned int attr_name,
+                              Dwarf_Word *result)
+{
+        Dwarf_Attribute attr;
+
+        if (dwarf_attr(tp_die, attr_name, &attr) == NULL ||
+            dwarf_formudata(&attr, result) != 0)
+                return -ENOENT;
+
+        return 0;
+}
+
+/* Get attribute and translate it as a sdata */
+static int die_get_attr_sdata(Dwarf_Die *tp_die, unsigned int attr_name,
+                              Dwarf_Sword *result)
+{
+        Dwarf_Attribute attr;
+
+        if (dwarf_attr(tp_die, attr_name, &attr) == NULL ||
+            dwarf_formsdata(&attr, result) != 0)
+                return -ENOENT;
+
+        return 0;
+}
+
+/**
+ * die_is_signed_type - Check whether a type DIE is signed or not
+ * @tp_die: a DIE of a type
+ *
+ * Get the encoding of @tp_die and return true if the encoding
+ * is signed.
+ */
+bool die_is_signed_type(Dwarf_Die *tp_die)
+{
+        Dwarf_Word ret;
+
+        if (die_get_attr_udata(tp_die, DW_AT_encoding, &ret))
+                return false;
+
+        return (ret == DW_ATE_signed_char || ret == DW_ATE_signed ||
+                ret == DW_ATE_signed_fixed);
+}
+
+/**
+ * die_get_data_member_location - Get the data-member offset
+ * @mb_die: a DIE of a member of a data structure
+ * @offs: The offset of the member in the data structure
+ *
+ * Get the offset of @mb_die in the data structure including @mb_die, and
+ * stores result offset to @offs. If any error occurs this returns errno.
+ */
+int die_get_data_member_location(Dwarf_Die *mb_die, Dwarf_Word *offs)
+{
+        Dwarf_Attribute attr;
+        Dwarf_Op *expr;
+        size_t nexpr;
+        int ret;
+
+        if (dwarf_attr(mb_die, DW_AT_data_member_location, &attr) == NULL)
+                return -ENOENT;
+
+        if (dwarf_formudata(&attr, offs) != 0) {
+                /* DW_AT_data_member_location should be DW_OP_plus_uconst */
+                ret = dwarf_getlocation(&attr, &expr, &nexpr);
+                if (ret < 0 || nexpr == 0)
+                        return -ENOENT;
+
+                if (expr[0].atom != DW_OP_plus_uconst || nexpr != 1) {
+                        pr_debug("Unable to get offset:Unexpected OP %x (%zd)\n",
+                                 expr[0].atom, nexpr);
+                        return -ENOTSUP;
+                }
+                *offs = (Dwarf_Word)expr[0].number;
+        }
+        return 0;
+}
+
+/* Get the call file index number in CU DIE */
+static int die_get_call_fileno(Dwarf_Die *in_die)
+{
+        Dwarf_Sword idx;
+
+        if (die_get_attr_sdata(in_die, DW_AT_call_file, &idx) == 0)
+                return (int)idx;
+        else
+                return -ENOENT;
+}
+
+/* Get the declared file index number in CU DIE */
+static int die_get_decl_fileno(Dwarf_Die *pdie)
+{
+        Dwarf_Sword idx;
+
+        if (die_get_attr_sdata(pdie, DW_AT_decl_file, &idx) == 0)
+                return (int)idx;
+        else
+                return -ENOENT;
+}
+
+/**
+ * die_get_call_file - Get callsite file name of inlined function instance
+ * @in_die: a DIE of an inlined function instance
+ *
+ * Get call-site file name of @in_die. This means from which file the inline
+ * function is called.
+ */
+const char *die_get_call_file(Dwarf_Die *in_die)
+{
+        Dwarf_Die cu_die;
+        Dwarf_Files *files;
+        int idx;
+
+        idx = die_get_call_fileno(in_die);
+        if (idx < 0 || !dwarf_diecu(in_die, &cu_die, NULL, NULL) ||
+            dwarf_getsrcfiles(&cu_die, &files, NULL) != 0)
+                return NULL;
+
+        return dwarf_filesrc(files, idx, NULL, NULL);
+}
+
+
+/**
+ * die_find_child - Generic DIE search function in DIE tree
+ * @rt_die: a root DIE
+ * @callback: a callback function
+ * @data: a user data passed to the callback function
+ * @die_mem: a buffer for result DIE
+ *
+ * Trace DIE tree from @rt_die and call @callback for each child DIE.
+ * If @callback returns DIE_FIND_CB_END, this stores the DIE into
+ * @die_mem and returns it. If @callback returns DIE_FIND_CB_CONTINUE,
+ * this continues to trace the tree. Optionally, @callback can return
+ * DIE_FIND_CB_CHILD and DIE_FIND_CB_SIBLING, those means trace only
+ * the children and trace only the siblings respectively.
+ * Returns NULL if @callback can't find any appropriate DIE.
+ */
+Dwarf_Die *die_find_child(Dwarf_Die *rt_die,
+                          int (*callback)(Dwarf_Die *, void *),
+                          void *data, Dwarf_Die *die_mem)
+{
+        Dwarf_Die child_die;
+        int ret;
+
+        ret = dwarf_child(rt_die, die_mem);
+        if (ret != 0)
+                return NULL;
+
+        do {
+                ret = callback(die_mem, data);
+                if (ret == DIE_FIND_CB_END)
+                        return die_mem;
+
+                if ((ret & DIE_FIND_CB_CHILD) &&
+                    die_find_child(die_mem, callback, data, &child_die)) {
+                        memcpy(die_mem, &child_die, sizeof(Dwarf_Die));
+                        return die_mem;
+                }
+        } while ((ret & DIE_FIND_CB_SIBLING) &&
+                 dwarf_siblingof(die_mem, die_mem) == 0);
+
+        return NULL;
+}
+
+struct __addr_die_search_param {
+        Dwarf_Addr      addr;
+        Dwarf_Die       *die_mem;
+};
+
+/* die_find callback for non-inlined function search */
+static int __die_search_func_cb(Dwarf_Die *fn_die, void *data)
+{
+        struct __addr_die_search_param *ad = data;
+
+        if (dwarf_tag(fn_die) == DW_TAG_subprogram &&
+            dwarf_haspc(fn_die, ad->addr)) {
+                memcpy(ad->die_mem, fn_die, sizeof(Dwarf_Die));
+                return DWARF_CB_ABORT;
+        }
+        return DWARF_CB_OK;
+}
+
+/**
+ * die_find_realfunc - Search a non-inlined function at given address
+ * @cu_die: a CU DIE which including @addr
+ * @addr: target address
+ * @die_mem: a buffer for result DIE
+ *
+ * Search a non-inlined function DIE which includes @addr. Stores the
+ * DIE to @die_mem and returns it if found. Returns NULl if failed.
+ */
+Dwarf_Die *die_find_realfunc(Dwarf_Die *cu_die, Dwarf_Addr addr,
+                                    Dwarf_Die *die_mem)
+{
+        struct __addr_die_search_param ad;
+        ad.addr = addr;
+        ad.die_mem = die_mem;
+        /* dwarf_getscopes can't find subprogram. */
+        if (!dwarf_getfuncs(cu_die, __die_search_func_cb, &ad, 0))
+                return NULL;
+        else
+                return die_mem;
+}
+
+/* die_find callback for inline function search */
+static int __die_find_inline_cb(Dwarf_Die *die_mem, void *data)
+{
+        Dwarf_Addr *addr = data;
+
+        if (dwarf_tag(die_mem) == DW_TAG_inlined_subroutine &&
+            dwarf_haspc(die_mem, *addr))
+                return DIE_FIND_CB_END;
+
+        return DIE_FIND_CB_CONTINUE;
+}
+
+/**
+ * die_find_inlinefunc - Search an inlined function at given address
+ * @cu_die: a CU DIE which including @addr
+ * @addr: target address
+ * @die_mem: a buffer for result DIE
+ *
+ * Search an inlined function DIE which includes @addr. Stores the
+ * DIE to @die_mem and returns it if found. Returns NULl if failed.
+ * If several inlined functions are expanded recursively, this trace
+ * it and returns deepest one.
+ */
+Dwarf_Die *die_find_inlinefunc(Dwarf_Die *sp_die, Dwarf_Addr addr,
+                               Dwarf_Die *die_mem)
+{
+        Dwarf_Die tmp_die;
+
+        sp_die = die_find_child(sp_die, __die_find_inline_cb, &addr, &tmp_die);
+        if (!sp_die)
+                return NULL;
+
+        /* Inlined function could be recursive. Trace it until fail */
+        while (sp_die) {
+                memcpy(die_mem, sp_die, sizeof(Dwarf_Die));
+                sp_die = die_find_child(sp_die, __die_find_inline_cb, &addr,
+                                        &tmp_die);
+        }
+
+        return die_mem;
+}
+
+struct __instance_walk_param {
+        void    *addr;
+        int     (*callback)(Dwarf_Die *, void *);
+        void    *data;
+        int     retval;
+};
+
+static int __die_walk_instances_cb(Dwarf_Die *inst, void *data)
+{
+        struct __instance_walk_param *iwp = data;
+        Dwarf_Attribute attr_mem;
+        Dwarf_Die origin_mem;
+        Dwarf_Attribute *attr;
+        Dwarf_Die *origin;
+        int tmp;
+
+        attr = dwarf_attr(inst, DW_AT_abstract_origin, &attr_mem);
+        if (attr == NULL)
+                return DIE_FIND_CB_CONTINUE;
+
+        origin = dwarf_formref_die(attr, &origin_mem);
+        if (origin == NULL || origin->addr != iwp->addr)
+                return DIE_FIND_CB_CONTINUE;
+
+        /* Ignore redundant instances */
+        if (dwarf_tag(inst) == DW_TAG_inlined_subroutine) {
+                dwarf_decl_line(origin, &tmp);
+                if (die_get_call_lineno(inst) == tmp) {
+                        tmp = die_get_decl_fileno(origin);
+                        if (die_get_call_fileno(inst) == tmp)
+                                return DIE_FIND_CB_CONTINUE;
+                }
+        }
+
+        iwp->retval = iwp->callback(inst, iwp->data);
+
+        return (iwp->retval) ? DIE_FIND_CB_END : DIE_FIND_CB_CONTINUE;
+}
+
+/**
+ * die_walk_instances - Walk on instances of given DIE
+ * @or_die: an abstract original DIE
+ * @callback: a callback function which is called with instance DIE
+ * @data: user data
+ *
+ * Walk on the instances of give @in_die. @in_die must be an inlined function
+ * declartion. This returns the return value of @callback if it returns
+ * non-zero value, or -ENOENT if there is no instance.
+ */
+int die_walk_instances(Dwarf_Die *or_die, int (*callback)(Dwarf_Die *, void *),
+                       void *data)
+{
+        Dwarf_Die cu_die;
+        Dwarf_Die die_mem;
+        struct __instance_walk_param iwp = {
+                .addr = or_die->addr,
+                .callback = callback,
+                .data = data,
+                .retval = -ENOENT,
+        };
+
+        if (dwarf_diecu(or_die, &cu_die, NULL, NULL) == NULL)
+                return -ENOENT;
+
+        die_find_child(&cu_die, __die_walk_instances_cb, &iwp, &die_mem);
+
+        return iwp.retval;
+}
+
+/* Line walker internal parameters */
+struct __line_walk_param {
+        bool recursive;
+        line_walk_callback_t callback;
+        void *data;
+        int retval;
+};
+
+static int __die_walk_funclines_cb(Dwarf_Die *in_die, void *data)
+{
+        struct __line_walk_param *lw = data;
+        Dwarf_Addr addr = 0;
+        const char *fname;
+        int lineno;
+
+        if (dwarf_tag(in_die) == DW_TAG_inlined_subroutine) {
+                fname = die_get_call_file(in_die);
+                lineno = die_get_call_lineno(in_die);
+                if (fname && lineno > 0 && dwarf_entrypc(in_die, &addr) == 0) {
+                        lw->retval = lw->callback(fname, lineno, addr, lw->data);
+                        if (lw->retval != 0)
+                                return DIE_FIND_CB_END;
+                }
+        }
+        if (!lw->recursive)
+                /* Don't need to search recursively */
+                return DIE_FIND_CB_SIBLING;
+
+        if (addr) {
+                fname = dwarf_decl_file(in_die);
+                if (fname && dwarf_decl_line(in_die, &lineno) == 0) {
+                        lw->retval = lw->callback(fname, lineno, addr, lw->data);
+                        if (lw->retval != 0)
+                                return DIE_FIND_CB_END;
+                }
+        }
+
+        /* Continue to search nested inlined function call-sites */
+        return DIE_FIND_CB_CONTINUE;
+}
+
+/* Walk on lines of blocks included in given DIE */
+static int __die_walk_funclines(Dwarf_Die *sp_die, bool recursive,
+                                line_walk_callback_t callback, void *data)
+{
+        struct __line_walk_param lw = {
+                .recursive = recursive,
+                .callback = callback,
+                .data = data,
+                .retval = 0,
+        };
+        Dwarf_Die die_mem;
+        Dwarf_Addr addr;
+        const char *fname;
+        int lineno;
+
+        /* Handle function declaration line */
+        fname = dwarf_decl_file(sp_die);
+        if (fname && dwarf_decl_line(sp_die, &lineno) == 0 &&
+            dwarf_entrypc(sp_die, &addr) == 0) {
+                lw.retval = callback(fname, lineno, addr, data);
+                if (lw.retval != 0)
+                        goto done;
+        }
+        die_find_child(sp_die, __die_walk_funclines_cb, &lw, &die_mem);
+done:
+        return lw.retval;
+}
+
+static int __die_walk_culines_cb(Dwarf_Die *sp_die, void *data)
+{
+        struct __line_walk_param *lw = data;
+
+        lw->retval = __die_walk_funclines(sp_die, true, lw->callback, lw->data);
+        if (lw->retval != 0)
+                return DWARF_CB_ABORT;
+
+        return DWARF_CB_OK;
+}
+
+/**
+ * die_walk_lines - Walk on lines inside given DIE
+ * @rt_die: a root DIE (CU, subprogram or inlined_subroutine)
+ * @callback: callback routine
+ * @data: user data
+ *
+ * Walk on all lines inside given @rt_die and call @callback on each line.
+ * If the @rt_die is a function, walk only on the lines inside the function,
+ * otherwise @rt_die must be a CU DIE.
+ * Note that this walks not only dwarf line list, but also function entries
+ * and inline call-site.
+ */
+int die_walk_lines(Dwarf_Die *rt_die, line_walk_callback_t callback, void *data)
+{
+        Dwarf_Lines *lines;
+        Dwarf_Line *line;
+        Dwarf_Addr addr;
+        const char *fname;
+        int lineno, ret = 0;
+        Dwarf_Die die_mem, *cu_die;
+        size_t nlines, i;
+
+        /* Get the CU die */
+        if (dwarf_tag(rt_die) != DW_TAG_compile_unit)
+                cu_die = dwarf_diecu(rt_die, &die_mem, NULL, NULL);
+        else
+                cu_die = rt_die;
+        if (!cu_die) {
+                pr_debug2("Failed to get CU from given DIE.\n");
+                return -EINVAL;
+        }
+
+        /* Get lines list in the CU */
+        if (dwarf_getsrclines(cu_die, &lines, &nlines) != 0) {
+                pr_debug2("Failed to get source lines on this CU.\n");
+                return -ENOENT;
+        }
+        pr_debug2("Get %zd lines from this CU\n", nlines);
+
+        /* Walk on the lines on lines list */
+        for (i = 0; i < nlines; i++) {
+                line = dwarf_onesrcline(lines, i);
+                if (line == NULL ||
+                    dwarf_lineno(line, &lineno) != 0 ||
+                    dwarf_lineaddr(line, &addr) != 0) {
+                        pr_debug2("Failed to get line info. "
+                                  "Possible error in debuginfo.\n");
+                        continue;
+                }
+                /* Filter lines based on address */
+                if (rt_die != cu_die)
+                        /*
+                         * Address filtering
+                         * The line is included in given function, and
+                         * no inline block includes it.
+                         */
+                        if (!dwarf_haspc(rt_die, addr) ||
+                            die_find_inlinefunc(rt_die, addr, &die_mem))
+                                continue;
+                /* Get source line */
+                fname = dwarf_linesrc(line, NULL, NULL);
+
+                ret = callback(fname, lineno, addr, data);
+                if (ret != 0)
+                        return ret;
+        }
+
+        /*
+         * Dwarf lines doesn't include function declarations and inlined
+         * subroutines. We have to check functions list or given function.
+         */
+        if (rt_die != cu_die)
+                /*
+                 * Don't need walk functions recursively, because nested
+                 * inlined functions don't have lines of the specified DIE.
+                 */
+                ret = __die_walk_funclines(rt_die, false, callback, data);
+        else {
+                struct __line_walk_param param = {
+                        .callback = callback,
+                        .data = data,
+                        .retval = 0,
+                };
+                dwarf_getfuncs(cu_die, __die_walk_culines_cb, &param, 0);
+                ret = param.retval;
+        }
+
+        return ret;
+}
+
+struct __find_variable_param {
+        const char *name;
+        Dwarf_Addr addr;
+};
+
+static int __die_find_variable_cb(Dwarf_Die *die_mem, void *data)
+{
+        struct __find_variable_param *fvp = data;
+        int tag;
+
+        tag = dwarf_tag(die_mem);
+        if ((tag == DW_TAG_formal_parameter ||
+             tag == DW_TAG_variable) &&
+            die_compare_name(die_mem, fvp->name))
+                return DIE_FIND_CB_END;
+
+        if (dwarf_haspc(die_mem, fvp->addr))
+                return DIE_FIND_CB_CONTINUE;
+        else
+                return DIE_FIND_CB_SIBLING;
+}
+
+/**
+ * die_find_variable_at - Find a given name variable at given address
+ * @sp_die: a function DIE
+ * @name: variable name
+ * @addr: address
+ * @die_mem: a buffer for result DIE
+ *
+ * Find a variable DIE called @name at @addr in @sp_die.
+ */
+Dwarf_Die *die_find_variable_at(Dwarf_Die *sp_die, const char *name,
+                                Dwarf_Addr addr, Dwarf_Die *die_mem)
+{
+        struct __find_variable_param fvp = { .name = name, .addr = addr};
+
+        return die_find_child(sp_die, __die_find_variable_cb, (void *)&fvp,
+                              die_mem);
+}
+
+static int __die_find_member_cb(Dwarf_Die *die_mem, void *data)
+{
+        const char *name = data;
+
+        if ((dwarf_tag(die_mem) == DW_TAG_member) &&
+            die_compare_name(die_mem, name))
+                return DIE_FIND_CB_END;
+
+        return DIE_FIND_CB_SIBLING;
+}
+
+/**
+ * die_find_member - Find a given name member in a data structure
+ * @st_die: a data structure type DIE
+ * @name: member name
+ * @die_mem: a buffer for result DIE
+ *
+ * Find a member DIE called @name in @st_die.
+ */
+Dwarf_Die *die_find_member(Dwarf_Die *st_die, const char *name,
+                           Dwarf_Die *die_mem)
+{
+        return die_find_child(st_die, __die_find_member_cb, (void *)name,
+                              die_mem);
+}
+
+/**
+ * die_get_typename - Get the name of given variable DIE
+ * @vr_die: a variable DIE
+ * @buf: a buffer for result type name
+ * @len: a max-length of @buf
+ *
+ * Get the name of @vr_die and stores it to @buf. Return the actual length
+ * of type name if succeeded. Return -E2BIG if @len is not enough long, and
+ * Return -ENOENT if failed to find type name.
+ * Note that the result will stores typedef name if possible, and stores
+ * "*(function_type)" if the type is a function pointer.
+ */
+int die_get_typename(Dwarf_Die *vr_die, char *buf, int len)
+{
+        Dwarf_Die type;
+        int tag, ret, ret2;
+        const char *tmp = "";
+
+        if (__die_get_real_type(vr_die, &type) == NULL)
+                return -ENOENT;
+
+        tag = dwarf_tag(&type);
+        if (tag == DW_TAG_array_type || tag == DW_TAG_pointer_type)
+                tmp = "*";
+        else if (tag == DW_TAG_subroutine_type) {
+                /* Function pointer */
+                ret = snprintf(buf, len, "(function_type)");
+                return (ret >= len) ? -E2BIG : ret;
+        } else {
+                if (!dwarf_diename(&type))
+                        return -ENOENT;
+                if (tag == DW_TAG_union_type)
+                        tmp = "union ";
+                else if (tag == DW_TAG_structure_type)
+                        tmp = "struct ";
+                /* Write a base name */
+                ret = snprintf(buf, len, "%s%s", tmp, dwarf_diename(&type));
+                return (ret >= len) ? -E2BIG : ret;
+        }
+        ret = die_get_typename(&type, buf, len);
+        if (ret > 0) {
+                ret2 = snprintf(buf + ret, len - ret, "%s", tmp);
+                ret = (ret2 >= len - ret) ? -E2BIG : ret2 + ret;
+        }
+        return ret;
+}
+
+/**
+ * die_get_varname - Get the name and type of given variable DIE
+ * @vr_die: a variable DIE
+ * @buf: a buffer for type and variable name
+ * @len: the max-length of @buf
+ *
+ * Get the name and type of @vr_die and stores it in @buf as "type\tname".
+ */
+int die_get_varname(Dwarf_Die *vr_die, char *buf, int len)
+{
+        int ret, ret2;
+
+        ret = die_get_typename(vr_die, buf, len);
+        if (ret < 0) {
+                pr_debug("Failed to get type, make it unknown.\n");
+                ret = snprintf(buf, len, "(unknown_type)");
+        }
+        if (ret > 0) {
+                ret2 = snprintf(buf + ret, len - ret, "\t%s",
+                                dwarf_diename(vr_die));
+                ret = (ret2 >= len - ret) ? -E2BIG : ret2 + ret;
+        }
+        return ret;
+}
+
diff --git a/tools/perf/util/dwarf-aux.h b/tools/perf/util/dwarf-aux.h
new file mode 100644
index 00000000000..6ce1717784b
--- /dev/null
+++ b/tools/perf/util/dwarf-aux.h
@@ -0,0 +1,111 @@
+#ifndef _DWARF_AUX_H
+#define _DWARF_AUX_H
+/*
+ * dwarf-aux.h : libdw auxiliary interfaces
+ *
+ * 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; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * 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.
+ *
+ */
+
+#include <dwarf.h>
+#include <elfutils/libdw.h>
+#include <elfutils/libdwfl.h>
+#include <elfutils/version.h>
+
+/* Find the realpath of the target file */
+extern const char *cu_find_realpath(Dwarf_Die *cu_die, const char *fname);
+
+/* Get DW_AT_comp_dir (should be NULL with older gcc) */
+extern const char *cu_get_comp_dir(Dwarf_Die *cu_die);
+
+/* Get a line number and file name for given address */
+extern int cu_find_lineinfo(Dwarf_Die *cudie, unsigned long addr,
+                            const char **fname, int *lineno);
+
+/* Walk on funcitons at given address */
+extern int cu_walk_functions_at(Dwarf_Die *cu_die, Dwarf_Addr addr,
+                        int (*callback)(Dwarf_Die *, void *), void *data);
+
+/* Compare diename and tname */
+extern bool die_compare_name(Dwarf_Die *dw_die, const char *tname);
+
+/* Get callsite line number of inline-function instance */
+extern int die_get_call_lineno(Dwarf_Die *in_die);
+
+/* Get callsite file name of inlined function instance */
+extern const char *die_get_call_file(Dwarf_Die *in_die);
+
+/* Get type die */
+extern Dwarf_Die *die_get_type(Dwarf_Die *vr_die, Dwarf_Die *die_mem);
+
+/* Get a type die, but skip qualifiers and typedef */
+extern Dwarf_Die *die_get_real_type(Dwarf_Die *vr_die, Dwarf_Die *die_mem);
+
+/* Check whether the DIE is signed or not */
+extern bool die_is_signed_type(Dwarf_Die *tp_die);
+
+/* Get data_member_location offset */
+extern int die_get_data_member_location(Dwarf_Die *mb_die, Dwarf_Word *offs);
+
+/* Return values for die_find_child() callbacks */
+enum {
+        DIE_FIND_CB_END = 0,            /* End of Search */
+        DIE_FIND_CB_CHILD = 1,          /* Search only children */
+        DIE_FIND_CB_SIBLING = 2,        /* Search only siblings */
+        DIE_FIND_CB_CONTINUE = 3,       /* Search children and siblings */
+};
+
+/* Search child DIEs */
+extern Dwarf_Die *die_find_child(Dwarf_Die *rt_die,
+                                 int (*callback)(Dwarf_Die *, void *),
+                                 void *data, Dwarf_Die *die_mem);
+
+/* Search a non-inlined function including given address */
+extern Dwarf_Die *die_find_realfunc(Dwarf_Die *cu_die, Dwarf_Addr addr,
+                                    Dwarf_Die *die_mem);
+
+/* Search an inlined function including given address */
+extern Dwarf_Die *die_find_inlinefunc(Dwarf_Die *sp_die, Dwarf_Addr addr,
+                                      Dwarf_Die *die_mem);
+
+/* Walk on the instances of given DIE */
+extern int die_walk_instances(Dwarf_Die *in_die,
+                              int (*callback)(Dwarf_Die *, void *), void *data);
+
+/* Walker on lines (Note: line number will not be sorted) */
+typedef int (* line_walk_callback_t) (const char *fname, int lineno,
+                                      Dwarf_Addr addr, void *data);
+
+/*
+ * Walk on lines inside given DIE. If the DIE is a subprogram, walk only on
+ * the lines inside the subprogram, otherwise the DIE must be a CU DIE.
+ */
+extern int die_walk_lines(Dwarf_Die *rt_die, line_walk_callback_t callback,
+                          void *data);
+
+/* Find a variable called 'name' at given address */
+extern Dwarf_Die *die_find_variable_at(Dwarf_Die *sp_die, const char *name,
+                                       Dwarf_Addr addr, Dwarf_Die *die_mem);
+
+/* Find a member called 'name' */
+extern Dwarf_Die *die_find_member(Dwarf_Die *st_die, const char *name,
+                                  Dwarf_Die *die_mem);
+
+/* Get the name of given variable DIE */
+extern int die_get_typename(Dwarf_Die *vr_die, char *buf, int len);
+
+/* Get the name and type of given variable DIE, stored as "type\tname" */
+extern int die_get_varname(Dwarf_Die *vr_die, char *buf, int len);
+#endif
diff --git a/tools/perf/util/event.c b/tools/perf/util/event.c
index 3c1b8a63210..437f8ca679a 100644
--- a/tools/perf/util/event.c
+++ b/tools/perf/util/event.c
@@ -169,12 +169,17 @@ static int perf_event__synthesize_mmap_events(union perf_event *event,
                         continue;
                 pbf += n + 3;
                 if (*pbf == 'x') { /* vm_exec */
+                        char anonstr[] = "//anon\n";
                         char *execname = strchr(bf, '/');
 
                         /* Catch VDSO */
                         if (execname == NULL)
                                 execname = strstr(bf, "[vdso]");
 
+                        /* Catch anonymous mmaps */
+                        if ((execname == NULL) && !strstr(bf, "["))
+                                execname = anonstr;
+
                         if (execname == NULL)
                                 continue;
 
diff --git a/tools/perf/util/event.h b/tools/perf/util/event.h
index 1d7f66488a8..357a85b8524 100644
--- a/tools/perf/util/event.h
+++ b/tools/perf/util/event.h
@@ -186,6 +186,6 @@ const char *perf_event__name(unsigned int id);
 
 int perf_event__parse_sample(const union perf_event *event, u64 type,
                              int sample_size, bool sample_id_all,
-                             struct perf_sample *sample);
+                             struct perf_sample *sample, bool swapped);
 
 #endif /* __PERF_RECORD_H */
diff --git a/tools/perf/util/evlist.c b/tools/perf/util/evlist.c
index b021ea9265c..72e9f4886b6 100644
--- a/tools/perf/util/evlist.c
+++ b/tools/perf/util/evlist.c
@@ -85,10 +85,45 @@ int perf_evlist__add_default(struct perf_evlist *evlist)
         struct perf_evsel *evsel = perf_evsel__new(&attr, 0);
 
         if (evsel == NULL)
-                return -ENOMEM;
+                goto error;
+
+        /* use strdup() because free(evsel) assumes name is allocated */
+        evsel->name = strdup("cycles");
+        if (!evsel->name)
+                goto error_free;
 
         perf_evlist__add(evlist, evsel);
         return 0;
+error_free:
+        perf_evsel__delete(evsel);
+error:
+        return -ENOMEM;
+}
+
+void perf_evlist__disable(struct perf_evlist *evlist)
+{
+        int cpu, thread;
+        struct perf_evsel *pos;
+
+        for (cpu = 0; cpu < evlist->cpus->nr; cpu++) {
+                list_for_each_entry(pos, &evlist->entries, node) {
+                        for (thread = 0; thread < evlist->threads->nr; thread++)
+                                ioctl(FD(pos, cpu, thread), PERF_EVENT_IOC_DISABLE);
+                }
+        }
+}
+
+void perf_evlist__enable(struct perf_evlist *evlist)
+{
+        int cpu, thread;
+        struct perf_evsel *pos;
+
+        for (cpu = 0; cpu < evlist->cpus->nr; cpu++) {
+                list_for_each_entry(pos, &evlist->entries, node) {
+                        for (thread = 0; thread < evlist->threads->nr; thread++)
+                                ioctl(FD(pos, cpu, thread), PERF_EVENT_IOC_ENABLE);
+                }
+        }
 }
 
 int perf_evlist__alloc_pollfd(struct perf_evlist *evlist)
diff --git a/tools/perf/util/evlist.h b/tools/perf/util/evlist.h
index b2b862374f3..f3491500274 100644
--- a/tools/perf/util/evlist.h
+++ b/tools/perf/util/evlist.h
@@ -53,6 +53,9 @@ int perf_evlist__alloc_mmap(struct perf_evlist *evlist);
 int perf_evlist__mmap(struct perf_evlist *evlist, int pages, bool overwrite);
 void perf_evlist__munmap(struct perf_evlist *evlist);
 
+void perf_evlist__disable(struct perf_evlist *evlist);
+void perf_evlist__enable(struct perf_evlist *evlist);
+
 static inline void perf_evlist__set_maps(struct perf_evlist *evlist,
                                          struct cpu_map *cpus,
                                          struct thread_map *threads)
diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c
index 0239eb87b23..e389815078d 100644
--- a/tools/perf/util/evsel.c
+++ b/tools/perf/util/evsel.c
@@ -7,6 +7,8 @@
  * Released under the GPL v2. (and only v2, not any later version)
  */
 
+#include <byteswap.h>
+#include "asm/bug.h"
 #include "evsel.h"
 #include "evlist.h"
 #include "util.h"
@@ -342,10 +344,20 @@ static bool sample_overlap(const union perf_event *event,
 
 int perf_event__parse_sample(const union perf_event *event, u64 type,
                              int sample_size, bool sample_id_all,
-                             struct perf_sample *data)
+                             struct perf_sample *data, bool swapped)
 {
         const u64 *array;
 
+        /*
+         * used for cross-endian analysis. See git commit 65014ab3
+         * for why this goofiness is needed.
+         */
+        union {
+                u64 val64;
+                u32 val32[2];
+        } u;
+
+
         data->cpu = data->pid = data->tid = -1;
         data->stream_id = data->id = data->time = -1ULL;
 
@@ -366,9 +378,16 @@ int perf_event__parse_sample(const union perf_event *event, u64 type,
         }
 
         if (type & PERF_SAMPLE_TID) {
-                u32 *p = (u32 *)array;
-                data->pid = p[0];
-                data->tid = p[1];
+                u.val64 = *array;
+                if (swapped) {
+                        /* undo swap of u64, then swap on individual u32s */
+                        u.val64 = bswap_64(u.val64);
+                        u.val32[0] = bswap_32(u.val32[0]);
+                        u.val32[1] = bswap_32(u.val32[1]);
+                }
+
+                data->pid = u.val32[0];
+                data->tid = u.val32[1];
                 array++;
         }
 
@@ -377,6 +396,7 @@ int perf_event__parse_sample(const union perf_event *event, u64 type,
                 array++;
         }
 
+        data->addr = 0;
         if (type & PERF_SAMPLE_ADDR) {
                 data->addr = *array;
                 array++;
@@ -394,8 +414,15 @@ int perf_event__parse_sample(const union perf_event *event, u64 type,
         }
 
         if (type & PERF_SAMPLE_CPU) {
-                u32 *p = (u32 *)array;
-                data->cpu = *p;
+
+                u.val64 = *array;
+                if (swapped) {
+                        /* undo swap of u64, then swap on individual u32s */
+                        u.val64 = bswap_64(u.val64);
+                        u.val32[0] = bswap_32(u.val32[0]);
+                }
+
+                data->cpu = u.val32[0];
                 array++;
         }
 
@@ -422,18 +449,27 @@ int perf_event__parse_sample(const union perf_event *event, u64 type,
         }
 
         if (type & PERF_SAMPLE_RAW) {
-                u32 *p = (u32 *)array;
+                const u64 *pdata;
+
+                u.val64 = *array;
+                if (WARN_ONCE(swapped,
+                              "Endianness of raw data not corrected!\n")) {
+                        /* undo swap of u64, then swap on individual u32s */
+                        u.val64 = bswap_64(u.val64);
+                        u.val32[0] = bswap_32(u.val32[0]);
+                        u.val32[1] = bswap_32(u.val32[1]);
+                }
 
                 if (sample_overlap(event, array, sizeof(u32)))
                         return -EFAULT;
 
-                data->raw_size = *p;
-                p++;
+                data->raw_size = u.val32[0];
+                pdata = (void *) array + sizeof(u32);
 
-                if (sample_overlap(event, p, data->raw_size))
+                if (sample_overlap(event, pdata, data->raw_size))
                         return -EFAULT;
 
-                data->raw_data = p;
+                data->raw_data = (void *) pdata;
         }
 
         return 0;
diff --git a/tools/perf/util/evsel.h b/tools/perf/util/evsel.h
index 7e9366e4490..e9a31554e26 100644
--- a/tools/perf/util/evsel.h
+++ b/tools/perf/util/evsel.h
@@ -61,6 +61,7 @@ struct perf_evsel {
                 off_t           id_offset;
         };
         struct cgroup_sel       *cgrp;
+        bool                    supported;
 };
 
 struct cpu_map;
diff --git a/tools/perf/util/header.c b/tools/perf/util/header.c
index afb0849fe53..b6c1ad123ca 100644
--- a/tools/perf/util/header.c
+++ b/tools/perf/util/header.c
@@ -189,8 +189,8 @@ int build_id_cache__add_s(const char *sbuild_id, const char *debugdir,
                           const char *name, bool is_kallsyms)
 {
         const size_t size = PATH_MAX;
-        char *realname, *filename = malloc(size),
-             *linkname = malloc(size), *targetname;
+        char *realname, *filename = zalloc(size),
+             *linkname = zalloc(size), *targetname;
         int len, err = -1;
 
         if (is_kallsyms) {
@@ -254,8 +254,8 @@ static int build_id_cache__add_b(const u8 *build_id, size_t build_id_size,
 int build_id_cache__remove_s(const char *sbuild_id, const char *debugdir)
 {
         const size_t size = PATH_MAX;
-        char *filename = malloc(size),
-             *linkname = malloc(size);
+        char *filename = zalloc(size),
+             *linkname = zalloc(size);
         int err = -1;
 
         if (filename == NULL || linkname == NULL)
@@ -726,7 +726,16 @@ static int perf_header__read_build_ids_abi_quirk(struct perf_header *header,
                         return -1;
 
                 bev.header = old_bev.header;
-                bev.pid    = 0;
+
+                /*
+                 * As the pid is the missing value, we need to fill
+                 * it properly. The header.misc value give us nice hint.
+                 */
+                bev.pid = HOST_KERNEL_ID;
+                if (bev.header.misc == PERF_RECORD_MISC_GUEST_USER ||
+                    bev.header.misc == PERF_RECORD_MISC_GUEST_KERNEL)
+                        bev.pid = DEFAULT_GUEST_KERNEL_ID;
+
                 memcpy(bev.build_id, old_bev.build_id, sizeof(bev.build_id));
                 __event_process_build_id(&bev, filename, session);
 
@@ -877,9 +886,12 @@ int perf_session__read_header(struct perf_session *session, int fd)
                 struct perf_evsel *evsel;
                 off_t tmp;
 
-                if (perf_header__getbuffer64(header, fd, &f_attr, sizeof(f_attr)))
+                if (readn(fd, &f_attr, sizeof(f_attr)) <= 0)
                         goto out_errno;
 
+                if (header->needs_swap)
+                        perf_event__attr_swap(&f_attr.attr);
+
                 tmp = lseek(fd, 0, SEEK_CUR);
                 evsel = perf_evsel__new(&f_attr.attr, i);
 
diff --git a/tools/perf/util/hist.c b/tools/perf/util/hist.c
index 627a02e03c5..677e1da6bb3 100644
--- a/tools/perf/util/hist.c
+++ b/tools/perf/util/hist.c
@@ -14,7 +14,8 @@ enum hist_filter {
 
 struct callchain_param  callchain_param = {
         .mode   = CHAIN_GRAPH_REL,
-        .min_percent = 0.5
+        .min_percent = 0.5,
+        .order  = ORDER_CALLEE
 };
 
 u16 hists__col_len(struct hists *self, enum hist_column col)
@@ -846,6 +847,9 @@ print_entries:
         for (nd = rb_first(&self->entries); nd; nd = rb_next(nd)) {
                 struct hist_entry *h = rb_entry(nd, struct hist_entry, rb_node);
 
+                if (h->filtered)
+                        continue;
+
                 if (show_displacement) {
                         if (h->pair != NULL)
                                 displacement = ((long)h->pair->position -
diff --git a/tools/perf/util/include/linux/compiler.h b/tools/perf/util/include/linux/compiler.h
index 791f9dd27eb..547628e97f3 100644
--- a/tools/perf/util/include/linux/compiler.h
+++ b/tools/perf/util/include/linux/compiler.h
@@ -5,7 +5,9 @@
 #define __always_inline inline
 #endif
 #define __user
+#ifndef __attribute_const__
 #define __attribute_const__
+#endif
 
 #define __used          __attribute__((__unused__))
 
diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c
index 41982c373fa..928918b796b 100644
--- a/tools/perf/util/parse-events.c
+++ b/tools/perf/util/parse-events.c
@@ -86,22 +86,24 @@ static const char *sw_event_names[PERF_COUNT_SW_MAX] = {
 
 #define MAX_ALIASES 8
 
-static const char *hw_cache[][MAX_ALIASES] = {
+static const char *hw_cache[PERF_COUNT_HW_CACHE_MAX][MAX_ALIASES] = {
  { "L1-dcache", "l1-d",         "l1d",          "L1-data",              },
  { "L1-icache", "l1-i",         "l1i",          "L1-instruction",       },
- { "LLC",       "L2"                                                    },
+ { "LLC",       "L2",                                                   },
  { "dTLB",      "d-tlb",        "Data-TLB",                             },
  { "iTLB",      "i-tlb",        "Instruction-TLB",                      },
  { "branch",    "branches",     "bpu",          "btb",          "bpc",  },
+ { "node",                                                              },
 };
 
-static const char *hw_cache_op[][MAX_ALIASES] = {
+static const char *hw_cache_op[PERF_COUNT_HW_CACHE_OP_MAX][MAX_ALIASES] = {
  { "load",      "loads",        "read",                                 },
  { "store",     "stores",       "write",                                },
  { "prefetch",  "prefetches",   "speculative-read", "speculative-load", },
 };
 
-static const char *hw_cache_result[][MAX_ALIASES] = {
+static const char *hw_cache_result[PERF_COUNT_HW_CACHE_RESULT_MAX]
+                                  [MAX_ALIASES] = {
  { "refs",      "Reference",    "ops",          "access",               },
  { "misses",    "miss",                                                 },
 };
@@ -124,6 +126,7 @@ static unsigned long hw_cache_stat[C(MAX)] = {
  [C(DTLB)]      = (CACHE_READ | CACHE_WRITE | CACHE_PREFETCH),
  [C(ITLB)]      = (CACHE_READ),
  [C(BPU)]       = (CACHE_READ),
+ [C(NODE)]      = (CACHE_READ | CACHE_WRITE | CACHE_PREFETCH),
 };
 
 #define for_each_subsystem(sys_dir, sys_dirent, sys_next)              \
@@ -393,7 +396,7 @@ parse_generic_hw_event(const char **str, struct perf_event_attr *attr)
                                                 PERF_COUNT_HW_CACHE_OP_MAX);
                         if (cache_op >= 0) {
                                 if (!is_cache_op_valid(cache_type, cache_op))
-                                        return 0;
+                                        return EVT_FAILED;
                                 continue;
                         }
                 }
@@ -475,7 +478,7 @@ parse_single_tracepoint_event(char *sys_name,
 /* sys + ':' + event + ':' + flags*/
 #define MAX_EVOPT_LEN   (MAX_EVENT_LENGTH * 2 + 2 + 128)
 static enum event_result
-parse_multiple_tracepoint_event(const struct option *opt, char *sys_name,
+parse_multiple_tracepoint_event(struct perf_evlist *evlist, char *sys_name,
                                 const char *evt_exp, char *flags)
 {
         char evt_path[MAXPATHLEN];
@@ -509,7 +512,7 @@ parse_multiple_tracepoint_event(const struct option *opt, char *sys_name,
                 if (len < 0)
                         return EVT_FAILED;
 
-                if (parse_events(opt, event_opt, 0))
+                if (parse_events(evlist, event_opt, 0))
                         return EVT_FAILED;
         }
 
@@ -517,7 +520,7 @@ parse_multiple_tracepoint_event(const struct option *opt, char *sys_name,
 }
 
 static enum event_result
-parse_tracepoint_event(const struct option *opt, const char **strp,
+parse_tracepoint_event(struct perf_evlist *evlist, const char **strp,
                        struct perf_event_attr *attr)
 {
         const char *evt_name;
@@ -557,8 +560,8 @@ parse_tracepoint_event(const struct option *opt, const char **strp,
                 return EVT_FAILED;
         if (strpbrk(evt_name, "*?")) {
                 *strp += strlen(sys_name) + evt_length + 1; /* 1 == the ':' */
-                return parse_multiple_tracepoint_event(opt, sys_name, evt_name,
-                                                       flags);
+                return parse_multiple_tracepoint_event(evlist, sys_name,
+                                                       evt_name, flags);
         } else {
                 return parse_single_tracepoint_event(sys_name, evt_name,
                                                      evt_length, attr, strp);
@@ -694,7 +697,11 @@ parse_raw_event(const char **strp, struct perf_event_attr *attr)
                 return EVT_FAILED;
         n = hex2u64(str + 1, &config);
         if (n > 0) {
-                *strp = str + n + 1;
+                const char *end = str + n + 1;
+                if (*end != '\0' && *end != ',' && *end != ':')
+                        return EVT_FAILED;
+
+                *strp = end;
                 attr->type = PERF_TYPE_RAW;
                 attr->config = config;
                 return EVT_HANDLED;
@@ -778,12 +785,12 @@ parse_event_modifier(const char **strp, struct perf_event_attr *attr)
  * Symbolic names are (almost) exactly matched.
  */
 static enum event_result
-parse_event_symbols(const struct option *opt, const char **str,
+parse_event_symbols(struct perf_evlist *evlist, const char **str,
                     struct perf_event_attr *attr)
 {
         enum event_result ret;
 
-        ret = parse_tracepoint_event(opt, str, attr);
+        ret = parse_tracepoint_event(evlist, str, attr);
         if (ret != EVT_FAILED)
                 goto modifier;
 
@@ -822,9 +829,8 @@ modifier:
         return ret;
 }
 
-int parse_events(const struct option *opt, const char *str, int unset __used)
+int parse_events(struct perf_evlist *evlist , const char *str, int unset __used)
 {
-        struct perf_evlist *evlist = *(struct perf_evlist **)opt->value;
         struct perf_event_attr attr;
         enum event_result ret;
         const char *ostr;
@@ -832,7 +838,7 @@ int parse_events(const struct option *opt, const char *str, int unset __used)
         for (;;) {
                 ostr = str;
                 memset(&attr, 0, sizeof(attr));
-                ret = parse_event_symbols(opt, &str, &attr);
+                ret = parse_event_symbols(evlist, &str, &attr);
                 if (ret == EVT_FAILED)
                         return -1;
 
@@ -863,6 +869,13 @@ int parse_events(const struct option *opt, const char *str, int unset __used)
         return 0;
 }
 
+int parse_events_option(const struct option *opt, const char *str,
+                        int unset __used)
+{
+        struct perf_evlist *evlist = *(struct perf_evlist **)opt->value;
+        return parse_events(evlist, str, unset);
+}
+
 int parse_filter(const struct option *opt, const char *str,
                  int unset __used)
 {
@@ -1088,6 +1101,4 @@ void print_events(const char *event_glob)
         printf("\n");
 
         print_tracepoint_events(NULL, NULL);
-
-        exit(129);
 }
diff --git a/tools/perf/util/parse-events.h b/tools/perf/util/parse-events.h
index 746d3fcbfc2..2f8e375e038 100644
--- a/tools/perf/util/parse-events.h
+++ b/tools/perf/util/parse-events.h
@@ -8,6 +8,7 @@
 
 struct list_head;
 struct perf_evsel;
+struct perf_evlist;
 
 struct option;
 
@@ -24,7 +25,10 @@ const char *event_type(int type);
 const char *event_name(struct perf_evsel *event);
 extern const char *__event_name(int type, u64 config);
 
-extern int parse_events(const struct option *opt, const char *str, int unset);
+extern int parse_events_option(const struct option *opt, const char *str,
+                               int unset);
+extern int parse_events(struct perf_evlist *evlist, const char *str,
+                        int unset);
 extern int parse_filter(const struct option *opt, const char *str, int unset);
 
 #define EVENTS_HELP_MAX (128*1024)
diff --git a/tools/perf/util/probe-event.c b/tools/perf/util/probe-event.c
index f0223166e76..eb25900e221 100644
--- a/tools/perf/util/probe-event.c
+++ b/tools/perf/util/probe-event.c
@@ -117,6 +117,10 @@ static struct map *kernel_get_module_map(const char *module)
         struct rb_node *nd;
         struct map_groups *grp = &machine.kmaps;
 
+        /* A file path -- this is an offline module */
+        if (module && strchr(module, '/'))
+                return machine__new_module(&machine, 0, module);
+
         if (!module)
                 module = "kernel";
 
@@ -170,16 +174,24 @@ const char *kernel_get_module_path(const char *module)
 }
 
 #ifdef DWARF_SUPPORT
-static int open_vmlinux(const char *module)
+/* Open new debuginfo of given module */
+static struct debuginfo *open_debuginfo(const char *module)
 {
-        const char *path = kernel_get_module_path(module);
-        if (!path) {
-                pr_err("Failed to find path of %s module.\n",
-                       module ?: "kernel");
-                return -ENOENT;
+        const char *path;
+
+        /* A file path -- this is an offline module */
+        if (module && strchr(module, '/'))
+                path = module;
+        else {
+                path = kernel_get_module_path(module);
+
+                if (!path) {
+                        pr_err("Failed to find path of %s module.\n",
+                               module ?: "kernel");
+                        return NULL;
+                }
         }
-        pr_debug("Try to open %s\n", path);
-        return open(path, O_RDONLY);
+        return debuginfo__new(path);
 }
 
 /*
@@ -193,13 +205,24 @@ static int kprobe_convert_to_perf_probe(struct probe_trace_point *tp,
         struct map *map;
         u64 addr;
         int ret = -ENOENT;
+        struct debuginfo *dinfo;
 
         sym = __find_kernel_function_by_name(tp->symbol, &map);
         if (sym) {
                 addr = map->unmap_ip(map, sym->start + tp->offset);
                 pr_debug("try to find %s+%ld@%" PRIx64 "\n", tp->symbol,
                          tp->offset, addr);
-                ret = find_perf_probe_point((unsigned long)addr, pp);
+
+                dinfo = debuginfo__new_online_kernel(addr);
+                if (dinfo) {
+                        ret = debuginfo__find_probe_point(dinfo,
+                                                 (unsigned long)addr, pp);
+                        debuginfo__delete(dinfo);
+                } else {
+                        pr_debug("Failed to open debuginfo at 0x%" PRIx64 "\n",
+                                 addr);
+                        ret = -ENOENT;
+                }
         }
         if (ret <= 0) {
                 pr_debug("Failed to find corresponding probes from "
@@ -214,30 +237,70 @@ static int kprobe_convert_to_perf_probe(struct probe_trace_point *tp,
         return 0;
 }
 
+static int add_module_to_probe_trace_events(struct probe_trace_event *tevs,
+                                            int ntevs, const char *module)
+{
+        int i, ret = 0;
+        char *tmp;
+
+        if (!module)
+                return 0;
+
+        tmp = strrchr(module, '/');
+        if (tmp) {
+                /* This is a module path -- get the module name */
+                module = strdup(tmp + 1);
+                if (!module)
+                        return -ENOMEM;
+                tmp = strchr(module, '.');
+                if (tmp)
+                        *tmp = '\0';
+                tmp = (char *)module;   /* For free() */
+        }
+
+        for (i = 0; i < ntevs; i++) {
+                tevs[i].point.module = strdup(module);
+                if (!tevs[i].point.module) {
+                        ret = -ENOMEM;
+                        break;
+                }
+        }
+
+        if (tmp)
+                free(tmp);
+
+        return ret;
+}
+
 /* Try to find perf_probe_event with debuginfo */
 static int try_to_find_probe_trace_events(struct perf_probe_event *pev,
-                                           struct probe_trace_event **tevs,
-                                           int max_tevs, const char *module)
+                                          struct probe_trace_event **tevs,
+                                          int max_tevs, const char *module)
 {
         bool need_dwarf = perf_probe_event_need_dwarf(pev);
-        int fd, ntevs;
+        struct debuginfo *dinfo = open_debuginfo(module);
+        int ntevs, ret = 0;
 
-        fd = open_vmlinux(module);
-        if (fd < 0) {
+        if (!dinfo) {
                 if (need_dwarf) {
                         pr_warning("Failed to open debuginfo file.\n");
-                        return fd;
+                        return -ENOENT;
                 }
-                pr_debug("Could not open vmlinux. Try to use symbols.\n");
+                pr_debug("Could not open debuginfo. Try to use symbols.\n");
                 return 0;
         }
 
-        /* Searching trace events corresponding to probe event */
-        ntevs = find_probe_trace_events(fd, pev, tevs, max_tevs);
+        /* Searching trace events corresponding to a probe event */
+        ntevs = debuginfo__find_trace_events(dinfo, pev, tevs, max_tevs);
+
+        debuginfo__delete(dinfo);
 
         if (ntevs > 0) {        /* Succeeded to find trace events */
                 pr_debug("find %d probe_trace_events.\n", ntevs);
-                return ntevs;
+                if (module)
+                        ret = add_module_to_probe_trace_events(*tevs, ntevs,
+                                                               module);
+                return ret < 0 ? ret : ntevs;
         }
 
         if (ntevs == 0) {       /* No error but failed to find probe point. */
@@ -371,8 +434,9 @@ int show_line_range(struct line_range *lr, const char *module)
 {
         int l = 1;
         struct line_node *ln;
+        struct debuginfo *dinfo;
         FILE *fp;
-        int fd, ret;
+        int ret;
         char *tmp;
 
         /* Search a line range */
@@ -380,13 +444,14 @@ int show_line_range(struct line_range *lr, const char *module)
         if (ret < 0)
                 return ret;
 
-        fd = open_vmlinux(module);
-        if (fd < 0) {
+        dinfo = open_debuginfo(module);
+        if (!dinfo) {
                 pr_warning("Failed to open debuginfo file.\n");
-                return fd;
+                return -ENOENT;
         }
 
-        ret = find_line_range(fd, lr);
+        ret = debuginfo__find_line_range(dinfo, lr);
+        debuginfo__delete(dinfo);
         if (ret == 0) {
                 pr_warning("Specified source line is not found.\n");
                 return -ENOENT;
@@ -448,7 +513,8 @@ end:
         return ret;
 }
 
-static int show_available_vars_at(int fd, struct perf_probe_event *pev,
+static int show_available_vars_at(struct debuginfo *dinfo,
+                                  struct perf_probe_event *pev,
                                   int max_vls, struct strfilter *_filter,
                                   bool externs)
 {
@@ -463,7 +529,8 @@ static int show_available_vars_at(int fd, struct perf_probe_event *pev,
                 return -EINVAL;
         pr_debug("Searching variables at %s\n", buf);
 
-        ret = find_available_vars_at(fd, pev, &vls, max_vls, externs);
+        ret = debuginfo__find_available_vars_at(dinfo, pev, &vls,
+                                                max_vls, externs);
         if (ret <= 0) {
                 pr_err("Failed to find variables at %s (%d)\n", buf, ret);
                 goto end;
@@ -504,24 +571,26 @@ int show_available_vars(struct perf_probe_event *pevs, int npevs,
                         int max_vls, const char *module,
                         struct strfilter *_filter, bool externs)
 {
-        int i, fd, ret = 0;
+        int i, ret = 0;
+        struct debuginfo *dinfo;
 
         ret = init_vmlinux();
         if (ret < 0)
                 return ret;
 
+        dinfo = open_debuginfo(module);
+        if (!dinfo) {
+                pr_warning("Failed to open debuginfo file.\n");
+                return -ENOENT;
+        }
+
         setup_pager();
 
-        for (i = 0; i < npevs && ret >= 0; i++) {
-                fd = open_vmlinux(module);
-                if (fd < 0) {
-                        pr_warning("Failed to open debug information file.\n");
-                        ret = fd;
-                        break;
-                }
-                ret = show_available_vars_at(fd, &pevs[i], max_vls, _filter,
+        for (i = 0; i < npevs && ret >= 0; i++)
+                ret = show_available_vars_at(dinfo, &pevs[i], max_vls, _filter,
                                              externs);
-        }
+
+        debuginfo__delete(dinfo);
         return ret;
 }
 
@@ -990,7 +1059,7 @@ bool perf_probe_event_need_dwarf(struct perf_probe_event *pev)
 
 /* Parse probe_events event into struct probe_point */
 static int parse_probe_trace_command(const char *cmd,
-                                        struct probe_trace_event *tev)
+                                     struct probe_trace_event *tev)
 {
         struct probe_trace_point *tp = &tev->point;
         char pr;
@@ -1023,8 +1092,14 @@ static int parse_probe_trace_command(const char *cmd,
 
         tp->retprobe = (pr == 'r');
 
-        /* Scan function name and offset */
-        ret = sscanf(argv[1], "%a[^+]+%lu", (float *)(void *)&tp->symbol,
+        /* Scan module name(if there), function name and offset */
+        p = strchr(argv[1], ':');
+        if (p) {
+                tp->module = strndup(argv[1], p - argv[1]);
+                p++;
+        } else
+                p = argv[1];
+        ret = sscanf(p, "%a[^+]+%lu", (float *)(void *)&tp->symbol,
                      &tp->offset);
         if (ret == 1)
                 tp->offset = 0;
@@ -1269,9 +1344,10 @@ char *synthesize_probe_trace_command(struct probe_trace_event *tev)
         if (buf == NULL)
                 return NULL;
 
-        len = e_snprintf(buf, MAX_CMDLEN, "%c:%s/%s %s+%lu",
+        len = e_snprintf(buf, MAX_CMDLEN, "%c:%s/%s %s%s%s+%lu",
                          tp->retprobe ? 'r' : 'p',
                          tev->group, tev->event,
+                         tp->module ?: "", tp->module ? ":" : "",
                          tp->symbol, tp->offset);
         if (len <= 0)
                 goto error;
@@ -1378,6 +1454,8 @@ static void clear_probe_trace_event(struct probe_trace_event *tev)
                 free(tev->group);
         if (tev->point.symbol)
                 free(tev->point.symbol);
+        if (tev->point.module)
+                free(tev->point.module);
         for (i = 0; i < tev->nargs; i++) {
                 if (tev->args[i].name)
                         free(tev->args[i].name);
@@ -1729,7 +1807,7 @@ static int convert_to_probe_trace_events(struct perf_probe_event *pev,
         /* Convert perf_probe_event with debuginfo */
         ret = try_to_find_probe_trace_events(pev, tevs, max_tevs, module);
         if (ret != 0)
-                return ret;
+                return ret;     /* Found in debuginfo or got an error */
 
         /* Allocate trace event buffer */
         tev = *tevs = zalloc(sizeof(struct probe_trace_event));
@@ -1742,6 +1820,15 @@ static int convert_to_probe_trace_events(struct perf_probe_event *pev,
                 ret = -ENOMEM;
                 goto error;
         }
+
+        if (module) {
+                tev->point.module = strdup(module);
+                if (tev->point.module == NULL) {
+                        ret = -ENOMEM;
+                        goto error;
+                }
+        }
+
         tev->point.offset = pev->point.offset;
         tev->point.retprobe = pev->point.retprobe;
         tev->nargs = pev->nargs;
@@ -1869,8 +1956,10 @@ static int __del_trace_probe_event(int fd, struct str_node *ent)
 
         pr_debug("Writing event: %s\n", buf);
         ret = write(fd, buf, strlen(buf));
-        if (ret < 0)
+        if (ret < 0) {
+                ret = -errno;
                 goto error;
+        }
 
         printf("Remove event: %s\n", ent->s);
         return 0;
diff --git a/tools/perf/util/probe-event.h b/tools/perf/util/probe-event.h
index 3434fc9d79d..a7dee835f49 100644
--- a/tools/perf/util/probe-event.h
+++ b/tools/perf/util/probe-event.h
@@ -10,6 +10,7 @@ extern bool probe_event_dry_run;
 /* kprobe-tracer tracing point */
 struct probe_trace_point {
         char            *symbol;        /* Base symbol */
+        char            *module;        /* Module name */
         unsigned long   offset;         /* Offset from symbol */
         bool            retprobe;       /* Return probe flag */
 };
diff --git a/tools/perf/util/probe-finder.c b/tools/perf/util/probe-finder.c
index 3b9d0b800d5..5d732621a46 100644
--- a/tools/perf/util/probe-finder.c
+++ b/tools/perf/util/probe-finder.c
@@ -43,21 +43,6 @@
 /* Kprobe tracer basic type is up to u64 */
 #define MAX_BASIC_TYPE_BITS     64
 
-/*
- * Compare the tail of two strings.
- * Return 0 if whole of either string is same as another's tail part.
- */
-static int strtailcmp(const char *s1, const char *s2)
-{
-        int i1 = strlen(s1);
-        int i2 = strlen(s2);
-        while (--i1 >= 0 && --i2 >= 0) {
-                if (s1[i1] != s2[i2])
-                        return s1[i1] - s2[i2];
-        }
-        return 0;
-}
-
 /* Line number list operations */
 
 /* Add a line to line number list */
@@ -131,29 +116,37 @@ static const Dwfl_Callbacks offline_callbacks = {
 };
 
 /* Get a Dwarf from offline image */
-static Dwarf *dwfl_init_offline_dwarf(int fd, Dwfl **dwflp, Dwarf_Addr *bias)
+static int debuginfo__init_offline_dwarf(struct debuginfo *self,
+                                         const char *path)
 {
         Dwfl_Module *mod;
-        Dwarf *dbg = NULL;
+        int fd;
 
-        if (!dwflp)
-                return NULL;
+        fd = open(path, O_RDONLY);
+        if (fd < 0)
+                return fd;
 
-        *dwflp = dwfl_begin(&offline_callbacks);
-        if (!*dwflp)
-                return NULL;
+        self->dwfl = dwfl_begin(&offline_callbacks);
+        if (!self->dwfl)
+                goto error;
 
-        mod = dwfl_report_offline(*dwflp, "", "", fd);
+        mod = dwfl_report_offline(self->dwfl, "", "", fd);
         if (!mod)
                 goto error;
 
-        dbg = dwfl_module_getdwarf(mod, bias);
-        if (!dbg) {
+        self->dbg = dwfl_module_getdwarf(mod, &self->bias);
+        if (!self->dbg)
+                goto error;
+
+        return 0;
 error:
-                dwfl_end(*dwflp);
-                *dwflp = NULL;
-        }
-        return dbg;
+        if (self->dwfl)
+                dwfl_end(self->dwfl);
+        else
+                close(fd);
+        memset(self, 0, sizeof(*self));
+
+        return -ENOENT;
 }
 
 #if _ELFUTILS_PREREQ(0, 148)
@@ -189,597 +182,81 @@ static const Dwfl_Callbacks kernel_callbacks = {
 };
 
 /* Get a Dwarf from live kernel image */
-static Dwarf *dwfl_init_live_kernel_dwarf(Dwarf_Addr addr, Dwfl **dwflp,
-                                          Dwarf_Addr *bias)
+static int debuginfo__init_online_kernel_dwarf(struct debuginfo *self,
+                                               Dwarf_Addr addr)
 {
-        Dwarf *dbg;
-
-        if (!dwflp)
-                return NULL;
-
-        *dwflp = dwfl_begin(&kernel_callbacks);
-        if (!*dwflp)
-                return NULL;
+        self->dwfl = dwfl_begin(&kernel_callbacks);
+        if (!self->dwfl)
+                return -EINVAL;
 
         /* Load the kernel dwarves: Don't care the result here */
-        dwfl_linux_kernel_report_kernel(*dwflp);
-        dwfl_linux_kernel_report_modules(*dwflp);
+        dwfl_linux_kernel_report_kernel(self->dwfl);
+        dwfl_linux_kernel_report_modules(self->dwfl);
 
-        dbg = dwfl_addrdwarf(*dwflp, addr, bias);
+        self->dbg = dwfl_addrdwarf(self->dwfl, addr, &self->bias);
         /* Here, check whether we could get a real dwarf */
-        if (!dbg) {
+        if (!self->dbg) {
                 pr_debug("Failed to find kernel dwarf at %lx\n",
                          (unsigned long)addr);
-                dwfl_end(*dwflp);
-                *dwflp = NULL;
+                dwfl_end(self->dwfl);
+                memset(self, 0, sizeof(*self));
+                return -ENOENT;
         }
-        return dbg;
+
+        return 0;
 }
 #else
 /* With older elfutils, this just support kernel module... */
-static Dwarf *dwfl_init_live_kernel_dwarf(Dwarf_Addr addr __used, Dwfl **dwflp,
-                                          Dwarf_Addr *bias)
+static int debuginfo__init_online_kernel_dwarf(struct debuginfo *self,
+                                               Dwarf_Addr addr __used)
 {
-        int fd;
         const char *path = kernel_get_module_path("kernel");
 
         if (!path) {
                 pr_err("Failed to find vmlinux path\n");
-                return NULL;
+                return -ENOENT;
         }
 
         pr_debug2("Use file %s for debuginfo\n", path);
-        fd = open(path, O_RDONLY);
-        if (fd < 0)
-                return NULL;
-
-        return dwfl_init_offline_dwarf(fd, dwflp, bias);
+        return debuginfo__init_offline_dwarf(self, path);
 }
 #endif
 
-/* Dwarf wrappers */
-
-/* Find the realpath of the target file. */
-static const char *cu_find_realpath(Dwarf_Die *cu_die, const char *fname)
+struct debuginfo *debuginfo__new(const char *path)
 {
-        Dwarf_Files *files;
-        size_t nfiles, i;
-        const char *src = NULL;
-        int ret;
-
-        if (!fname)
+        struct debuginfo *self = zalloc(sizeof(struct debuginfo));
+        if (!self)
                 return NULL;
 
-        ret = dwarf_getsrcfiles(cu_die, &files, &nfiles);
-        if (ret != 0)
-                return NULL;
-
-        for (i = 0; i < nfiles; i++) {
-                src = dwarf_filesrc(files, i, NULL, NULL);
-                if (strtailcmp(src, fname) == 0)
-                        break;
+        if (debuginfo__init_offline_dwarf(self, path) < 0) {
+                free(self);
+                self = NULL;
         }
-        if (i == nfiles)
-                return NULL;
-        return src;
-}
 
-/* Get DW_AT_comp_dir (should be NULL with older gcc) */
-static const char *cu_get_comp_dir(Dwarf_Die *cu_die)
-{
-        Dwarf_Attribute attr;
-        if (dwarf_attr(cu_die, DW_AT_comp_dir, &attr) == NULL)
-                return NULL;
-        return dwarf_formstring(&attr);
+        return self;
 }
 
-/* Get a line number and file name for given address */
-static int cu_find_lineinfo(Dwarf_Die *cudie, unsigned long addr,
-                            const char **fname, int *lineno)
+struct debuginfo *debuginfo__new_online_kernel(unsigned long addr)
 {
-        Dwarf_Line *line;
-        Dwarf_Addr laddr;
-
-        line = dwarf_getsrc_die(cudie, (Dwarf_Addr)addr);
-        if (line && dwarf_lineaddr(line, &laddr) == 0 &&
-            addr == (unsigned long)laddr && dwarf_lineno(line, lineno) == 0) {
-                *fname = dwarf_linesrc(line, NULL, NULL);
-                if (!*fname)
-                        /* line number is useless without filename */
-                        *lineno = 0;
-        }
-
-        return *lineno ?: -ENOENT;
-}
-
-/* Compare diename and tname */
-static bool die_compare_name(Dwarf_Die *dw_die, const char *tname)
-{
-        const char *name;
-        name = dwarf_diename(dw_die);
-        return name ? (strcmp(tname, name) == 0) : false;
-}
-
-/* Get callsite line number of inline-function instance */
-static int die_get_call_lineno(Dwarf_Die *in_die)
-{
-        Dwarf_Attribute attr;
-        Dwarf_Word ret;
-
-        if (!dwarf_attr(in_die, DW_AT_call_line, &attr))
-                return -ENOENT;
-
-        dwarf_formudata(&attr, &ret);
-        return (int)ret;
-}
-
-/* Get type die */
-static Dwarf_Die *die_get_type(Dwarf_Die *vr_die, Dwarf_Die *die_mem)
-{
-        Dwarf_Attribute attr;
-
-        if (dwarf_attr_integrate(vr_die, DW_AT_type, &attr) &&
-            dwarf_formref_die(&attr, die_mem))
-                return die_mem;
-        else
+        struct debuginfo *self = zalloc(sizeof(struct debuginfo));
+        if (!self)
                 return NULL;
-}
-
-/* Get a type die, but skip qualifiers */
-static Dwarf_Die *__die_get_real_type(Dwarf_Die *vr_die, Dwarf_Die *die_mem)
-{
-        int tag;
-
-        do {
-                vr_die = die_get_type(vr_die, die_mem);
-                if (!vr_die)
-                        break;
-                tag = dwarf_tag(vr_die);
-        } while (tag == DW_TAG_const_type ||
-                 tag == DW_TAG_restrict_type ||
-                 tag == DW_TAG_volatile_type ||
-                 tag == DW_TAG_shared_type);
-
-        return vr_die;
-}
-
-/* Get a type die, but skip qualifiers and typedef */
-static Dwarf_Die *die_get_real_type(Dwarf_Die *vr_die, Dwarf_Die *die_mem)
-{
-        do {
-                vr_die = __die_get_real_type(vr_die, die_mem);
-        } while (vr_die && dwarf_tag(vr_die) == DW_TAG_typedef);
-
-        return vr_die;
-}
-
-static int die_get_attr_udata(Dwarf_Die *tp_die, unsigned int attr_name,
-                              Dwarf_Word *result)
-{
-        Dwarf_Attribute attr;
-
-        if (dwarf_attr(tp_die, attr_name, &attr) == NULL ||
-            dwarf_formudata(&attr, result) != 0)
-                return -ENOENT;
-
-        return 0;
-}
 
-static bool die_is_signed_type(Dwarf_Die *tp_die)
-{
-        Dwarf_Word ret;
-
-        if (die_get_attr_udata(tp_die, DW_AT_encoding, &ret))
-                return false;
-
-        return (ret == DW_ATE_signed_char || ret == DW_ATE_signed ||
-                ret == DW_ATE_signed_fixed);
-}
-
-static int die_get_byte_size(Dwarf_Die *tp_die)
-{
-        Dwarf_Word ret;
-
-        if (die_get_attr_udata(tp_die, DW_AT_byte_size, &ret))
-                return 0;
-
-        return (int)ret;
-}
-
-static int die_get_bit_size(Dwarf_Die *tp_die)
-{
-        Dwarf_Word ret;
-
-        if (die_get_attr_udata(tp_die, DW_AT_bit_size, &ret))
-                return 0;
-
-        return (int)ret;
-}
-
-static int die_get_bit_offset(Dwarf_Die *tp_die)
-{
-        Dwarf_Word ret;
-
-        if (die_get_attr_udata(tp_die, DW_AT_bit_offset, &ret))
-                return 0;
-
-        return (int)ret;
-}
-
-/* Get data_member_location offset */
-static int die_get_data_member_location(Dwarf_Die *mb_die, Dwarf_Word *offs)
-{
-        Dwarf_Attribute attr;
-        Dwarf_Op *expr;
-        size_t nexpr;
-        int ret;
-
-        if (dwarf_attr(mb_die, DW_AT_data_member_location, &attr) == NULL)
-                return -ENOENT;
-
-        if (dwarf_formudata(&attr, offs) != 0) {
-                /* DW_AT_data_member_location should be DW_OP_plus_uconst */
-                ret = dwarf_getlocation(&attr, &expr, &nexpr);
-                if (ret < 0 || nexpr == 0)
-                        return -ENOENT;
-
-                if (expr[0].atom != DW_OP_plus_uconst || nexpr != 1) {
-                        pr_debug("Unable to get offset:Unexpected OP %x (%zd)\n",
-                                 expr[0].atom, nexpr);
-                        return -ENOTSUP;
-                }
-                *offs = (Dwarf_Word)expr[0].number;
-        }
-        return 0;
-}
-
-/* Return values for die_find callbacks */
-enum {
-        DIE_FIND_CB_FOUND = 0,          /* End of Search */
-        DIE_FIND_CB_CHILD = 1,          /* Search only children */
-        DIE_FIND_CB_SIBLING = 2,        /* Search only siblings */
-        DIE_FIND_CB_CONTINUE = 3,       /* Search children and siblings */
-};
-
-/* Search a child die */
-static Dwarf_Die *die_find_child(Dwarf_Die *rt_die,
-                                 int (*callback)(Dwarf_Die *, void *),
-                                 void *data, Dwarf_Die *die_mem)
-{
-        Dwarf_Die child_die;
-        int ret;
-
-        ret = dwarf_child(rt_die, die_mem);
-        if (ret != 0)
-                return NULL;
-
-        do {
-                ret = callback(die_mem, data);
-                if (ret == DIE_FIND_CB_FOUND)
-                        return die_mem;
-
-                if ((ret & DIE_FIND_CB_CHILD) &&
-                    die_find_child(die_mem, callback, data, &child_die)) {
-                        memcpy(die_mem, &child_die, sizeof(Dwarf_Die));
-                        return die_mem;
-                }
-        } while ((ret & DIE_FIND_CB_SIBLING) &&
-                 dwarf_siblingof(die_mem, die_mem) == 0);
-
-        return NULL;
-}
-
-struct __addr_die_search_param {
-        Dwarf_Addr      addr;
-        Dwarf_Die       *die_mem;
-};
-
-static int __die_search_func_cb(Dwarf_Die *fn_die, void *data)
-{
-        struct __addr_die_search_param *ad = data;
-
-        if (dwarf_tag(fn_die) == DW_TAG_subprogram &&
-            dwarf_haspc(fn_die, ad->addr)) {
-                memcpy(ad->die_mem, fn_die, sizeof(Dwarf_Die));
-                return DWARF_CB_ABORT;
+        if (debuginfo__init_online_kernel_dwarf(self, (Dwarf_Addr)addr) < 0) {
+                free(self);
+                self = NULL;
         }
-        return DWARF_CB_OK;
-}
 
-/* Search a real subprogram including this line, */
-static Dwarf_Die *die_find_real_subprogram(Dwarf_Die *cu_die, Dwarf_Addr addr,
-                                           Dwarf_Die *die_mem)
-{
-        struct __addr_die_search_param ad;
-        ad.addr = addr;
-        ad.die_mem = die_mem;
-        /* dwarf_getscopes can't find subprogram. */
-        if (!dwarf_getfuncs(cu_die, __die_search_func_cb, &ad, 0))
-                return NULL;
-        else
-                return die_mem;
+        return self;
 }
 
-/* die_find callback for inline function search */
-static int __die_find_inline_cb(Dwarf_Die *die_mem, void *data)
+void debuginfo__delete(struct debuginfo *self)
 {
-        Dwarf_Addr *addr = data;
-
-        if (dwarf_tag(die_mem) == DW_TAG_inlined_subroutine &&
-            dwarf_haspc(die_mem, *addr))
-                return DIE_FIND_CB_FOUND;
-
-        return DIE_FIND_CB_CONTINUE;
-}
-
-/* Similar to dwarf_getfuncs, but returns inlined_subroutine if exists. */
-static Dwarf_Die *die_find_inlinefunc(Dwarf_Die *sp_die, Dwarf_Addr addr,
-                                      Dwarf_Die *die_mem)
-{
-        Dwarf_Die tmp_die;
-
-        sp_die = die_find_child(sp_die, __die_find_inline_cb, &addr, &tmp_die);
-        if (!sp_die)
-                return NULL;
-
-        /* Inlined function could be recursive. Trace it until fail */
-        while (sp_die) {
-                memcpy(die_mem, sp_die, sizeof(Dwarf_Die));
-                sp_die = die_find_child(sp_die, __die_find_inline_cb, &addr,
-                                        &tmp_die);
-        }
-
-        return die_mem;
-}
-
-/* Walker on lines (Note: line number will not be sorted) */
-typedef int (* line_walk_handler_t) (const char *fname, int lineno,
-                                     Dwarf_Addr addr, void *data);
-
-struct __line_walk_param {
-        const char *fname;
-        line_walk_handler_t handler;
-        void *data;
-        int retval;
-};
-
-static int __die_walk_funclines_cb(Dwarf_Die *in_die, void *data)
-{
-        struct __line_walk_param *lw = data;
-        Dwarf_Addr addr;
-        int lineno;
-
-        if (dwarf_tag(in_die) == DW_TAG_inlined_subroutine) {
-                lineno = die_get_call_lineno(in_die);
-                if (lineno > 0 && dwarf_entrypc(in_die, &addr) == 0) {
-                        lw->retval = lw->handler(lw->fname, lineno, addr,
-                                                 lw->data);
-                        if (lw->retval != 0)
-                                return DIE_FIND_CB_FOUND;
-                }
+        if (self) {
+                if (self->dwfl)
+                        dwfl_end(self->dwfl);
+                free(self);
         }
-        return DIE_FIND_CB_SIBLING;
-}
-
-/* Walk on lines of blocks included in given DIE */
-static int __die_walk_funclines(Dwarf_Die *sp_die,
-                                line_walk_handler_t handler, void *data)
-{
-        struct __line_walk_param lw = {
-                .handler = handler,
-                .data = data,
-                .retval = 0,
-        };
-        Dwarf_Die die_mem;
-        Dwarf_Addr addr;
-        int lineno;
-
-        /* Handle function declaration line */
-        lw.fname = dwarf_decl_file(sp_die);
-        if (lw.fname && dwarf_decl_line(sp_die, &lineno) == 0 &&
-            dwarf_entrypc(sp_die, &addr) == 0) {
-                lw.retval = handler(lw.fname, lineno, addr, data);
-                if (lw.retval != 0)
-                        goto done;
-        }
-        die_find_child(sp_die, __die_walk_funclines_cb, &lw, &die_mem);
-done:
-        return lw.retval;
-}
-
-static int __die_walk_culines_cb(Dwarf_Die *sp_die, void *data)
-{
-        struct __line_walk_param *lw = data;
-
-        lw->retval = __die_walk_funclines(sp_die, lw->handler, lw->data);
-        if (lw->retval != 0)
-                return DWARF_CB_ABORT;
-
-        return DWARF_CB_OK;
-}
-
-/*
- * Walk on lines inside given PDIE. If the PDIE is subprogram, walk only on
- * the lines inside the subprogram, otherwise PDIE must be a CU DIE.
- */
-static int die_walk_lines(Dwarf_Die *pdie, line_walk_handler_t handler,
-                          void *data)
-{
-        Dwarf_Lines *lines;
-        Dwarf_Line *line;
-        Dwarf_Addr addr;
-        const char *fname;
-        int lineno, ret = 0;
-        Dwarf_Die die_mem, *cu_die;
-        size_t nlines, i;
-
-        /* Get the CU die */
-        if (dwarf_tag(pdie) == DW_TAG_subprogram)
-                cu_die = dwarf_diecu(pdie, &die_mem, NULL, NULL);
-        else
-                cu_die = pdie;
-        if (!cu_die) {
-                pr_debug2("Failed to get CU from subprogram\n");
-                return -EINVAL;
-        }
-
-        /* Get lines list in the CU */
-        if (dwarf_getsrclines(cu_die, &lines, &nlines) != 0) {
-                pr_debug2("Failed to get source lines on this CU.\n");
-                return -ENOENT;
-        }
-        pr_debug2("Get %zd lines from this CU\n", nlines);
-
-        /* Walk on the lines on lines list */
-        for (i = 0; i < nlines; i++) {
-                line = dwarf_onesrcline(lines, i);
-                if (line == NULL ||
-                    dwarf_lineno(line, &lineno) != 0 ||
-                    dwarf_lineaddr(line, &addr) != 0) {
-                        pr_debug2("Failed to get line info. "
-                                  "Possible error in debuginfo.\n");
-                        continue;
-                }
-                /* Filter lines based on address */
-                if (pdie != cu_die)
-                        /*
-                         * Address filtering
-                         * The line is included in given function, and
-                         * no inline block includes it.
-                         */
-                        if (!dwarf_haspc(pdie, addr) ||
-                            die_find_inlinefunc(pdie, addr, &die_mem))
-                                continue;
-                /* Get source line */
-                fname = dwarf_linesrc(line, NULL, NULL);
-
-                ret = handler(fname, lineno, addr, data);
-                if (ret != 0)
-                        return ret;
-        }
-
-        /*
-         * Dwarf lines doesn't include function declarations and inlined
-         * subroutines. We have to check functions list or given function.
-         */
-        if (pdie != cu_die)
-                ret = __die_walk_funclines(pdie, handler, data);
-        else {
-                struct __line_walk_param param = {
-                        .handler = handler,
-                        .data = data,
-                        .retval = 0,
-                };
-                dwarf_getfuncs(cu_die, __die_walk_culines_cb, &param, 0);
-                ret = param.retval;
-        }
-
-        return ret;
-}
-
-struct __find_variable_param {
-        const char *name;
-        Dwarf_Addr addr;
-};
-
-static int __die_find_variable_cb(Dwarf_Die *die_mem, void *data)
-{
-        struct __find_variable_param *fvp = data;
-        int tag;
-
-        tag = dwarf_tag(die_mem);
-        if ((tag == DW_TAG_formal_parameter ||
-             tag == DW_TAG_variable) &&
-            die_compare_name(die_mem, fvp->name))
-                return DIE_FIND_CB_FOUND;
-
-        if (dwarf_haspc(die_mem, fvp->addr))
-                return DIE_FIND_CB_CONTINUE;
-        else
-                return DIE_FIND_CB_SIBLING;
-}
-
-/* Find a variable called 'name' at given address */
-static Dwarf_Die *die_find_variable_at(Dwarf_Die *sp_die, const char *name,
-                                       Dwarf_Addr addr, Dwarf_Die *die_mem)
-{
-        struct __find_variable_param fvp = { .name = name, .addr = addr};
-
-        return die_find_child(sp_die, __die_find_variable_cb, (void *)&fvp,
-                              die_mem);
-}
-
-static int __die_find_member_cb(Dwarf_Die *die_mem, void *data)
-{
-        const char *name = data;
-
-        if ((dwarf_tag(die_mem) == DW_TAG_member) &&
-            die_compare_name(die_mem, name))
-                return DIE_FIND_CB_FOUND;
-
-        return DIE_FIND_CB_SIBLING;
-}
-
-/* Find a member called 'name' */
-static Dwarf_Die *die_find_member(Dwarf_Die *st_die, const char *name,
-                                  Dwarf_Die *die_mem)
-{
-        return die_find_child(st_die, __die_find_member_cb, (void *)name,
-                              die_mem);
-}
-
-/* Get the name of given variable DIE */
-static int die_get_typename(Dwarf_Die *vr_die, char *buf, int len)
-{
-        Dwarf_Die type;
-        int tag, ret, ret2;
-        const char *tmp = "";
-
-        if (__die_get_real_type(vr_die, &type) == NULL)
-                return -ENOENT;
-
-        tag = dwarf_tag(&type);
-        if (tag == DW_TAG_array_type || tag == DW_TAG_pointer_type)
-                tmp = "*";
-        else if (tag == DW_TAG_subroutine_type) {
-                /* Function pointer */
-                ret = snprintf(buf, len, "(function_type)");
-                return (ret >= len) ? -E2BIG : ret;
-        } else {
-                if (!dwarf_diename(&type))
-                        return -ENOENT;
-                if (tag == DW_TAG_union_type)
-                        tmp = "union ";
-                else if (tag == DW_TAG_structure_type)
-                        tmp = "struct ";
-                /* Write a base name */
-                ret = snprintf(buf, len, "%s%s", tmp, dwarf_diename(&type));
-                return (ret >= len) ? -E2BIG : ret;
-        }
-        ret = die_get_typename(&type, buf, len);
-        if (ret > 0) {
-                ret2 = snprintf(buf + ret, len - ret, "%s", tmp);
-                ret = (ret2 >= len - ret) ? -E2BIG : ret2 + ret;
-        }
-        return ret;
-}
-
-/* Get the name and type of given variable DIE, stored as "type\tname" */
-static int die_get_varname(Dwarf_Die *vr_die, char *buf, int len)
-{
-        int ret, ret2;
-
-        ret = die_get_typename(vr_die, buf, len);
-        if (ret < 0) {
-                pr_debug("Failed to get type, make it unknown.\n");
-                ret = snprintf(buf, len, "(unknown_type)");
-        }
-        if (ret > 0) {
-                ret2 = snprintf(buf + ret, len - ret, "\t%s",
-                                dwarf_diename(vr_die));
-                ret = (ret2 >= len - ret) ? -E2BIG : ret2 + ret;
-        }
-        return ret;
 }
 
 /*
@@ -897,6 +374,7 @@ static int convert_variable_type(Dwarf_Die *vr_die,
         struct probe_trace_arg_ref **ref_ptr = &tvar->ref;
         Dwarf_Die type;
         char buf[16];
+        int bsize, boffs, total;
         int ret;
 
         /* TODO: check all types */
@@ -906,11 +384,15 @@ static int convert_variable_type(Dwarf_Die *vr_die,
                 return (tvar->type == NULL) ? -ENOMEM : 0;
         }
 
-        if (die_get_bit_size(vr_die) != 0) {
+        bsize = dwarf_bitsize(vr_die);
+        if (bsize > 0) {
                 /* This is a bitfield */
-                ret = snprintf(buf, 16, "b%d@%d/%zd", die_get_bit_size(vr_die),
-                                die_get_bit_offset(vr_die),
-                                BYTES_TO_BITS(die_get_byte_size(vr_die)));
+                boffs = dwarf_bitoffset(vr_die);
+                total = dwarf_bytesize(vr_die);
+                if (boffs < 0 || total < 0)
+                        return -ENOENT;
+                ret = snprintf(buf, 16, "b%d@%d/%zd", bsize, boffs,
+                                BYTES_TO_BITS(total));
                 goto formatted;
         }
 
@@ -958,10 +440,11 @@ static int convert_variable_type(Dwarf_Die *vr_die,
                 return (tvar->type == NULL) ? -ENOMEM : 0;
         }
 
-        ret = BYTES_TO_BITS(die_get_byte_size(&type));
-        if (!ret)
+        ret = dwarf_bytesize(&type);
+        if (ret <= 0)
                 /* No size ... try to use default type */
                 return 0;
+        ret = BYTES_TO_BITS(ret);
 
         /* Check the bitwidth */
         if (ret > MAX_BASIC_TYPE_BITS) {
@@ -1025,7 +508,7 @@ static int convert_variable_fields(Dwarf_Die *vr_die, const char *varname,
                         else
                                 *ref_ptr = ref;
                 }
-                ref->offset += die_get_byte_size(&type) * field->index;
+                ref->offset += dwarf_bytesize(&type) * field->index;
                 if (!field->next)
                         /* Save vr_die for converting types */
                         memcpy(die_mem, vr_die, sizeof(*die_mem));
@@ -1129,12 +612,12 @@ static int convert_variable(Dwarf_Die *vr_die, struct probe_finder *pf)
         return ret;
 }
 
-/* Find a variable in a subprogram die */
-static int find_variable(Dwarf_Die *sp_die, struct probe_finder *pf)
+/* Find a variable in a scope DIE */
+static int find_variable(Dwarf_Die *sc_die, struct probe_finder *pf)
 {
-        Dwarf_Die vr_die, *scopes;
+        Dwarf_Die vr_die;
         char buf[32], *ptr;
-        int ret, nscopes;
+        int ret = 0;
 
         if (!is_c_varname(pf->pvar->var)) {
                 /* Copy raw parameters */
@@ -1169,30 +652,16 @@ static int find_variable(Dwarf_Die *sp_die, struct probe_finder *pf)
         if (pf->tvar->name == NULL)
                 return -ENOMEM;
 
-        pr_debug("Searching '%s' variable in context.\n",
-                 pf->pvar->var);
+        pr_debug("Searching '%s' variable in context.\n", pf->pvar->var);
         /* Search child die for local variables and parameters. */
-        if (die_find_variable_at(sp_die, pf->pvar->var, pf->addr, &vr_die))
-                ret = convert_variable(&vr_die, pf);
-        else {
-                /* Search upper class */
-                nscopes = dwarf_getscopes_die(sp_die, &scopes);
-                while (nscopes-- > 1) {
-                        pr_debug("Searching variables in %s\n",
-                                 dwarf_diename(&scopes[nscopes]));
-                        /* We should check this scope, so give dummy address */
-                        if (die_find_variable_at(&scopes[nscopes],
-                                                 pf->pvar->var, 0,
-                                                 &vr_die)) {
-                                ret = convert_variable(&vr_die, pf);
-                                goto found;
-                        }
-                }
-                if (scopes)
-                        free(scopes);
-                ret = -ENOENT;
+        if (!die_find_variable_at(sc_die, pf->pvar->var, pf->addr, &vr_die)) {
+                /* Search again in global variables */
+                if (!die_find_variable_at(&pf->cu_die, pf->pvar->var, 0, &vr_die))
+                        ret = -ENOENT;
         }
-found:
+        if (ret >= 0)
+                ret = convert_variable(&vr_die, pf);
+
         if (ret < 0)
                 pr_warning("Failed to find '%s' in this function.\n",
                            pf->pvar->var);
@@ -1235,27 +704,30 @@ static int convert_to_trace_point(Dwarf_Die *sp_die, Dwarf_Addr paddr,
         return 0;
 }
 
-/* Call probe_finder callback with real subprogram DIE */
-static int call_probe_finder(Dwarf_Die *sp_die, struct probe_finder *pf)
+/* Call probe_finder callback with scope DIE */
+static int call_probe_finder(Dwarf_Die *sc_die, struct probe_finder *pf)
 {
-        Dwarf_Die die_mem;
         Dwarf_Attribute fb_attr;
         size_t nops;
         int ret;
 
-        /* If no real subprogram, find a real one */
-        if (!sp_die || dwarf_tag(sp_die) != DW_TAG_subprogram) {
-                sp_die = die_find_real_subprogram(&pf->cu_die,
-                                                  pf->addr, &die_mem);
-                if (!sp_die) {
+        if (!sc_die) {
+                pr_err("Caller must pass a scope DIE. Program error.\n");
+                return -EINVAL;
+        }
+
+        /* If not a real subprogram, find a real one */
+        if (dwarf_tag(sc_die) != DW_TAG_subprogram) {
+                if (!die_find_realfunc(&pf->cu_die, pf->addr, &pf->sp_die)) {
                         pr_warning("Failed to find probe point in any "
                                    "functions.\n");
                         return -ENOENT;
                 }
-        }
+        } else
+                memcpy(&pf->sp_die, sc_die, sizeof(Dwarf_Die));
 
-        /* Get the frame base attribute/ops */
-        dwarf_attr(sp_die, DW_AT_frame_base, &fb_attr);
+        /* Get the frame base attribute/ops from subprogram */
+        dwarf_attr(&pf->sp_die, DW_AT_frame_base, &fb_attr);
         ret = dwarf_getlocation_addr(&fb_attr, pf->addr, &pf->fb_ops, &nops, 1);
         if (ret <= 0 || nops == 0) {
                 pf->fb_ops = NULL;
@@ -1273,7 +745,7 @@ static int call_probe_finder(Dwarf_Die *sp_die, struct probe_finder *pf)
         }
 
         /* Call finder's callback handler */
-        ret = pf->callback(sp_die, pf);
+        ret = pf->callback(sc_die, pf);
 
         /* *pf->fb_ops will be cached in libdw. Don't free it. */
         pf->fb_ops = NULL;
@@ -1281,17 +753,82 @@ static int call_probe_finder(Dwarf_Die *sp_die, struct probe_finder *pf)
         return ret;
 }
 
+struct find_scope_param {
+        const char *function;
+        const char *file;
+        int line;
+        int diff;
+        Dwarf_Die *die_mem;
+        bool found;
+};
+
+static int find_best_scope_cb(Dwarf_Die *fn_die, void *data)
+{
+        struct find_scope_param *fsp = data;
+        const char *file;
+        int lno;
+
+        /* Skip if declared file name does not match */
+        if (fsp->file) {
+                file = dwarf_decl_file(fn_die);
+                if (!file || strcmp(fsp->file, file) != 0)
+                        return 0;
+        }
+        /* If the function name is given, that's what user expects */
+        if (fsp->function) {
+                if (die_compare_name(fn_die, fsp->function)) {
+                        memcpy(fsp->die_mem, fn_die, sizeof(Dwarf_Die));
+                        fsp->found = true;
+                        return 1;
+                }
+        } else {
+                /* With the line number, find the nearest declared DIE */
+                dwarf_decl_line(fn_die, &lno);
+                if (lno < fsp->line && fsp->diff > fsp->line - lno) {
+                        /* Keep a candidate and continue */
+                        fsp->diff = fsp->line - lno;
+                        memcpy(fsp->die_mem, fn_die, sizeof(Dwarf_Die));
+                        fsp->found = true;
+                }
+        }
+        return 0;
+}
+
+/* Find an appropriate scope fits to given conditions */
+static Dwarf_Die *find_best_scope(struct probe_finder *pf, Dwarf_Die *die_mem)
+{
+        struct find_scope_param fsp = {
+                .function = pf->pev->point.function,
+                .file = pf->fname,
+                .line = pf->lno,
+                .diff = INT_MAX,
+                .die_mem = die_mem,
+                .found = false,
+        };
+
+        cu_walk_functions_at(&pf->cu_die, pf->addr, find_best_scope_cb, &fsp);
+
+        return fsp.found ? die_mem : NULL;
+}
+
 static int probe_point_line_walker(const char *fname, int lineno,
                                    Dwarf_Addr addr, void *data)
 {
         struct probe_finder *pf = data;
+        Dwarf_Die *sc_die, die_mem;
         int ret;
 
         if (lineno != pf->lno || strtailcmp(fname, pf->fname) != 0)
                 return 0;
 
         pf->addr = addr;
-        ret = call_probe_finder(NULL, pf);
+        sc_die = find_best_scope(pf, &die_mem);
+        if (!sc_die) {
+                pr_warning("Failed to find scope of probe point.\n");
+                return -ENOENT;
+        }
+
+        ret = call_probe_finder(sc_die, pf);
 
         /* Continue if no error, because the line will be in inline function */
         return ret < 0 ? ret : 0;
@@ -1345,6 +882,7 @@ static int probe_point_lazy_walker(const char *fname, int lineno,
                                    Dwarf_Addr addr, void *data)
 {
         struct probe_finder *pf = data;
+        Dwarf_Die *sc_die, die_mem;
         int ret;
 
         if (!line_list__has_line(&pf->lcache, lineno) ||
@@ -1354,7 +892,14 @@ static int probe_point_lazy_walker(const char *fname, int lineno,
         pr_debug("Probe line found: line:%d addr:0x%llx\n",
                  lineno, (unsigned long long)addr);
         pf->addr = addr;
-        ret = call_probe_finder(NULL, pf);
+        pf->lno = lineno;
+        sc_die = find_best_scope(pf, &die_mem);
+        if (!sc_die) {
+                pr_warning("Failed to find scope of probe point.\n");
+                return -ENOENT;
+        }
+
+        ret = call_probe_finder(sc_die, pf);
 
         /*
          * Continue if no error, because the lazy pattern will match
@@ -1379,42 +924,39 @@ static int find_probe_point_lazy(Dwarf_Die *sp_die, struct probe_finder *pf)
         return die_walk_lines(sp_die, probe_point_lazy_walker, pf);
 }
 
-/* Callback parameter with return value */
-struct dwarf_callback_param {
-        void *data;
-        int retval;
-};
-
 static int probe_point_inline_cb(Dwarf_Die *in_die, void *data)
 {
-        struct dwarf_callback_param *param = data;
-        struct probe_finder *pf = param->data;
+        struct probe_finder *pf = data;
         struct perf_probe_point *pp = &pf->pev->point;
         Dwarf_Addr addr;
+        int ret;
 
         if (pp->lazy_line)
-                param->retval = find_probe_point_lazy(in_die, pf);
+                ret = find_probe_point_lazy(in_die, pf);
         else {
                 /* Get probe address */
                 if (dwarf_entrypc(in_die, &addr) != 0) {
                         pr_warning("Failed to get entry address of %s.\n",
                                    dwarf_diename(in_die));
-                        param->retval = -ENOENT;
-                        return DWARF_CB_ABORT;
+                        return -ENOENT;
                 }
                 pf->addr = addr;
                 pf->addr += pp->offset;
                 pr_debug("found inline addr: 0x%jx\n",
                          (uintmax_t)pf->addr);
 
-                param->retval = call_probe_finder(in_die, pf);
-                if (param->retval < 0)
-                        return DWARF_CB_ABORT;
+                ret = call_probe_finder(in_die, pf);
         }
 
-        return DWARF_CB_OK;
+        return ret;
 }
 
+/* Callback parameter with return value for libdw */
+struct dwarf_callback_param {
+        void *data;
+        int retval;
+};
+
 /* Search function from function name */
 static int probe_point_search_cb(Dwarf_Die *sp_die, void *data)
 {
@@ -1451,14 +993,10 @@ static int probe_point_search_cb(Dwarf_Die *sp_die, void *data)
                         /* TODO: Check the address in this function */
                         param->retval = call_probe_finder(sp_die, pf);
                 }
-        } else {
-                struct dwarf_callback_param _param = {.data = (void *)pf,
-                                                      .retval = 0};
+        } else
                 /* Inlined function: search instances */
-                dwarf_func_inline_instances(sp_die, probe_point_inline_cb,
-                                            &_param);
-                param->retval = _param.retval;
-        }
+                param->retval = die_walk_instances(sp_die,
+                                        probe_point_inline_cb, (void *)pf);
 
         return DWARF_CB_ABORT; /* Exit; no same symbol in this CU. */
 }
@@ -1504,28 +1042,18 @@ static int pubname_search_cb(Dwarf *dbg, Dwarf_Global *gl, void *data)
 }
 
 /* Find probe points from debuginfo */
-static int find_probes(int fd, struct probe_finder *pf)
+static int debuginfo__find_probes(struct debuginfo *self,
+                                  struct probe_finder *pf)
 {
         struct perf_probe_point *pp = &pf->pev->point;
         Dwarf_Off off, noff;
         size_t cuhl;
         Dwarf_Die *diep;
-        Dwarf *dbg = NULL;
-        Dwfl *dwfl;
-        Dwarf_Addr bias;        /* Currently ignored */
         int ret = 0;
 
-        dbg = dwfl_init_offline_dwarf(fd, &dwfl, &bias);
-        if (!dbg) {
-                pr_warning("No debug information found in the vmlinux - "
-                        "please rebuild with CONFIG_DEBUG_INFO=y.\n");
-                close(fd);      /* Without dwfl_end(), fd isn't closed. */
-                return -EBADF;
-        }
-
 #if _ELFUTILS_PREREQ(0, 142)
         /* Get the call frame information from this dwarf */
-        pf->cfi = dwarf_getcfi(dbg);
+        pf->cfi = dwarf_getcfi(self->dbg);
 #endif
 
         off = 0;
@@ -1544,7 +1072,8 @@ static int find_probes(int fd, struct probe_finder *pf)
                         .data = pf,
                 };
 
-                dwarf_getpubnames(dbg, pubname_search_cb, &pubname_param, 0);
+                dwarf_getpubnames(self->dbg, pubname_search_cb,
+                                  &pubname_param, 0);
                 if (pubname_param.found) {
                         ret = probe_point_search_cb(&pf->sp_die, &probe_param);
                         if (ret)
@@ -1553,9 +1082,9 @@ static int find_probes(int fd, struct probe_finder *pf)
         }
 
         /* Loop on CUs (Compilation Unit) */
-        while (!dwarf_nextcu(dbg, off, &noff, &cuhl, NULL, NULL, NULL)) {
+        while (!dwarf_nextcu(self->dbg, off, &noff, &cuhl, NULL, NULL, NULL)) {
                 /* Get the DIE(Debugging Information Entry) of this CU */
-                diep = dwarf_offdie(dbg, off + cuhl, &pf->cu_die);
+                diep = dwarf_offdie(self->dbg, off + cuhl, &pf->cu_die);
                 if (!diep)
                         continue;
 
@@ -1582,14 +1111,12 @@ static int find_probes(int fd, struct probe_finder *pf)
 
 found:
         line_list__free(&pf->lcache);
-        if (dwfl)
-                dwfl_end(dwfl);
 
         return ret;
 }
 
 /* Add a found probe point into trace event list */
-static int add_probe_trace_event(Dwarf_Die *sp_die, struct probe_finder *pf)
+static int add_probe_trace_event(Dwarf_Die *sc_die, struct probe_finder *pf)
 {
         struct trace_event_finder *tf =
                         container_of(pf, struct trace_event_finder, pf);
@@ -1604,8 +1131,9 @@ static int add_probe_trace_event(Dwarf_Die *sp_die, struct probe_finder *pf)
         }
         tev = &tf->tevs[tf->ntevs++];
 
-        ret = convert_to_trace_point(sp_die, pf->addr, pf->pev->point.retprobe,
-                                     &tev->point);
+        /* Trace point should be converted from subprogram DIE */
+        ret = convert_to_trace_point(&pf->sp_die, pf->addr,
+                                     pf->pev->point.retprobe, &tev->point);
         if (ret < 0)
                 return ret;
 
@@ -1620,7 +1148,8 @@ static int add_probe_trace_event(Dwarf_Die *sp_die, struct probe_finder *pf)
         for (i = 0; i < pf->pev->nargs; i++) {
                 pf->pvar = &pf->pev->args[i];
                 pf->tvar = &tev->args[i];
-                ret = find_variable(sp_die, pf);
+                /* Variable should be found from scope DIE */
+                ret = find_variable(sc_die, pf);
                 if (ret != 0)
                         return ret;
         }
@@ -1629,8 +1158,9 @@ static int add_probe_trace_event(Dwarf_Die *sp_die, struct probe_finder *pf)
 }
 
 /* Find probe_trace_events specified by perf_probe_event from debuginfo */
-int find_probe_trace_events(int fd, struct perf_probe_event *pev,
-                            struct probe_trace_event **tevs, int max_tevs)
+int debuginfo__find_trace_events(struct debuginfo *self,
+                                 struct perf_probe_event *pev,
+                                 struct probe_trace_event **tevs, int max_tevs)
 {
         struct trace_event_finder tf = {
                         .pf = {.pev = pev, .callback = add_probe_trace_event},
@@ -1645,7 +1175,7 @@ int find_probe_trace_events(int fd, struct perf_probe_event *pev,
         tf.tevs = *tevs;
         tf.ntevs = 0;
 
-        ret = find_probes(fd, &tf.pf);
+        ret = debuginfo__find_probes(self, &tf.pf);
         if (ret < 0) {
                 free(*tevs);
                 *tevs = NULL;
@@ -1687,13 +1217,13 @@ static int collect_variables_cb(Dwarf_Die *die_mem, void *data)
 }
 
 /* Add a found vars into available variables list */
-static int add_available_vars(Dwarf_Die *sp_die, struct probe_finder *pf)
+static int add_available_vars(Dwarf_Die *sc_die, struct probe_finder *pf)
 {
         struct available_var_finder *af =
                         container_of(pf, struct available_var_finder, pf);
         struct variable_list *vl;
-        Dwarf_Die die_mem, *scopes = NULL;
-        int ret, nscopes;
+        Dwarf_Die die_mem;
+        int ret;
 
         /* Check number of tevs */
         if (af->nvls == af->max_vls) {
@@ -1702,8 +1232,9 @@ static int add_available_vars(Dwarf_Die *sp_die, struct probe_finder *pf)
         }
         vl = &af->vls[af->nvls++];
 
-        ret = convert_to_trace_point(sp_die, pf->addr, pf->pev->point.retprobe,
-                                     &vl->point);
+        /* Trace point should be converted from subprogram DIE */
+        ret = convert_to_trace_point(&pf->sp_die, pf->addr,
+                                     pf->pev->point.retprobe, &vl->point);
         if (ret < 0)
                 return ret;
 
@@ -1715,19 +1246,14 @@ static int add_available_vars(Dwarf_Die *sp_die, struct probe_finder *pf)
         if (vl->vars == NULL)
                 return -ENOMEM;
         af->child = true;
-        die_find_child(sp_die, collect_variables_cb, (void *)af, &die_mem);
+        die_find_child(sc_die, collect_variables_cb, (void *)af, &die_mem);
 
         /* Find external variables */
         if (!af->externs)
                 goto out;
         /* Don't need to search child DIE for externs. */
         af->child = false;
-        nscopes = dwarf_getscopes_die(sp_die, &scopes);
-        while (nscopes-- > 1)
-                die_find_child(&scopes[nscopes], collect_variables_cb,
-                               (void *)af, &die_mem);
-        if (scopes)
-                free(scopes);
+        die_find_child(&pf->cu_die, collect_variables_cb, (void *)af, &die_mem);
 
 out:
         if (strlist__empty(vl->vars)) {
@@ -1739,9 +1265,10 @@ out:
 }
 
 /* Find available variables at given probe point */
-int find_available_vars_at(int fd, struct perf_probe_event *pev,
-                           struct variable_list **vls, int max_vls,
-                           bool externs)
+int debuginfo__find_available_vars_at(struct debuginfo *self,
+                                      struct perf_probe_event *pev,
+                                      struct variable_list **vls,
+                                      int max_vls, bool externs)
 {
         struct available_var_finder af = {
                         .pf = {.pev = pev, .callback = add_available_vars},
@@ -1756,7 +1283,7 @@ int find_available_vars_at(int fd, struct perf_probe_event *pev,
         af.vls = *vls;
         af.nvls = 0;
 
-        ret = find_probes(fd, &af.pf);
+        ret = debuginfo__find_probes(self, &af.pf);
         if (ret < 0) {
                 /* Free vlist for error */
                 while (af.nvls--) {
@@ -1774,28 +1301,19 @@ int find_available_vars_at(int fd, struct perf_probe_event *pev,
 }
 
 /* Reverse search */
-int find_perf_probe_point(unsigned long addr, struct perf_probe_point *ppt)
+int debuginfo__find_probe_point(struct debuginfo *self, unsigned long addr,
+                                struct perf_probe_point *ppt)
 {
         Dwarf_Die cudie, spdie, indie;
-        Dwarf *dbg = NULL;
-        Dwfl *dwfl = NULL;
-        Dwarf_Addr _addr, baseaddr, bias = 0;
+        Dwarf_Addr _addr, baseaddr;
         const char *fname = NULL, *func = NULL, *tmp;
         int baseline = 0, lineno = 0, ret = 0;
 
-        /* Open the live linux kernel */
-        dbg = dwfl_init_live_kernel_dwarf(addr, &dwfl, &bias);
-        if (!dbg) {
-                pr_warning("No debug information found in the vmlinux - "
-                        "please rebuild with CONFIG_DEBUG_INFO=y.\n");
-                ret = -EINVAL;
-                goto end;
-        }
-
         /* Adjust address with bias */
-        addr += bias;
+        addr += self->bias;
+
         /* Find cu die */
-        if (!dwarf_addrdie(dbg, (Dwarf_Addr)addr - bias, &cudie)) {
+        if (!dwarf_addrdie(self->dbg, (Dwarf_Addr)addr - self->bias, &cudie)) {
                 pr_warning("Failed to find debug information for address %lx\n",
                            addr);
                 ret = -EINVAL;
@@ -1807,7 +1325,7 @@ int find_perf_probe_point(unsigned long addr, struct perf_probe_point *ppt)
         /* Don't care whether it failed or not */
 
         /* Find a corresponding function (name, baseline and baseaddr) */
-        if (die_find_real_subprogram(&cudie, (Dwarf_Addr)addr, &spdie)) {
+        if (die_find_realfunc(&cudie, (Dwarf_Addr)addr, &spdie)) {
                 /* Get function entry information */
                 tmp = dwarf_diename(&spdie);
                 if (!tmp ||
@@ -1871,8 +1389,6 @@ post:
                 }
         }
 end:
-        if (dwfl)
-                dwfl_end(dwfl);
         if (ret == 0 && (fname || func))
                 ret = 1;        /* Found a point */
         return ret;
@@ -1929,10 +1445,14 @@ static int find_line_range_by_line(Dwarf_Die *sp_die, struct line_finder *lf)
 
 static int line_range_inline_cb(Dwarf_Die *in_die, void *data)
 {
-        struct dwarf_callback_param *param = data;
+        find_line_range_by_line(in_die, data);
 
-        param->retval = find_line_range_by_line(in_die, param->data);
-        return DWARF_CB_ABORT;  /* No need to find other instances */
+        /*
+         * We have to check all instances of inlined function, because
+         * some execution paths can be optimized out depends on the
+         * function argument of instances
+         */
+        return 0;
 }
 
 /* Search function from function name */
@@ -1960,15 +1480,10 @@ static int line_range_search_cb(Dwarf_Die *sp_die, void *data)
                 pr_debug("New line range: %d to %d\n", lf->lno_s, lf->lno_e);
                 lr->start = lf->lno_s;
                 lr->end = lf->lno_e;
-                if (dwarf_func_inline(sp_die)) {
-                        struct dwarf_callback_param _param;
-                        _param.data = (void *)lf;
-                        _param.retval = 0;
-                        dwarf_func_inline_instances(sp_die,
-                                                    line_range_inline_cb,
-                                                    &_param);
-                        param->retval = _param.retval;
-                } else
+                if (dwarf_func_inline(sp_die))
+                        param->retval = die_walk_instances(sp_die,
+                                                line_range_inline_cb, lf);
+                else
                         param->retval = find_line_range_by_line(sp_die, lf);
                 return DWARF_CB_ABORT;
         }
@@ -1982,26 +1497,15 @@ static int find_line_range_by_func(struct line_finder *lf)
         return param.retval;
 }
 
-int find_line_range(int fd, struct line_range *lr)
+int debuginfo__find_line_range(struct debuginfo *self, struct line_range *lr)
 {
         struct line_finder lf = {.lr = lr, .found = 0};
         int ret = 0;
         Dwarf_Off off = 0, noff;
         size_t cuhl;
         Dwarf_Die *diep;
-        Dwarf *dbg = NULL;
-        Dwfl *dwfl;
-        Dwarf_Addr bias;        /* Currently ignored */
         const char *comp_dir;
 
-        dbg = dwfl_init_offline_dwarf(fd, &dwfl, &bias);
-        if (!dbg) {
-                pr_warning("No debug information found in the vmlinux - "
-                        "please rebuild with CONFIG_DEBUG_INFO=y.\n");
-                close(fd);      /* Without dwfl_end(), fd isn't closed. */
-                return -EBADF;
-        }
-
         /* Fastpath: lookup by function name from .debug_pubnames section */
         if (lr->function) {
                 struct pubname_callback_param pubname_param = {
@@ -2010,7 +1514,8 @@ int find_line_range(int fd, struct line_range *lr)
                 struct dwarf_callback_param line_range_param = {
                         .data = (void *)&lf, .retval = 0};
 
-                dwarf_getpubnames(dbg, pubname_search_cb, &pubname_param, 0);
+                dwarf_getpubnames(self->dbg, pubname_search_cb,
+                                  &pubname_param, 0);
                 if (pubname_param.found) {
                         line_range_search_cb(&lf.sp_die, &line_range_param);
                         if (lf.found)
@@ -2020,11 +1525,12 @@ int find_line_range(int fd, struct line_range *lr)
 
         /* Loop on CUs (Compilation Unit) */
         while (!lf.found && ret >= 0) {
-                if (dwarf_nextcu(dbg, off, &noff, &cuhl, NULL, NULL, NULL) != 0)
+                if (dwarf_nextcu(self->dbg, off, &noff, &cuhl,
+                                 NULL, NULL, NULL) != 0)
                         break;
 
                 /* Get the DIE(Debugging Information Entry) of this CU */
-                diep = dwarf_offdie(dbg, off + cuhl, &lf.cu_die);
+                diep = dwarf_offdie(self->dbg, off + cuhl, &lf.cu_die);
                 if (!diep)
                         continue;
 
@@ -2058,7 +1564,6 @@ found:
         }
 
         pr_debug("path: %s\n", lr->path);
-        dwfl_end(dwfl);
         return (ret < 0) ? ret : lf.found;
 }
 
diff --git a/tools/perf/util/probe-finder.h b/tools/perf/util/probe-finder.h
index 605730a366d..1132c8f0ce8 100644
--- a/tools/perf/util/probe-finder.h
+++ b/tools/perf/util/probe-finder.h
@@ -16,33 +16,48 @@ static inline int is_c_varname(const char *name)
 }
 
 #ifdef DWARF_SUPPORT
+
+#include "dwarf-aux.h"
+
+/* TODO: export debuginfo data structure even if no dwarf support */
+
+/* debug information structure */
+struct debuginfo {
+        Dwarf           *dbg;
+        Dwfl            *dwfl;
+        Dwarf_Addr      bias;
+};
+
+extern struct debuginfo *debuginfo__new(const char *path);
+extern struct debuginfo *debuginfo__new_online_kernel(unsigned long addr);
+extern void debuginfo__delete(struct debuginfo *self);
+
 /* Find probe_trace_events specified by perf_probe_event from debuginfo */
-extern int find_probe_trace_events(int fd, struct perf_probe_event *pev,
-                                    struct probe_trace_event **tevs,
-                                    int max_tevs);
+extern int debuginfo__find_trace_events(struct debuginfo *self,
+                                        struct perf_probe_event *pev,
+                                        struct probe_trace_event **tevs,
+                                        int max_tevs);
 
 /* Find a perf_probe_point from debuginfo */
-extern int find_perf_probe_point(unsigned long addr,
-                                 struct perf_probe_point *ppt);
+extern int debuginfo__find_probe_point(struct debuginfo *self,
+                                       unsigned long addr,
+                                       struct perf_probe_point *ppt);
 
 /* Find a line range */
-extern int find_line_range(int fd, struct line_range *lr);
+extern int debuginfo__find_line_range(struct debuginfo *self,
+                                      struct line_range *lr);
 
 /* Find available variables */
-extern int find_available_vars_at(int fd, struct perf_probe_event *pev,
-                                  struct variable_list **vls, int max_points,
-                                  bool externs);
-
-#include <dwarf.h>
-#include <elfutils/libdw.h>
-#include <elfutils/libdwfl.h>
-#include <elfutils/version.h>
+extern int debuginfo__find_available_vars_at(struct debuginfo *self,
+                                             struct perf_probe_event *pev,
+                                             struct variable_list **vls,
+                                             int max_points, bool externs);
 
 struct probe_finder {
         struct perf_probe_event *pev;           /* Target probe event */
 
         /* Callback when a probe point is found */
-        int (*callback)(Dwarf_Die *sp_die, struct probe_finder *pf);
+        int (*callback)(Dwarf_Die *sc_die, struct probe_finder *pf);
 
         /* For function searching */
         int                     lno;            /* Line number */
diff --git a/tools/perf/util/python.c b/tools/perf/util/python.c
index a9ac0504aab..7624324efad 100644
--- a/tools/perf/util/python.c
+++ b/tools/perf/util/python.c
@@ -187,16 +187,119 @@ static PyTypeObject pyrf_throttle_event__type = {
         .tp_repr        = (reprfunc)pyrf_throttle_event__repr,
 };
 
+static char pyrf_lost_event__doc[] = PyDoc_STR("perf lost event object.");
+
+static PyMemberDef pyrf_lost_event__members[] = {
+        sample_members
+        member_def(lost_event, id, T_ULONGLONG, "event id"),
+        member_def(lost_event, lost, T_ULONGLONG, "number of lost events"),
+        { .name = NULL, },
+};
+
+static PyObject *pyrf_lost_event__repr(struct pyrf_event *pevent)
+{
+        PyObject *ret;
+        char *s;
+
+        if (asprintf(&s, "{ type: lost, id: %#" PRIx64 ", "
+                         "lost: %#" PRIx64 " }",
+                     pevent->event.lost.id, pevent->event.lost.lost) < 0) {
+                ret = PyErr_NoMemory();
+        } else {
+                ret = PyString_FromString(s);
+                free(s);
+        }
+        return ret;
+}
+
+static PyTypeObject pyrf_lost_event__type = {
+        PyVarObject_HEAD_INIT(NULL, 0)
+        .tp_name        = "perf.lost_event",
+        .tp_basicsize   = sizeof(struct pyrf_event),
+        .tp_flags       = Py_TPFLAGS_DEFAULT|Py_TPFLAGS_BASETYPE,
+        .tp_doc         = pyrf_lost_event__doc,
+        .tp_members     = pyrf_lost_event__members,
+        .tp_repr        = (reprfunc)pyrf_lost_event__repr,
+};
+
+static char pyrf_read_event__doc[] = PyDoc_STR("perf read event object.");
+
+static PyMemberDef pyrf_read_event__members[] = {
+        sample_members
+        member_def(read_event, pid, T_UINT, "event pid"),
+        member_def(read_event, tid, T_UINT, "event tid"),
+        { .name = NULL, },
+};
+
+static PyObject *pyrf_read_event__repr(struct pyrf_event *pevent)
+{
+        return PyString_FromFormat("{ type: read, pid: %u, tid: %u }",
+                                   pevent->event.read.pid,
+                                   pevent->event.read.tid);
+        /*
+         * FIXME: return the array of read values,
+         * making this method useful ;-)
+         */
+}
+
+static PyTypeObject pyrf_read_event__type = {
+        PyVarObject_HEAD_INIT(NULL, 0)
+        .tp_name        = "perf.read_event",
+        .tp_basicsize   = sizeof(struct pyrf_event),
+        .tp_flags       = Py_TPFLAGS_DEFAULT|Py_TPFLAGS_BASETYPE,
+        .tp_doc         = pyrf_read_event__doc,
+        .tp_members     = pyrf_read_event__members,
+        .tp_repr        = (reprfunc)pyrf_read_event__repr,
+};
+
+static char pyrf_sample_event__doc[] = PyDoc_STR("perf sample event object.");
+
+static PyMemberDef pyrf_sample_event__members[] = {
+        sample_members
+        member_def(perf_event_header, type, T_UINT, "event type"),
+        { .name = NULL, },
+};
+
+static PyObject *pyrf_sample_event__repr(struct pyrf_event *pevent)
+{
+        PyObject *ret;
+        char *s;
+
+        if (asprintf(&s, "{ type: sample }") < 0) {
+                ret = PyErr_NoMemory();
+        } else {
+                ret = PyString_FromString(s);
+                free(s);
+        }
+        return ret;
+}
+
+static PyTypeObject pyrf_sample_event__type = {
+        PyVarObject_HEAD_INIT(NULL, 0)
+        .tp_name        = "perf.sample_event",
+        .tp_basicsize   = sizeof(struct pyrf_event),
+        .tp_flags       = Py_TPFLAGS_DEFAULT|Py_TPFLAGS_BASETYPE,
+        .tp_doc         = pyrf_sample_event__doc,
+        .tp_members     = pyrf_sample_event__members,
+        .tp_repr        = (reprfunc)pyrf_sample_event__repr,
+};
+
 static int pyrf_event__setup_types(void)
 {
         int err;
         pyrf_mmap_event__type.tp_new =
         pyrf_task_event__type.tp_new =
         pyrf_comm_event__type.tp_new =
+        pyrf_lost_event__type.tp_new =
+        pyrf_read_event__type.tp_new =
+        pyrf_sample_event__type.tp_new =
         pyrf_throttle_event__type.tp_new = PyType_GenericNew;
         err = PyType_Ready(&pyrf_mmap_event__type);
         if (err < 0)
                 goto out;
+        err = PyType_Ready(&pyrf_lost_event__type);
+        if (err < 0)
+                goto out;
         err = PyType_Ready(&pyrf_task_event__type);
         if (err < 0)
                 goto out;
@@ -206,20 +309,26 @@ static int pyrf_event__setup_types(void)
         err = PyType_Ready(&pyrf_throttle_event__type);
         if (err < 0)
                 goto out;
+        err = PyType_Ready(&pyrf_read_event__type);
+        if (err < 0)
+                goto out;
+        err = PyType_Ready(&pyrf_sample_event__type);
+        if (err < 0)
+                goto out;
 out:
         return err;
 }
 
 static PyTypeObject *pyrf_event__type[] = {
         [PERF_RECORD_MMAP]       = &pyrf_mmap_event__type,
-        [PERF_RECORD_LOST]       = &pyrf_mmap_event__type,
+        [PERF_RECORD_LOST]       = &pyrf_lost_event__type,
         [PERF_RECORD_COMM]       = &pyrf_comm_event__type,
         [PERF_RECORD_EXIT]       = &pyrf_task_event__type,
         [PERF_RECORD_THROTTLE]   = &pyrf_throttle_event__type,
         [PERF_RECORD_UNTHROTTLE] = &pyrf_throttle_event__type,
         [PERF_RECORD_FORK]       = &pyrf_task_event__type,
-        [PERF_RECORD_READ]       = &pyrf_mmap_event__type,
-        [PERF_RECORD_SAMPLE]     = &pyrf_mmap_event__type,
+        [PERF_RECORD_READ]       = &pyrf_read_event__type,
+        [PERF_RECORD_SAMPLE]     = &pyrf_sample_event__type,
 };
 
 static PyObject *pyrf_event__new(union perf_event *event)
@@ -247,7 +356,7 @@ struct pyrf_cpu_map {
 static int pyrf_cpu_map__init(struct pyrf_cpu_map *pcpus,
                               PyObject *args, PyObject *kwargs)
 {
-        static char *kwlist[] = { "cpustr", NULL, NULL, };
+        static char *kwlist[] = { "cpustr", NULL };
         char *cpustr = NULL;
 
         if (!PyArg_ParseTupleAndKeywords(args, kwargs, "|s",
@@ -316,7 +425,7 @@ struct pyrf_thread_map {
 static int pyrf_thread_map__init(struct pyrf_thread_map *pthreads,
                                  PyObject *args, PyObject *kwargs)
 {
-        static char *kwlist[] = { "pid", "tid", NULL, NULL, };
+        static char *kwlist[] = { "pid", "tid", NULL };
         int pid = -1, tid = -1;
 
         if (!PyArg_ParseTupleAndKeywords(args, kwargs, "|ii",
@@ -418,7 +527,9 @@ static int pyrf_evsel__init(struct pyrf_evsel *pevsel,
                 "wakeup_events",
                 "bp_type",
                 "bp_addr",
-                "bp_len", NULL, NULL, };
+                "bp_len",
+                 NULL
+        };
         u64 sample_period = 0;
         u32 disabled = 0,
             inherit = 0,
@@ -499,7 +610,7 @@ static PyObject *pyrf_evsel__open(struct pyrf_evsel *pevsel,
         struct thread_map *threads = NULL;
         PyObject *pcpus = NULL, *pthreads = NULL;
         int group = 0, inherit = 0;
-        static char *kwlist[] = {"cpus", "threads", "group", "inherit", NULL, NULL};
+        static char *kwlist[] = { "cpus", "threads", "group", "inherit", NULL };
 
         if (!PyArg_ParseTupleAndKeywords(args, kwargs, "|OOii", kwlist,
                                          &pcpus, &pthreads, &group, &inherit))
@@ -582,8 +693,7 @@ static PyObject *pyrf_evlist__mmap(struct pyrf_evlist *pevlist,
                                    PyObject *args, PyObject *kwargs)
 {
         struct perf_evlist *evlist = &pevlist->evlist;
-        static char *kwlist[] = {"pages", "overwrite",
-                                  NULL, NULL};
+        static char *kwlist[] = { "pages", "overwrite", NULL };
         int pages = 128, overwrite = false;
 
         if (!PyArg_ParseTupleAndKeywords(args, kwargs, "|ii", kwlist,
@@ -603,7 +713,7 @@ static PyObject *pyrf_evlist__poll(struct pyrf_evlist *pevlist,
                                    PyObject *args, PyObject *kwargs)
 {
         struct perf_evlist *evlist = &pevlist->evlist;
-        static char *kwlist[] = {"timeout", NULL, NULL};
+        static char *kwlist[] = { "timeout", NULL };
         int timeout = -1, n;
 
         if (!PyArg_ParseTupleAndKeywords(args, kwargs, "|i", kwlist, &timeout))
@@ -674,7 +784,7 @@ static PyObject *pyrf_evlist__read_on_cpu(struct pyrf_evlist *pevlist,
         struct perf_evlist *evlist = &pevlist->evlist;
         union perf_event *event;
         int sample_id_all = 1, cpu;
-        static char *kwlist[] = {"cpu", "sample_id_all", NULL, NULL};
+        static char *kwlist[] = { "cpu", "sample_id_all", NULL };
         int err;
 
         if (!PyArg_ParseTupleAndKeywords(args, kwargs, "i|i", kwlist,
@@ -693,7 +803,7 @@ static PyObject *pyrf_evlist__read_on_cpu(struct pyrf_evlist *pevlist,
                 first = list_entry(evlist->entries.next, struct perf_evsel, node);
                 err = perf_event__parse_sample(event, first->attr.sample_type,
                                                perf_evsel__sample_size(first),
-                                               sample_id_all, &pevent->sample);
+                                               sample_id_all, &pevent->sample, false);
                 if (err)
                         return PyErr_Format(PyExc_OSError,
                                             "perf: can't parse sample, err=%d", err);
diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c
index f5a8fbdd3f7..72458d9da5b 100644
--- a/tools/perf/util/session.c
+++ b/tools/perf/util/session.c
@@ -12,6 +12,7 @@
 #include "session.h"
 #include "sort.h"
 #include "util.h"
+#include "cpumap.h"
 
 static int perf_session__open(struct perf_session *self, bool force)
 {
@@ -247,9 +248,14 @@ int perf_session__resolve_callchain(struct perf_session *self,
         callchain_cursor_reset(&self->callchain_cursor);
 
         for (i = 0; i < chain->nr; i++) {
-                u64 ip = chain->ips[i];
+                u64 ip;
                 struct addr_location al;
 
+                if (callchain_param.order == ORDER_CALLEE)
+                        ip = chain->ips[i];
+                else
+                        ip = chain->ips[chain->nr - i - 1];
+
                 if (ip >= PERF_CONTEXT_MAX) {
                         switch (ip) {
                         case PERF_CONTEXT_HV:
@@ -407,20 +413,26 @@ static void perf_event__read_swap(union perf_event *event)
         event->read.id           = bswap_64(event->read.id);
 }
 
-static void perf_event__attr_swap(union perf_event *event)
+/* exported for swapping attributes in file header */
+void perf_event__attr_swap(struct perf_event_attr *attr)
+{
+        attr->type              = bswap_32(attr->type);
+        attr->size              = bswap_32(attr->size);
+        attr->config            = bswap_64(attr->config);
+        attr->sample_period     = bswap_64(attr->sample_period);
+        attr->sample_type       = bswap_64(attr->sample_type);
+        attr->read_format       = bswap_64(attr->read_format);
+        attr->wakeup_events     = bswap_32(attr->wakeup_events);
+        attr->bp_type           = bswap_32(attr->bp_type);
+        attr->bp_addr           = bswap_64(attr->bp_addr);
+        attr->bp_len            = bswap_64(attr->bp_len);
+}
+
+static void perf_event__hdr_attr_swap(union perf_event *event)
 {
         size_t size;
 
-        event->attr.attr.type           = bswap_32(event->attr.attr.type);
-        event->attr.attr.size           = bswap_32(event->attr.attr.size);
-        event->attr.attr.config         = bswap_64(event->attr.attr.config);
-        event->attr.attr.sample_period  = bswap_64(event->attr.attr.sample_period);
-        event->attr.attr.sample_type    = bswap_64(event->attr.attr.sample_type);
-        event->attr.attr.read_format    = bswap_64(event->attr.attr.read_format);
-        event->attr.attr.wakeup_events  = bswap_32(event->attr.attr.wakeup_events);
-        event->attr.attr.bp_type        = bswap_32(event->attr.attr.bp_type);
-        event->attr.attr.bp_addr        = bswap_64(event->attr.attr.bp_addr);
-        event->attr.attr.bp_len         = bswap_64(event->attr.attr.bp_len);
+        perf_event__attr_swap(&event->attr.attr);
 
         size = event->header.size;
         size -= (void *)&event->attr.id - (void *)event;
@@ -448,7 +460,7 @@ static perf_event__swap_op perf_event__swap_ops[] = {
         [PERF_RECORD_LOST]                = perf_event__all64_swap,
         [PERF_RECORD_READ]                = perf_event__read_swap,
         [PERF_RECORD_SAMPLE]              = perf_event__all64_swap,
-        [PERF_RECORD_HEADER_ATTR]         = perf_event__attr_swap,
+        [PERF_RECORD_HEADER_ATTR]         = perf_event__hdr_attr_swap,
         [PERF_RECORD_HEADER_EVENT_TYPE]   = perf_event__event_type_swap,
         [PERF_RECORD_HEADER_TRACING_DATA] = perf_event__tracing_data_swap,
         [PERF_RECORD_HEADER_BUILD_ID]     = NULL,
@@ -708,9 +720,9 @@ static void dump_sample(struct perf_session *session, union perf_event *event,
         if (!dump_trace)
                 return;
 
-        printf("(IP, %d): %d/%d: %#" PRIx64 " period: %" PRIu64 "\n",
+        printf("(IP, %d): %d/%d: %#" PRIx64 " period: %" PRIu64 " addr: %#" PRIx64 "\n",
                event->header.misc, sample->pid, sample->tid, sample->ip,
-               sample->period);
+               sample->period, sample->addr);
 
         if (session->sample_type & PERF_SAMPLE_CALLCHAIN)
                 callchain__printf(sample);
@@ -1202,9 +1214,10 @@ struct perf_evsel *perf_session__find_first_evtype(struct perf_session *session,
         return NULL;
 }
 
-void perf_session__print_symbols(union perf_event *event,
-                                struct perf_sample *sample,
-                                struct perf_session *session)
+void perf_session__print_ip(union perf_event *event,
+                            struct perf_sample *sample,
+                            struct perf_session *session,
+                            int print_sym, int print_dso)
 {
         struct addr_location al;
         const char *symname, *dsoname;
@@ -1233,32 +1246,83 @@ void perf_session__print_symbols(union perf_event *event,
                         if (!node)
                                 break;
 
-                        if (node->sym && node->sym->name)
-                                symname = node->sym->name;
+                        printf("\t%16" PRIx64, node->ip);
+                        if (print_sym) {
+                                if (node->sym && node->sym->name)
+                                        symname = node->sym->name;
+                                else
+                                        symname = "";
+
+                                printf(" %s", symname);
+                        }
+                        if (print_dso) {
+                                if (node->map && node->map->dso && node->map->dso->name)
+                                        dsoname = node->map->dso->name;
+                                else
+                                        dsoname = "";
+
+                                printf(" (%s)", dsoname);
+                        }
+                        printf("\n");
+
+                        callchain_cursor_advance(cursor);
+                }
+
+        } else {
+                printf("%16" PRIx64, sample->ip);
+                if (print_sym) {
+                        if (al.sym && al.sym->name)
+                                symname = al.sym->name;
                         else
                                 symname = "";
 
-                        if (node->map && node->map->dso && node->map->dso->name)
-                                dsoname = node->map->dso->name;
+                        printf(" %s", symname);
+                }
+
+                if (print_dso) {
+                        if (al.map && al.map->dso && al.map->dso->name)
+                                dsoname = al.map->dso->name;
                         else
                                 dsoname = "";
 
-                        printf("\t%16" PRIx64 " %s (%s)\n", node->ip, symname, dsoname);
+                        printf(" (%s)", dsoname);
+                }
+        }
+}
 
-                        callchain_cursor_advance(cursor);
+int perf_session__cpu_bitmap(struct perf_session *session,
+                             const char *cpu_list, unsigned long *cpu_bitmap)
+{
+        int i;
+        struct cpu_map *map;
+
+        for (i = 0; i < PERF_TYPE_MAX; ++i) {
+                struct perf_evsel *evsel;
+
+                evsel = perf_session__find_first_evtype(session, i);
+                if (!evsel)
+                        continue;
+
+                if (!(evsel->attr.sample_type & PERF_SAMPLE_CPU)) {
+                        pr_err("File does not contain CPU events. "
+                               "Remove -c option to proceed.\n");
+                        return -1;
                 }
+        }
 
-        } else {
-                if (al.sym && al.sym->name)
-                        symname = al.sym->name;
-                else
-                        symname = "";
+        map = cpu_map__new(cpu_list);
 
-                if (al.map && al.map->dso && al.map->dso->name)
-                        dsoname = al.map->dso->name;
-                else
-                        dsoname = "";
+        for (i = 0; i < map->nr; i++) {
+                int cpu = map->map[i];
+
+                if (cpu >= MAX_NR_CPUS) {
+                        pr_err("Requested CPU %d too large. "
+                               "Consider raising MAX_NR_CPUS\n", cpu);
+                        return -1;
+                }
 
-                printf("%16" PRIx64 " %s (%s)", al.addr, symname, dsoname);
+                set_bit(cpu, cpu_bitmap);
         }
+
+        return 0;
 }
diff --git a/tools/perf/util/session.h b/tools/perf/util/session.h
index 66d4e149087..974d0cbee5e 100644
--- a/tools/perf/util/session.h
+++ b/tools/perf/util/session.h
@@ -112,6 +112,7 @@ int perf_session__set_kallsyms_ref_reloc_sym(struct map **maps,
                                              u64 addr);
 
 void mem_bswap_64(void *src, int byte_size);
+void perf_event__attr_swap(struct perf_event_attr *attr);
 
 int perf_session__create_kernel_maps(struct perf_session *self);
 
@@ -161,14 +162,19 @@ static inline int perf_session__parse_sample(struct perf_session *session,
 {
         return perf_event__parse_sample(event, session->sample_type,
                                         session->sample_size,
-                                        session->sample_id_all, sample);
+                                        session->sample_id_all, sample,
+                                        session->header.needs_swap);
 }
 
 struct perf_evsel *perf_session__find_first_evtype(struct perf_session *session,
                                             unsigned int type);
 
-void perf_session__print_symbols(union perf_event *event,
+void perf_session__print_ip(union perf_event *event,
                                  struct perf_sample *sample,
-                                 struct perf_session *session);
+                                 struct perf_session *session,
+                                 int print_sym, int print_dso);
+
+int perf_session__cpu_bitmap(struct perf_session *session,
+                             const char *cpu_list, unsigned long *cpu_bitmap);
 
 #endif /* __PERF_SESSION_H */
diff --git a/tools/perf/util/setup.py b/tools/perf/util/setup.py
index bbc982f5dd8..95d37007492 100644
--- a/tools/perf/util/setup.py
+++ b/tools/perf/util/setup.py
@@ -3,9 +3,27 @@
 from distutils.core import setup, Extension
 from os import getenv
 
+from distutils.command.build_ext   import build_ext   as _build_ext
+from distutils.command.install_lib import install_lib as _install_lib
+
+class build_ext(_build_ext):
+    def finalize_options(self):
+        _build_ext.finalize_options(self)
+        self.build_lib  = build_lib
+        self.build_temp = build_tmp
+
+class install_lib(_install_lib):
+    def finalize_options(self):
+        _install_lib.finalize_options(self)
+        self.build_dir = build_lib
+
+
 cflags = ['-fno-strict-aliasing', '-Wno-write-strings']
 cflags += getenv('CFLAGS', '').split()
 
+build_lib = getenv('PYTHON_EXTBUILD_LIB')
+build_tmp = getenv('PYTHON_EXTBUILD_TMP')
+
 perf = Extension('perf',
                   sources = ['util/python.c', 'util/ctype.c', 'util/evlist.c',
                              'util/evsel.c', 'util/cpumap.c', 'util/thread_map.c',
@@ -21,4 +39,5 @@ setup(name='perf',
       author_email='acme@redhat.com',
       license='GPLv2',
       url='http://perf.wiki.kernel.org',
-      ext_modules=[perf])
+      ext_modules=[perf],
+      cmdclass={'build_ext': build_ext, 'install_lib': install_lib})
diff --git a/tools/perf/util/sort.c b/tools/perf/util/sort.c
index f44fa541d56..1ee8f1e40f1 100644
--- a/tools/perf/util/sort.c
+++ b/tools/perf/util/sort.c
@@ -15,95 +15,6 @@ char * field_sep;
 
 LIST_HEAD(hist_entry__sort_list);
 
-static int hist_entry__thread_snprintf(struct hist_entry *self, char *bf,
-                                       size_t size, unsigned int width);
-static int hist_entry__comm_snprintf(struct hist_entry *self, char *bf,
-                                     size_t size, unsigned int width);
-static int hist_entry__dso_snprintf(struct hist_entry *self, char *bf,
-                                    size_t size, unsigned int width);
-static int hist_entry__sym_snprintf(struct hist_entry *self, char *bf,
-                                    size_t size, unsigned int width);
-static int hist_entry__parent_snprintf(struct hist_entry *self, char *bf,
-                                       size_t size, unsigned int width);
-static int hist_entry__cpu_snprintf(struct hist_entry *self, char *bf,
-                                    size_t size, unsigned int width);
-
-struct sort_entry sort_thread = {
-        .se_header      = "Command:  Pid",
-        .se_cmp         = sort__thread_cmp,
-        .se_snprintf    = hist_entry__thread_snprintf,
-        .se_width_idx   = HISTC_THREAD,
-};
-
-struct sort_entry sort_comm = {
-        .se_header      = "Command",
-        .se_cmp         = sort__comm_cmp,
-        .se_collapse    = sort__comm_collapse,
-        .se_snprintf    = hist_entry__comm_snprintf,
-        .se_width_idx   = HISTC_COMM,
-};
-
-struct sort_entry sort_dso = {
-        .se_header      = "Shared Object",
-        .se_cmp         = sort__dso_cmp,
-        .se_snprintf    = hist_entry__dso_snprintf,
-        .se_width_idx   = HISTC_DSO,
-};
-
-struct sort_entry sort_sym = {
-        .se_header      = "Symbol",
-        .se_cmp         = sort__sym_cmp,
-        .se_snprintf    = hist_entry__sym_snprintf,
-        .se_width_idx   = HISTC_SYMBOL,
-};
-
-struct sort_entry sort_parent = {
-        .se_header      = "Parent symbol",
-        .se_cmp         = sort__parent_cmp,
-        .se_snprintf    = hist_entry__parent_snprintf,
-        .se_width_idx   = HISTC_PARENT,
-};
- 
-struct sort_entry sort_cpu = {
-        .se_header      = "CPU",
-        .se_cmp         = sort__cpu_cmp,
-        .se_snprintf    = hist_entry__cpu_snprintf,
-        .se_width_idx   = HISTC_CPU,
-};
-
-struct sort_dimension {
-        const char              *name;
-        struct sort_entry       *entry;
-        int                     taken;
-};
-
-static struct sort_dimension sort_dimensions[] = {
-        { .name = "pid",        .entry = &sort_thread,  },
-        { .name = "comm",       .entry = &sort_comm,    },
-        { .name = "dso",        .entry = &sort_dso,     },
-        { .name = "symbol",     .entry = &sort_sym,     },
-        { .name = "parent",     .entry = &sort_parent,  },
-        { .name = "cpu",        .entry = &sort_cpu,     },
-};
-
-int64_t cmp_null(void *l, void *r)
-{
-        if (!l && !r)
-                return 0;
-        else if (!l)
-                return -1;
-        else
-                return 1;
-}
-
-/* --sort pid */
-
-int64_t
-sort__thread_cmp(struct hist_entry *left, struct hist_entry *right)
-{
-        return right->thread->pid - left->thread->pid;
-}
-
 static int repsep_snprintf(char *bf, size_t size, const char *fmt, ...)
 {
         int n;
@@ -125,6 +36,24 @@ static int repsep_snprintf(char *bf, size_t size, const char *fmt, ...)
         return n;
 }
 
+static int64_t cmp_null(void *l, void *r)
+{
+        if (!l && !r)
+                return 0;
+        else if (!l)
+                return -1;
+        else
+                return 1;
+}
+
+/* --sort pid */
+
+static int64_t
+sort__thread_cmp(struct hist_entry *left, struct hist_entry *right)
+{
+        return right->thread->pid - left->thread->pid;
+}
+
 static int hist_entry__thread_snprintf(struct hist_entry *self, char *bf,
                                        size_t size, unsigned int width)
 {
@@ -132,15 +61,50 @@ static int hist_entry__thread_snprintf(struct hist_entry *self, char *bf,
                               self->thread->comm ?: "", self->thread->pid);
 }
 
+struct sort_entry sort_thread = {
+        .se_header      = "Command:  Pid",
+        .se_cmp         = sort__thread_cmp,
+        .se_snprintf    = hist_entry__thread_snprintf,
+        .se_width_idx   = HISTC_THREAD,
+};
+
+/* --sort comm */
+
+static int64_t
+sort__comm_cmp(struct hist_entry *left, struct hist_entry *right)
+{
+        return right->thread->pid - left->thread->pid;
+}
+
+static int64_t
+sort__comm_collapse(struct hist_entry *left, struct hist_entry *right)
+{
+        char *comm_l = left->thread->comm;
+        char *comm_r = right->thread->comm;
+
+        if (!comm_l || !comm_r)
+                return cmp_null(comm_l, comm_r);
+
+        return strcmp(comm_l, comm_r);
+}
+
 static int hist_entry__comm_snprintf(struct hist_entry *self, char *bf,
                                      size_t size, unsigned int width)
 {
         return repsep_snprintf(bf, size, "%*s", width, self->thread->comm);
 }
 
+struct sort_entry sort_comm = {
+        .se_header      = "Command",
+        .se_cmp         = sort__comm_cmp,
+        .se_collapse    = sort__comm_collapse,
+        .se_snprintf    = hist_entry__comm_snprintf,
+        .se_width_idx   = HISTC_COMM,
+};
+
 /* --sort dso */
 
-int64_t
+static int64_t
 sort__dso_cmp(struct hist_entry *left, struct hist_entry *right)
 {
         struct dso *dso_l = left->ms.map ? left->ms.map->dso : NULL;
@@ -173,18 +137,31 @@ static int hist_entry__dso_snprintf(struct hist_entry *self, char *bf,
         return repsep_snprintf(bf, size, "%-*s", width, "[unknown]");
 }
 
+struct sort_entry sort_dso = {
+        .se_header      = "Shared Object",
+        .se_cmp         = sort__dso_cmp,
+        .se_snprintf    = hist_entry__dso_snprintf,
+        .se_width_idx   = HISTC_DSO,
+};
+
 /* --sort symbol */
 
-int64_t
+static int64_t
 sort__sym_cmp(struct hist_entry *left, struct hist_entry *right)
 {
         u64 ip_l, ip_r;
 
+        if (!left->ms.sym && !right->ms.sym)
+                return right->level - left->level;
+
+        if (!left->ms.sym || !right->ms.sym)
+                return cmp_null(left->ms.sym, right->ms.sym);
+
         if (left->ms.sym == right->ms.sym)
                 return 0;
 
-        ip_l = left->ms.sym ? left->ms.sym->start : left->ip;
-        ip_r = right->ms.sym ? right->ms.sym->start : right->ip;
+        ip_l = left->ms.sym->start;
+        ip_r = right->ms.sym->start;
 
         return (int64_t)(ip_r - ip_l);
 }
@@ -211,29 +188,16 @@ static int hist_entry__sym_snprintf(struct hist_entry *self, char *bf,
         return ret;
 }
 
-/* --sort comm */
-
-int64_t
-sort__comm_cmp(struct hist_entry *left, struct hist_entry *right)
-{
-        return right->thread->pid - left->thread->pid;
-}
-
-int64_t
-sort__comm_collapse(struct hist_entry *left, struct hist_entry *right)
-{
-        char *comm_l = left->thread->comm;
-        char *comm_r = right->thread->comm;
-
-        if (!comm_l || !comm_r)
-                return cmp_null(comm_l, comm_r);
-
-        return strcmp(comm_l, comm_r);
-}
+struct sort_entry sort_sym = {
+        .se_header      = "Symbol",
+        .se_cmp         = sort__sym_cmp,
+        .se_snprintf    = hist_entry__sym_snprintf,
+        .se_width_idx   = HISTC_SYMBOL,
+};
 
 /* --sort parent */
 
-int64_t
+static int64_t
 sort__parent_cmp(struct hist_entry *left, struct hist_entry *right)
 {
         struct symbol *sym_l = left->parent;
@@ -252,9 +216,16 @@ static int hist_entry__parent_snprintf(struct hist_entry *self, char *bf,
                               self->parent ? self->parent->name : "[other]");
 }
 
+struct sort_entry sort_parent = {
+        .se_header      = "Parent symbol",
+        .se_cmp         = sort__parent_cmp,
+        .se_snprintf    = hist_entry__parent_snprintf,
+        .se_width_idx   = HISTC_PARENT,
+};
+
 /* --sort cpu */
 
-int64_t
+static int64_t
 sort__cpu_cmp(struct hist_entry *left, struct hist_entry *right)
 {
         return right->cpu - left->cpu;
@@ -266,6 +237,28 @@ static int hist_entry__cpu_snprintf(struct hist_entry *self, char *bf,
         return repsep_snprintf(bf, size, "%-*d", width, self->cpu);
 }
 
+struct sort_entry sort_cpu = {
+        .se_header      = "CPU",
+        .se_cmp         = sort__cpu_cmp,
+        .se_snprintf    = hist_entry__cpu_snprintf,
+        .se_width_idx   = HISTC_CPU,
+};
+
+struct sort_dimension {
+        const char              *name;
+        struct sort_entry       *entry;
+        int                     taken;
+};
+
+static struct sort_dimension sort_dimensions[] = {
+        { .name = "pid",        .entry = &sort_thread,  },
+        { .name = "comm",       .entry = &sort_comm,    },
+        { .name = "dso",        .entry = &sort_dso,     },
+        { .name = "symbol",     .entry = &sort_sym,     },
+        { .name = "parent",     .entry = &sort_parent,  },
+        { .name = "cpu",        .entry = &sort_cpu,     },
+};
+
 int sort_dimension__add(const char *tok)
 {
         unsigned int i;
@@ -273,15 +266,9 @@ int sort_dimension__add(const char *tok)
         for (i = 0; i < ARRAY_SIZE(sort_dimensions); i++) {
                 struct sort_dimension *sd = &sort_dimensions[i];
 
-                if (sd->taken)
-                        continue;
-
                 if (strncasecmp(tok, sd->name, strlen(tok)))
                         continue;
 
-                if (sd->entry->se_collapse)
-                        sort__need_collapse = 1;
-
                 if (sd->entry == &sort_parent) {
                         int ret = regcomp(&parent_regex, parent_pattern, REG_EXTENDED);
                         if (ret) {
@@ -294,6 +281,12 @@ int sort_dimension__add(const char *tok)
                         sort__has_parent = 1;
                 }
 
+                if (sd->taken)
+                        return 0;
+
+                if (sd->entry->se_collapse)
+                        sort__need_collapse = 1;
+
                 if (list_empty(&hist_entry__sort_list)) {
                         if (!strcmp(sd->name, "pid"))
                                 sort__first_dimension = SORT_PID;
diff --git a/tools/perf/util/sort.h b/tools/perf/util/sort.h
index 0b91053a7d1..77d0388ad41 100644
--- a/tools/perf/util/sort.h
+++ b/tools/perf/util/sort.h
@@ -103,20 +103,6 @@ extern struct sort_entry sort_thread;
 extern struct list_head hist_entry__sort_list;
 
 void setup_sorting(const char * const usagestr[], const struct option *opts);
-
-extern size_t sort__thread_print(FILE *, struct hist_entry *, unsigned int);
-extern size_t sort__comm_print(FILE *, struct hist_entry *, unsigned int);
-extern size_t sort__dso_print(FILE *, struct hist_entry *, unsigned int);
-extern size_t sort__sym_print(FILE *, struct hist_entry *, unsigned int __used);
-extern int64_t cmp_null(void *, void *);
-extern int64_t sort__thread_cmp(struct hist_entry *, struct hist_entry *);
-extern int64_t sort__comm_cmp(struct hist_entry *, struct hist_entry *);
-extern int64_t sort__comm_collapse(struct hist_entry *, struct hist_entry *);
-extern int64_t sort__dso_cmp(struct hist_entry *, struct hist_entry *);
-extern int64_t sort__sym_cmp(struct hist_entry *, struct hist_entry *);
-extern int64_t sort__parent_cmp(struct hist_entry *, struct hist_entry *);
-int64_t sort__cpu_cmp(struct hist_entry *left, struct hist_entry *right);
-extern size_t sort__parent_print(FILE *, struct hist_entry *, unsigned int);
 extern int sort_dimension__add(const char *);
 void sort_entry__setup_elide(struct sort_entry *self, struct strlist *list,
                              const char *list_name, FILE *fp);
diff --git a/tools/perf/util/string.c b/tools/perf/util/string.c
index b9a985dadd0..d5836382ff2 100644
--- a/tools/perf/util/string.c
+++ b/tools/perf/util/string.c
@@ -294,3 +294,22 @@ bool strlazymatch(const char *str, const char *pat)
 {
         return __match_glob(str, pat, true);
 }
+
+/**
+ * strtailcmp - Compare the tail of two strings
+ * @s1: 1st string to be compared
+ * @s2: 2nd string to be compared
+ *
+ * Return 0 if whole of either string is same as another's tail part.
+ */
+int strtailcmp(const char *s1, const char *s2)
+{
+        int i1 = strlen(s1);
+        int i2 = strlen(s2);
+        while (--i1 >= 0 && --i2 >= 0) {
+                if (s1[i1] != s2[i2])
+                        return s1[i1] - s2[i2];
+        }
+        return 0;
+}
+
diff --git a/tools/perf/util/symbol.c b/tools/perf/util/symbol.c
index eec196329fd..40eeaf07725 100644
--- a/tools/perf/util/symbol.c
+++ b/tools/perf/util/symbol.c
@@ -74,16 +74,104 @@ static void dso__set_sorted_by_name(struct dso *dso, enum map_type type)
 
 bool symbol_type__is_a(char symbol_type, enum map_type map_type)
 {
+        symbol_type = toupper(symbol_type);
+
         switch (map_type) {
         case MAP__FUNCTION:
                 return symbol_type == 'T' || symbol_type == 'W';
         case MAP__VARIABLE:
-                return symbol_type == 'D' || symbol_type == 'd';
+                return symbol_type == 'D';
         default:
                 return false;
         }
 }
 
+static int prefix_underscores_count(const char *str)
+{
+        const char *tail = str;
+
+        while (*tail == '_')
+                tail++;
+
+        return tail - str;
+}
+
+#define SYMBOL_A 0
+#define SYMBOL_B 1
+
+static int choose_best_symbol(struct symbol *syma, struct symbol *symb)
+{
+        s64 a;
+        s64 b;
+
+        /* Prefer a symbol with non zero length */
+        a = syma->end - syma->start;
+        b = symb->end - symb->start;
+        if ((b == 0) && (a > 0))
+                return SYMBOL_A;
+        else if ((a == 0) && (b > 0))
+                return SYMBOL_B;
+
+        /* Prefer a non weak symbol over a weak one */
+        a = syma->binding == STB_WEAK;
+        b = symb->binding == STB_WEAK;
+        if (b && !a)
+                return SYMBOL_A;
+        if (a && !b)
+                return SYMBOL_B;
+
+        /* Prefer a global symbol over a non global one */
+        a = syma->binding == STB_GLOBAL;
+        b = symb->binding == STB_GLOBAL;
+        if (a && !b)
+                return SYMBOL_A;
+        if (b && !a)
+                return SYMBOL_B;
+
+        /* Prefer a symbol with less underscores */
+        a = prefix_underscores_count(syma->name);
+        b = prefix_underscores_count(symb->name);
+        if (b > a)
+                return SYMBOL_A;
+        else if (a > b)
+                return SYMBOL_B;
+
+        /* If all else fails, choose the symbol with the longest name */
+        if (strlen(syma->name) >= strlen(symb->name))
+                return SYMBOL_A;
+        else
+                return SYMBOL_B;
+}
+
+static void symbols__fixup_duplicate(struct rb_root *symbols)
+{
+        struct rb_node *nd;
+        struct symbol *curr, *next;
+
+        nd = rb_first(symbols);
+
+        while (nd) {
+                curr = rb_entry(nd, struct symbol, rb_node);
+again:
+                nd = rb_next(&curr->rb_node);
+                next = rb_entry(nd, struct symbol, rb_node);
+
+                if (!nd)
+                        break;
+
+                if (curr->start != next->start)
+                        continue;
+
+                if (choose_best_symbol(curr, next) == SYMBOL_A) {
+                        rb_erase(&next->rb_node, symbols);
+                        goto again;
+                } else {
+                        nd = rb_next(&curr->rb_node);
+                        rb_erase(&curr->rb_node, symbols);
+                }
+        }
+}
+
 static void symbols__fixup_end(struct rb_root *symbols)
 {
         struct rb_node *nd, *prevnd = rb_first(symbols);
@@ -438,18 +526,11 @@ int kallsyms__parse(const char *filename, void *arg,
         char *line = NULL;
         size_t n;
         int err = -1;
-        u64 prev_start = 0;
-        char prev_symbol_type = 0;
-        char *prev_symbol_name;
         FILE *file = fopen(filename, "r");
 
         if (file == NULL)
                 goto out_failure;
 
-        prev_symbol_name = malloc(KSYM_NAME_LEN);
-        if (prev_symbol_name == NULL)
-                goto out_close;
-
         err = 0;
 
         while (!feof(file)) {
@@ -470,7 +551,7 @@ int kallsyms__parse(const char *filename, void *arg,
                 if (len + 2 >= line_len)
                         continue;
 
-                symbol_type = toupper(line[len]);
+                symbol_type = line[len];
                 len += 2;
                 symbol_name = line + len;
                 len = line_len - len;
@@ -480,24 +561,18 @@ int kallsyms__parse(const char *filename, void *arg,
                         break;
                 }
 
-                if (prev_symbol_type) {
-                        u64 end = start;
-                        if (end != prev_start)
-                                --end;
-                        err = process_symbol(arg, prev_symbol_name,
-                                             prev_symbol_type, prev_start, end);
-                        if (err)
-                                break;
-                }
-
-                memcpy(prev_symbol_name, symbol_name, len + 1);
-                prev_symbol_type = symbol_type;
-                prev_start = start;
+                /*
+                 * module symbols are not sorted so we add all
+                 * symbols with zero length and rely on
+                 * symbols__fixup_end() to fix it up.
+                 */
+                err = process_symbol(arg, symbol_name,
+                                     symbol_type, start, start);
+                if (err)
+                        break;
         }
 
-        free(prev_symbol_name);
         free(line);
-out_close:
         fclose(file);
         return err;
 
@@ -703,6 +778,9 @@ int dso__load_kallsyms(struct dso *dso, const char *filename,
         if (dso__load_all_kallsyms(dso, filename, map) < 0)
                 return -1;
 
+        symbols__fixup_duplicate(&dso->symbols[map->type]);
+        symbols__fixup_end(&dso->symbols[map->type]);
+
         if (dso->kernel == DSO_TYPE_GUEST_KERNEL)
                 dso->symtab_type = SYMTAB__GUEST_KALLSYMS;
         else
@@ -1092,8 +1170,7 @@ static int dso__load_sym(struct dso *dso, struct map *map, const char *name,
         if (dso->has_build_id) {
                 u8 build_id[BUILD_ID_SIZE];
 
-                if (elf_read_build_id(elf, build_id,
-                                      BUILD_ID_SIZE) != BUILD_ID_SIZE)
+                if (elf_read_build_id(elf, build_id, BUILD_ID_SIZE) < 0)
                         goto out_elf_end;
 
                 if (!dso__build_id_equal(dso, build_id))
@@ -1111,6 +1188,8 @@ static int dso__load_sym(struct dso *dso, struct map *map, const char *name,
         }
 
         opdsec = elf_section_by_name(elf, &ehdr, &opdshdr, ".opd", &opdidx);
+        if (opdshdr.sh_type != SHT_PROGBITS)
+                opdsec = NULL;
         if (opdsec)
                 opddata = elf_rawdata(opdsec, NULL);
 
@@ -1276,6 +1355,7 @@ new_symbol:
          * For misannotated, zeroed, ASM function sizes.
          */
         if (nr > 0) {
+                symbols__fixup_duplicate(&dso->symbols[map->type]);
                 symbols__fixup_end(&dso->symbols[map->type]);
                 if (kmap) {
                         /*
@@ -1362,8 +1442,8 @@ static int elf_read_build_id(Elf *elf, void *bf, size_t size)
         ptr = data->d_buf;
         while (ptr < (data->d_buf + data->d_size)) {
                 GElf_Nhdr *nhdr = ptr;
-                int namesz = NOTE_ALIGN(nhdr->n_namesz),
-                    descsz = NOTE_ALIGN(nhdr->n_descsz);
+                size_t namesz = NOTE_ALIGN(nhdr->n_namesz),
+                       descsz = NOTE_ALIGN(nhdr->n_descsz);
                 const char *name;
 
                 ptr += sizeof(*nhdr);
@@ -1372,8 +1452,10 @@ static int elf_read_build_id(Elf *elf, void *bf, size_t size)
                 if (nhdr->n_type == NT_GNU_BUILD_ID &&
                     nhdr->n_namesz == sizeof("GNU")) {
                         if (memcmp(name, "GNU", sizeof("GNU")) == 0) {
-                                memcpy(bf, ptr, BUILD_ID_SIZE);
-                                err = BUILD_ID_SIZE;
+                                size_t sz = min(size, descsz);
+                                memcpy(bf, ptr, sz);
+                                memset(bf + sz, 0, size - sz);
+                                err = descsz;
                                 break;
                         }
                 }
@@ -1425,7 +1507,7 @@ int sysfs__read_build_id(const char *filename, void *build_id, size_t size)
         while (1) {
                 char bf[BUFSIZ];
                 GElf_Nhdr nhdr;
-                int namesz, descsz;
+                size_t namesz, descsz;
 
                 if (read(fd, &nhdr, sizeof(nhdr)) != sizeof(nhdr))
                         break;
@@ -1434,15 +1516,16 @@ int sysfs__read_build_id(const char *filename, void *build_id, size_t size)
                 descsz = NOTE_ALIGN(nhdr.n_descsz);
                 if (nhdr.n_type == NT_GNU_BUILD_ID &&
                     nhdr.n_namesz == sizeof("GNU")) {
-                        if (read(fd, bf, namesz) != namesz)
+                        if (read(fd, bf, namesz) != (ssize_t)namesz)
                                 break;
                         if (memcmp(bf, "GNU", sizeof("GNU")) == 0) {
-                                if (read(fd, build_id,
-                                    BUILD_ID_SIZE) == BUILD_ID_SIZE) {
+                                size_t sz = min(descsz, size);
+                                if (read(fd, build_id, sz) == (ssize_t)sz) {
+                                        memset(build_id + sz, 0, size - sz);
                                         err = 0;
                                         break;
                                 }
-                        } else if (read(fd, bf, descsz) != descsz)
+                        } else if (read(fd, bf, descsz) != (ssize_t)descsz)
                                 break;
                 } else {
                         int n = namesz + descsz;
@@ -1504,6 +1587,17 @@ int dso__load(struct dso *dso, struct map *map, symbol_filter_t filter)
         dso->adjust_symbols = 0;
 
         if (strncmp(dso->name, "/tmp/perf-", 10) == 0) {
+                struct stat st;
+
+                if (lstat(dso->name, &st) < 0)
+                        return -1;
+
+                if (st.st_uid && (st.st_uid != geteuid())) {
+                        pr_warning("File %s not owned by current user or root, "
+                                "ignoring it.\n", dso->name);
+                        return -1;
+                }
+
                 ret = dso__load_perf_map(dso, map, filter);
                 dso->symtab_type = ret > 0 ? SYMTAB__JAVA_JIT :
                                               SYMTAB__NOT_FOUND;
@@ -2170,27 +2264,22 @@ size_t machines__fprintf_dsos_buildid(struct rb_root *machines,
         return ret;
 }
 
-struct dso *dso__new_kernel(const char *name)
+static struct dso*
+dso__kernel_findnew(struct machine *machine, const char *name,
+                    const char *short_name, int dso_type)
 {
-        struct dso *dso = dso__new(name ?: "[kernel.kallsyms]");
-
-        if (dso != NULL) {
-                dso__set_short_name(dso, "[kernel]");
-                dso->kernel = DSO_TYPE_KERNEL;
-        }
-
-        return dso;
-}
+        /*
+         * The kernel dso could be created by build_id processing.
+         */
+        struct dso *dso = __dsos__findnew(&machine->kernel_dsos, name);
 
-static struct dso *dso__new_guest_kernel(struct machine *machine,
-                                        const char *name)
-{
-        char bf[PATH_MAX];
-        struct dso *dso = dso__new(name ?: machine__mmap_name(machine, bf,
-                                                              sizeof(bf)));
+        /*
+         * We need to run this in all cases, since during the build_id
+         * processing we had no idea this was the kernel dso.
+         */
         if (dso != NULL) {
-                dso__set_short_name(dso, "[guest.kernel]");
-                dso->kernel = DSO_TYPE_GUEST_KERNEL;
+                dso__set_short_name(dso, short_name);
+                dso->kernel = dso_type;
         }
 
         return dso;
@@ -2208,24 +2297,36 @@ void dso__read_running_kernel_build_id(struct dso *dso, struct machine *machine)
                 dso->has_build_id = true;
 }
 
-static struct dso *machine__create_kernel(struct machine *machine)
+static struct dso *machine__get_kernel(struct machine *machine)
 {
         const char *vmlinux_name = NULL;
         struct dso *kernel;
 
         if (machine__is_host(machine)) {
                 vmlinux_name = symbol_conf.vmlinux_name;
-                kernel = dso__new_kernel(vmlinux_name);
+                if (!vmlinux_name)
+                        vmlinux_name = "[kernel.kallsyms]";
+
+                kernel = dso__kernel_findnew(machine, vmlinux_name,
+                                             "[kernel]",
+                                             DSO_TYPE_KERNEL);
         } else {
+                char bf[PATH_MAX];
+
                 if (machine__is_default_guest(machine))
                         vmlinux_name = symbol_conf.default_guest_vmlinux_name;
-                kernel = dso__new_guest_kernel(machine, vmlinux_name);
+                if (!vmlinux_name)
+                        vmlinux_name = machine__mmap_name(machine, bf,
+                                                          sizeof(bf));
+
+                kernel = dso__kernel_findnew(machine, vmlinux_name,
+                                             "[guest.kernel]",
+                                             DSO_TYPE_GUEST_KERNEL);
         }
 
-        if (kernel != NULL) {
+        if (kernel != NULL && (!kernel->has_build_id))
                 dso__read_running_kernel_build_id(kernel, machine);
-                dsos__add(&machine->kernel_dsos, kernel);
-        }
+
         return kernel;
 }
 
@@ -2329,7 +2430,7 @@ void machine__destroy_kernel_maps(struct machine *machine)
 
 int machine__create_kernel_maps(struct machine *machine)
 {
-        struct dso *kernel = machine__create_kernel(machine);
+        struct dso *kernel = machine__get_kernel(machine);
 
         if (kernel == NULL ||
             __machine__create_kernel_maps(machine, kernel) < 0)
diff --git a/tools/perf/util/symbol.h b/tools/perf/util/symbol.h
index 325ee36a9d2..4f377d92e75 100644
--- a/tools/perf/util/symbol.h
+++ b/tools/perf/util/symbol.h
@@ -155,7 +155,6 @@ struct dso {
 };
 
 struct dso *dso__new(const char *name);
-struct dso *dso__new_kernel(const char *name);
 void dso__delete(struct dso *dso);
 
 int dso__name_len(const struct dso *dso);
diff --git a/tools/perf/util/trace-event-info.c b/tools/perf/util/trace-event-info.c
index 35729f4c40c..3403f814ad7 100644
--- a/tools/perf/util/trace-event-info.c
+++ b/tools/perf/util/trace-event-info.c
@@ -183,106 +183,59 @@ int bigendian(void)
         return *ptr == 0x01020304;
 }
 
-static unsigned long long copy_file_fd(int fd)
+/* unfortunately, you can not stat debugfs or proc files for size */
+static void record_file(const char *file, size_t hdr_sz)
 {
         unsigned long long size = 0;
-        char buf[BUFSIZ];
-        int r;
-
-        do {
-                r = read(fd, buf, BUFSIZ);
-                if (r > 0) {
-                        size += r;
-                        write_or_die(buf, r);
-                }
-        } while (r > 0);
-
-        return size;
-}
-
-static unsigned long long copy_file(const char *file)
-{
-        unsigned long long size = 0;
-        int fd;
+        char buf[BUFSIZ], *sizep;
+        off_t hdr_pos = lseek(output_fd, 0, SEEK_CUR);
+        int r, fd;
 
         fd = open(file, O_RDONLY);
         if (fd < 0)
                 die("Can't read '%s'", file);
-        size = copy_file_fd(fd);
-        close(fd);
 
-        return size;
-}
-
-static unsigned long get_size_fd(int fd)
-{
-        unsigned long long size = 0;
-        char buf[BUFSIZ];
-        int r;
+        /* put in zeros for file size, then fill true size later */
+        write_or_die(&size, hdr_sz);
 
         do {
                 r = read(fd, buf, BUFSIZ);
-                if (r > 0)
+                if (r > 0) {
                         size += r;
+                        write_or_die(buf, r);
+                }
         } while (r > 0);
-
-        lseek(fd, 0, SEEK_SET);
-
-        return size;
-}
-
-static unsigned long get_size(const char *file)
-{
-        unsigned long long size = 0;
-        int fd;
-
-        fd = open(file, O_RDONLY);
-        if (fd < 0)
-                die("Can't read '%s'", file);
-        size = get_size_fd(fd);
         close(fd);
 
-        return size;
+        /* ugh, handle big-endian hdr_size == 4 */
+        sizep = (char*)&size;
+        if (bigendian())
+                sizep += sizeof(u64) - hdr_sz;
+
+        if (pwrite(output_fd, sizep, hdr_sz, hdr_pos) < 0)
+                die("writing to %s", output_file);
 }
 
 static void read_header_files(void)
 {
-        unsigned long long size, check_size;
         char *path;
-        int fd;
+        struct stat st;
 
         path = get_tracing_file("events/header_page");
-        fd = open(path, O_RDONLY);
-        if (fd < 0)
+        if (stat(path, &st) < 0)
                 die("can't read '%s'", path);
 
-        /* unfortunately, you can not stat debugfs files for size */
-        size = get_size_fd(fd);
-
         write_or_die("header_page", 12);
-        write_or_die(&size, 8);
-        check_size = copy_file_fd(fd);
-        close(fd);
-
-        if (size != check_size)
-                die("wrong size for '%s' size=%lld read=%lld",
-                    path, size, check_size);
+        record_file(path, 8);
         put_tracing_file(path);
 
         path = get_tracing_file("events/header_event");
-        fd = open(path, O_RDONLY);
-        if (fd < 0)
+        if (stat(path, &st) < 0)
                 die("can't read '%s'", path);
 
-        size = get_size_fd(fd);
-
         write_or_die("header_event", 13);
-        write_or_die(&size, 8);
-        check_size = copy_file_fd(fd);
-        if (size != check_size)
-                die("wrong size for '%s'", path);
+        record_file(path, 8);
         put_tracing_file(path);
-        close(fd);
 }
 
 static bool name_in_tp_list(char *sys, struct tracepoint_path *tps)
@@ -298,7 +251,6 @@ static bool name_in_tp_list(char *sys, struct tracepoint_path *tps)
 
 static void copy_event_system(const char *sys, struct tracepoint_path *tps)
 {
-        unsigned long long size, check_size;
         struct dirent *dent;
         struct stat st;
         char *format;
@@ -338,14 +290,8 @@ static void copy_event_system(const char *sys, struct tracepoint_path *tps)
                 sprintf(format, "%s/%s/format", sys, dent->d_name);
                 ret = stat(format, &st);
 
-                if (ret >= 0) {
-                        /* unfortunately, you can not stat debugfs files for size */
-                        size = get_size(format);
-                        write_or_die(&size, 8);
-                        check_size = copy_file(format);
-                        if (size != check_size)
-                                die("error in size of file '%s'", format);
-                }
+                if (ret >= 0)
+                        record_file(format, 8);
 
                 free(format);
         }
@@ -426,7 +372,7 @@ static void read_event_files(struct tracepoint_path *tps)
 
 static void read_proc_kallsyms(void)
 {
-        unsigned int size, check_size;
+        unsigned int size;
         const char *path = "/proc/kallsyms";
         struct stat st;
         int ret;
@@ -438,17 +384,12 @@ static void read_proc_kallsyms(void)
                 write_or_die(&size, 4);
                 return;
         }
-        size = get_size(path);
-        write_or_die(&size, 4);
-        check_size = copy_file(path);
-        if (size != check_size)
-                die("error in size of file '%s'", path);
-
+        record_file(path, 4);
 }
 
 static void read_ftrace_printk(void)
 {
-        unsigned int size, check_size;
+        unsigned int size;
         char *path;
         struct stat st;
         int ret;
@@ -461,11 +402,8 @@ static void read_ftrace_printk(void)
                 write_or_die(&size, 4);
                 goto out;
         }
-        size = get_size(path);
-        write_or_die(&size, 4);
-        check_size = copy_file(path);
-        if (size != check_size)
-                die("error in size of file '%s'", path);
+        record_file(path, 4);
+
 out:
         put_tracing_file(path);
 }
diff --git a/tools/perf/util/trace-event-parse.c b/tools/perf/util/trace-event-parse.c
index 0a7ed5b5e28..bf54c48871d 100644
--- a/tools/perf/util/trace-event-parse.c
+++ b/tools/perf/util/trace-event-parse.c
@@ -1537,6 +1537,8 @@ process_flags(struct event *event, struct print_arg *arg, char **tok)
         field = malloc_or_die(sizeof(*field));
 
         type = process_arg(event, field, &token);
+        while (type == EVENT_OP)
+                type = process_op(event, field, &token);
         if (test_type_token(type, token, EVENT_DELIM, ","))
                 goto out_free;
 
@@ -1580,6 +1582,8 @@ process_symbols(struct event *event, struct print_arg *arg, char **tok)
         field = malloc_or_die(sizeof(*field));
 
         type = process_arg(event, field, &token);
+        while (type == EVENT_OP)
+                type = process_op(event, field, &token);
         if (test_type_token(type, token, EVENT_DELIM, ","))
                 goto out_free;
 
diff --git a/tools/perf/util/ui/browsers/top.c b/tools/perf/util/ui/browsers/top.c
index 5a06538532a..88403cf8396 100644
--- a/tools/perf/util/ui/browsers/top.c
+++ b/tools/perf/util/ui/browsers/top.c
@@ -208,6 +208,5 @@ int perf_top__tui_browser(struct perf_top *top)
                 },
         };
 
-        ui_helpline__push("Press <- or ESC to exit");
         return perf_top_browser__run(&browser);
 }
diff --git a/tools/perf/util/util.h b/tools/perf/util/util.h
index fc784284ac8..0128906bac8 100644
--- a/tools/perf/util/util.h
+++ b/tools/perf/util/util.h
@@ -238,6 +238,7 @@ char **argv_split(const char *str, int *argcp);
 void argv_free(char **argv);
 bool strglobmatch(const char *str, const char *pat);
 bool strlazymatch(const char *str, const char *pat);
+int strtailcmp(const char *s1, const char *s2);
 unsigned long convert_unit(unsigned long value, char *unit);
 int readn(int fd, void *buf, size_t size);
 
diff --git a/tools/power/cpupower/.gitignore b/tools/power/cpupower/.gitignore
new file mode 100644
index 00000000000..d42073f1260
--- /dev/null
+++ b/tools/power/cpupower/.gitignore
@@ -0,0 +1,29 @@
+.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
+debug/kernel/Module.symvers
+debug/i386/centrino-decode
+debug/i386/dump_psb
+debug/i386/intel_gsic
+debug/i386/powernow-k8-decode
+debug/x86_64/centrino-decode
+debug/x86_64/powernow-k8-decode
diff --git a/tools/power/cpupower/Makefile b/tools/power/cpupower/Makefile
new file mode 100644
index 00000000000..e8a03aceceb
--- /dev/null
+++ b/tools/power/cpupower/Makefile
@@ -0,0 +1,280 @@
+# 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 ?=        true
+
+# 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
+CPUFREQ_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
+        CFLAGS += -DNLS
+endif
+
+ifeq ($(strip $(CPUFREQ_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
diff --git a/tools/power/cpupower/README b/tools/power/cpupower/README
new file mode 100644
index 00000000000..fd9d4c0d668
--- /dev/null
+++ b/tools/power/cpupower/README
@@ -0,0 +1,49 @@
+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
diff --git a/tools/power/cpupower/ToDo b/tools/power/cpupower/ToDo
new file mode 100644
index 00000000000..874b78b586e
--- /dev/null
+++ b/tools/power/cpupower/ToDo
@@ -0,0 +1,11 @@
+ToDos sorted by priority:
+
+- Use bitmask functions to parse CPU topology more robust
+  (current implementation has issues on AMD)
+- Try to read out boost states and frequencies on Intel
+- Adjust README
+- Somewhere saw the ability to read power consumption of
+  RAM from HW on Intel SandyBridge -> another monitor?
+- Add another c1e debug idle monitor
+  -> Is by design racy with BIOS, but could be added
+     with a --force option and some "be careful" messages
diff --git a/tools/power/cpupower/bench/Makefile b/tools/power/cpupower/bench/Makefile
new file mode 100644
index 00000000000..2b67606fc3e
--- /dev/null
+++ b/tools/power/cpupower/bench/Makefile
@@ -0,0 +1,29 @@
+LIBS = -L../ -lm -lcpupower
+
+OBJS = main.o parse.o system.o benchmark.o
+CFLAGS += -D_GNU_SOURCE -I../lib -DDEFAULT_CONFIG_FILE=\"$(confdir)/cpufreq-bench.conf\"
+
+%.o : %.c
+        $(ECHO) "  CC      " $@
+        $(QUIET) $(CC) -c $(CFLAGS) $< -o $@
+
+cpufreq-bench: $(OBJS)
+        $(ECHO) "  CC      " $@
+        $(QUIET) $(CC) -o $@ $(CFLAGS) $(OBJS) $(LIBS)
+
+all: cpufreq-bench
+
+install:
+        mkdir -p $(DESTDIR)/$(sbindir)
+        mkdir -p $(DESTDIR)/$(bindir)
+        mkdir -p $(DESTDIR)/$(docdir)
+        mkdir -p $(DESTDIR)/$(confdir)
+        install -m 755 cpufreq-bench $(DESTDIR)/$(sbindir)/cpufreq-bench
+        install -m 755 cpufreq-bench_plot.sh $(DESTDIR)/$(bindir)/cpufreq-bench_plot.sh
+        install -m 644 README-BENCH $(DESTDIR)/$(docdir)/README-BENCH
+        install -m 755 cpufreq-bench_script.sh $(DESTDIR)/$(docdir)/cpufreq-bench_script.sh
+        install -m 644 example.cfg $(DESTDIR)/$(confdir)/cpufreq-bench.conf
+
+clean:
+        rm -f *.o
+        rm -f cpufreq-bench
diff --git a/tools/power/cpupower/bench/README-BENCH b/tools/power/cpupower/bench/README-BENCH
new file mode 100644
index 00000000000..8093ec73817
--- /dev/null
+++ b/tools/power/cpupower/bench/README-BENCH
@@ -0,0 +1,124 @@
+This is cpufreq-bench, a microbenchmark for the cpufreq framework.
+
+Purpose
+=======
+
+What is this benchmark for:
+  - Identify worst case performance loss when doing dynamic frequency
+    scaling using Linux kernel governors
+  - Identify average reaction time of a governor to CPU load changes
+  - (Stress) Testing whether a cpufreq low level driver or governor works
+    as expected
+  - Identify cpufreq related performance regressions between kernels
+  - Possibly Real time priority testing? -> what happens if there are
+    processes with a higher prio than the governor's kernel thread
+  - ...
+
+What this benchmark does *not* cover:
+  - Power saving related regressions (In fact as better the performance
+    throughput is, the worse the power savings will be, but the first should
+    mostly count more...)
+  - Real world (workloads)
+
+
+Description
+===========
+
+cpufreq-bench helps to test the condition of a given cpufreq governor.
+For that purpose, it compares the performance governor to a configured
+powersave module.
+
+
+How it works
+============
+You can specify load (100% CPU load) and sleep (0% CPU load) times in us which
+will be run X time in a row (cycles):
+
+         sleep=25000
+         load=25000
+         cycles=20
+
+This part of the configuration file will create 25ms load/sleep turns,
+repeated 20 times.
+
+Adding this:
+         sleep_step=25000
+         load_step=25000
+         rounds=5
+Will increase load and sleep time by 25ms 5 times.
+Together you get following test:
+25ms  load/sleep time repeated 20 times (cycles).
+50ms  load/sleep time repeated 20 times (cycles).
+..
+100ms load/sleep time repeated 20 times (cycles).
+
+First it is calibrated how long a specific CPU intensive calculation
+takes on this machine and needs to be run in a loop using the performance
+governor.
+Then the above test runs are processed using the performance governor
+and the governor to test. The time the calculation really needed
+with the dynamic freq scaling governor is compared with the time needed
+on full performance and you get the overall performance loss.
+
+
+Example of expected results with ondemand governor:
+
+This shows expected results of the first two test run rounds from
+above config, you there have:
+
+100% CPU load (load) | 0 % CPU load (sleep)  | round
+   25 ms             |    25 ms              |   1
+   50 ms             |    50 ms              |   2
+
+For example if ondemand governor is configured to have a 50ms
+sampling rate you get:
+
+In round 1, ondemand should have rather static 50% load and probably
+won't ever switch up (as long as up_threshold is above).
+
+In round 2, if the ondemand sampling times exactly match the load/sleep
+trigger of the cpufreq-bench, you will see no performance loss (compare with
+below possible ondemand sample kick ins (1)):
+
+But if ondemand always kicks in in the middle of the load sleep cycles, it
+will always see 50% loads and you get worst performance impact never
+switching up (compare with below possible ondemand sample kick ins (2))::
+
+      50     50   50   50ms ->time
+load -----|     |-----|     |-----|     |-----|
+          |     |     |     |     |     |     |
+sleep     |-----|     |-----|     |-----|     |----
+    |-----|-----|-----|-----|-----|-----|-----|----  ondemand sampling (1)
+         100    0    100    0    100    0    100     load seen by ondemand(%)
+       |-----|-----|-----|-----|-----|-----|-----|--   ondemand sampling (2)
+      50     50    50    50    50    50    50        load seen by ondemand(%)
+
+You can easily test all kind of load/sleep times and check whether your
+governor in average behaves as expected.
+
+
+ToDo
+====
+
+Provide a gnuplot utility script for easy generation of plots to present
+the outcome nicely.
+
+
+cpufreq-bench Command Usage
+===========================
+-l, --load=<long int>           initial load time in us
+-s, --sleep=<long int>          initial sleep time in us
+-x, --load-step=<long int>      time to be added to load time, in us
+-y, --sleep-step=<long int>     time to be added to sleep time, in us
+-c, --cpu=<unsigned int>        CPU Number to use, starting at 0
+-p, --prio=<priority>           scheduler priority, HIGH, LOW or DEFAULT
+-g, --governor=<governor>       cpufreq governor to test
+-n, --cycles=<int>              load/sleep cycles to get an avarage value to compare
+-r, --rounds<int>               load/sleep rounds
+-f, --file=<configfile>         config file to use
+-o, --output=<dir>              output dir, must exist
+-v, --verbose                   verbose output on/off
+
+Due to the high priority, the application may not be responsible for some time.
+After the benchmark, the logfile is saved in OUTPUTDIR/benchmark_TIMESTAMP.log
+
diff --git a/tools/power/cpupower/bench/benchmark.c b/tools/power/cpupower/bench/benchmark.c
new file mode 100644
index 00000000000..81b1c48607d
--- /dev/null
+++ b/tools/power/cpupower/bench/benchmark.c
@@ -0,0 +1,194 @@
+/*  cpufreq-bench CPUFreq microbenchmark
+ *
+ *  Copyright (C) 2008 Christian Kornacker <ckornacker@suse.de>
+ *
+ *  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; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  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.
+ */
+
+#include <stdio.h>
+#include <unistd.h>
+#include <math.h>
+
+#include "config.h"
+#include "system.h"
+#include "benchmark.h"
+
+/* Print out progress if we log into a file */
+#define show_progress(total_time, progress_time)        \
+if (config->output != stdout) {                         \
+        fprintf(stdout, "Progress: %02lu %%\r",         \
+                (progress_time * 100) / total_time);    \
+        fflush(stdout);                                 \
+}
+
+/**
+ * compute how many rounds of calculation we should do
+ * to get the given load time
+ *
+ * @param load aimed load time in µs
+ *
+ * @retval rounds of calculation
+ **/
+
+unsigned int calculate_timespace(long load, struct config *config)
+{
+        int i;
+        long long now, then;
+        unsigned int estimated = GAUGECOUNT;
+        unsigned int rounds = 0;
+        unsigned int timed = 0;
+
+        if (config->verbose)
+                printf("calibrating load of %lius, please wait...\n", load);
+
+        /* get the initial calculation time for a specific number of rounds */
+        now = get_time();
+        ROUNDS(estimated);
+        then = get_time();
+
+        timed = (unsigned int)(then - now);
+
+        /* approximation of the wanted load time by comparing with the
+         * initial calculation time */
+        for (i = 0; i < 4; i++) {
+                rounds = (unsigned int)(load * estimated / timed);
+                dprintf("calibrating with %u rounds\n", rounds);
+                now = get_time();
+                ROUNDS(rounds);
+                then = get_time();
+
+                timed = (unsigned int)(then - now);
+                estimated = rounds;
+        }
+        if (config->verbose)
+                printf("calibration done\n");
+
+        return estimated;
+}
+
+/**
+ * benchmark
+ * generates a specific sleep an load time with the performance
+ * governor and compares the used time for same calculations done
+ * with the configured powersave governor
+ *
+ * @param config config values for the benchmark
+ *
+ **/
+
+void start_benchmark(struct config *config)
+{
+        unsigned int _round, cycle;
+        long long now, then;
+        long sleep_time = 0, load_time = 0;
+        long performance_time = 0, powersave_time = 0;
+        unsigned int calculations;
+        unsigned long total_time = 0, progress_time = 0;
+
+        sleep_time = config->sleep;
+        load_time = config->load;
+
+        /* For the progress bar */
+        for (_round = 1; _round <= config->rounds; _round++)
+                total_time += _round * (config->sleep + config->load);
+        total_time *= 2; /* powersave and performance cycles */
+
+        for (_round = 0; _round < config->rounds; _round++) {
+                performance_time = 0LL;
+                powersave_time = 0LL;
+
+                show_progress(total_time, progress_time);
+
+                /* set the cpufreq governor to "performance" which disables
+                 * P-State switching. */
+                if (set_cpufreq_governor("performance", config->cpu) != 0)
+                        return;
+
+                /* calibrate the calculation time. the resulting calculation
+                 * _rounds should produce a load which matches the configured
+                 * load time */
+                calculations = calculate_timespace(load_time, config);
+
+                if (config->verbose)
+                        printf("_round %i: doing %u cycles with %u calculations"
+                               " for %lius\n", _round + 1, config->cycles,
+                               calculations, load_time);
+
+                fprintf(config->output, "%u %li %li ",
+                        _round, load_time, sleep_time);
+
+                if (config->verbose)
+                        printf("avarage: %lius, rps:%li\n",
+                                load_time / calculations,
+                                1000000 * calculations / load_time);
+
+                /* do some sleep/load cycles with the performance governor */
+                for (cycle = 0; cycle < config->cycles; cycle++) {
+                        now = get_time();
+                        usleep(sleep_time);
+                        ROUNDS(calculations);
+                        then = get_time();
+                        performance_time += then - now - sleep_time;
+                        if (config->verbose)
+                                printf("performance cycle took %lius, "
+                                        "sleep: %lius, "
+                                        "load: %lius, rounds: %u\n",
+                                        (long)(then - now), sleep_time,
+                                        load_time, calculations);
+                }
+                fprintf(config->output, "%li ",
+                        performance_time / config->cycles);
+
+                progress_time += sleep_time + load_time;
+                show_progress(total_time, progress_time);
+
+                /* set the powersave governor which activates P-State switching
+                 * again */
+                if (set_cpufreq_governor(config->governor, config->cpu) != 0)
+                        return;
+
+                /* again, do some sleep/load cycles with the
+                 * powersave governor */
+                for (cycle = 0; cycle < config->cycles; cycle++) {
+                        now = get_time();
+                        usleep(sleep_time);
+                        ROUNDS(calculations);
+                        then = get_time();
+                        powersave_time += then - now - sleep_time;
+                        if (config->verbose)
+                                printf("powersave cycle took %lius, "
+                                        "sleep: %lius, "
+                                        "load: %lius, rounds: %u\n",
+                                        (long)(then - now), sleep_time,
+                                        load_time, calculations);
+                }
+
+                progress_time += sleep_time + load_time;
+
+                /* compare the avarage sleep/load cycles  */
+                fprintf(config->output, "%li ",
+                        powersave_time / config->cycles);
+                fprintf(config->output, "%.3f\n",
+                        performance_time * 100.0 / powersave_time);
+                fflush(config->output);
+
+                if (config->verbose)
+                        printf("performance is at %.2f%%\n",
+                                performance_time * 100.0 / powersave_time);
+
+                sleep_time += config->sleep_step;
+                load_time += config->load_step;
+        }
+}
diff --git a/tools/power/cpupower/bench/benchmark.h b/tools/power/cpupower/bench/benchmark.h
new file mode 100644
index 00000000000..51d7f50ac2b
--- /dev/null
+++ b/tools/power/cpupower/bench/benchmark.h
@@ -0,0 +1,29 @@
+/*  cpufreq-bench CPUFreq microbenchmark
+ *
+ *  Copyright (C) 2008 Christian Kornacker <ckornacker@suse.de>
+ *
+ *  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; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  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.
+ */
+
+/* load loop, this schould take about 1 to 2ms to complete */
+#define ROUNDS(x) {unsigned int rcnt;                          \
+                for (rcnt = 0; rcnt < x*1000; rcnt++) { \
+                        (void)(((int)(pow(rcnt, rcnt) * \
+                                      sqrt(rcnt*7230970)) ^ 7230716) ^ \
+                                      (int)atan2(rcnt, rcnt));         \
+                } }                                                     \
+
+
+void start_benchmark(struct config *config);
diff --git a/tools/power/cpupower/bench/config.h b/tools/power/cpupower/bench/config.h
new file mode 100644
index 00000000000..ee6f258e533
--- /dev/null
+++ b/tools/power/cpupower/bench/config.h
@@ -0,0 +1,36 @@
+/*  cpufreq-bench CPUFreq microbenchmark
+ *
+ *  Copyright (C) 2008 Christian Kornacker <ckornacker@suse.de>
+ *
+ *  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; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  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.
+ */
+
+/* initial loop count for the load calibration */
+#define GAUGECOUNT      1500
+
+/* default scheduling policy SCHED_OTHER */
+#define SCHEDULER       SCHED_OTHER
+
+#define PRIORITY_DEFAULT 0
+#define PRIORITY_HIGH    sched_get_priority_max(SCHEDULER)
+#define PRIORITY_LOW     sched_get_priority_min(SCHEDULER)
+
+/* enable further debug messages */
+#ifdef DEBUG
+#define dprintf printf
+#else
+#define dprintf(...) do { } while (0)
+#endif
+
diff --git a/tools/power/cpupower/bench/cpufreq-bench_plot.sh b/tools/power/cpupower/bench/cpufreq-bench_plot.sh
new file mode 100644
index 00000000000..410021a12f4
--- /dev/null
+++ b/tools/power/cpupower/bench/cpufreq-bench_plot.sh
@@ -0,0 +1,104 @@
+#!/bin/bash
+
+# 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; either version 2, or (at your option)
+# any later version.
+
+# 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., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.
+
+# Author/Copyright(c): 2009, Thomas Renninger <trenn@suse.de>, Novell Inc.
+
+# Helper script to easily create nice plots of your cpufreq-bench results
+
+dir=`mktemp -d`
+output_file="cpufreq-bench.png"
+global_title="cpufreq-bench plot"
+picture_type="jpeg"
+file[0]=""
+
+function usage()
+{
+    echo "cpufreq-bench_plot.sh [OPTIONS] logfile [measure_title] [logfile [measure_title]] ...]"
+    echo
+    echo "Options"
+    echo "   -o output_file"
+    echo "   -t global_title"
+    echo "   -p picture_type [jpeg|gif|png|postscript|...]"
+    exit 1
+}
+
+if [ $# -eq 0 ];then
+        echo "No benchmark results file provided"
+        echo
+        usage
+fi
+
+while getopts o:t:p: name ; do
+    case $name in
+        o)
+            output_file="$OPTARG".$picture_type
+            ;;
+        t)
+            global_title="$OPTARG"
+            ;;
+        p)
+            picture_type="$OPTARG"
+            ;;
+        ?)
+            usage
+            ;;
+    esac
+done
+shift $(($OPTIND -1))
+
+plots=0
+while [ "$1" ];do
+    if [ ! -f "$1" ];then
+        echo "File $1 does not exist"
+        usage
+    fi
+    file[$plots]="$1"
+    title[$plots]="$2"
+    # echo "File: ${file[$plots]} - ${title[plots]}"
+    shift;shift
+    plots=$((plots + 1))
+done
+
+echo "set terminal $picture_type"       >> $dir/plot_script.gpl
+echo "set output \"$output_file\""      >> $dir/plot_script.gpl
+echo "set title \"$global_title\""      >> $dir/plot_script.gpl
+echo "set xlabel \"sleep/load time\""   >> $dir/plot_script.gpl
+echo "set ylabel \"Performance (%)\""   >> $dir/plot_script.gpl
+
+for((plot=0;plot<$plots;plot++));do
+
+    # Sanity check
+    ###### I am to dump to get this redirected to stderr/stdout in one awk call... #####
+    cat ${file[$plot]} |grep -v "^#" |awk '{if ($2 != $3) printf("Error in measure %d:Load time %s does not equal sleep time %s, plot will not be correct\n", $1, $2, $3); ERR=1}'
+    ###### I am to dump to get this redirected in one awk call... #####
+
+    # Parse out load time (which must be equal to sleep time for a plot), divide it by 1000
+    # to get ms and parse out the performance in percentage and write it to a temp file for plotting
+    cat ${file[$plot]} |grep -v "^#" |awk '{printf "%lu %.1f\n",$2/1000, $6}' >$dir/data_$plot
+
+    if [ $plot -eq 0 ];then
+        echo -n "plot " >> $dir/plot_script.gpl
+    fi
+    echo -n "\"$dir/data_$plot\" title \"${title[$plot]}\" with lines" >> $dir/plot_script.gpl
+    if [ $(($plot + 1)) -ne $plots ];then
+        echo -n ", " >> $dir/plot_script.gpl
+    fi
+done
+echo >> $dir/plot_script.gpl
+
+gnuplot $dir/plot_script.gpl
+rm -r $dir
\ No newline at end of file
diff --git a/tools/power/cpupower/bench/cpufreq-bench_script.sh b/tools/power/cpupower/bench/cpufreq-bench_script.sh
new file mode 100644
index 00000000000..de20d2a0687
--- /dev/null
+++ b/tools/power/cpupower/bench/cpufreq-bench_script.sh
@@ -0,0 +1,101 @@
+#!/bin/bash
+
+# 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; either version 2, or (at your option)
+# any later version.
+
+# 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., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.
+
+# Author/Copyright(c): 2009, Thomas Renninger <trenn@suse.de>, Novell Inc.
+
+# Ondemand up_threshold and sampling rate test script for cpufreq-bench
+# mircobenchmark.
+# Modify the general variables at the top or extend or copy out parts
+# if you want to test other things
+#
+
+# Default with latest kernels is 95, before micro account patches
+# it was 80, cmp. with git commit 808009131046b62ac434dbc796
+UP_THRESHOLD="60 80 95"
+# Depending on the kernel and the HW sampling rate could be restricted
+# and cannot be set that low...
+# E.g. before git commit cef9615a853ebc4972084f7 one could only set
+# min sampling rate of 80000 if CONFIG_HZ=250
+SAMPLING_RATE="20000 80000"
+
+function measure()
+{
+    local -i up_threshold_set
+    local -i sampling_rate_set
+
+    for up_threshold in $UP_THRESHOLD;do
+        for sampling_rate in $SAMPLING_RATE;do
+            # Set values in sysfs
+            echo $up_threshold >/sys/devices/system/cpu/cpu0/cpufreq/ondemand/up_threshold
+            echo $sampling_rate >/sys/devices/system/cpu/cpu0/cpufreq/ondemand/sampling_rate
+            up_threshold_set=$(cat /sys/devices/system/cpu/cpu0/cpufreq/ondemand/up_threshold)
+            sampling_rate_set=$(cat /sys/devices/system/cpu/cpu0/cpufreq/ondemand/sampling_rate)
+
+            # Verify set values in sysfs
+            if [ ${up_threshold_set} -eq ${up_threshold} ];then
+                echo "up_threshold: $up_threshold, set in sysfs: ${up_threshold_set}"
+            else
+                echo "WARNING: Tried to set up_threshold: $up_threshold, set in sysfs: ${up_threshold_set}"
+            fi
+            if [ ${sampling_rate_set} -eq ${sampling_rate} ];then
+                echo "sampling_rate: $sampling_rate, set in sysfs: ${sampling_rate_set}"
+            else
+                echo "WARNING: Tried to set sampling_rate: $sampling_rate, set in sysfs: ${sampling_rate_set}"
+            fi
+
+            # Benchmark
+            cpufreq-bench -o /var/log/cpufreq-bench/up_threshold_${up_threshold}_sampling_rate_${sampling_rate}
+        done
+    done
+}
+
+function create_plots()
+{
+    local command
+
+    for up_threshold in $UP_THRESHOLD;do
+        command="cpufreq-bench_plot.sh -o \"sampling_rate_${SAMPLING_RATE}_up_threshold_${up_threshold}\" -t \"Ondemand sampling_rate: ${SAMPLING_RATE} comparison - Up_threshold: $up_threshold %\""
+        for sampling_rate in $SAMPLING_RATE;do
+            command="${command} /var/log/cpufreq-bench/up_threshold_${up_threshold}_sampling_rate_${sampling_rate}/* \"sampling_rate = $sampling_rate\""
+        done
+        echo $command
+        eval "$command"
+        echo
+    done
+
+    for sampling_rate in $SAMPLING_RATE;do
+        command="cpufreq-bench_plot.sh -o \"up_threshold_${UP_THRESHOLD}_sampling_rate_${sampling_rate}\" -t \"Ondemand up_threshold: ${UP_THRESHOLD} % comparison - sampling_rate: $sampling_rate\""
+        for up_threshold in $UP_THRESHOLD;do
+            command="${command} /var/log/cpufreq-bench/up_threshold_${up_threshold}_sampling_rate_${sampling_rate}/* \"up_threshold = $up_threshold\""
+        done
+        echo $command
+        eval "$command"
+        echo
+    done
+
+    command="cpufreq-bench_plot.sh -o \"up_threshold_${UP_THRESHOLD}_sampling_rate_${SAMPLING_RATE}\" -t \"Ondemand up_threshold: ${UP_THRESHOLD} and sampling_rate ${SAMPLING_RATE} comparison\""
+    for sampling_rate in $SAMPLING_RATE;do
+        for up_threshold in $UP_THRESHOLD;do
+            command="${command} /var/log/cpufreq-bench/up_threshold_${up_threshold}_sampling_rate_${sampling_rate}/* \"up_threshold = $up_threshold - sampling_rate = $sampling_rate\""
+        done
+    done
+    echo "$command"
+    eval "$command"
+}
+
+measure
+create_plots
\ No newline at end of file
diff --git a/tools/power/cpupower/bench/example.cfg b/tools/power/cpupower/bench/example.cfg
new file mode 100644
index 00000000000..f91f6436068
--- /dev/null
+++ b/tools/power/cpupower/bench/example.cfg
@@ -0,0 +1,11 @@
+sleep = 50000
+load = 50000
+cpu = 0
+priority = LOW
+output = /var/log/cpufreq-bench
+sleep_step = 50000
+load_step = 50000
+cycles = 20
+rounds = 40
+verbose = 0
+governor = ondemand
diff --git a/tools/power/cpupower/bench/main.c b/tools/power/cpupower/bench/main.c
new file mode 100644
index 00000000000..24910313a52
--- /dev/null
+++ b/tools/power/cpupower/bench/main.c
@@ -0,0 +1,202 @@
+/*  cpufreq-bench CPUFreq microbenchmark
+ *
+ *  Copyright (C) 2008 Christian Kornacker <ckornacker@suse.de>
+ *
+ *  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; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  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.
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <getopt.h>
+#include <errno.h>
+
+#include "config.h"
+#include "system.h"
+#include "benchmark.h"
+
+static struct option long_options[] = {
+        {"output",      1,      0,      'o'},
+        {"sleep",       1,      0,      's'},
+        {"load",        1,      0,      'l'},
+        {"verbose",     0,      0,      'v'},
+        {"cpu",         1,      0,      'c'},
+        {"governor",    1,      0,      'g'},
+        {"prio",        1,      0,      'p'},
+        {"file",        1,      0,      'f'},
+        {"cycles",      1,      0,      'n'},
+        {"rounds",      1,      0,      'r'},
+        {"load-step",   1,      0,      'x'},
+        {"sleep-step",  1,      0,      'y'},
+        {"help",        0,      0,      'h'},
+        {0, 0, 0, 0}
+};
+
+/*******************************************************************
+ usage
+*******************************************************************/
+
+void usage()
+{
+        printf("usage: ./bench\n");
+        printf("Options:\n");
+        printf(" -l, --load=<long int>\t\tinitial load time in us\n");
+        printf(" -s, --sleep=<long int>\t\tinitial sleep time in us\n");
+        printf(" -x, --load-step=<long int>\ttime to be added to load time, in us\n");
+        printf(" -y, --sleep-step=<long int>\ttime to be added to sleep time, in us\n");
+        printf(" -c, --cpu=<cpu #>\t\t\tCPU Nr. to use, starting at 0\n");
+        printf(" -p, --prio=<priority>\t\t\tscheduler priority, HIGH, LOW or DEFAULT\n");
+        printf(" -g, --governor=<governor>\t\tcpufreq governor to test\n");
+        printf(" -n, --cycles=<int>\t\t\tload/sleep cycles\n");
+        printf(" -r, --rounds<int>\t\t\tload/sleep rounds\n");
+        printf(" -f, --file=<configfile>\t\tconfig file to use\n");
+        printf(" -o, --output=<dir>\t\t\toutput path. Filename will be OUTPUTPATH/benchmark_TIMESTAMP.log\n");
+        printf(" -v, --verbose\t\t\t\tverbose output on/off\n");
+        printf(" -h, --help\t\t\t\tPrint this help screen\n");
+        exit(1);
+}
+
+/*******************************************************************
+ main
+*******************************************************************/
+
+int main(int argc, char **argv)
+{
+        int c;
+        int option_index = 0;
+        struct config *config = NULL;
+
+        config = prepare_default_config();
+
+        if (config == NULL)
+                return EXIT_FAILURE;
+
+        while (1) {
+                c = getopt_long (argc, argv, "hg:o:s:l:vc:p:f:n:r:x:y:",
+                                long_options, &option_index);
+                if (c == -1)
+                        break;
+
+                switch (c) {
+                case 'o':
+                        if (config->output != NULL)
+                                fclose(config->output);
+
+                        config->output = prepare_output(optarg);
+
+                        if (config->output == NULL)
+                                return EXIT_FAILURE;
+
+                        dprintf("user output path -> %s\n", optarg);
+                        break;
+                case 's':
+                        sscanf(optarg, "%li", &config->sleep);
+                        dprintf("user sleep time -> %s\n", optarg);
+                        break;
+                case 'l':
+                        sscanf(optarg, "%li", &config->load);
+                        dprintf("user load time -> %s\n", optarg);
+                        break;
+                case 'c':
+                        sscanf(optarg, "%u", &config->cpu);
+                        dprintf("user cpu -> %s\n", optarg);
+                        break;
+                case 'g':
+                        strncpy(config->governor, optarg, 14);
+                        dprintf("user governor -> %s\n", optarg);
+                        break;
+                case 'p':
+                        if (string_to_prio(optarg) != SCHED_ERR) {
+                                config->prio = string_to_prio(optarg);
+                                dprintf("user prio -> %s\n", optarg);
+                        } else {
+                                if (config != NULL) {
+                                        if (config->output != NULL)
+                                                fclose(config->output);
+                                        free(config);
+                                }
+                                usage();
+                        }
+                        break;
+                case 'n':
+                        sscanf(optarg, "%u", &config->cycles);
+                        dprintf("user cycles -> %s\n", optarg);
+                        break;
+                case 'r':
+                        sscanf(optarg, "%u", &config->rounds);
+                        dprintf("user rounds -> %s\n", optarg);
+                        break;
+                case 'x':
+                        sscanf(optarg, "%li", &config->load_step);
+                        dprintf("user load_step -> %s\n", optarg);
+                        break;
+                case 'y':
+                        sscanf(optarg, "%li", &config->sleep_step);
+                        dprintf("user sleep_step -> %s\n", optarg);
+                        break;
+                case 'f':
+                        if (prepare_config(optarg, config))
+                                return EXIT_FAILURE;
+                        break;
+                case 'v':
+                        config->verbose = 1;
+                        dprintf("verbose output enabled\n");
+                        break;
+                case 'h':
+                case '?':
+                default:
+                        if (config != NULL) {
+                                if (config->output != NULL)
+                                        fclose(config->output);
+                                free(config);
+                        }
+                        usage();
+                }
+        }
+
+        if (config->verbose) {
+                printf("starting benchmark with parameters:\n");
+                printf("config:\n\t"
+                       "sleep=%li\n\t"
+                       "load=%li\n\t"
+                       "sleep_step=%li\n\t"
+                       "load_step=%li\n\t"
+                       "cpu=%u\n\t"
+                       "cycles=%u\n\t"
+                       "rounds=%u\n\t"
+                       "governor=%s\n\n",
+                       config->sleep,
+                       config->load,
+                       config->sleep_step,
+                       config->load_step,
+                       config->cpu,
+                       config->cycles,
+                       config->rounds,
+                       config->governor);
+        }
+
+        prepare_user(config);
+        prepare_system(config);
+        start_benchmark(config);
+
+        if (config->output != stdout)
+                fclose(config->output);
+
+        free(config);
+
+        return EXIT_SUCCESS;
+}
+
diff --git a/tools/power/cpupower/bench/parse.c b/tools/power/cpupower/bench/parse.c
new file mode 100644
index 00000000000..543bba14ae2
--- /dev/null
+++ b/tools/power/cpupower/bench/parse.c
@@ -0,0 +1,225 @@
+/*  cpufreq-bench CPUFreq microbenchmark
+ *
+ *  Copyright (C) 2008 Christian Kornacker <ckornacker@suse.de>
+ *
+ *  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; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  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.
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdarg.h>
+#include <string.h>
+#include <time.h>
+#include <dirent.h>
+
+#include <sys/utsname.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+
+#include "parse.h"
+#include "config.h"
+
+/**
+ * converts priority string to priority
+ *
+ * @param str string that represents a scheduler priority
+ *
+ * @retval priority
+ * @retval SCHED_ERR when the priority doesn't exit
+ **/
+
+enum sched_prio string_to_prio(const char *str)
+{
+        if (strncasecmp("high", str, strlen(str)) == 0)
+                return  SCHED_HIGH;
+        else if (strncasecmp("default", str, strlen(str)) == 0)
+                return SCHED_DEFAULT;
+        else if (strncasecmp("low", str, strlen(str)) == 0)
+                return SCHED_LOW;
+        else
+                return SCHED_ERR;
+}
+
+/**
+ * create and open logfile
+ *
+ * @param dir directory in which the logfile should be created
+ *
+ * @retval logfile on success
+ * @retval NULL when the file can't be created
+ **/
+
+FILE *prepare_output(const char *dirname)
+{
+        FILE *output = NULL;
+        int len;
+        char *filename;
+        struct utsname sysdata;
+        DIR *dir;
+
+        dir = opendir(dirname);
+        if (dir == NULL) {
+                if (mkdir(dirname, 0755)) {
+                        perror("mkdir");
+                        fprintf(stderr, "error: Cannot create dir %s\n",
+                                dirname);
+                        return NULL;
+                }
+        }
+
+        len = strlen(dirname) + 30;
+        filename = malloc(sizeof(char) * len);
+
+        if (uname(&sysdata) == 0) {
+                len += strlen(sysdata.nodename) + strlen(sysdata.release);
+                filename = realloc(filename, sizeof(char) * len);
+
+                if (filename == NULL) {
+                        perror("realloc");
+                        return NULL;
+                }
+
+                snprintf(filename, len - 1, "%s/benchmark_%s_%s_%li.log",
+                        dirname, sysdata.nodename, sysdata.release, time(NULL));
+        } else {
+                snprintf(filename, len - 1, "%s/benchmark_%li.log",
+                        dirname, time(NULL));
+        }
+
+        dprintf("logilename: %s\n", filename);
+
+        output = fopen(filename, "w+");
+        if (output == NULL) {
+                perror("fopen");
+                fprintf(stderr, "error: unable to open logfile\n");
+        }
+
+        fprintf(stdout, "Logfile: %s\n", filename);
+
+        free(filename);
+        fprintf(output, "#round load sleep performance powersave percentage\n");
+        return output;
+}
+
+/**
+ * returns the default config
+ *
+ * @retval default config on success
+ * @retval NULL when the output file can't be created
+ **/
+
+struct config *prepare_default_config()
+{
+        struct config *config = malloc(sizeof(struct config));
+
+        dprintf("loading defaults\n");
+
+        config->sleep = 500000;
+        config->load = 500000;
+        config->sleep_step = 500000;
+        config->load_step = 500000;
+        config->cycles = 5;
+        config->rounds = 50;
+        config->cpu = 0;
+        config->prio = SCHED_HIGH;
+        config->verbose = 0;
+        strncpy(config->governor, "ondemand", 8);
+
+        config->output = stdout;
+
+#ifdef DEFAULT_CONFIG_FILE
+        if (prepare_config(DEFAULT_CONFIG_FILE, config))
+                return NULL;
+#endif
+        return config;
+}
+
+/**
+ * parses config file and returns the config to the caller
+ *
+ * @param path config file name
+ *
+ * @retval 1 on error
+ * @retval 0 on success
+ **/
+
+int prepare_config(const char *path, struct config *config)
+{
+        size_t len = 0;
+        char *opt, *val, *line = NULL;
+        FILE *configfile = fopen(path, "r");
+
+        if (config == NULL) {
+                fprintf(stderr, "error: config is NULL\n");
+                return 1;
+        }
+
+        if (configfile == NULL) {
+                perror("fopen");
+                fprintf(stderr, "error: unable to read configfile\n");
+                free(config);
+                return 1;
+        }
+
+        while (getline(&line, &len, configfile) != -1) {
+                if (line[0] == '#' || line[0] == ' ')
+                        continue;
+
+                sscanf(line, "%as = %as", &opt, &val);
+
+                dprintf("parsing: %s -> %s\n", opt, val);
+
+                if (strncmp("sleep", opt, strlen(opt)) == 0)
+                        sscanf(val, "%li", &config->sleep);
+
+                else if (strncmp("load", opt, strlen(opt)) == 0)
+                        sscanf(val, "%li", &config->load);
+
+                else if (strncmp("load_step", opt, strlen(opt)) == 0)
+                        sscanf(val, "%li", &config->load_step);
+
+                else if (strncmp("sleep_step", opt, strlen(opt)) == 0)
+                        sscanf(val, "%li", &config->sleep_step);
+
+                else if (strncmp("cycles", opt, strlen(opt)) == 0)
+                        sscanf(val, "%u", &config->cycles);
+
+                else if (strncmp("rounds", opt, strlen(opt)) == 0)
+                        sscanf(val, "%u", &config->rounds);
+
+                else if (strncmp("verbose", opt, strlen(opt)) == 0)
+                        sscanf(val, "%u", &config->verbose);
+
+                else if (strncmp("output", opt, strlen(opt)) == 0)
+                        config->output = prepare_output(val); 
+
+                else if (strncmp("cpu", opt, strlen(opt)) == 0)
+                        sscanf(val, "%u", &config->cpu);
+
+                else if (strncmp("governor", opt, 14) == 0)
+                        strncpy(config->governor, val, 14);
+
+                else if (strncmp("priority", opt, strlen(opt)) == 0) {
+                        if (string_to_prio(val) != SCHED_ERR)
+                                config->prio = string_to_prio(val);
+                }
+        }
+
+        free(line);
+        free(opt);
+        free(val);
+
+        return 0;
+}
diff --git a/tools/power/cpupower/bench/parse.h b/tools/power/cpupower/bench/parse.h
new file mode 100644
index 00000000000..a8dc632d9ee
--- /dev/null
+++ b/tools/power/cpupower/bench/parse.h
@@ -0,0 +1,53 @@
+/*  cpufreq-bench CPUFreq microbenchmark
+ *
+ *  Copyright (C) 2008 Christian Kornacker <ckornacker@suse.de>
+ *
+ *  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; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  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.
+ */
+
+/* struct that holds the required config parameters */
+struct config
+{
+        long sleep;             /* sleep time in µs */
+        long load;              /* load time in µs */
+        long sleep_step;        /* time value which changes the
+                                 * sleep time after every round in µs */
+        long load_step;         /* time value which changes the
+                                 * load time after every round in µs */
+        unsigned int cycles;    /* calculation cycles with the same sleep/load time */
+        unsigned int rounds;    /* calculation rounds with iterated sleep/load time */
+        unsigned int cpu;       /* cpu for which the affinity is set */
+        char governor[15];      /* cpufreq governor */
+        enum sched_prio         /* possible scheduler priorities */
+        {
+                SCHED_ERR = -1,
+                SCHED_HIGH,
+                SCHED_DEFAULT,
+                SCHED_LOW
+        } prio;
+
+        unsigned int verbose;   /* verbose output */
+        FILE *output;           /* logfile */
+        char *output_filename;  /* logfile name, must be freed at the end
+                                   if output != NULL and output != stdout*/
+};
+
+enum sched_prio string_to_prio(const char *str);
+
+FILE *prepare_output(const char *dir);
+
+int prepare_config(const char *path, struct config *config);
+struct config *prepare_default_config();
+
diff --git a/tools/power/cpupower/bench/system.c b/tools/power/cpupower/bench/system.c
new file mode 100644
index 00000000000..f01e3f4be84
--- /dev/null
+++ b/tools/power/cpupower/bench/system.c
@@ -0,0 +1,191 @@
+/*  cpufreq-bench CPUFreq microbenchmark
+ *
+ *  Copyright (C) 2008 Christian Kornacker <ckornacker@suse.de>
+ *
+ *  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; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  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.
+ */
+
+#include <stdio.h>
+#include <time.h>
+#include <sys/time.h>
+#include <sys/types.h>
+#include <unistd.h>
+
+#include <sched.h>
+
+#include <cpufreq.h>
+
+#include "config.h"
+#include "system.h"
+
+/**
+ * returns time since epoch in µs
+ *
+ * @retval time
+ **/
+
+long long int get_time()
+{
+        struct timeval now;
+
+        gettimeofday(&now, NULL);
+
+        return (long long int)(now.tv_sec * 1000000LL + now.tv_usec);
+}
+
+/**
+ * sets the cpufreq governor
+ *
+ * @param governor cpufreq governor name
+ * @param cpu cpu for which the governor should be set
+ *
+ * @retval 0 on success
+ * @retval -1 when failed
+ **/
+
+int set_cpufreq_governor(char *governor, unsigned int cpu)
+{
+
+        dprintf("set %s as cpufreq governor\n", governor);
+
+        if (cpufreq_cpu_exists(cpu) != 0) {
+                perror("cpufreq_cpu_exists");
+                fprintf(stderr, "error: cpu %u does not exist\n", cpu);
+                return -1;
+        }
+
+        if (cpufreq_modify_policy_governor(cpu, governor) != 0) {
+                perror("cpufreq_modify_policy_governor");
+                fprintf(stderr, "error: unable to set %s governor\n", governor);
+                return -1;
+        }
+
+        return 0;
+}
+
+/**
+ * sets cpu affinity for the process
+ *
+ * @param cpu cpu# to which the affinity should be set
+ *
+ * @retval 0 on success
+ * @retval -1 when setting the affinity failed
+ **/
+
+int set_cpu_affinity(unsigned int cpu)
+{
+        cpu_set_t cpuset;
+
+        CPU_ZERO(&cpuset);
+        CPU_SET(cpu, &cpuset);
+
+        dprintf("set affinity to cpu #%u\n", cpu);
+
+        if (sched_setaffinity(getpid(), sizeof(cpu_set_t), &cpuset) < 0) {
+                perror("sched_setaffinity");
+                fprintf(stderr, "warning: unable to set cpu affinity\n");
+                return -1;
+        }
+
+        return 0;
+}
+
+/**
+ * sets the process priority parameter
+ *
+ * @param priority priority value
+ *
+ * @retval 0 on success
+ * @retval -1 when setting the priority failed
+ **/
+
+int set_process_priority(int priority)
+{
+        struct sched_param param;
+
+        dprintf("set scheduler priority to %i\n", priority);
+
+        param.sched_priority = priority;
+
+        if (sched_setscheduler(0, SCHEDULER, &param) < 0) {
+                perror("sched_setscheduler");
+                fprintf(stderr, "warning: unable to set scheduler priority\n");
+                return -1;
+        }
+
+        return 0;
+}
+
+/**
+ * notifies the user that the benchmark may run some time
+ *
+ * @param config benchmark config values
+ *
+ **/
+
+void prepare_user(const struct config *config)
+{
+        unsigned long sleep_time = 0;
+        unsigned long load_time = 0;
+        unsigned int round;
+
+        for (round = 0; round < config->rounds; round++) {
+                sleep_time +=  2 * config->cycles *
+                        (config->sleep + config->sleep_step * round);
+                load_time += 2 * config->cycles *
+                        (config->load + config->load_step * round) +
+                        (config->load + config->load_step * round * 4);
+        }
+
+        if (config->verbose || config->output != stdout)
+                printf("approx. test duration: %im\n",
+                       (int)((sleep_time + load_time) / 60000000));
+}
+
+/**
+ * sets up the cpu affinity and scheduler priority
+ *
+ * @param config benchmark config values
+ *
+ **/
+
+void prepare_system(const struct config *config)
+{
+        if (config->verbose)
+                printf("set cpu affinity to cpu #%u\n", config->cpu);
+
+        set_cpu_affinity(config->cpu);
+
+        switch (config->prio) {
+        case SCHED_HIGH:
+                if (config->verbose)
+                        printf("high priority condition requested\n");
+
+                set_process_priority(PRIORITY_HIGH);
+                break;
+        case SCHED_LOW:
+                if (config->verbose)
+                        printf("low priority condition requested\n");
+
+                set_process_priority(PRIORITY_LOW);
+                break;
+        default:
+                if (config->verbose)
+                        printf("default priority condition requested\n");
+
+                set_process_priority(PRIORITY_DEFAULT);
+        }
+}
+
diff --git a/tools/power/cpupower/bench/system.h b/tools/power/cpupower/bench/system.h
new file mode 100644
index 00000000000..3a8c858b78f
--- /dev/null
+++ b/tools/power/cpupower/bench/system.h
@@ -0,0 +1,29 @@
+/*  cpufreq-bench CPUFreq microbenchmark
+ *
+ *  Copyright (C) 2008 Christian Kornacker <ckornacker@suse.de>
+ *
+ *  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; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  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.
+ */
+
+#include "parse.h"
+
+long long get_time();
+
+int set_cpufreq_governor(char *governor, unsigned int cpu);
+int set_cpu_affinity(unsigned int cpu);
+int set_process_priority(int priority);
+
+void prepare_user(const struct config *config);
+void prepare_system(const struct config *config);
diff --git a/tools/power/cpupower/debug/i386/Makefile b/tools/power/cpupower/debug/i386/Makefile
new file mode 100644
index 00000000000..d08cc1ead9b
--- /dev/null
+++ b/tools/power/cpupower/debug/i386/Makefile
@@ -0,0 +1,20 @@
+default: all
+
+centrino-decode: centrino-decode.c
+        $(CC) $(CFLAGS) -o centrino-decode centrino-decode.c
+
+dump_psb: dump_psb.c
+        $(CC) $(CFLAGS) -o dump_psb dump_psb.c
+
+intel_gsic: intel_gsic.c
+        $(CC) $(CFLAGS) -o intel_gsic -llrmi intel_gsic.c
+
+powernow-k8-decode: powernow-k8-decode.c
+        $(CC) $(CFLAGS) -o powernow-k8-decode powernow-k8-decode.c
+
+all: centrino-decode dump_psb intel_gsic powernow-k8-decode
+
+clean:
+        rm -rf centrino-decode dump_psb intel_gsic powernow-k8-decode
+
+.PHONY: all default clean
diff --git a/tools/power/cpupower/debug/i386/centrino-decode.c b/tools/power/cpupower/debug/i386/centrino-decode.c
new file mode 100644
index 00000000000..7ef24cce492
--- /dev/null
+++ b/tools/power/cpupower/debug/i386/centrino-decode.c
@@ -0,0 +1,113 @@
+/*
+ *  (C) 2003 - 2004  Dominik Brodowski <linux@dominikbrodowski.de>
+ *
+ *  Licensed under the terms of the GNU GPL License version 2.
+ *
+ * Based on code found in
+ * linux/arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c
+ * and originally developed by Jeremy Fitzhardinge.
+ *
+ * USAGE: simply run it to decode the current settings on CPU 0,
+ *        or pass the CPU number as argument, or pass the MSR content
+ *        as argument.
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdint.h>
+#include <unistd.h>
+#include <errno.h>
+#include <fcntl.h>
+
+#include <sys/types.h>
+#include <sys/stat.h>
+
+#define MCPU    32
+
+#define MSR_IA32_PERF_STATUS    0x198
+
+static int rdmsr(unsigned int cpu, unsigned int msr,
+                 unsigned int *lo, unsigned int *hi)
+{
+        int fd;
+        char file[20];
+        unsigned long long val;
+        int retval = -1;
+
+        *lo = *hi = 0;
+
+        if (cpu > MCPU)
+                goto err1;
+
+        sprintf(file, "/dev/cpu/%d/msr", cpu);
+        fd = open(file, O_RDONLY);
+
+        if (fd < 0)
+                goto err1;
+
+        if (lseek(fd, msr, SEEK_CUR) == -1)
+                goto err2;
+
+        if (read(fd, &val, 8) != 8)
+                goto err2;
+
+        *lo = (uint32_t )(val & 0xffffffffull);
+        *hi = (uint32_t )(val>>32 & 0xffffffffull);
+
+        retval = 0;
+err2:
+        close(fd);
+err1:
+        return retval;
+}
+
+static void decode (unsigned int msr)
+{
+        unsigned int multiplier;
+        unsigned int mv;
+
+        multiplier = ((msr >> 8) & 0xFF);
+
+        mv = (((msr & 0xFF) * 16) + 700);
+
+        printf("0x%x means multiplier %d @ %d mV\n", msr, multiplier, mv);
+}
+
+static int decode_live(unsigned int cpu)
+{
+        unsigned int lo, hi;
+        int err;
+
+        err = rdmsr(cpu, MSR_IA32_PERF_STATUS, &lo, &hi);
+
+        if (err) {
+                printf("can't get MSR_IA32_PERF_STATUS for cpu %d\n", cpu);
+                printf("Possible trouble: you don't run an Enhanced SpeedStep capable cpu\n");
+                printf("or you are not root, or the msr driver is not present\n");
+                return 1;
+        }
+
+        decode(lo);
+
+        return 0;
+}
+
+int main (int argc, char **argv)
+{
+        unsigned int cpu, mode = 0;
+
+        if (argc < 2)
+                cpu = 0;
+        else {
+                cpu = strtoul(argv[1], NULL, 0);
+                if (cpu >= MCPU)
+                        mode = 1;
+        }
+
+        if (mode)
+                decode(cpu);
+        else
+                decode_live(cpu);
+
+        return 0;
+}
diff --git a/tools/power/cpupower/debug/i386/dump_psb.c b/tools/power/cpupower/debug/i386/dump_psb.c
new file mode 100644
index 00000000000..8d6a4751425
--- /dev/null
+++ b/tools/power/cpupower/debug/i386/dump_psb.c
@@ -0,0 +1,196 @@
+/*
+ * dump_psb. (c) 2004, Dave Jones, Red Hat Inc.
+ * Licensed under the GPL v2.
+ */
+
+#include <fcntl.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#define _GNU_SOURCE
+#include <getopt.h>
+
+#include <sys/mman.h>
+
+#define LEN (0x100000 - 0xc0000)
+#define OFFSET (0xc0000)
+
+#ifndef __packed
+#define __packed __attribute((packed))
+#endif
+
+static long relevant;
+
+static const int fid_to_mult[32] = {
+        110, 115, 120, 125, 50, 55, 60, 65,
+        70, 75, 80, 85, 90, 95, 100, 105,
+        30, 190, 40, 200, 130, 135, 140, 210,
+        150, 225, 160, 165, 170, 180, -1, -1,
+};
+
+static const int vid_to_voltage[32] = {
+        2000, 1950, 1900, 1850, 1800, 1750, 1700, 1650,
+        1600, 1550, 1500, 1450, 1400, 1350, 1300, 0,
+        1275, 1250, 1225, 1200, 1175, 1150, 1125, 1100,
+        1075, 1050, 1024, 1000, 975, 950, 925, 0,
+};
+
+struct psb_header {
+        char signature[10];
+        u_char version;
+        u_char flags;
+        u_short settlingtime;
+        u_char res1;
+        u_char numpst;
+} __packed;
+
+struct pst_header {
+        u_int32_t cpuid;
+        u_char fsb;
+        u_char maxfid;
+        u_char startvid;
+        u_char numpstates;
+} __packed;
+
+static u_int fsb;
+static u_int sgtc;
+
+static int
+decode_pst(char *p, int npstates)
+{
+        int i;
+        int freq, fid, vid;
+
+        for (i = 0; i < npstates; ++i) {
+                fid = *p++;
+                vid = *p++;
+                freq = 100 * fid_to_mult[fid] * fsb;
+
+                printf("   %2d %8dkHz  FID %02x (%2d.%01d)  VID %02x (%4dmV)\n",
+                       i,
+                       freq,
+                       fid, fid_to_mult[fid]/10, fid_to_mult[fid]%10,
+                       vid, vid_to_voltage[vid]);
+        }
+
+        return 0;
+}
+
+static
+void decode_psb(char *p, int numpst)
+{
+        int i;
+        struct psb_header *psb;
+        struct pst_header *pst;
+
+        psb = (struct psb_header*) p;
+
+        if (psb->version != 0x12)
+                return;
+
+        printf("PSB version: %hhx flags: %hhx settling time %hhuus res1 %hhx num pst %hhu\n",
+                        psb->version,
+                        psb->flags,
+                        psb->settlingtime,
+                        psb->res1,
+                        psb->numpst);
+        sgtc = psb->settlingtime * 100;
+
+        if (sgtc < 10000)
+                sgtc = 10000;
+
+        p = ((char *) psb) + sizeof(struct psb_header);
+
+        if (numpst < 0)
+                numpst = psb->numpst;
+        else
+                printf("Overriding number of pst :%d\n", numpst);
+
+        for (i = 0; i < numpst; i++) {
+                pst = (struct pst_header*) p;
+
+                if (relevant != 0) {
+                        if (relevant!= pst->cpuid)
+                                goto next_one;
+                }
+
+                printf("  PST %d  cpuid %.3x fsb %hhu mfid %hhx svid %hhx numberstates %hhu\n",
+                                i+1,
+                                pst->cpuid,
+                                pst->fsb,
+                                pst->maxfid,
+                                pst->startvid,
+                                pst->numpstates);
+
+                fsb = pst->fsb;
+                decode_pst(p + sizeof(struct pst_header), pst->numpstates);
+
+next_one:
+                p += sizeof(struct pst_header) + 2*pst->numpstates;
+        }
+
+}
+
+static struct option info_opts[] = {
+        {.name = "numpst",      .has_arg=no_argument,   .flag=NULL, .val='n'},
+};
+
+void print_help(void)
+{
+        printf ("Usage: dump_psb [options]\n");
+        printf ("Options:\n");
+        printf ("  -n, --numpst     Set number of PST tables to scan\n");
+        printf ("  -r, --relevant   Only display PSTs relevant to cpuid N\n");
+}
+
+int
+main(int argc, char *argv[])
+{
+        int fd;
+        int numpst=-1;
+        int ret=0, cont=1;
+        char *mem = NULL;
+        char *p;
+
+        do {
+                ret = getopt_long(argc, argv, "hr:n:", info_opts, NULL);
+                switch (ret){
+                case '?':
+                case 'h':
+                        print_help();
+                        cont = 0;
+                        break;
+                case 'r':
+                        relevant = strtol(optarg, NULL, 16);
+                        break;
+                case 'n':
+                        numpst = strtol(optarg, NULL, 10);
+                        break;
+                case -1:
+                        cont = 0;
+                        break;
+                }
+
+        } while(cont);
+
+        fd = open("/dev/mem", O_RDONLY);
+        if (fd < 0) {
+                printf ("Couldn't open /dev/mem. Are you root?\n");
+                exit(1);
+        }
+
+        mem = mmap(mem, 0x100000 - 0xc0000, PROT_READ, MAP_SHARED, fd, 0xc0000);
+        close(fd);
+
+        for (p = mem; p - mem < LEN; p+=16) {
+                if (memcmp(p, "AMDK7PNOW!", 10) == 0) {
+                        decode_psb(p, numpst);
+                        break;
+                }
+        }
+
+        munmap(mem, LEN);
+        return 0;
+}
diff --git a/tools/power/cpupower/debug/i386/intel_gsic.c b/tools/power/cpupower/debug/i386/intel_gsic.c
new file mode 100644
index 00000000000..53f5293c9c9
--- /dev/null
+++ b/tools/power/cpupower/debug/i386/intel_gsic.c
@@ -0,0 +1,78 @@
+/*
+ *  (C) 2003  Bruno Ducrot
+ *  (C) 2004  Dominik Brodowski <linux@dominikbrodowski.de>
+ *
+ *  Licensed under the terms of the GNU GPL License version 2.
+ *
+ * Based on code found in
+ * linux/include/asm-i386/ist.h and linux/arch/i386/kernel/setup.c
+ * and originally developed by Andy Grover <andrew.grover@intel.com>
+ */
+
+#include <stdio.h>
+#include <string.h>
+#include <lrmi.h>
+
+int main (void)
+{
+        struct LRMI_regs        r;
+        int                     retval;
+
+        if (!LRMI_init())
+                return 0;
+
+        memset(&r, 0, sizeof(r));
+
+        r.eax = 0x0000E980;
+        r.edx = 0x47534943;
+
+        retval = LRMI_int(0x15, &r);
+
+        if (!retval) {
+                printf("Failed!\n");
+                return 0;
+        }
+        if (r.eax == 0x47534943) {
+                printf("BIOS supports GSIC call:\n");
+                printf("\tsignature: %c%c%c%c\n",
+                       (r.eax >> 24) & 0xff,
+                       (r.eax >> 16) & 0xff,
+                       (r.eax >> 8) & 0xff,
+                       (r.eax) & 0xff);
+                printf("\tcommand port = 0x%.4x\n",
+                       r.ebx & 0xffff);
+                printf("\tcommand =      0x%.4x\n",
+                       (r.ebx >> 16) & 0xffff);
+                printf("\tevent port =   0x%.8x\n", r.ecx);
+                printf("\tflags =        0x%.8x\n", r.edx);
+                if (((r.ebx >> 16) & 0xffff) != 0x82) {
+                        printf("non-default command value. If speedstep-smi "
+                               "doesn't work out of the box,\nyou may want to "
+                               "try out the default value by passing "
+                               "smi_cmd=0x82 to the module\n ON YOUR OWN "
+                               "RISK.\n");
+                }
+                if ((r.ebx & 0xffff) != 0xb2) {
+                        printf("non-default command port. If speedstep-smi "
+                               "doesn't work out of the box,\nyou may want to "
+                               "try out the default value by passing "
+                               "smi_port=0x82 to the module\n ON YOUR OWN "
+                               "RISK.\n");
+                }
+        } else {
+                printf("BIOS DOES NOT support GSIC call.  Dumping registers anyway:\n");
+                printf("eax = 0x%.8x\n", r.eax);
+                printf("ebx = 0x%.8x\n", r.ebx);
+                printf("ecx = 0x%.8x\n", r.ecx);
+                printf("edx = 0x%.8x\n", r.edx);
+                printf("Note also that some BIOS do not support the initial "
+                       "GSIC call, but the newer\nspeeedstep-smi driver may "
+                       "work.\nFor this, you need to pass some arguments to "
+                       "the speedstep-smi driver:\n");
+                printf("\tsmi_cmd=0x?? smi_port=0x?? smi_sig=1\n");
+                printf("\nUnfortunately, you have to know what exactly are "
+                       "smi_cmd and smi_port, and this\nis system "
+                       "dependant.\n");
+        }
+        return 1;
+}
diff --git a/tools/power/cpupower/debug/i386/powernow-k8-decode.c b/tools/power/cpupower/debug/i386/powernow-k8-decode.c
new file mode 100644
index 00000000000..638a6b3bfd9
--- /dev/null
+++ b/tools/power/cpupower/debug/i386/powernow-k8-decode.c
@@ -0,0 +1,96 @@
+/*
+ *  (C) 2004 Bruno Ducrot <ducrot@poupinou.org>
+ *
+ *  Licensed under the terms of the GNU GPL License version 2.
+ *
+ * Based on code found in
+ * linux/arch/i386/kernel/cpu/cpufreq/powernow-k8.c
+ * and originally developed by Paul Devriendt
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdint.h>
+#include <unistd.h>
+#include <errno.h>
+#include <fcntl.h>
+
+#include <sys/types.h>
+#include <sys/stat.h>
+
+#define MCPU 32
+
+#define MSR_FIDVID_STATUS       0xc0010042
+
+#define MSR_S_HI_CURRENT_VID    0x0000001f
+#define MSR_S_LO_CURRENT_FID    0x0000003f
+
+static int get_fidvid(uint32_t cpu, uint32_t *fid, uint32_t *vid)
+{
+        int err = 1;
+        uint64_t msr = 0;
+        int fd;
+        char file[20];
+
+        if (cpu > MCPU)
+                goto out;
+
+        sprintf(file, "/dev/cpu/%d/msr", cpu);
+
+        fd = open(file, O_RDONLY);
+        if (fd < 0)
+                goto out;
+        lseek(fd, MSR_FIDVID_STATUS, SEEK_CUR);
+        if (read(fd, &msr, 8) != 8)
+                goto err1;
+
+        *fid = ((uint32_t )(msr & 0xffffffffull)) & MSR_S_LO_CURRENT_FID;
+        *vid = ((uint32_t )(msr>>32 & 0xffffffffull)) & MSR_S_HI_CURRENT_VID;
+        err = 0;
+err1:
+        close(fd);
+out:
+        return err;
+}
+
+
+/* Return a frequency in MHz, given an input fid */
+static uint32_t find_freq_from_fid(uint32_t fid)
+{
+        return 800 + (fid * 100);
+}
+
+/* Return a voltage in miliVolts, given an input vid */
+static uint32_t find_millivolts_from_vid(uint32_t vid)
+{
+        return 1550-vid*25;
+}
+
+int main (int argc, char *argv[])
+{
+        int err;
+        int cpu;
+        uint32_t fid, vid;
+
+        if (argc < 2)
+                cpu = 0;
+        else
+                cpu = strtoul(argv[1], NULL, 0);
+
+        err = get_fidvid(cpu, &fid, &vid);
+
+        if (err) {
+                printf("can't get fid, vid from MSR\n");
+                printf("Possible trouble: you don't run a powernow-k8 capable cpu\n");
+                printf("or you are not root, or the msr driver is not present\n");
+                exit(1);
+        }
+
+        
+        printf("cpu %d currently at %d MHz and %d mV\n",
+                        cpu,
+                        find_freq_from_fid(fid),
+                        find_millivolts_from_vid(vid));
+        
+        return 0;
+}
diff --git a/tools/power/cpupower/debug/kernel/Makefile b/tools/power/cpupower/debug/kernel/Makefile
new file mode 100644
index 00000000000..96b146fe6f8
--- /dev/null
+++ b/tools/power/cpupower/debug/kernel/Makefile
@@ -0,0 +1,23 @@
+obj-m   :=
+
+KDIR    := /lib/modules/$(shell uname -r)/build
+PWD             := $(shell pwd)
+KMISC   := /lib/modules/$(shell uname -r)/cpufrequtils/
+
+ifeq ("$(CONFIG_X86_TSC)", "y")
+  obj-m  += cpufreq-test_tsc.o
+endif
+
+default:
+        $(MAKE) -C $(KDIR) M=$(PWD)
+
+clean:
+        - rm -rf *.o *.ko .tmp-versions .*.cmd .*.mod.* *.mod.c
+        - rm -rf .tmp_versions* Module.symvers modules.order
+
+install: default
+        install -d $(KMISC)
+        install -m 644 -c *.ko $(KMISC)
+        /sbin/depmod -a
+
+all:    default
diff --git a/tools/power/cpupower/debug/kernel/cpufreq-test_tsc.c b/tools/power/cpupower/debug/kernel/cpufreq-test_tsc.c
new file mode 100644
index 00000000000..66cace601e5
--- /dev/null
+++ b/tools/power/cpupower/debug/kernel/cpufreq-test_tsc.c
@@ -0,0 +1,113 @@
+/*
+ * test module to check whether the TSC-based delay routine continues
+ * to work properly after cpufreq transitions. Needs ACPI to work
+ * properly.
+ *
+ * Based partly on the Power Management Timer (PMTMR) code to be found
+ * in arch/i386/kernel/timers/timer_pm.c on recent 2.6. kernels, especially
+ * code written by John Stultz. The read_pmtmr function was copied verbatim
+ * from that file.
+ *
+ * (C) 2004 Dominik Brodowski
+ *
+ * To use:
+ * 1.) pass clock=tsc to the kernel on your bootloader
+ * 2.) modprobe this module (it'll fail)
+ * 3.) change CPU frequency
+ * 4.) modprobe this module again
+ * 5.) if the third value, "diff_pmtmr", changes between 2. and 4., the
+ *     TSC-based delay routine on the Linux kernel does not correctly
+ *     handle the cpufreq transition. Please report this to
+ *     cpufreq@vger.kernel.org
+ */
+
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/delay.h>
+
+#include <asm/io.h>
+
+#include <acpi/acpi_bus.h>
+#include <acpi/acpi_drivers.h>
+
+static int pm_tmr_ioport = 0;
+
+/*helper function to safely read acpi pm timesource*/
+static u32 read_pmtmr(void)
+{
+        u32 v1=0,v2=0,v3=0;
+        /* It has been reported that because of various broken
+         * chipsets (ICH4, PIIX4 and PIIX4E) where the ACPI PM time
+         * source is not latched, so you must read it multiple
+         * times to insure a safe value is read.
+         */
+        do {
+                v1 = inl(pm_tmr_ioport);
+                v2 = inl(pm_tmr_ioport);
+                v3 = inl(pm_tmr_ioport);
+        } while ((v1 > v2 && v1 < v3) || (v2 > v3 && v2 < v1)
+                 || (v3 > v1 && v3 < v2));
+
+        /* mask the output to 24 bits */
+        return (v2 & 0xFFFFFF);
+}
+
+static int __init cpufreq_test_tsc(void)
+{
+        u32 now, then, diff;
+        u64 now_tsc, then_tsc, diff_tsc;
+        int i;
+
+        /* the following code snipped is copied from arch/x86/kernel/acpi/boot.c
+           of Linux v2.6.25. */
+
+        /* detect the location of the ACPI PM Timer */
+        if (acpi_gbl_FADT.header.revision >= FADT2_REVISION_ID) {
+                /* FADT rev. 2 */
+                if (acpi_gbl_FADT.xpm_timer_block.space_id !=
+                    ACPI_ADR_SPACE_SYSTEM_IO)
+                        return 0;
+
+                pm_tmr_ioport = acpi_gbl_FADT.xpm_timer_block.address;
+                /*
+                 * "X" fields are optional extensions to the original V1.0
+                 * fields, so we must selectively expand V1.0 fields if the
+                 * corresponding X field is zero.
+                 */
+                if (!pm_tmr_ioport)
+                        pm_tmr_ioport = acpi_gbl_FADT.pm_timer_block;
+        } else {
+                /* FADT rev. 1 */
+                pm_tmr_ioport = acpi_gbl_FADT.pm_timer_block;
+        }
+
+        printk(KERN_DEBUG "start--> \n");
+        then = read_pmtmr();
+        rdtscll(then_tsc);
+        for (i=0;i<20;i++) {
+                mdelay(100);
+                now = read_pmtmr();
+                rdtscll(now_tsc);
+                diff = (now - then) & 0xFFFFFF;
+                diff_tsc = now_tsc - then_tsc;
+                printk(KERN_DEBUG "t1: %08u t2: %08u diff_pmtmr: %08u diff_tsc: %016llu\n", then, now, diff, diff_tsc);
+                then = now;
+                then_tsc = now_tsc;
+        }
+        printk(KERN_DEBUG "<-- end \n");
+        return -ENODEV;
+}
+
+static void __exit cpufreq_none(void)
+{
+        return;
+}
+
+module_init(cpufreq_test_tsc)
+module_exit(cpufreq_none)
+
+
+MODULE_AUTHOR("Dominik Brodowski");
+MODULE_DESCRIPTION("Verify the TSC cpufreq notifier working correctly -- needs ACPI-enabled system");
+MODULE_LICENSE ("GPL");
diff --git a/tools/power/cpupower/debug/x86_64/Makefile b/tools/power/cpupower/debug/x86_64/Makefile
new file mode 100644
index 00000000000..3326217dd31
--- /dev/null
+++ b/tools/power/cpupower/debug/x86_64/Makefile
@@ -0,0 +1,14 @@
+default: all
+
+centrino-decode: ../i386/centrino-decode.c
+        $(CC) $(CFLAGS) -o $@ $<
+
+powernow-k8-decode: ../i386/powernow-k8-decode.c
+        $(CC) $(CFLAGS) -o $@ $<
+
+all: centrino-decode powernow-k8-decode
+
+clean:
+        rm -rf centrino-decode powernow-k8-decode
+
+.PHONY: all default clean
diff --git a/tools/power/cpupower/lib/cpufreq.c b/tools/power/cpupower/lib/cpufreq.c
new file mode 100644
index 00000000000..d961101d1ce
--- /dev/null
+++ b/tools/power/cpupower/lib/cpufreq.c
@@ -0,0 +1,208 @@
+/*
+ *  (C) 2004-2009  Dominik Brodowski <linux@dominikbrodowski.de>
+ *
+ *  Licensed under the terms of the GNU GPL License version 2.
+ */
+
+
+#include <stdio.h>
+#include <errno.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "cpufreq.h"
+#include "sysfs.h"
+
+int cpufreq_cpu_exists(unsigned int cpu)
+{
+        return sysfs_cpu_exists(cpu);
+}
+
+unsigned long cpufreq_get_freq_kernel(unsigned int cpu)
+{
+        return sysfs_get_freq_kernel(cpu);
+}
+
+unsigned long cpufreq_get_freq_hardware(unsigned int cpu)
+{
+        return sysfs_get_freq_hardware(cpu);
+}
+
+unsigned long cpufreq_get_transition_latency(unsigned int cpu)
+{
+        return sysfs_get_freq_transition_latency(cpu);
+}
+
+int cpufreq_get_hardware_limits(unsigned int cpu,
+                                unsigned long *min,
+                                unsigned long *max)
+{
+        if ((!min) || (!max))
+                return -EINVAL;
+        return sysfs_get_freq_hardware_limits(cpu, min, max);
+}
+
+char *cpufreq_get_driver(unsigned int cpu)
+{
+        return sysfs_get_freq_driver(cpu);
+}
+
+void cpufreq_put_driver(char *ptr)
+{
+        if (!ptr)
+                return;
+        free(ptr);
+}
+
+struct cpufreq_policy *cpufreq_get_policy(unsigned int cpu)
+{
+        return sysfs_get_freq_policy(cpu);
+}
+
+void cpufreq_put_policy(struct cpufreq_policy *policy)
+{
+        if ((!policy) || (!policy->governor))
+                return;
+
+        free(policy->governor);
+        policy->governor = NULL;
+        free(policy);
+}
+
+struct cpufreq_available_governors *cpufreq_get_available_governors(unsigned
+                                                                int cpu)
+{
+        return sysfs_get_freq_available_governors(cpu);
+}
+
+void cpufreq_put_available_governors(struct cpufreq_available_governors *any)
+{
+        struct cpufreq_available_governors *tmp, *next;
+
+        if (!any)
+                return;
+
+        tmp = any->first;
+        while (tmp) {
+                next = tmp->next;
+                if (tmp->governor)
+                        free(tmp->governor);
+                free(tmp);
+                tmp = next;
+        }
+}
+
+
+struct cpufreq_available_frequencies
+*cpufreq_get_available_frequencies(unsigned int cpu)
+{
+        return sysfs_get_available_frequencies(cpu);
+}
+
+void cpufreq_put_available_frequencies(struct cpufreq_available_frequencies
+                                *any) {
+        struct cpufreq_available_frequencies *tmp, *next;
+
+        if (!any)
+                return;
+
+        tmp = any->first;
+        while (tmp) {
+                next = tmp->next;
+                free(tmp);
+                tmp = next;
+        }
+}
+
+
+struct cpufreq_affected_cpus *cpufreq_get_affected_cpus(unsigned int cpu)
+{
+        return sysfs_get_freq_affected_cpus(cpu);
+}
+
+void cpufreq_put_affected_cpus(struct cpufreq_affected_cpus *any)
+{
+        struct cpufreq_affected_cpus *tmp, *next;
+
+        if (!any)
+                return;
+
+        tmp = any->first;
+        while (tmp) {
+                next = tmp->next;
+                free(tmp);
+                tmp = next;
+        }
+}
+
+
+struct cpufreq_affected_cpus *cpufreq_get_related_cpus(unsigned int cpu)
+{
+        return sysfs_get_freq_related_cpus(cpu);
+}
+
+void cpufreq_put_related_cpus(struct cpufreq_affected_cpus *any)
+{
+        cpufreq_put_affected_cpus(any);
+}
+
+
+int cpufreq_set_policy(unsigned int cpu, struct cpufreq_policy *policy)
+{
+        if (!policy || !(policy->governor))
+                return -EINVAL;
+
+        return sysfs_set_freq_policy(cpu, policy);
+}
+
+
+int cpufreq_modify_policy_min(unsigned int cpu, unsigned long min_freq)
+{
+        return sysfs_modify_freq_policy_min(cpu, min_freq);
+}
+
+
+int cpufreq_modify_policy_max(unsigned int cpu, unsigned long max_freq)
+{
+        return sysfs_modify_freq_policy_max(cpu, max_freq);
+}
+
+
+int cpufreq_modify_policy_governor(unsigned int cpu, char *governor)
+{
+        if ((!governor) || (strlen(governor) > 19))
+                return -EINVAL;
+
+        return sysfs_modify_freq_policy_governor(cpu, governor);
+}
+
+int cpufreq_set_frequency(unsigned int cpu, unsigned long target_frequency)
+{
+        return sysfs_set_frequency(cpu, target_frequency);
+}
+
+struct cpufreq_stats *cpufreq_get_stats(unsigned int cpu,
+                                        unsigned long long *total_time)
+{
+        return sysfs_get_freq_stats(cpu, total_time);
+}
+
+void cpufreq_put_stats(struct cpufreq_stats *any)
+{
+        struct cpufreq_stats *tmp, *next;
+
+        if (!any)
+                return;
+
+        tmp = any->first;
+        while (tmp) {
+                next = tmp->next;
+                free(tmp);
+                tmp = next;
+        }
+}
+
+unsigned long cpufreq_get_transitions(unsigned int cpu)
+{
+        return sysfs_get_freq_transitions(cpu);
+}
diff --git a/tools/power/cpupower/lib/cpufreq.h b/tools/power/cpupower/lib/cpufreq.h
new file mode 100644
index 00000000000..3aae8e7a083
--- /dev/null
+++ b/tools/power/cpupower/lib/cpufreq.h
@@ -0,0 +1,223 @@
+/*
+ *  cpufreq.h - definitions for libcpufreq
+ *
+ *  Copyright (C) 2004-2009  Dominik Brodowski <linux@dominikbrodowski.de>
+ *
+ *  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
+ */
+
+#ifndef _CPUFREQ_H
+#define _CPUFREQ_H 1
+
+struct cpufreq_policy {
+        unsigned long min;
+        unsigned long max;
+        char *governor;
+};
+
+struct cpufreq_available_governors {
+        char *governor;
+        struct cpufreq_available_governors *next;
+        struct cpufreq_available_governors *first;
+};
+
+struct cpufreq_available_frequencies {
+        unsigned long frequency;
+        struct cpufreq_available_frequencies *next;
+        struct cpufreq_available_frequencies *first;
+};
+
+
+struct cpufreq_affected_cpus {
+        unsigned int cpu;
+        struct cpufreq_affected_cpus *next;
+        struct cpufreq_affected_cpus *first;
+};
+
+struct cpufreq_stats {
+        unsigned long frequency;
+        unsigned long long time_in_state;
+        struct cpufreq_stats *next;
+        struct cpufreq_stats *first;
+};
+
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*
+ * returns 0 if the specified CPU is present (it doesn't say
+ * whether it is online!), and an error value if not.
+ */
+
+extern int cpufreq_cpu_exists(unsigned int cpu);
+
+/* determine current CPU frequency
+ * - _kernel variant means kernel's opinion of CPU frequency
+ * - _hardware variant means actual hardware CPU frequency,
+ *    which is only available to root.
+ *
+ * returns 0 on failure, else frequency in kHz.
+ */
+
+extern unsigned long cpufreq_get_freq_kernel(unsigned int cpu);
+
+extern unsigned long cpufreq_get_freq_hardware(unsigned int cpu);
+
+#define cpufreq_get(cpu) cpufreq_get_freq_kernel(cpu);
+
+
+/* determine CPU transition latency
+ *
+ * returns 0 on failure, else transition latency in 10^(-9) s = nanoseconds
+ */
+extern unsigned long cpufreq_get_transition_latency(unsigned int cpu);
+
+
+/* determine hardware CPU frequency limits
+ *
+ * These may be limited further by thermal, energy or other
+ * considerations by cpufreq policy notifiers in the kernel.
+ */
+
+extern int cpufreq_get_hardware_limits(unsigned int cpu,
+                                unsigned long *min,
+                                unsigned long *max);
+
+
+/* determine CPUfreq driver used
+ *
+ * Remember to call cpufreq_put_driver when no longer needed
+ * to avoid memory leakage, please.
+ */
+
+extern char *cpufreq_get_driver(unsigned int cpu);
+
+extern void cpufreq_put_driver(char *ptr);
+
+
+/* determine CPUfreq policy currently used
+ *
+ * Remember to call cpufreq_put_policy when no longer needed
+ * to avoid memory leakage, please.
+ */
+
+
+extern struct cpufreq_policy *cpufreq_get_policy(unsigned int cpu);
+
+extern void cpufreq_put_policy(struct cpufreq_policy *policy);
+
+
+/* determine CPUfreq governors currently available
+ *
+ * may be modified by modprobe'ing or rmmod'ing other governors. Please
+ * free allocated memory by calling cpufreq_put_available_governors
+ * after use.
+ */
+
+
+extern struct cpufreq_available_governors
+*cpufreq_get_available_governors(unsigned int cpu);
+
+extern void cpufreq_put_available_governors(
+        struct cpufreq_available_governors *first);
+
+
+/* determine CPU frequency states available
+ *
+ * Only present on _some_ ->target() cpufreq drivers. For information purposes
+ * only. Please free allocated memory by calling
+ * cpufreq_put_available_frequencies after use.
+ */
+
+extern struct cpufreq_available_frequencies
+*cpufreq_get_available_frequencies(unsigned int cpu);
+
+extern void cpufreq_put_available_frequencies(
+                struct cpufreq_available_frequencies *first);
+
+
+/* determine affected CPUs
+ *
+ * Remember to call cpufreq_put_affected_cpus when no longer needed
+ * to avoid memory leakage, please.
+ */
+
+extern struct cpufreq_affected_cpus *cpufreq_get_affected_cpus(unsigned
+                                                        int cpu);
+
+extern void cpufreq_put_affected_cpus(struct cpufreq_affected_cpus *first);
+
+
+/* determine related CPUs
+ *
+ * Remember to call cpufreq_put_related_cpus when no longer needed
+ * to avoid memory leakage, please.
+ */
+
+extern struct cpufreq_affected_cpus *cpufreq_get_related_cpus(unsigned
+                                                        int cpu);
+
+extern void cpufreq_put_related_cpus(struct cpufreq_affected_cpus *first);
+
+
+/* determine stats for cpufreq subsystem
+ *
+ * This is not available in all kernel versions or configurations.
+ */
+
+extern struct cpufreq_stats *cpufreq_get_stats(unsigned int cpu,
+                                        unsigned long long *total_time);
+
+extern void cpufreq_put_stats(struct cpufreq_stats *stats);
+
+extern unsigned long cpufreq_get_transitions(unsigned int cpu);
+
+
+/* set new cpufreq policy
+ *
+ * Tries to set the passed policy as new policy as close as possible,
+ * but results may differ depending e.g. on governors being available.
+ */
+
+extern int cpufreq_set_policy(unsigned int cpu, struct cpufreq_policy *policy);
+
+
+/* modify a policy by only changing min/max freq or governor
+ *
+ * Does not check whether result is what was intended.
+ */
+
+extern int cpufreq_modify_policy_min(unsigned int cpu, unsigned long min_freq);
+extern int cpufreq_modify_policy_max(unsigned int cpu, unsigned long max_freq);
+extern int cpufreq_modify_policy_governor(unsigned int cpu, char *governor);
+
+
+/* set a specific frequency
+ *
+ * Does only work if userspace governor can be used and no external
+ * interference (other calls to this function or to set/modify_policy)
+ * occurs. Also does not work on ->range() cpufreq drivers.
+ */
+
+extern int cpufreq_set_frequency(unsigned int cpu,
+                                unsigned long target_frequency);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _CPUFREQ_H */
diff --git a/tools/power/cpupower/lib/sysfs.c b/tools/power/cpupower/lib/sysfs.c
new file mode 100644
index 00000000000..870713a75a8
--- /dev/null
+++ b/tools/power/cpupower/lib/sysfs.c
@@ -0,0 +1,672 @@
+/*
+ *  (C) 2004-2009  Dominik Brodowski <linux@dominikbrodowski.de>
+ *
+ *  Licensed under the terms of the GNU GPL License version 2.
+ */
+
+#include <stdio.h>
+#include <errno.h>
+#include <stdlib.h>
+#include <string.h>
+#include <limits.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <unistd.h>
+
+#include "cpufreq.h"
+
+#define PATH_TO_CPU "/sys/devices/system/cpu/"
+#define MAX_LINE_LEN 4096
+#define SYSFS_PATH_MAX 255
+
+
+static unsigned int sysfs_read_file(const char *path, char *buf, size_t buflen)
+{
+        int fd;
+        ssize_t numread;
+
+        fd = open(path, O_RDONLY);
+        if (fd == -1)
+                return 0;
+
+        numread = read(fd, buf, buflen - 1);
+        if (numread < 1) {
+                close(fd);
+                return 0;
+        }
+
+        buf[numread] = '\0';
+        close(fd);
+
+        return (unsigned int) numread;
+}
+
+
+/* CPUFREQ sysfs access **************************************************/
+
+/* helper function to read file from /sys into given buffer */
+/* fname is a relative path under "cpuX/cpufreq" dir */
+static unsigned int sysfs_cpufreq_read_file(unsigned int cpu, const char *fname,
+                                            char *buf, size_t buflen)
+{
+        char path[SYSFS_PATH_MAX];
+
+        snprintf(path, sizeof(path), PATH_TO_CPU "cpu%u/cpufreq/%s",
+                         cpu, fname);
+        return sysfs_read_file(path, buf, buflen);
+}
+
+/* helper function to write a new value to a /sys file */
+/* fname is a relative path under "cpuX/cpufreq" dir */
+static unsigned int sysfs_cpufreq_write_file(unsigned int cpu,
+                                             const char *fname,
+                                             const char *value, size_t len)
+{
+        char path[SYSFS_PATH_MAX];
+        int fd;
+        ssize_t numwrite;
+
+        snprintf(path, sizeof(path), PATH_TO_CPU "cpu%u/cpufreq/%s",
+                         cpu, fname);
+
+        fd = open(path, O_WRONLY);
+        if (fd == -1)
+                return 0;
+
+        numwrite = write(fd, value, len);
+        if (numwrite < 1) {
+                close(fd);
+                return 0;
+        }
+
+        close(fd);
+
+        return (unsigned int) numwrite;
+}
+
+/* read access to files which contain one numeric value */
+
+enum cpufreq_value {
+        CPUINFO_CUR_FREQ,
+        CPUINFO_MIN_FREQ,
+        CPUINFO_MAX_FREQ,
+        CPUINFO_LATENCY,
+        SCALING_CUR_FREQ,
+        SCALING_MIN_FREQ,
+        SCALING_MAX_FREQ,
+        STATS_NUM_TRANSITIONS,
+        MAX_CPUFREQ_VALUE_READ_FILES
+};
+
+static const char *cpufreq_value_files[MAX_CPUFREQ_VALUE_READ_FILES] = {
+        [CPUINFO_CUR_FREQ] = "cpuinfo_cur_freq",
+        [CPUINFO_MIN_FREQ] = "cpuinfo_min_freq",
+        [CPUINFO_MAX_FREQ] = "cpuinfo_max_freq",
+        [CPUINFO_LATENCY]  = "cpuinfo_transition_latency",
+        [SCALING_CUR_FREQ] = "scaling_cur_freq",
+        [SCALING_MIN_FREQ] = "scaling_min_freq",
+        [SCALING_MAX_FREQ] = "scaling_max_freq",
+        [STATS_NUM_TRANSITIONS] = "stats/total_trans"
+};
+
+
+static unsigned long sysfs_cpufreq_get_one_value(unsigned int cpu,
+                                                 enum cpufreq_value which)
+{
+        unsigned long value;
+        unsigned int len;
+        char linebuf[MAX_LINE_LEN];
+        char *endp;
+
+        if (which >= MAX_CPUFREQ_VALUE_READ_FILES)
+                return 0;
+
+        len = sysfs_cpufreq_read_file(cpu, cpufreq_value_files[which],
+                                linebuf, sizeof(linebuf));
+
+        if (len == 0)
+                return 0;
+
+        value = strtoul(linebuf, &endp, 0);
+
+        if (endp == linebuf || errno == ERANGE)
+                return 0;
+
+        return value;
+}
+
+/* read access to files which contain one string */
+
+enum cpufreq_string {
+        SCALING_DRIVER,
+        SCALING_GOVERNOR,
+        MAX_CPUFREQ_STRING_FILES
+};
+
+static const char *cpufreq_string_files[MAX_CPUFREQ_STRING_FILES] = {
+        [SCALING_DRIVER] = "scaling_driver",
+        [SCALING_GOVERNOR] = "scaling_governor",
+};
+
+
+static char *sysfs_cpufreq_get_one_string(unsigned int cpu,
+                                           enum cpufreq_string which)
+{
+        char linebuf[MAX_LINE_LEN];
+        char *result;
+        unsigned int len;
+
+        if (which >= MAX_CPUFREQ_STRING_FILES)
+                return NULL;
+
+        len = sysfs_cpufreq_read_file(cpu, cpufreq_string_files[which],
+                                linebuf, sizeof(linebuf));
+        if (len == 0)
+                return NULL;
+
+        result = strdup(linebuf);
+        if (result == NULL)
+                return NULL;
+
+        if (result[strlen(result) - 1] == '\n')
+                result[strlen(result) - 1] = '\0';
+
+        return result;
+}
+
+/* write access */
+
+enum cpufreq_write {
+        WRITE_SCALING_MIN_FREQ,
+        WRITE_SCALING_MAX_FREQ,
+        WRITE_SCALING_GOVERNOR,
+        WRITE_SCALING_SET_SPEED,
+        MAX_CPUFREQ_WRITE_FILES
+};
+
+static const char *cpufreq_write_files[MAX_CPUFREQ_WRITE_FILES] = {
+        [WRITE_SCALING_MIN_FREQ] = "scaling_min_freq",
+        [WRITE_SCALING_MAX_FREQ] = "scaling_max_freq",
+        [WRITE_SCALING_GOVERNOR] = "scaling_governor",
+        [WRITE_SCALING_SET_SPEED] = "scaling_setspeed",
+};
+
+static int sysfs_cpufreq_write_one_value(unsigned int cpu,
+                                         enum cpufreq_write which,
+                                         const char *new_value, size_t len)
+{
+        if (which >= MAX_CPUFREQ_WRITE_FILES)
+                return 0;
+
+        if (sysfs_cpufreq_write_file(cpu, cpufreq_write_files[which],
+                                        new_value, len) != len)
+                return -ENODEV;
+
+        return 0;
+};
+
+unsigned long sysfs_get_freq_kernel(unsigned int cpu)
+{
+        return sysfs_cpufreq_get_one_value(cpu, SCALING_CUR_FREQ);
+}
+
+unsigned long sysfs_get_freq_hardware(unsigned int cpu)
+{
+        return sysfs_cpufreq_get_one_value(cpu, CPUINFO_CUR_FREQ);
+}
+
+unsigned long sysfs_get_freq_transition_latency(unsigned int cpu)
+{
+        return sysfs_cpufreq_get_one_value(cpu, CPUINFO_LATENCY);
+}
+
+int sysfs_get_freq_hardware_limits(unsigned int cpu,
+                              unsigned long *min,
+                              unsigned long *max)
+{
+        if ((!min) || (!max))
+                return -EINVAL;
+
+        *min = sysfs_cpufreq_get_one_value(cpu, CPUINFO_MIN_FREQ);
+        if (!*min)
+                return -ENODEV;
+
+        *max = sysfs_cpufreq_get_one_value(cpu, CPUINFO_MAX_FREQ);
+        if (!*max)
+                return -ENODEV;
+
+        return 0;
+}
+
+char *sysfs_get_freq_driver(unsigned int cpu)
+{
+        return sysfs_cpufreq_get_one_string(cpu, SCALING_DRIVER);
+}
+
+struct cpufreq_policy *sysfs_get_freq_policy(unsigned int cpu)
+{
+        struct cpufreq_policy *policy;
+
+        policy = malloc(sizeof(struct cpufreq_policy));
+        if (!policy)
+                return NULL;
+
+        policy->governor = sysfs_cpufreq_get_one_string(cpu, SCALING_GOVERNOR);
+        if (!policy->governor) {
+                free(policy);
+                return NULL;
+        }
+        policy->min = sysfs_cpufreq_get_one_value(cpu, SCALING_MIN_FREQ);
+        policy->max = sysfs_cpufreq_get_one_value(cpu, SCALING_MAX_FREQ);
+        if ((!policy->min) || (!policy->max)) {
+                free(policy->governor);
+                free(policy);
+                return NULL;
+        }
+
+        return policy;
+}
+
+struct cpufreq_available_governors *
+sysfs_get_freq_available_governors(unsigned int cpu) {
+        struct cpufreq_available_governors *first = NULL;
+        struct cpufreq_available_governors *current = NULL;
+        char linebuf[MAX_LINE_LEN];
+        unsigned int pos, i;
+        unsigned int len;
+
+        len = sysfs_cpufreq_read_file(cpu, "scaling_available_governors",
+                                linebuf, sizeof(linebuf));
+        if (len == 0)
+                return NULL;
+
+        pos = 0;
+        for (i = 0; i < len; i++) {
+                if (linebuf[i] == ' ' || linebuf[i] == '\n') {
+                        if (i - pos < 2)
+                                continue;
+                        if (current) {
+                                current->next = malloc(sizeof(*current));
+                                if (!current->next)
+                                        goto error_out;
+                                current = current->next;
+                        } else {
+                                first = malloc(sizeof(*first));
+                                if (!first)
+                                        goto error_out;
+                                current = first;
+                        }
+                        current->first = first;
+                        current->next = NULL;
+
+                        current->governor = malloc(i - pos + 1);
+                        if (!current->governor)
+                                goto error_out;
+
+                        memcpy(current->governor, linebuf + pos, i - pos);
+                        current->governor[i - pos] = '\0';
+                        pos = i + 1;
+                }
+        }
+
+        return first;
+
+ error_out:
+        while (first) {
+                current = first->next;
+                if (first->governor)
+                        free(first->governor);
+                free(first);
+                first = current;
+        }
+        return NULL;
+}
+
+
+struct cpufreq_available_frequencies *
+sysfs_get_available_frequencies(unsigned int cpu) {
+        struct cpufreq_available_frequencies *first = NULL;
+        struct cpufreq_available_frequencies *current = NULL;
+        char one_value[SYSFS_PATH_MAX];
+        char linebuf[MAX_LINE_LEN];
+        unsigned int pos, i;
+        unsigned int len;
+
+        len = sysfs_cpufreq_read_file(cpu, "scaling_available_frequencies",
+                                linebuf, sizeof(linebuf));
+        if (len == 0)
+                return NULL;
+
+        pos = 0;
+        for (i = 0; i < len; i++) {
+                if (linebuf[i] == ' ' || linebuf[i] == '\n') {
+                        if (i - pos < 2)
+                                continue;
+                        if (i - pos >= SYSFS_PATH_MAX)
+                                goto error_out;
+                        if (current) {
+                                current->next = malloc(sizeof(*current));
+                                if (!current->next)
+                                        goto error_out;
+                                current = current->next;
+                        } else {
+                                first = malloc(sizeof(*first));
+                                if (!first)
+                                        goto error_out;
+                                current = first;
+                        }
+                        current->first = first;
+                        current->next = NULL;
+
+                        memcpy(one_value, linebuf + pos, i - pos);
+                        one_value[i - pos] = '\0';
+                        if (sscanf(one_value, "%lu", &current->frequency) != 1)
+                                goto error_out;
+
+                        pos = i + 1;
+                }
+        }
+
+        return first;
+
+ error_out:
+        while (first) {
+                current = first->next;
+                free(first);
+                first = current;
+        }
+        return NULL;
+}
+
+static struct cpufreq_affected_cpus *sysfs_get_cpu_list(unsigned int cpu,
+                                                        const char *file)
+{
+        struct cpufreq_affected_cpus *first = NULL;
+        struct cpufreq_affected_cpus *current = NULL;
+        char one_value[SYSFS_PATH_MAX];
+        char linebuf[MAX_LINE_LEN];
+        unsigned int pos, i;
+        unsigned int len;
+
+        len = sysfs_cpufreq_read_file(cpu, file, linebuf, sizeof(linebuf));
+        if (len == 0)
+                return NULL;
+
+        pos = 0;
+        for (i = 0; i < len; i++) {
+                if (i == len || linebuf[i] == ' ' || linebuf[i] == '\n') {
+                        if (i - pos  < 1)
+                                continue;
+                        if (i - pos >= SYSFS_PATH_MAX)
+                                goto error_out;
+                        if (current) {
+                                current->next = malloc(sizeof(*current));
+                                if (!current->next)
+                                        goto error_out;
+                                current = current->next;
+                        } else {
+                                first = malloc(sizeof(*first));
+                                if (!first)
+                                        goto error_out;
+                                current = first;
+                        }
+                        current->first = first;
+                        current->next = NULL;
+
+                        memcpy(one_value, linebuf + pos, i - pos);
+                        one_value[i - pos] = '\0';
+
+                        if (sscanf(one_value, "%u", &current->cpu) != 1)
+                                goto error_out;
+
+                        pos = i + 1;
+                }
+        }
+
+        return first;
+
+ error_out:
+        while (first) {
+                current = first->next;
+                free(first);
+                first = current;
+        }
+        return NULL;
+}
+
+struct cpufreq_affected_cpus *sysfs_get_freq_affected_cpus(unsigned int cpu)
+{
+        return sysfs_get_cpu_list(cpu, "affected_cpus");
+}
+
+struct cpufreq_affected_cpus *sysfs_get_freq_related_cpus(unsigned int cpu)
+{
+        return sysfs_get_cpu_list(cpu, "related_cpus");
+}
+
+struct cpufreq_stats *sysfs_get_freq_stats(unsigned int cpu,
+                                        unsigned long long *total_time) {
+        struct cpufreq_stats *first = NULL;
+        struct cpufreq_stats *current = NULL;
+        char one_value[SYSFS_PATH_MAX];
+        char linebuf[MAX_LINE_LEN];
+        unsigned int pos, i;
+        unsigned int len;
+
+        len = sysfs_cpufreq_read_file(cpu, "stats/time_in_state",
+                                linebuf, sizeof(linebuf));
+        if (len == 0)
+                return NULL;
+
+        *total_time = 0;
+        pos = 0;
+        for (i = 0; i < len; i++) {
+                if (i == strlen(linebuf) || linebuf[i] == '\n') {
+                        if (i - pos < 2)
+                                continue;
+                        if ((i - pos) >= SYSFS_PATH_MAX)
+                                goto error_out;
+                        if (current) {
+                                current->next = malloc(sizeof(*current));
+                                if (!current->next)
+                                        goto error_out;
+                                current = current->next;
+                        } else {
+                                first = malloc(sizeof(*first));
+                                if (!first)
+                                        goto error_out;
+                                current = first;
+                        }
+                        current->first = first;
+                        current->next = NULL;
+
+                        memcpy(one_value, linebuf + pos, i - pos);
+                        one_value[i - pos] = '\0';
+                        if (sscanf(one_value, "%lu %llu",
+                                        &current->frequency,
+                                        &current->time_in_state) != 2)
+                                goto error_out;
+
+                        *total_time = *total_time + current->time_in_state;
+                        pos = i + 1;
+                }
+        }
+
+        return first;
+
+ error_out:
+        while (first) {
+                current = first->next;
+                free(first);
+                first = current;
+        }
+        return NULL;
+}
+
+unsigned long sysfs_get_freq_transitions(unsigned int cpu)
+{
+        return sysfs_cpufreq_get_one_value(cpu, STATS_NUM_TRANSITIONS);
+}
+
+static int verify_gov(char *new_gov, char *passed_gov)
+{
+        unsigned int i, j = 0;
+
+        if (!passed_gov || (strlen(passed_gov) > 19))
+                return -EINVAL;
+
+        strncpy(new_gov, passed_gov, 20);
+        for (i = 0; i < 20; i++) {
+                if (j) {
+                        new_gov[i] = '\0';
+                        continue;
+                }
+                if ((new_gov[i] >= 'a') && (new_gov[i] <= 'z'))
+                        continue;
+
+                if ((new_gov[i] >= 'A') && (new_gov[i] <= 'Z'))
+                        continue;
+
+                if (new_gov[i] == '-')
+                        continue;
+
+                if (new_gov[i] == '_')
+                        continue;
+
+                if (new_gov[i] == '\0') {
+                        j = 1;
+                        continue;
+                }
+                return -EINVAL;
+        }
+        new_gov[19] = '\0';
+        return 0;
+}
+
+int sysfs_modify_freq_policy_governor(unsigned int cpu, char *governor)
+{
+        char new_gov[SYSFS_PATH_MAX];
+
+        if (!governor)
+                return -EINVAL;
+
+        if (verify_gov(new_gov, governor))
+                return -EINVAL;
+
+        return sysfs_cpufreq_write_one_value(cpu, WRITE_SCALING_GOVERNOR,
+                                             new_gov, strlen(new_gov));
+};
+
+int sysfs_modify_freq_policy_max(unsigned int cpu, unsigned long max_freq)
+{
+        char value[SYSFS_PATH_MAX];
+
+        snprintf(value, SYSFS_PATH_MAX, "%lu", max_freq);
+
+        return sysfs_cpufreq_write_one_value(cpu, WRITE_SCALING_MAX_FREQ,
+                                             value, strlen(value));
+};
+
+
+int sysfs_modify_freq_policy_min(unsigned int cpu, unsigned long min_freq)
+{
+        char value[SYSFS_PATH_MAX];
+
+        snprintf(value, SYSFS_PATH_MAX, "%lu", min_freq);
+
+        return sysfs_cpufreq_write_one_value(cpu, WRITE_SCALING_MIN_FREQ,
+                                             value, strlen(value));
+};
+
+
+int sysfs_set_freq_policy(unsigned int cpu, struct cpufreq_policy *policy)
+{
+        char min[SYSFS_PATH_MAX];
+        char max[SYSFS_PATH_MAX];
+        char gov[SYSFS_PATH_MAX];
+        int ret;
+        unsigned long old_min;
+        int write_max_first;
+
+        if (!policy || !(policy->governor))
+                return -EINVAL;
+
+        if (policy->max < policy->min)
+                return -EINVAL;
+
+        if (verify_gov(gov, policy->governor))
+                return -EINVAL;
+
+        snprintf(min, SYSFS_PATH_MAX, "%lu", policy->min);
+        snprintf(max, SYSFS_PATH_MAX, "%lu", policy->max);
+
+        old_min = sysfs_cpufreq_get_one_value(cpu, SCALING_MIN_FREQ);
+        write_max_first = (old_min && (policy->max < old_min) ? 0 : 1);
+
+        if (write_max_first) {
+                ret = sysfs_cpufreq_write_one_value(cpu, WRITE_SCALING_MAX_FREQ,
+                                                    max, strlen(max));
+                if (ret)
+                        return ret;
+        }
+
+        ret = sysfs_cpufreq_write_one_value(cpu, WRITE_SCALING_MIN_FREQ, min,
+                                            strlen(min));
+        if (ret)
+                return ret;
+
+        if (!write_max_first) {
+                ret = sysfs_cpufreq_write_one_value(cpu, WRITE_SCALING_MAX_FREQ,
+                                                    max, strlen(max));
+                if (ret)
+                        return ret;
+        }
+
+        return sysfs_cpufreq_write_one_value(cpu, WRITE_SCALING_GOVERNOR,
+                                             gov, strlen(gov));
+}
+
+int sysfs_set_frequency(unsigned int cpu, unsigned long target_frequency)
+{
+        struct cpufreq_policy *pol = sysfs_get_freq_policy(cpu);
+        char userspace_gov[] = "userspace";
+        char freq[SYSFS_PATH_MAX];
+        int ret;
+
+        if (!pol)
+                return -ENODEV;
+
+        if (strncmp(pol->governor, userspace_gov, 9) != 0) {
+                ret = sysfs_modify_freq_policy_governor(cpu, userspace_gov);
+                if (ret) {
+                        cpufreq_put_policy(pol);
+                        return ret;
+                }
+        }
+
+        cpufreq_put_policy(pol);
+
+        snprintf(freq, SYSFS_PATH_MAX, "%lu", target_frequency);
+
+        return sysfs_cpufreq_write_one_value(cpu, WRITE_SCALING_SET_SPEED,
+                                             freq, strlen(freq));
+}
+
+/* CPUFREQ sysfs access **************************************************/
+
+/* General sysfs access **************************************************/
+int sysfs_cpu_exists(unsigned int cpu)
+{
+        char file[SYSFS_PATH_MAX];
+        struct stat statbuf;
+
+        snprintf(file, SYSFS_PATH_MAX, PATH_TO_CPU "cpu%u/", cpu);
+
+        if (stat(file, &statbuf) != 0)
+                return -ENOSYS;
+
+        return S_ISDIR(statbuf.st_mode) ? 0 : -ENOSYS;
+}
+
+/* General sysfs access **************************************************/
diff --git a/tools/power/cpupower/lib/sysfs.h b/tools/power/cpupower/lib/sysfs.h
new file mode 100644
index 00000000000..c76a5e0af50
--- /dev/null
+++ b/tools/power/cpupower/lib/sysfs.h
@@ -0,0 +1,31 @@
+/* General */
+extern unsigned int sysfs_cpu_exists(unsigned int cpu);
+
+/* CPUfreq */
+extern unsigned long sysfs_get_freq_kernel(unsigned int cpu);
+extern unsigned long sysfs_get_freq_hardware(unsigned int cpu);
+extern unsigned long sysfs_get_freq_transition_latency(unsigned int cpu);
+extern int sysfs_get_freq_hardware_limits(unsigned int cpu,
+                                        unsigned long *min, unsigned long *max);
+extern char *sysfs_get_freq_driver(unsigned int cpu);
+extern struct cpufreq_policy *sysfs_get_freq_policy(unsigned int cpu);
+extern struct cpufreq_available_governors *sysfs_get_freq_available_governors(
+        unsigned int cpu);
+extern struct cpufreq_available_frequencies *sysfs_get_available_frequencies(
+        unsigned int cpu);
+extern struct cpufreq_affected_cpus *sysfs_get_freq_affected_cpus(
+        unsigned int cpu);
+extern struct cpufreq_affected_cpus *sysfs_get_freq_related_cpus(
+        unsigned int cpu);
+extern struct cpufreq_stats *sysfs_get_freq_stats(unsigned int cpu,
+                                                unsigned long long *total_time);
+extern unsigned long sysfs_get_freq_transitions(unsigned int cpu);
+extern int sysfs_set_freq_policy(unsigned int cpu,
+                                struct cpufreq_policy *policy);
+extern int sysfs_modify_freq_policy_min(unsigned int cpu,
+                                        unsigned long min_freq);
+extern int sysfs_modify_freq_policy_max(unsigned int cpu,
+                                        unsigned long max_freq);
+extern int sysfs_modify_freq_policy_governor(unsigned int cpu, char *governor);
+extern int sysfs_set_frequency(unsigned int cpu,
+                        unsigned long target_frequency);
diff --git a/tools/power/cpupower/man/cpupower-frequency-info.1 b/tools/power/cpupower/man/cpupower-frequency-info.1
new file mode 100644
index 00000000000..bb60a8d1e45
--- /dev/null
+++ b/tools/power/cpupower/man/cpupower-frequency-info.1
@@ -0,0 +1,76 @@
+.TH "cpupower-frequency-info" "1" "0.1" "Mattia Dongili" ""
+.SH "NAME"
+.LP 
+cpupower frequency\-info \- Utility to retrieve cpufreq kernel information
+.SH "SYNTAX"
+.LP 
+cpupower [ \-c cpulist ] frequency\-info [\fIoptions\fP]
+.SH "DESCRIPTION"
+.LP 
+A small tool which prints out cpufreq information helpful to developers and interested users.
+.SH "OPTIONS"
+.LP 
+.TP  
+\fB\-e\fR \fB\-\-debug\fR
+Prints out debug information.
+.TP  
+\fB\-f\fR \fB\-\-freq\fR
+Get frequency the CPU currently runs at, according to the cpufreq core.
+.TP  
+\fB\-w\fR \fB\-\-hwfreq\fR
+Get frequency the CPU currently runs at, by reading it from hardware (only available to root).
+.TP  
+\fB\-l\fR \fB\-\-hwlimits\fR
+Determine the minimum and maximum CPU frequency allowed.
+.TP  
+\fB\-d\fR \fB\-\-driver\fR
+Determines the used cpufreq kernel driver.
+.TP  
+\fB\-p\fR \fB\-\-policy\fR
+Gets the currently used cpufreq policy.
+.TP  
+\fB\-g\fR \fB\-\-governors\fR
+Determines available cpufreq governors.
+.TP  
+\fB\-a\fR \fB\-\-related\-cpus\fR
+Determines which CPUs run at the same hardware frequency.
+.TP  
+\fB\-a\fR \fB\-\-affected\-cpus\fR
+Determines which CPUs need to have their frequency coordinated by software.
+.TP  
+\fB\-s\fR \fB\-\-stats\fR
+Shows cpufreq statistics if available.
+.TP  
+\fB\-y\fR \fB\-\-latency\fR
+Determines the maximum latency on CPU frequency changes.
+.TP  
+\fB\-o\fR \fB\-\-proc\fR
+Prints out information like provided by the /proc/cpufreq interface in 2.4. and early 2.6. kernels.
+.TP  
+\fB\-m\fR \fB\-\-human\fR
+human\-readable output for the \-f, \-w, \-s and \-y parameters.
+.TP  
+\fB\-h\fR \fB\-\-help\fR
+Prints out the help screen.
+.SH "REMARKS"
+.LP 
+By default only values of core zero are displayed. How to display settings of
+other cores is described in the cpupower(1) manpage in the \-\-cpu option section.
+.LP 
+You can't specify more than one of the output specific options \-o \-e \-a \-g \-p \-d \-l \-w \-f \-y.
+.LP 
+You also can't specify the \-o option combined with the \-c option.
+.SH "FILES"
+.nf 
+\fI/sys/devices/system/cpu/cpu*/cpufreq/\fP  
+\fI/proc/cpufreq\fP (deprecated) 
+\fI/proc/sys/cpu/\fP (deprecated)
+.fi 
+.SH "AUTHORS"
+.nf
+Dominik Brodowski <linux@brodo.de> \- author 
+Mattia Dongili<malattia@gmail.com> \- first autolibtoolization
+.fi
+.SH "SEE ALSO"
+.LP 
+cpupower\-frequency\-set(1), cpupower(1)
diff --git a/tools/power/cpupower/man/cpupower-frequency-set.1 b/tools/power/cpupower/man/cpupower-frequency-set.1
new file mode 100644
index 00000000000..685f469093a
--- /dev/null
+++ b/tools/power/cpupower/man/cpupower-frequency-set.1
@@ -0,0 +1,54 @@
+.TH "cpupower-freqency-set" "1" "0.1" "Mattia Dongili" ""
+.SH "NAME"
+.LP 
+cpupower frequency\-set \- A small tool which allows to modify cpufreq settings.
+.SH "SYNTAX"
+.LP 
+cpupower [ \-c cpu ] frequency\-set [\fIoptions\fP]
+.SH "DESCRIPTION"
+.LP 
+cpupower frequency\-set allows you to modify cpufreq settings without having to type e.g. "/sys/devices/system/cpu/cpu0/cpufreq/scaling_set_speed" all the time.
+.SH "OPTIONS"
+.LP 
+.TP 
+\fB\-d\fR \fB\-\-min\fR <FREQ>
+new minimum CPU frequency the governor may select.
+.TP 
+\fB\-u\fR \fB\-\-max\fR <FREQ>
+new maximum CPU frequency the governor may select.
+.TP 
+\fB\-g\fR \fB\-\-governor\fR <GOV>
+new cpufreq governor.
+.TP 
+\fB\-f\fR \fB\-\-freq\fR <FREQ>
+specific frequency to be set. Requires userspace governor to be available and loaded.
+.TP 
+\fB\-r\fR \fB\-\-related\fR
+modify all hardware-related CPUs at the same time
+.TP 
+\fB\-h\fR \fB\-\-help\fR
+Prints out the help screen.
+.SH "REMARKS"
+.LP 
+By default values are applied on all cores. How to modify single core
+configurations is described in the cpupower(1) manpage in the \-\-cpu option section.
+.LP 
+The \-f FREQ, \-\-freq FREQ parameter cannot be combined with any other parameter.
+.LP 
+FREQuencies can be passed in Hz, kHz (default), MHz, GHz, or THz by postfixing the value with the wanted unit name, without any space (frequency in kHz =^ Hz * 0.001 =^ MHz * 1000 =^ GHz * 1000000).
+.LP 
+On Linux kernels up to 2.6.29, the \-r or \-\-related parameter is ignored.
+.SH "FILES" 
+.nf
+\fI/sys/devices/system/cpu/cpu*/cpufreq/\fP  
+\fI/proc/cpufreq\fP (deprecated) 
+\fI/proc/sys/cpu/\fP (deprecated)
+.fi 
+.SH "AUTHORS"
+.nf 
+Dominik Brodowski <linux@brodo.de> \- author 
+Mattia Dongili<malattia@gmail.com> \- first autolibtoolization
+.fi
+.SH "SEE ALSO"
+.LP 
+cpupower\-frequency\-info(1), cpupower(1)
diff --git a/tools/power/cpupower/man/cpupower-info.1 b/tools/power/cpupower/man/cpupower-info.1
new file mode 100644
index 00000000000..58e21196f17
--- /dev/null
+++ b/tools/power/cpupower/man/cpupower-info.1
@@ -0,0 +1,19 @@
+.TH CPUPOWER\-INFO "1" "22/02/2011" "" "cpupower Manual"
+.SH NAME
+cpupower\-info \- Shows processor power related kernel or hardware configurations
+.SH SYNOPSIS
+.ft B
+.B cpupower info [ \-b ] [ \-s ] [ \-m ]
+
+.SH DESCRIPTION
+\fBcpupower info \fP shows kernel configurations or processor hardware
+registers affecting processor power saving policies.
+
+Some options are platform wide, some affect single cores. By default values
+of core zero are displayed only. cpupower --cpu all cpuinfo will show the
+settings of all cores, see cpupower(1) how to choose specific cores.
+
+.SH "SEE ALSO"
+Options are described in detail in:
+
+cpupower(1), cpupower-set(1)
diff --git a/tools/power/cpupower/man/cpupower-monitor.1 b/tools/power/cpupower/man/cpupower-monitor.1
new file mode 100644
index 00000000000..d5cfa265c3d
--- /dev/null
+++ b/tools/power/cpupower/man/cpupower-monitor.1
@@ -0,0 +1,179 @@
+.TH CPUPOWER\-MONITOR "1" "22/02/2011" "" "cpupower Manual"
+.SH NAME
+cpupower\-monitor \- Report processor frequency and idle statistics
+.SH SYNOPSIS
+.ft B
+.B cpupower monitor
+.RB "\-l"
+
+.B cpupower monitor
+.RB [ "\-m <mon1>," [ "<mon2>,..." ] ]
+.RB [ "\-i seconds" ]
+.br
+.B cpupower monitor
+.RB [ "\-m <mon1>," [ "<mon2>,..." ] ]
+.RB command
+.br
+.SH DESCRIPTION
+\fBcpupower-monitor \fP reports processor topology, frequency and idle power
+state statistics. Either \fBcommand\fP is forked and
+statistics are printed upon its completion, or statistics are printed periodically.
+
+\fBcpupower-monitor \fP implements independent processor sleep state and
+frequency counters. Some are retrieved from kernel statistics, some are
+directly reading out hardware registers. Use \-l to get an overview which are
+supported on your system.
+
+.SH Options
+.PP
+\-l
+.RS 4
+List available monitors on your system. Additional details about each monitor
+are shown:
+.RS 2
+.IP \(bu
+The name in quotation marks which can be passed to the \-m parameter.
+.IP \(bu
+The number of different counters the monitor supports in brackets.
+.IP \(bu
+The amount of time in seconds the counters might overflow, due to
+implementation constraints.
+.IP \(bu
+The name and a description of each counter and its processor hierarchy level
+coverage in square brackets:
+.RS 4
+.IP \(bu
+[T] \-> Thread
+.IP \(bu
+[C] \-> Core
+.IP \(bu
+[P] \-> Processor Package (Socket)
+.IP \(bu
+[M] \-> Machine/Platform wide counter
+.RE
+.RE
+.RE
+.PP
+\-m <mon1>,<mon2>,...
+.RS 4
+Only display specific monitors. Use the monitor string(s) provided by \-l option.
+.RE
+.PP
+\-i seconds
+.RS 4
+Measure intervall.
+.RE
+.PP
+command
+.RS 4
+Measure idle and frequency characteristics of an arbitrary command/workload.
+The executable \fBcommand\fP is forked and upon its exit, statistics gathered since it was
+forked are displayed.
+.RE
+.PP
+\-v
+.RS 4
+Increase verbosity if the binary was compiled with the DEBUG option set.
+.RE
+
+.SH MONITOR DESCRIPTIONS
+.SS "Idle_Stats"
+Shows statistics of the cpuidle kernel subsystem. Values are retrieved from
+/sys/devices/system/cpu/cpu*/cpuidle/state*/.
+The kernel updates these values every time an idle state is entered or
+left. Therefore there can be some inaccuracy when cores are in an idle
+state for some time when the measure starts or ends. In worst case it can happen
+that one core stayed in an idle state for the whole measure time and the idle
+state usage time as exported by the kernel did not get updated. In this case
+a state residency of 0 percent is shown while it was 100.
+
+.SS "Mperf"
+The name comes from the aperf/mperf (average and maximum) MSR registers used
+which are available on recent X86 processors. It shows the average frequency
+(including boost frequencies).
+The fact that on all recent hardware the mperf timer stops ticking in any idle
+state it is also used to show C0 (processor is active) and Cx (processor is in
+any sleep state) times. These counters do not have the inaccuracy restrictions
+the "Idle_Stats" counters may show.
+May work poorly on Linux-2.6.20 through 2.6.29, as the \fBacpi-cpufreq \fP
+kernel frequency driver periodically cleared aperf/mperf registers in those
+kernels.
+
+.SS "Nehalem" "SandyBridge"
+Intel Core and Package sleep state counters.
+Threads (hyperthreaded cores) may not be able to enter deeper core states if
+its sibling is utilized.
+Deepest package sleep states may in reality show up as machine/platform wide
+sleep states and can only be entered if all cores are idle. Look up Intel
+manuals (some are provided in the References section) for further details.
+
+.SS "Ontario" "Liano"
+AMD laptop and desktop processor (family 12h and 14h) sleep state counters.
+The registers are accessed via PCI and therefore can still be read out while
+cores have been offlined.
+
+There is one special counter: NBP1 (North Bridge P1).
+This one always returns 0 or 1, depending on whether the North Bridge P1
+power state got entered at least once during measure time.
+Being able to enter NBP1 state also depends on graphics power management.
+Therefore this counter can be used to verify whether the graphics' driver
+power management is working as expected.
+
+.SH EXAMPLES
+
+cpupower monitor -l" may show:
+.RS 4
+Monitor "Mperf" (3 states) \- Might overflow after 922000000 s
+
+   ...
+
+Monitor "Idle_Stats" (3 states) \- Might overflow after 4294967295 s
+
+   ...
+
+.RE
+cpupower monitor \-m "Idle_Stats,Mperf" scp /tmp/test /nfs/tmp
+
+Monitor the scp command, show both Mperf and Idle_Stats states counter
+statistics, but in exchanged order.
+
+
+
+.RE
+Be careful that the typical command to fully utilize one CPU by doing:
+
+cpupower monitor cat /dev/zero >/dev/null
+
+Does not work as expected, because the measured output is redirected to
+/dev/null. This could get workarounded by putting the line into an own, tiny
+shell script. Hit CTRL\-c to terminate the command and get the measure output
+displayed.
+
+.SH REFERENCES
+"BIOS and Kernel Developer’s Guide (BKDG) for AMD Family 14h Processors"
+http://support.amd.com/us/Processor_TechDocs/43170.pdf
+
+"Intel® Turbo Boost Technology
+in Intel® Core™ Microarchitecture (Nehalem) Based Processors"
+http://download.intel.com/design/processor/applnots/320354.pdf
+
+"Intel® 64 and IA-32 Architectures Software Developer's Manual
+Volume 3B: System Programming Guide"
+http://www.intel.com/products/processor/manuals
+
+.SH FILES
+.ta
+.nf
+/dev/cpu/*/msr
+/sys/devices/system/cpu/cpu*/cpuidle/state*/.
+.fi
+
+.SH "SEE ALSO"
+powertop(8), msr(4), vmstat(8)
+.PP
+.SH AUTHORS
+.nf
+Written by Thomas Renninger <trenn@suse.de>
+
+Nehalem, SandyBridge monitors and command passing
+based on turbostat.8 from Len Brown <len.brown@intel.com>
diff --git a/tools/power/cpupower/man/cpupower-set.1 b/tools/power/cpupower/man/cpupower-set.1
new file mode 100644
index 00000000000..c4954a9fe4e
--- /dev/null
+++ b/tools/power/cpupower/man/cpupower-set.1
@@ -0,0 +1,103 @@
+.TH CPUPOWER\-SET "1" "22/02/2011" "" "cpupower Manual"
+.SH NAME
+cpupower\-set \- Set processor power related kernel or hardware configurations
+.SH SYNOPSIS
+.ft B
+.B cpupower set [ \-b VAL ] [ \-s VAL ] [ \-m VAL ]
+
+
+.SH DESCRIPTION
+\fBcpupower set \fP sets kernel configurations or directly accesses hardware
+registers affecting processor power saving policies.
+
+Some options are platform wide, some affect single cores. By default values
+are applied on all cores. How to modify single core configurations is
+described in the cpupower(1) manpage in the \-\-cpu option section. Whether an
+option affects the whole system or can be applied to individual cores is
+described in the Options sections.
+
+Use \fBcpupower info \fP to read out current settings and whether they are
+supported on the system at all.
+
+.SH Options
+.PP
+\-\-perf-bias, \-b
+.RS 4
+Sets a register on supported Intel processore which allows software to convey
+its policy for the relative importance of performance versus energy savings to
+the  processor.
+
+The range of valid numbers is 0-15, where 0 is maximum
+performance and 15 is maximum energy efficiency.
+
+The processor uses this information in model-specific ways
+when it must select trade-offs between performance and
+energy efficiency.
+
+This policy hint does not supersede Processor Performance states
+(P-states) or CPU Idle power states (C-states), but allows
+software to have influence where it would otherwise be unable
+to express a preference.
+
+For example, this setting may tell the hardware how
+aggressively or conservatively to control frequency
+in the "turbo range" above the explicitly OS-controlled
+P-state frequency range.  It may also tell the hardware
+how aggressively it should enter the OS requested C-states.
+
+This option can be applied to individual cores only via the \-\-cpu option,
+cpupower(1).
+
+Setting the performance bias value on one CPU can modify the setting on
+related CPUs as well (for example all CPUs on one socket), because of
+hardware restrictions.
+Use \fBcpupower -c all info -b\fP to verify.
+
+This options needs the msr kernel driver (CONFIG_X86_MSR) loaded.
+.RE
+.PP
+\-\-sched\-mc,  \-m [ VAL ]
+.RE
+\-\-sched\-smt, \-s [ VAL ]
+.RS 4
+\-\-sched\-mc utilizes cores in one processor package/socket first before
+processes are scheduled to other processor packages/sockets.
+
+\-\-sched\-smt utilizes thread siblings of one processor core first before
+processes are scheduled to other cores.
+
+The impact on power consumption and performance (positiv or negativ) heavily
+depends on processor support for deep sleep states, frequency scaling and
+frequency boost modes and their dependencies between other thread siblings
+and processor cores.
+
+Taken over from kernel documentation:
+
+Adjust the kernel's multi-core scheduler support.
+
+Possible values are:
+.RS 2
+0 - No power saving load balance (default value)
+
+1 - Fill one thread/core/package first for long running threads
+
+2 - Also bias task wakeups to semi-idle cpu package for power
+savings
+.RE
+
+sched_mc_power_savings is dependent upon SCHED_MC, which is
+itself architecture dependent.
+
+sched_smt_power_savings is dependent upon SCHED_SMT, which
+is itself architecture dependent.
+
+The two files are independent of each other. It is possible
+that one file may be present without the other.
+
+.SH "SEE ALSO"
+cpupower-info(1), cpupower-monitor(1), powertop(1)
+.PP
+.SH AUTHORS
+.nf
+\-\-perf\-bias parts written by Len Brown <len.brown@intel.com>
+Thomas Renninger <trenn@suse.de>
diff --git a/tools/power/cpupower/man/cpupower.1 b/tools/power/cpupower/man/cpupower.1
new file mode 100644
index 00000000000..baf741d06e8
--- /dev/null
+++ b/tools/power/cpupower/man/cpupower.1
@@ -0,0 +1,72 @@
+.TH CPUPOWER "1" "07/03/2011" "" "cpupower Manual"
+.SH NAME
+cpupower \- Shows and sets processor power related values
+.SH SYNOPSIS
+.ft B
+.B cpupower [ \-c cpulist ] <command> [ARGS]
+
+.B cpupower \-v|\-\-version
+
+.B cpupower \-h|\-\-help
+
+.SH DESCRIPTION
+\fBcpupower \fP is a collection of tools to examine and tune power saving
+related features of your processor.
+
+The manpages of the commands (cpupower\-<command>(1)) provide detailed
+descriptions of supported features. Run \fBcpupower help\fP to get an overview
+of supported commands.
+
+.SH Options
+.PP
+\-\-help, \-h
+.RS 4
+Shows supported commands and general usage.
+.RE
+.PP
+\-\-cpu cpulist,  \-c cpulist
+.RS 4
+Only show or set values for specific cores.
+This option is not supported by all commands, details can be found in the
+manpages of the commands.
+
+Some commands access all cores (typically the *\-set commands), some only
+the first core (typically the *\-info commands) by default.
+
+The syntax for <cpulist> is based on how the kernel exports CPU bitmasks via
+sysfs files. Some examples:
+.RS 4
+.TP 16
+Input
+Equivalent to
+.TP
+all
+all cores
+.TP
+0\-3
+0,1,2,3
+.TP
+0\-7:2
+0,2,4,6
+.TP
+1,3,5-7
+1,3,5,6,7
+.TP
+0\-3:2,8\-15:4
+0,2,8,12        
+.RE
+.RE
+.PP
+\-\-version,  \-v
+.RS 4
+Print the package name and version number.
+
+.SH "SEE ALSO"
+cpupower-set(1), cpupower-info(1), cpupower-idle(1),
+cpupower-frequency-set(1), cpupower-frequency-info(1), cpupower-monitor(1),
+powertop(1)
+.PP
+.SH AUTHORS
+.nf
+\-\-perf\-bias parts written by Len Brown <len.brown@intel.com>
+Thomas Renninger <trenn@suse.de>
diff --git a/tools/power/cpupower/po/cs.po b/tools/power/cpupower/po/cs.po
new file mode 100644
index 00000000000..cb22c45c506
--- /dev/null
+++ b/tools/power/cpupower/po/cs.po
@@ -0,0 +1,944 @@
+# translation of cs.po to Czech
+# Czech translation for cpufrequtils package
+# Czech messages for cpufrequtils.
+# Copyright (C) 2007 kavol
+# This file is distributed under the same license as the cpufrequtils package.
+#
+# Karel Volný <kavol@seznam.cz>, 2007, 2008.
+msgid ""
+msgstr ""
+"Project-Id-Version: cs\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-03-08 17:03+0100\n"
+"PO-Revision-Date: 2008-06-11 16:26+0200\n"
+"Last-Translator: Karel Volný <kavol@seznam.cz>\n"
+"Language-Team: Czech <diskuze@lists.l10n.cz>\n"
+"Language: cs\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms:  nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"X-Generator: KBabel 1.11.4\n"
+
+#: utils/idle_monitor/nhm_idle.c:36
+msgid "Processor Core C3"
+msgstr ""
+
+#: utils/idle_monitor/nhm_idle.c:43
+msgid "Processor Core C6"
+msgstr ""
+
+#: utils/idle_monitor/nhm_idle.c:51
+msgid "Processor Package C3"
+msgstr ""
+
+#: utils/idle_monitor/nhm_idle.c:58 utils/idle_monitor/amd_fam14h_idle.c:70
+msgid "Processor Package C6"
+msgstr ""
+
+#: utils/idle_monitor/snb_idle.c:33
+msgid "Processor Core C7"
+msgstr ""
+
+#: utils/idle_monitor/snb_idle.c:40
+msgid "Processor Package C2"
+msgstr ""
+
+#: utils/idle_monitor/snb_idle.c:47
+msgid "Processor Package C7"
+msgstr ""
+
+#: utils/idle_monitor/amd_fam14h_idle.c:56
+msgid "Package in sleep state (PC1 or deeper)"
+msgstr ""
+
+#: utils/idle_monitor/amd_fam14h_idle.c:63
+msgid "Processor Package C1"
+msgstr ""
+
+#: utils/idle_monitor/amd_fam14h_idle.c:77
+msgid "North Bridge P1 boolean counter (returns 0 or 1)"
+msgstr ""
+
+#: utils/idle_monitor/mperf_monitor.c:35
+msgid "Processor Core not idle"
+msgstr ""
+
+#: utils/idle_monitor/mperf_monitor.c:42
+msgid "Processor Core in an idle state"
+msgstr ""
+
+#: utils/idle_monitor/mperf_monitor.c:50
+msgid "Average Frequency (including boost) in MHz"
+msgstr ""
+
+#: utils/idle_monitor/cpupower-monitor.c:66
+#, c-format
+msgid ""
+"cpupower monitor: [-h] [ [-t] | [-l] | [-m <mon1>,[<mon2>] ] ] [-i "
+"interval_sec | -c command ...]\n"
+msgstr ""
+
+#: utils/idle_monitor/cpupower-monitor.c:69
+#, c-format
+msgid ""
+"cpupower monitor: [-v] [-h] [ [-t] | [-l] | [-m <mon1>,[<mon2>] ] ] [-i "
+"interval_sec | -c command ...]\n"
+msgstr ""
+
+#: utils/idle_monitor/cpupower-monitor.c:71
+#, c-format
+msgid "\t -v: be more verbose\n"
+msgstr ""
+
+#: utils/idle_monitor/cpupower-monitor.c:73
+#, c-format
+msgid "\t -h: print this help\n"
+msgstr ""
+
+#: utils/idle_monitor/cpupower-monitor.c:74
+#, c-format
+msgid "\t -i: time intervall to measure for in seconds (default 1)\n"
+msgstr ""
+
+#: utils/idle_monitor/cpupower-monitor.c:75
+#, c-format
+msgid "\t -t: show CPU topology/hierarchy\n"
+msgstr ""
+
+#: utils/idle_monitor/cpupower-monitor.c:76
+#, c-format
+msgid "\t -l: list available CPU sleep monitors (for use with -m)\n"
+msgstr ""
+
+#: utils/idle_monitor/cpupower-monitor.c:77
+#, c-format
+msgid "\t -m: show specific CPU sleep monitors only (in same order)\n"
+msgstr ""
+
+#: utils/idle_monitor/cpupower-monitor.c:79
+#, c-format
+msgid ""
+"only one of: -t, -l, -m are allowed\n"
+"If none of them is passed,"
+msgstr ""
+
+#: utils/idle_monitor/cpupower-monitor.c:80
+#, c-format
+msgid " all supported monitors are shown\n"
+msgstr ""
+
+#: utils/idle_monitor/cpupower-monitor.c:197
+#, c-format
+msgid "Monitor %s, Counter %s has no count function. Implementation error\n"
+msgstr ""
+
+#: utils/idle_monitor/cpupower-monitor.c:207
+#, c-format
+msgid " *is offline\n"
+msgstr ""
+
+#: utils/idle_monitor/cpupower-monitor.c:236
+#, c-format
+msgid "%s: max monitor name length (%d) exceeded\n"
+msgstr ""
+
+#: utils/idle_monitor/cpupower-monitor.c:250
+#, c-format
+msgid "No matching monitor found in %s, try -l option\n"
+msgstr ""
+
+#: utils/idle_monitor/cpupower-monitor.c:266
+#, c-format
+msgid "Monitor \"%s\" (%d states) - Might overflow after %u s\n"
+msgstr ""
+
+#: utils/idle_monitor/cpupower-monitor.c:319
+#, c-format
+msgid "%s took %.5f seconds and exited with status %d\n"
+msgstr ""
+
+#: utils/idle_monitor/cpupower-monitor.c:406
+#, c-format
+msgid "Cannot read number of available processors\n"
+msgstr ""
+
+#: utils/idle_monitor/cpupower-monitor.c:417
+#, c-format
+msgid "Available monitor %s needs root access\n"
+msgstr ""
+
+#: utils/idle_monitor/cpupower-monitor.c:428
+#, c-format
+msgid "No HW Cstate monitors found\n"
+msgstr ""
+
+#: utils/cpupower.c:78
+#, c-format
+msgid "cpupower [ -c cpulist ] subcommand [ARGS]\n"
+msgstr ""
+
+#: utils/cpupower.c:79
+#, c-format
+msgid "cpupower --version\n"
+msgstr ""
+
+#: utils/cpupower.c:80
+#, c-format
+msgid "Supported subcommands are:\n"
+msgstr ""
+
+#: utils/cpupower.c:83
+#, c-format
+msgid ""
+"\n"
+"Some subcommands can make use of the -c cpulist option.\n"
+msgstr ""
+
+#: utils/cpupower.c:84
+#, c-format
+msgid "Look at the general cpupower manpage how to use it\n"
+msgstr ""
+
+#: utils/cpupower.c:85
+#, c-format
+msgid "and read up the subcommand's manpage whether it is supported.\n"
+msgstr ""
+
+#: utils/cpupower.c:86
+#, c-format
+msgid ""
+"\n"
+"Use cpupower help subcommand for getting help for above subcommands.\n"
+msgstr ""
+
+#: utils/cpupower.c:91
+#, c-format
+msgid "Report errors and bugs to %s, please.\n"
+msgstr ""
+"Chyby v programu prosím hlaste na %s (anglicky).\n"
+"Chyby v překladu prosím hlaste na kavol@seznam.cz (�esky ;-)\n"
+
+#: utils/cpupower.c:114
+#, c-format
+msgid "Error parsing cpu list\n"
+msgstr ""
+
+#: utils/cpupower.c:172
+#, c-format
+msgid "Subcommand %s needs root privileges\n"
+msgstr ""
+
+#: utils/cpufreq-info.c:31
+#, c-format
+msgid "Couldn't count the number of CPUs (%s: %s), assuming 1\n"
+msgstr "Nelze zjistit po�et CPU (%s: %s), předpokládá se 1.\n"
+
+#: utils/cpufreq-info.c:63
+#, c-format
+msgid ""
+"          minimum CPU frequency  -  maximum CPU frequency  -  governor\n"
+msgstr ""
+"         minimální frekvence CPU - maximální frekvence CPU -  regulátor\n"
+
+#: utils/cpufreq-info.c:151
+#, c-format
+msgid "Error while evaluating Boost Capabilities on CPU %d -- are you root?\n"
+msgstr ""
+
+#. P state changes via MSR are identified via cpuid 80000007
+#. on Intel and AMD, but we assume boost capable machines can do that
+#. if (cpuid_eax(0x80000000) >= 0x80000007
+#. && (cpuid_edx(0x80000007) & (1 << 7)))
+#.
+#: utils/cpufreq-info.c:161
+#, c-format
+msgid "  boost state support: \n"
+msgstr ""
+
+#: utils/cpufreq-info.c:163
+#, c-format
+msgid "    Supported: %s\n"
+msgstr ""
+
+#: utils/cpufreq-info.c:163 utils/cpufreq-info.c:164
+msgid "yes"
+msgstr ""
+
+#: utils/cpufreq-info.c:163 utils/cpufreq-info.c:164
+msgid "no"
+msgstr ""
+
+#: utils/cpufreq-info.c:164
+#, fuzzy, c-format
+msgid "    Active: %s\n"
+msgstr "  ovlada�: %s\n"
+
+#: utils/cpufreq-info.c:177
+#, c-format
+msgid "    Boost States: %d\n"
+msgstr ""
+
+#: utils/cpufreq-info.c:178
+#, c-format
+msgid "    Total States: %d\n"
+msgstr ""
+
+#: utils/cpufreq-info.c:181
+#, c-format
+msgid "    Pstate-Pb%d: %luMHz (boost state)\n"
+msgstr ""
+
+#: utils/cpufreq-info.c:184
+#, c-format
+msgid "    Pstate-P%d:  %luMHz\n"
+msgstr ""
+
+#: utils/cpufreq-info.c:211
+#, c-format
+msgid "  no or unknown cpufreq driver is active on this CPU\n"
+msgstr "  pro tento CPU není aktivní žádný známý ovlada� cpufreq\n"
+
+#: utils/cpufreq-info.c:213
+#, c-format
+msgid "  driver: %s\n"
+msgstr "  ovlada�: %s\n"
+
+#: utils/cpufreq-info.c:219
+#, fuzzy, c-format
+msgid "  CPUs which run at the same hardware frequency: "
+msgstr "  CPU, které musí měnit frekvenci zároveň: "
+
+#: utils/cpufreq-info.c:230
+#, fuzzy, c-format
+msgid "  CPUs which need to have their frequency coordinated by software: "
+msgstr "  CPU, které musí měnit frekvenci zároveň: "
+
+#: utils/cpufreq-info.c:241
+#, c-format
+msgid "  maximum transition latency: "
+msgstr ""
+
+#: utils/cpufreq-info.c:247
+#, c-format
+msgid "  hardware limits: "
+msgstr "  hardwarové meze: "
+
+#: utils/cpufreq-info.c:256
+#, c-format
+msgid "  available frequency steps: "
+msgstr "  dostupné frekvence: "
+
+#: utils/cpufreq-info.c:269
+#, c-format
+msgid "  available cpufreq governors: "
+msgstr "  dostupné regulátory: "
+
+#: utils/cpufreq-info.c:280
+#, c-format
+msgid "  current policy: frequency should be within "
+msgstr "  sou�asná taktika: frekvence by měla být mezi "
+
+#: utils/cpufreq-info.c:282
+#, c-format
+msgid " and "
+msgstr " a "
+
+#: utils/cpufreq-info.c:286
+#, c-format
+msgid ""
+"The governor \"%s\" may decide which speed to use\n"
+"                  within this range.\n"
+msgstr ""
+"  Regulátor \"%s\" může rozhodnout jakou frekvenci použít\n"
+"                    v těchto mezích.\n"
+
+#: utils/cpufreq-info.c:293
+#, c-format
+msgid "  current CPU frequency is "
+msgstr "  sou�asná frekvence CPU je "
+
+#: utils/cpufreq-info.c:296
+#, c-format
+msgid " (asserted by call to hardware)"
+msgstr "  (zjištěno hardwarovým voláním)"
+
+#: utils/cpufreq-info.c:304
+#, c-format
+msgid "  cpufreq stats: "
+msgstr "  statistika cpufreq: "
+
+#: utils/cpufreq-info.c:472
+#, fuzzy, c-format
+msgid "Usage: cpupower freqinfo [options]\n"
+msgstr "Užití: cpufreq-info [přepína�e]\n"
+
+#: utils/cpufreq-info.c:473 utils/cpufreq-set.c:26 utils/cpupower-set.c:23
+#: utils/cpupower-info.c:22 utils/cpuidle-info.c:148
+#, c-format
+msgid "Options:\n"
+msgstr "Přepína�e:\n"
+
+#: utils/cpufreq-info.c:474
+#, fuzzy, c-format
+msgid "  -e, --debug          Prints out debug information [default]\n"
+msgstr "  -e, --debug          Vypíše ladicí informace\n"
+
+#: utils/cpufreq-info.c:475
+#, c-format
+msgid ""
+"  -f, --freq           Get frequency the CPU currently runs at, according\n"
+"                       to the cpufreq core *\n"
+msgstr ""
+"  -f, --freq           Zjistí aktuální frekvenci, na které CPU běží\n"
+"                       podle cpufreq *\n"
+
+#: utils/cpufreq-info.c:477
+#, c-format
+msgid ""
+"  -w, --hwfreq         Get frequency the CPU currently runs at, by reading\n"
+"                       it from hardware (only available to root) *\n"
+msgstr ""
+"  -w, --hwfreq         Zjistí aktuální frekvenci, na které CPU běží\n"
+"                       z hardware (dostupné jen uživateli root) *\n"
+
+#: utils/cpufreq-info.c:479
+#, c-format
+msgid ""
+"  -l, --hwlimits       Determine the minimum and maximum CPU frequency "
+"allowed *\n"
+msgstr ""
+"  -l, --hwlimits       Zjistí minimální a maximální dostupnou frekvenci CPU "
+"*\n"
+
+#: utils/cpufreq-info.c:480
+#, c-format
+msgid "  -d, --driver         Determines the used cpufreq kernel driver *\n"
+msgstr "  -d, --driver         Zjistí aktivní ovlada� cpufreq *\n"
+
+#: utils/cpufreq-info.c:481
+#, c-format
+msgid "  -p, --policy         Gets the currently used cpufreq policy *\n"
+msgstr "  -p, --policy         Zjistí aktuální taktiku cpufreq *\n"
+
+#: utils/cpufreq-info.c:482
+#, c-format
+msgid "  -g, --governors      Determines available cpufreq governors *\n"
+msgstr "  -g, --governors      Zjistí dostupné regulátory cpufreq *\n"
+
+#: utils/cpufreq-info.c:483
+#, fuzzy, c-format
+msgid ""
+"  -r, --related-cpus   Determines which CPUs run at the same hardware "
+"frequency *\n"
+msgstr ""
+"  -a, --affected-cpus  Zjistí, které CPU musí měnit frekvenci zároveň *\n"
+
+#: utils/cpufreq-info.c:484
+#, fuzzy, c-format
+msgid ""
+"  -a, --affected-cpus  Determines which CPUs need to have their frequency\n"
+"                       coordinated by software *\n"
+msgstr ""
+"  -a, --affected-cpus  Zjistí, které CPU musí měnit frekvenci zároveň *\n"
+
+#: utils/cpufreq-info.c:486
+#, c-format
+msgid "  -s, --stats          Shows cpufreq statistics if available\n"
+msgstr "  -s, --stats          Zobrazí statistiku cpufreq, je-li dostupná\n"
+
+#: utils/cpufreq-info.c:487
+#, fuzzy, c-format
+msgid ""
+"  -y, --latency        Determines the maximum latency on CPU frequency "
+"changes *\n"
+msgstr ""
+"  -l, --hwlimits       Zjistí minimální a maximální dostupnou frekvenci CPU "
+"*\n"
+
+#: utils/cpufreq-info.c:488
+#, c-format
+msgid "  -b, --boost          Checks for turbo or boost modes  *\n"
+msgstr ""
+
+#: utils/cpufreq-info.c:489
+#, c-format
+msgid ""
+"  -o, --proc           Prints out information like provided by the /proc/"
+"cpufreq\n"
+"                       interface in 2.4. and early 2.6. kernels\n"
+msgstr ""
+"  -o, --proc           Vypíše informace ve formátu, jaký používalo rozhraní\n"
+"                       /proc/cpufreq v kernelech řady 2.4 a �asné 2.6\n"
+
+#: utils/cpufreq-info.c:491
+#, fuzzy, c-format
+msgid ""
+"  -m, --human          human-readable output for the -f, -w, -s and -y "
+"parameters\n"
+msgstr ""
+"  -m, --human          Výstup parametrů -f, -w a -s v „lidmi �itelném“ "
+"formátu\n"
+
+#: utils/cpufreq-info.c:492 utils/cpuidle-info.c:152
+#, c-format
+msgid "  -h, --help           Prints out this screen\n"
+msgstr "  -h, --help           Vypíše tuto nápovědu\n"
+
+#: utils/cpufreq-info.c:495
+#, c-format
+msgid ""
+"If no argument or only the -c, --cpu parameter is given, debug output about\n"
+"cpufreq is printed which is useful e.g. for reporting bugs.\n"
+msgstr ""
+"Není-li zadán žádný parametr nebo je-li zadán pouze přepína� -c, --cpu, "
+"jsou\n"
+"vypsány ladicí informace, což může být užite�né například při hlášení chyb.\n"
+
+#: utils/cpufreq-info.c:497
+#, c-format
+msgid ""
+"For the arguments marked with *, omitting the -c or --cpu argument is\n"
+"equivalent to setting it to zero\n"
+msgstr ""
+"Není-li při použití přepína�ů ozna�ených * zadán parametr -c nebo --cpu,\n"
+"předpokládá se jeho hodnota 0.\n"
+
+#: utils/cpufreq-info.c:580
+#, c-format
+msgid ""
+"The argument passed to this tool can't be combined with passing a --cpu "
+"argument\n"
+msgstr "Zadaný parametr nemůže být použit zároveň s přepína�em -c nebo --cpu\n"
+
+#: utils/cpufreq-info.c:596
+#, c-format
+msgid ""
+"You can't specify more than one --cpu parameter and/or\n"
+"more than one output-specific argument\n"
+msgstr ""
+"Nelze zadat více než jeden parametr -c nebo --cpu\n"
+"anebo více než jeden parametr ur�ující výstup\n"
+
+#: utils/cpufreq-info.c:600 utils/cpufreq-set.c:82 utils/cpupower-set.c:42
+#: utils/cpupower-info.c:42 utils/cpuidle-info.c:213
+#, c-format
+msgid "invalid or unknown argument\n"
+msgstr "neplatný nebo neznámý parametr\n"
+
+#: utils/cpufreq-info.c:617
+#, c-format
+msgid "couldn't analyze CPU %d as it doesn't seem to be present\n"
+msgstr "nelze analyzovat CPU %d, vypadá to, že není přítomen\n"
+
+#: utils/cpufreq-info.c:620 utils/cpupower-info.c:142
+#, c-format
+msgid "analyzing CPU %d:\n"
+msgstr "analyzuji CPU %d:\n"
+
+#: utils/cpufreq-set.c:25
+#, fuzzy, c-format
+msgid "Usage: cpupower frequency-set [options]\n"
+msgstr "Užití: cpufreq-set [přepína�e]\n"
+
+#: utils/cpufreq-set.c:27
+#, c-format
+msgid ""
+"  -d FREQ, --min FREQ      new minimum CPU frequency the governor may "
+"select\n"
+msgstr ""
+"  -d FREQ, --min FREQ      Nová nejnižší frekvence, kterou může regulátor "
+"vybrat\n"
+
+#: utils/cpufreq-set.c:28
+#, c-format
+msgid ""
+"  -u FREQ, --max FREQ      new maximum CPU frequency the governor may "
+"select\n"
+msgstr ""
+"  -u FREQ, --max FREQ      Nová nejvyšší frekvence, kterou může regulátor "
+"zvolit\n"
+
+#: utils/cpufreq-set.c:29
+#, c-format
+msgid "  -g GOV, --governor GOV   new cpufreq governor\n"
+msgstr "  -g GOV, --governors GOV  Nový regulátor cpufreq\n"
+
+#: utils/cpufreq-set.c:30
+#, c-format
+msgid ""
+"  -f FREQ, --freq FREQ     specific frequency to be set. Requires userspace\n"
+"                           governor to be available and loaded\n"
+msgstr ""
+"  -f FREQ, --freq FREQ     Frekvence, která má být nastavena. Vyžaduje, aby "
+"byl\n"
+"                           v jádře nahrán regulátor ‚userspace‘.\n"
+
+#: utils/cpufreq-set.c:32
+#, c-format
+msgid "  -r, --related            Switches all hardware-related CPUs\n"
+msgstr ""
+
+#: utils/cpufreq-set.c:33 utils/cpupower-set.c:28 utils/cpupower-info.c:27
+#, fuzzy, c-format
+msgid "  -h, --help               Prints out this screen\n"
+msgstr "  -h, --help           Vypíše tuto nápovědu\n"
+
+#: utils/cpufreq-set.c:35
+#, fuzzy, c-format
+msgid ""
+"Notes:\n"
+"1. Omitting the -c or --cpu argument is equivalent to setting it to \"all\"\n"
+msgstr ""
+"Není-li při použití přepína�ů ozna�ených * zadán parametr -c nebo --cpu,\n"
+"předpokládá se jeho hodnota 0.\n"
+
+#: utils/cpufreq-set.c:37
+#, fuzzy, c-format
+msgid ""
+"2. The -f FREQ, --freq FREQ parameter cannot be combined with any other "
+"parameter\n"
+"   except the -c CPU, --cpu CPU parameter\n"
+"3. FREQuencies can be passed in Hz, kHz (default), MHz, GHz, or THz\n"
+"   by postfixing the value with the wanted unit name, without any space\n"
+"   (FREQuency in kHz =^ Hz * 0.001 =^ MHz * 1000 =^ GHz * 1000000).\n"
+msgstr ""
+"Poznámky:\n"
+"1. Vynechání parametru -c nebo --cpu je ekvivalentní jeho nastavení na 0\n"
+"2. Přepína� -f nebo --freq nemůže být použit zároveň s žádným jiným vyjma -"
+"c\n"
+"   nebo --cpu\n"
+"3. Frekvence (FREQ) mohou být zadány v Hz, kHz (výchozí), MHz, GHz nebo THz\n"
+"   připojením názvu jednotky bez mezery mezi �íslem a jednotkou\n"
+"   (FREQ v kHz =^ Hz * 0,001 = ^ MHz * 1000 =^ GHz * 1000000)\n"
+
+#: utils/cpufreq-set.c:57
+#, c-format
+msgid ""
+"Error setting new values. Common errors:\n"
+"- Do you have proper administration rights? (super-user?)\n"
+"- Is the governor you requested available and modprobed?\n"
+"- Trying to set an invalid policy?\n"
+"- Trying to set a specific frequency, but userspace governor is not "
+"available,\n"
+"   for example because of hardware which cannot be set to a specific "
+"frequency\n"
+"   or because the userspace governor isn't loaded?\n"
+msgstr ""
+"Chyba při nastavování nových hodnot. Obvyklé problémy:\n"
+"- Máte patři�ná administrátorská práva? (root?)\n"
+"- Je požadovaný regulátor dostupný v jádře? (modprobe?)\n"
+"- Snažíte se nastavit neplatnou taktiku?\n"
+"- Snažíte se nastavit ur�itou frekvenci, ale není dostupný\n"
+"  regulátor ‚userspace‘, například protože není nahrán v jádře,\n"
+"  nebo nelze na tomto hardware nastavit ur�itou frekvenci?\n"
+
+#: utils/cpufreq-set.c:170
+#, c-format
+msgid "wrong, unknown or unhandled CPU?\n"
+msgstr "neznámý nebo nepodporovaný CPU?\n"
+
+#: utils/cpufreq-set.c:302
+#, c-format
+msgid ""
+"the -f/--freq parameter cannot be combined with -d/--min, -u/--max or\n"
+"-g/--governor parameters\n"
+msgstr ""
+"přepína� -f/--freq nemůže být použit zároveň\n"
+"s přepína�em -d/--min, -u/--max nebo -g/--governor\n"
+
+#: utils/cpufreq-set.c:308
+#, c-format
+msgid ""
+"At least one parameter out of -f/--freq, -d/--min, -u/--max, and\n"
+"-g/--governor must be passed\n"
+msgstr ""
+"Musí být zadán alespoň jeden přepína�\n"
+"-f/--freq, -d/--min, -u/--max nebo -g/--governor\n"
+
+#: utils/cpufreq-set.c:347
+#, c-format
+msgid "Setting cpu: %d\n"
+msgstr ""
+
+#: utils/cpupower-set.c:22
+#, c-format
+msgid "Usage: cpupower set [ -b val ] [ -m val ] [ -s val ]\n"
+msgstr ""
+
+#: utils/cpupower-set.c:24
+#, c-format
+msgid ""
+"  -b, --perf-bias [VAL]    Sets CPU's power vs performance policy on some\n"
+"                           Intel models [0-15], see manpage for details\n"
+msgstr ""
+
+#: utils/cpupower-set.c:26
+#, c-format
+msgid ""
+"  -m, --sched-mc  [VAL]    Sets the kernel's multi core scheduler policy.\n"
+msgstr ""
+
+#: utils/cpupower-set.c:27
+#, c-format
+msgid ""
+"  -s, --sched-smt [VAL]    Sets the kernel's thread sibling scheduler "
+"policy.\n"
+msgstr ""
+
+#: utils/cpupower-set.c:80
+#, c-format
+msgid "--perf-bias param out of range [0-%d]\n"
+msgstr ""
+
+#: utils/cpupower-set.c:91
+#, c-format
+msgid "--sched-mc param out of range [0-%d]\n"
+msgstr ""
+
+#: utils/cpupower-set.c:102
+#, c-format
+msgid "--sched-smt param out of range [0-%d]\n"
+msgstr ""
+
+#: utils/cpupower-set.c:121
+#, c-format
+msgid "Error setting sched-mc %s\n"
+msgstr ""
+
+#: utils/cpupower-set.c:127
+#, c-format
+msgid "Error setting sched-smt %s\n"
+msgstr ""
+
+#: utils/cpupower-set.c:146
+#, c-format
+msgid "Error setting perf-bias value on CPU %d\n"
+msgstr ""
+
+#: utils/cpupower-info.c:21
+#, c-format
+msgid "Usage: cpupower info [ -b ] [ -m ] [ -s ]\n"
+msgstr ""
+
+#: utils/cpupower-info.c:23
+#, c-format
+msgid ""
+"  -b, --perf-bias    Gets CPU's power vs performance policy on some\n"
+"                           Intel models [0-15], see manpage for details\n"
+msgstr ""
+
+#: utils/cpupower-info.c:25
+#, fuzzy, c-format
+msgid "  -m, --sched-mc     Gets the kernel's multi core scheduler policy.\n"
+msgstr "  -p, --policy         Zjistí aktuální taktiku cpufreq *\n"
+
+#: utils/cpupower-info.c:26
+#, c-format
+msgid ""
+"  -s, --sched-smt    Gets the kernel's thread sibling scheduler policy.\n"
+msgstr ""
+
+#: utils/cpupower-info.c:28
+#, c-format
+msgid ""
+"\n"
+"Passing no option will show all info, by default only on core 0\n"
+msgstr ""
+
+#: utils/cpupower-info.c:102
+#, c-format
+msgid "System's multi core scheduler setting: "
+msgstr ""
+
+#. if sysfs file is missing it's: errno == ENOENT
+#: utils/cpupower-info.c:105 utils/cpupower-info.c:114
+#, c-format
+msgid "not supported\n"
+msgstr ""
+
+#: utils/cpupower-info.c:111
+#, c-format
+msgid "System's thread sibling scheduler setting: "
+msgstr ""
+
+#: utils/cpupower-info.c:126
+#, c-format
+msgid "Intel's performance bias setting needs root privileges\n"
+msgstr ""
+
+#: utils/cpupower-info.c:128
+#, c-format
+msgid "System does not support Intel's performance bias setting\n"
+msgstr ""
+
+#: utils/cpupower-info.c:147
+#, c-format
+msgid "Could not read perf-bias value\n"
+msgstr ""
+
+#: utils/cpupower-info.c:150
+#, c-format
+msgid "perf-bias: %d\n"
+msgstr ""
+
+#: utils/cpuidle-info.c:28
+#, fuzzy, c-format
+msgid "Analyzing CPU %d:\n"
+msgstr "analyzuji CPU %d:\n"
+
+#: utils/cpuidle-info.c:32
+#, c-format
+msgid "CPU %u: No idle states\n"
+msgstr ""
+
+#: utils/cpuidle-info.c:36
+#, c-format
+msgid "CPU %u: Can't read idle state info\n"
+msgstr ""
+
+#: utils/cpuidle-info.c:41
+#, c-format
+msgid "Could not determine max idle state %u\n"
+msgstr ""
+
+#: utils/cpuidle-info.c:46
+#, c-format
+msgid "Number of idle states: %d\n"
+msgstr ""
+
+#: utils/cpuidle-info.c:48
+#, fuzzy, c-format
+msgid "Available idle states:"
+msgstr "  dostupné frekvence: "
+
+#: utils/cpuidle-info.c:71
+#, c-format
+msgid "Flags/Description: %s\n"
+msgstr ""
+
+#: utils/cpuidle-info.c:74
+#, c-format
+msgid "Latency: %lu\n"
+msgstr ""
+
+#: utils/cpuidle-info.c:76
+#, c-format
+msgid "Usage: %lu\n"
+msgstr ""
+
+#: utils/cpuidle-info.c:78
+#, c-format
+msgid "Duration: %llu\n"
+msgstr ""
+
+#: utils/cpuidle-info.c:90
+#, c-format
+msgid "Could not determine cpuidle driver\n"
+msgstr ""
+
+#: utils/cpuidle-info.c:94
+#, fuzzy, c-format
+msgid "CPUidle driver: %s\n"
+msgstr "  ovlada�: %s\n"
+
+#: utils/cpuidle-info.c:99
+#, c-format
+msgid "Could not determine cpuidle governor\n"
+msgstr ""
+
+#: utils/cpuidle-info.c:103
+#, c-format
+msgid "CPUidle governor: %s\n"
+msgstr ""
+
+#: utils/cpuidle-info.c:122
+#, c-format
+msgid "CPU %u: Can't read C-state info\n"
+msgstr ""
+
+#. printf("Cstates: %d\n", cstates);
+#: utils/cpuidle-info.c:127
+#, c-format
+msgid "active state:            C0\n"
+msgstr ""
+
+#: utils/cpuidle-info.c:128
+#, c-format
+msgid "max_cstate:              C%u\n"
+msgstr ""
+
+#: utils/cpuidle-info.c:129
+#, c-format
+msgid "maximum allowed latency: %lu usec\n"
+msgstr ""
+
+#: utils/cpuidle-info.c:130
+#, c-format
+msgid "states:\t\n"
+msgstr ""
+
+#: utils/cpuidle-info.c:132
+#, c-format
+msgid "    C%d:                  type[C%d] "
+msgstr ""
+
+#: utils/cpuidle-info.c:134
+#, c-format
+msgid "promotion[--] demotion[--] "
+msgstr ""
+
+#: utils/cpuidle-info.c:135
+#, c-format
+msgid "latency[%03lu] "
+msgstr ""
+
+#: utils/cpuidle-info.c:137
+#, c-format
+msgid "usage[%08lu] "
+msgstr ""
+
+#: utils/cpuidle-info.c:139
+#, c-format
+msgid "duration[%020Lu] \n"
+msgstr ""
+
+#: utils/cpuidle-info.c:147
+#, fuzzy, c-format
+msgid "Usage: cpupower idleinfo [options]\n"
+msgstr "Užití: cpufreq-info [přepína�e]\n"
+
+#: utils/cpuidle-info.c:149
+#, fuzzy, c-format
+msgid "  -s, --silent         Only show general C-state information\n"
+msgstr "  -e, --debug          Vypíše ladicí informace\n"
+
+#: utils/cpuidle-info.c:150
+#, fuzzy, c-format
+msgid ""
+"  -o, --proc           Prints out information like provided by the /proc/"
+"acpi/processor/*/power\n"
+"                       interface in older kernels\n"
+msgstr ""
+"  -o, --proc           Vypíše informace ve formátu, jaký používalo rozhraní\n"
+"                       /proc/cpufreq v kernelech řady 2.4 a �asné 2.6\n"
+
+#: utils/cpuidle-info.c:209
+#, fuzzy, c-format
+msgid "You can't specify more than one output-specific argument\n"
+msgstr ""
+"Nelze zadat více než jeden parametr -c nebo --cpu\n"
+"anebo více než jeden parametr ur�ující výstup\n"
+
+#~ msgid ""
+#~ "  -c CPU, --cpu CPU    CPU number which information shall be determined "
+#~ "about\n"
+#~ msgstr ""
+#~ "  -c CPU, --cpu CPU    Číslo CPU, o kterém se mají zjistit informace\n"
+
+#~ msgid ""
+#~ "  -c CPU, --cpu CPU        number of CPU where cpufreq settings shall be "
+#~ "modified\n"
+#~ msgstr ""
+#~ "  -c CPU, --cpu CPU        Číslo CPU pro který se má provést nastavení "
+#~ "cpufreq\n"
diff --git a/tools/power/cpupower/po/de.po b/tools/power/cpupower/po/de.po
new file mode 100644
index 00000000000..78c09e51663
--- /dev/null
+++ b/tools/power/cpupower/po/de.po
@@ -0,0 +1,961 @@
+# German translations for cpufrequtils package
+# German messages for cpufrequtils.
+# Copyright (C) 2004-2009 Dominik Brodowski <linux@dominikbrodowski.net>
+# This file is distributed under the same license as the cpufrequtils package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: cpufrequtils 006\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-03-08 17:03+0100\n"
+"PO-Revision-Date: 2009-08-08 17:18+0100\n"
+"Last-Translator:  <linux@dominikbrodowski.net>\n"
+"Language-Team: NONE\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-1\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: utils/idle_monitor/nhm_idle.c:36
+msgid "Processor Core C3"
+msgstr ""
+
+#: utils/idle_monitor/nhm_idle.c:43
+msgid "Processor Core C6"
+msgstr ""
+
+#: utils/idle_monitor/nhm_idle.c:51
+msgid "Processor Package C3"
+msgstr ""
+
+#: utils/idle_monitor/nhm_idle.c:58 utils/idle_monitor/amd_fam14h_idle.c:70
+msgid "Processor Package C6"
+msgstr ""
+
+#: utils/idle_monitor/snb_idle.c:33
+msgid "Processor Core C7"
+msgstr ""
+
+#: utils/idle_monitor/snb_idle.c:40
+msgid "Processor Package C2"
+msgstr ""
+
+#: utils/idle_monitor/snb_idle.c:47
+msgid "Processor Package C7"
+msgstr ""
+
+#: utils/idle_monitor/amd_fam14h_idle.c:56
+msgid "Package in sleep state (PC1 or deeper)"
+msgstr ""
+
+#: utils/idle_monitor/amd_fam14h_idle.c:63
+msgid "Processor Package C1"
+msgstr ""
+
+#: utils/idle_monitor/amd_fam14h_idle.c:77
+msgid "North Bridge P1 boolean counter (returns 0 or 1)"
+msgstr ""
+
+#: utils/idle_monitor/mperf_monitor.c:35
+msgid "Processor Core not idle"
+msgstr ""
+
+#: utils/idle_monitor/mperf_monitor.c:42
+msgid "Processor Core in an idle state"
+msgstr ""
+
+#: utils/idle_monitor/mperf_monitor.c:50
+msgid "Average Frequency (including boost) in MHz"
+msgstr ""
+
+#: utils/idle_monitor/cpupower-monitor.c:66
+#, c-format
+msgid ""
+"cpupower monitor: [-h] [ [-t] | [-l] | [-m <mon1>,[<mon2>] ] ] [-i "
+"interval_sec | -c command ...]\n"
+msgstr ""
+
+#: utils/idle_monitor/cpupower-monitor.c:69
+#, c-format
+msgid ""
+"cpupower monitor: [-v] [-h] [ [-t] | [-l] | [-m <mon1>,[<mon2>] ] ] [-i "
+"interval_sec | -c command ...]\n"
+msgstr ""
+
+#: utils/idle_monitor/cpupower-monitor.c:71
+#, c-format
+msgid "\t -v: be more verbose\n"
+msgstr ""
+
+#: utils/idle_monitor/cpupower-monitor.c:73
+#, c-format
+msgid "\t -h: print this help\n"
+msgstr ""
+
+#: utils/idle_monitor/cpupower-monitor.c:74
+#, c-format
+msgid "\t -i: time intervall to measure for in seconds (default 1)\n"
+msgstr ""
+
+#: utils/idle_monitor/cpupower-monitor.c:75
+#, c-format
+msgid "\t -t: show CPU topology/hierarchy\n"
+msgstr ""
+
+#: utils/idle_monitor/cpupower-monitor.c:76
+#, c-format
+msgid "\t -l: list available CPU sleep monitors (for use with -m)\n"
+msgstr ""
+
+#: utils/idle_monitor/cpupower-monitor.c:77
+#, c-format
+msgid "\t -m: show specific CPU sleep monitors only (in same order)\n"
+msgstr ""
+
+#: utils/idle_monitor/cpupower-monitor.c:79
+#, c-format
+msgid ""
+"only one of: -t, -l, -m are allowed\n"
+"If none of them is passed,"
+msgstr ""
+
+#: utils/idle_monitor/cpupower-monitor.c:80
+#, c-format
+msgid " all supported monitors are shown\n"
+msgstr ""
+
+#: utils/idle_monitor/cpupower-monitor.c:197
+#, c-format
+msgid "Monitor %s, Counter %s has no count function. Implementation error\n"
+msgstr ""
+
+#: utils/idle_monitor/cpupower-monitor.c:207
+#, c-format
+msgid " *is offline\n"
+msgstr ""
+
+#: utils/idle_monitor/cpupower-monitor.c:236
+#, c-format
+msgid "%s: max monitor name length (%d) exceeded\n"
+msgstr ""
+
+#: utils/idle_monitor/cpupower-monitor.c:250
+#, c-format
+msgid "No matching monitor found in %s, try -l option\n"
+msgstr ""
+
+#: utils/idle_monitor/cpupower-monitor.c:266
+#, c-format
+msgid "Monitor \"%s\" (%d states) - Might overflow after %u s\n"
+msgstr ""
+
+#: utils/idle_monitor/cpupower-monitor.c:319
+#, c-format
+msgid "%s took %.5f seconds and exited with status %d\n"
+msgstr ""
+
+#: utils/idle_monitor/cpupower-monitor.c:406
+#, c-format
+msgid "Cannot read number of available processors\n"
+msgstr ""
+
+#: utils/idle_monitor/cpupower-monitor.c:417
+#, c-format
+msgid "Available monitor %s needs root access\n"
+msgstr ""
+
+#: utils/idle_monitor/cpupower-monitor.c:428
+#, c-format
+msgid "No HW Cstate monitors found\n"
+msgstr ""
+
+#: utils/cpupower.c:78
+#, c-format
+msgid "cpupower [ -c cpulist ] subcommand [ARGS]\n"
+msgstr ""
+
+#: utils/cpupower.c:79
+#, c-format
+msgid "cpupower --version\n"
+msgstr ""
+
+#: utils/cpupower.c:80
+#, c-format
+msgid "Supported subcommands are:\n"
+msgstr ""
+
+#: utils/cpupower.c:83
+#, c-format
+msgid ""
+"\n"
+"Some subcommands can make use of the -c cpulist option.\n"
+msgstr ""
+
+#: utils/cpupower.c:84
+#, c-format
+msgid "Look at the general cpupower manpage how to use it\n"
+msgstr ""
+
+#: utils/cpupower.c:85
+#, c-format
+msgid "and read up the subcommand's manpage whether it is supported.\n"
+msgstr ""
+
+#: utils/cpupower.c:86
+#, c-format
+msgid ""
+"\n"
+"Use cpupower help subcommand for getting help for above subcommands.\n"
+msgstr ""
+
+#: utils/cpupower.c:91
+#, c-format
+msgid "Report errors and bugs to %s, please.\n"
+msgstr "Bitte melden Sie Fehler an %s.\n"
+
+#: utils/cpupower.c:114
+#, c-format
+msgid "Error parsing cpu list\n"
+msgstr ""
+
+#: utils/cpupower.c:172
+#, c-format
+msgid "Subcommand %s needs root privileges\n"
+msgstr ""
+
+#: utils/cpufreq-info.c:31
+#, c-format
+msgid "Couldn't count the number of CPUs (%s: %s), assuming 1\n"
+msgstr ""
+"Konnte nicht die Anzahl der CPUs herausfinden (%s : %s), nehme daher 1 an.\n"
+
+#: utils/cpufreq-info.c:63
+#, c-format
+msgid ""
+"          minimum CPU frequency  -  maximum CPU frequency  -  governor\n"
+msgstr ""
+"          minimale CPU-Taktfreq. -  maximale CPU-Taktfreq. -  Regler  \n"
+
+#: utils/cpufreq-info.c:151
+#, c-format
+msgid "Error while evaluating Boost Capabilities on CPU %d -- are you root?\n"
+msgstr ""
+
+#. P state changes via MSR are identified via cpuid 80000007
+#. on Intel and AMD, but we assume boost capable machines can do that
+#. if (cpuid_eax(0x80000000) >= 0x80000007
+#. && (cpuid_edx(0x80000007) & (1 << 7)))
+#.
+#: utils/cpufreq-info.c:161
+#, c-format
+msgid "  boost state support: \n"
+msgstr ""
+
+#: utils/cpufreq-info.c:163
+#, c-format
+msgid "    Supported: %s\n"
+msgstr ""
+
+#: utils/cpufreq-info.c:163 utils/cpufreq-info.c:164
+msgid "yes"
+msgstr ""
+
+#: utils/cpufreq-info.c:163 utils/cpufreq-info.c:164
+msgid "no"
+msgstr ""
+
+#: utils/cpufreq-info.c:164
+#, fuzzy, c-format
+msgid "    Active: %s\n"
+msgstr "  Treiber: %s\n"
+
+#: utils/cpufreq-info.c:177
+#, c-format
+msgid "    Boost States: %d\n"
+msgstr ""
+
+#: utils/cpufreq-info.c:178
+#, c-format
+msgid "    Total States: %d\n"
+msgstr ""
+
+#: utils/cpufreq-info.c:181
+#, c-format
+msgid "    Pstate-Pb%d: %luMHz (boost state)\n"
+msgstr ""
+
+#: utils/cpufreq-info.c:184
+#, c-format
+msgid "    Pstate-P%d:  %luMHz\n"
+msgstr ""
+
+#: utils/cpufreq-info.c:211
+#, c-format
+msgid "  no or unknown cpufreq driver is active on this CPU\n"
+msgstr "  kein oder nicht bestimmbarer cpufreq-Treiber aktiv\n"
+
+#: utils/cpufreq-info.c:213
+#, c-format
+msgid "  driver: %s\n"
+msgstr "  Treiber: %s\n"
+
+#: utils/cpufreq-info.c:219
+#, c-format
+msgid "  CPUs which run at the same hardware frequency: "
+msgstr "  Folgende CPUs laufen mit der gleichen Hardware-Taktfrequenz: "
+
+#: utils/cpufreq-info.c:230
+#, c-format
+msgid "  CPUs which need to have their frequency coordinated by software: "
+msgstr "  Die Taktfrequenz folgender CPUs werden per Software koordiniert: "
+
+#: utils/cpufreq-info.c:241
+#, c-format
+msgid "  maximum transition latency: "
+msgstr "  Maximale Dauer eines Taktfrequenzwechsels: "
+
+#: utils/cpufreq-info.c:247
+#, c-format
+msgid "  hardware limits: "
+msgstr "  Hardwarebedingte Grenzen der Taktfrequenz: "
+
+#: utils/cpufreq-info.c:256
+#, c-format
+msgid "  available frequency steps: "
+msgstr "  mögliche Taktfrequenzen: "
+
+#: utils/cpufreq-info.c:269
+#, c-format
+msgid "  available cpufreq governors: "
+msgstr "  mögliche Regler: "
+
+#: utils/cpufreq-info.c:280
+#, c-format
+msgid "  current policy: frequency should be within "
+msgstr "  momentane Taktik: die Frequenz soll innerhalb "
+
+#: utils/cpufreq-info.c:282
+#, c-format
+msgid " and "
+msgstr " und "
+
+#: utils/cpufreq-info.c:286
+#, c-format
+msgid ""
+"The governor \"%s\" may decide which speed to use\n"
+"                  within this range.\n"
+msgstr ""
+"  liegen. Der Regler \"%s\" kann frei entscheiden,\n"
+"                    welche Taktfrequenz innerhalb dieser Grenze verwendet "
+"wird.\n"
+
+#: utils/cpufreq-info.c:293
+#, c-format
+msgid "  current CPU frequency is "
+msgstr "  momentane Taktfrequenz ist "
+
+#: utils/cpufreq-info.c:296
+#, c-format
+msgid " (asserted by call to hardware)"
+msgstr "  (verifiziert durch Nachfrage bei der Hardware)"
+
+#: utils/cpufreq-info.c:304
+#, c-format
+msgid "  cpufreq stats: "
+msgstr "  Statistik:"
+
+#: utils/cpufreq-info.c:472
+#, fuzzy, c-format
+msgid "Usage: cpupower freqinfo [options]\n"
+msgstr "Aufruf: cpufreq-info [Optionen]\n"
+
+#: utils/cpufreq-info.c:473 utils/cpufreq-set.c:26 utils/cpupower-set.c:23
+#: utils/cpupower-info.c:22 utils/cpuidle-info.c:148
+#, c-format
+msgid "Options:\n"
+msgstr "Optionen:\n"
+
+#: utils/cpufreq-info.c:474
+#, fuzzy, c-format
+msgid "  -e, --debug          Prints out debug information [default]\n"
+msgstr ""
+"  -e, --debug          Erzeugt detaillierte Informationen, hilfreich\n"
+"                       zum Aufspüren von Fehlern\n"
+
+#: utils/cpufreq-info.c:475
+#, c-format
+msgid ""
+"  -f, --freq           Get frequency the CPU currently runs at, according\n"
+"                       to the cpufreq core *\n"
+msgstr ""
+"  -f, --freq           Findet die momentane CPU-Taktfrquenz heraus (nach\n"
+"                       Meinung des Betriebssystems) *\n"
+
+#: utils/cpufreq-info.c:477
+#, c-format
+msgid ""
+"  -w, --hwfreq         Get frequency the CPU currently runs at, by reading\n"
+"                       it from hardware (only available to root) *\n"
+msgstr ""
+"  -w, --hwfreq         Findet die momentane CPU-Taktfrequenz heraus\n"
+"                       (verifiziert durch Nachfrage bei der Hardware)\n"
+"                       [nur der Administrator kann dies tun] *\n"
+
+#: utils/cpufreq-info.c:479
+#, c-format
+msgid ""
+"  -l, --hwlimits       Determine the minimum and maximum CPU frequency "
+"allowed *\n"
+msgstr ""
+"  -l, --hwlimits       Findet die minimale und maximale Taktfrequenz heraus "
+"*\n"
+
+#: utils/cpufreq-info.c:480
+#, c-format
+msgid "  -d, --driver         Determines the used cpufreq kernel driver *\n"
+msgstr "  -d, --driver         Findet den momentanen Treiber heraus *\n"
+
+#: utils/cpufreq-info.c:481
+#, c-format
+msgid "  -p, --policy         Gets the currently used cpufreq policy *\n"
+msgstr "  -p, --policy         Findet die momentane Taktik heraus *\n"
+
+#: utils/cpufreq-info.c:482
+#, c-format
+msgid "  -g, --governors      Determines available cpufreq governors *\n"
+msgstr "  -g, --governors      Erzeugt eine Liste mit verfügbaren Reglern *\n"
+
+#: utils/cpufreq-info.c:483
+#, c-format
+msgid ""
+"  -r, --related-cpus   Determines which CPUs run at the same hardware "
+"frequency *\n"
+msgstr ""
+"  -r, --related-cpus   Findet heraus, welche CPUs mit derselben "
+"physikalischen\n"
+"                       Taktfrequenz laufen *\n"
+
+#: utils/cpufreq-info.c:484
+#, c-format
+msgid ""
+"  -a, --affected-cpus  Determines which CPUs need to have their frequency\n"
+"                       coordinated by software *\n"
+msgstr ""
+"  -a, --affected-cpus  Findet heraus, von welchen CPUs die Taktfrequenz "
+"durch\n"
+"                       Software koordiniert werden muss *\n"
+
+#: utils/cpufreq-info.c:486
+#, c-format
+msgid "  -s, --stats          Shows cpufreq statistics if available\n"
+msgstr ""
+"  -s, --stats          Zeigt, sofern möglich, Statistiken über cpufreq an.\n"
+
+#: utils/cpufreq-info.c:487
+#, c-format
+msgid ""
+"  -y, --latency        Determines the maximum latency on CPU frequency "
+"changes *\n"
+msgstr ""
+"  -y, --latency        Findet die maximale Dauer eines Taktfrequenzwechsels "
+"heraus *\n"
+
+#: utils/cpufreq-info.c:488
+#, c-format
+msgid "  -b, --boost          Checks for turbo or boost modes  *\n"
+msgstr ""
+
+#: utils/cpufreq-info.c:489
+#, c-format
+msgid ""
+"  -o, --proc           Prints out information like provided by the /proc/"
+"cpufreq\n"
+"                       interface in 2.4. and early 2.6. kernels\n"
+msgstr ""
+"  -o, --proc           Erzeugt Informationen in einem ähnlichem Format zu "
+"dem\n"
+"                       der /proc/cpufreq-Datei in 2.4. und frühen 2.6.\n"
+"                       Kernel-Versionen\n"
+
+#: utils/cpufreq-info.c:491
+#, c-format
+msgid ""
+"  -m, --human          human-readable output for the -f, -w, -s and -y "
+"parameters\n"
+msgstr ""
+"  -m, --human          Formatiert Taktfrequenz- und Zeitdauerangaben in "
+"besser\n"
+"                       lesbarer Form (MHz, GHz; us, ms)\n"
+
+#: utils/cpufreq-info.c:492 utils/cpuidle-info.c:152
+#, c-format
+msgid "  -h, --help           Prints out this screen\n"
+msgstr "  -h, --help           Gibt diese Kurzübersicht aus\n"
+
+#: utils/cpufreq-info.c:495
+#, c-format
+msgid ""
+"If no argument or only the -c, --cpu parameter is given, debug output about\n"
+"cpufreq is printed which is useful e.g. for reporting bugs.\n"
+msgstr ""
+"Sofern kein anderer Parameter als '-c, --cpu' angegeben wird, liefert "
+"dieses\n"
+"Programm Informationen, die z.B. zum Berichten von Fehlern nützlich sind.\n"
+
+#: utils/cpufreq-info.c:497
+#, c-format
+msgid ""
+"For the arguments marked with *, omitting the -c or --cpu argument is\n"
+"equivalent to setting it to zero\n"
+msgstr ""
+"Bei den mit * markierten Parametern wird '--cpu 0' angenommen, soweit nicht\n"
+"mittels -c oder --cpu etwas anderes angegeben wird\n"
+
+#: utils/cpufreq-info.c:580
+#, c-format
+msgid ""
+"The argument passed to this tool can't be combined with passing a --cpu "
+"argument\n"
+msgstr "Diese Option kann nicht mit der --cpu-Option kombiniert werden\n"
+
+#: utils/cpufreq-info.c:596
+#, c-format
+msgid ""
+"You can't specify more than one --cpu parameter and/or\n"
+"more than one output-specific argument\n"
+msgstr ""
+"Man kann nicht mehr als einen --cpu-Parameter und/oder mehr als einen\n"
+"informationsspezifischen Parameter gleichzeitig angeben\n"
+
+#: utils/cpufreq-info.c:600 utils/cpufreq-set.c:82 utils/cpupower-set.c:42
+#: utils/cpupower-info.c:42 utils/cpuidle-info.c:213
+#, c-format
+msgid "invalid or unknown argument\n"
+msgstr "unbekannter oder falscher Parameter\n"
+
+#: utils/cpufreq-info.c:617
+#, c-format
+msgid "couldn't analyze CPU %d as it doesn't seem to be present\n"
+msgstr ""
+"Konnte nicht die CPU %d analysieren, da sie (scheinbar?) nicht existiert.\n"
+
+#: utils/cpufreq-info.c:620 utils/cpupower-info.c:142
+#, c-format
+msgid "analyzing CPU %d:\n"
+msgstr "analysiere CPU %d:\n"
+
+#: utils/cpufreq-set.c:25
+#, fuzzy, c-format
+msgid "Usage: cpupower frequency-set [options]\n"
+msgstr "Aufruf: cpufreq-set [Optionen]\n"
+
+#: utils/cpufreq-set.c:27
+#, c-format
+msgid ""
+"  -d FREQ, --min FREQ      new minimum CPU frequency the governor may "
+"select\n"
+msgstr ""
+"  -d FREQ, --min FREQ      neue minimale Taktfrequenz, die der Regler\n"
+"                           auswählen darf\n"
+
+#: utils/cpufreq-set.c:28
+#, c-format
+msgid ""
+"  -u FREQ, --max FREQ      new maximum CPU frequency the governor may "
+"select\n"
+msgstr ""
+"  -u FREQ, --max FREQ      neue maximale Taktfrequenz, die der Regler\n"
+"                           auswählen darf\n"
+
+#: utils/cpufreq-set.c:29
+#, c-format
+msgid "  -g GOV, --governor GOV   new cpufreq governor\n"
+msgstr "  -g GOV, --governors GOV  wechsle zu Regler GOV\n"
+
+#: utils/cpufreq-set.c:30
+#, c-format
+msgid ""
+"  -f FREQ, --freq FREQ     specific frequency to be set. Requires userspace\n"
+"                           governor to be available and loaded\n"
+msgstr ""
+"  -f FREQ, --freq FREQ     setze exakte Taktfrequenz. Benötigt den Regler\n"
+"                           'userspace'.\n"
+
+#: utils/cpufreq-set.c:32
+#, c-format
+msgid "  -r, --related            Switches all hardware-related CPUs\n"
+msgstr ""
+"  -r, --related            Setze Werte für alle CPUs, deren Taktfrequenz\n"
+"                           hardwarebedingt identisch ist.\n"
+
+#: utils/cpufreq-set.c:33 utils/cpupower-set.c:28 utils/cpupower-info.c:27
+#, c-format
+msgid "  -h, --help               Prints out this screen\n"
+msgstr "  -h, --help               Gibt diese Kurzübersicht aus\n"
+
+#: utils/cpufreq-set.c:35
+#, fuzzy, c-format
+msgid ""
+"Notes:\n"
+"1. Omitting the -c or --cpu argument is equivalent to setting it to \"all\"\n"
+msgstr ""
+"Bei den mit * markierten Parametern wird '--cpu 0' angenommen, soweit nicht\n"
+"mittels -c oder --cpu etwas anderes angegeben wird\n"
+
+#: utils/cpufreq-set.c:37
+#, fuzzy, c-format
+msgid ""
+"2. The -f FREQ, --freq FREQ parameter cannot be combined with any other "
+"parameter\n"
+"   except the -c CPU, --cpu CPU parameter\n"
+"3. FREQuencies can be passed in Hz, kHz (default), MHz, GHz, or THz\n"
+"   by postfixing the value with the wanted unit name, without any space\n"
+"   (FREQuency in kHz =^ Hz * 0.001 =^ MHz * 1000 =^ GHz * 1000000).\n"
+msgstr ""
+"Hinweise:\n"
+"1. Sofern kein -c oder --cpu-Parameter angegeben ist, wird '--cpu 0'\n"
+"   angenommen\n"
+"2. Der Parameter -f bzw. --freq kann mit keinem anderen als dem Parameter\n"
+"   -c bzw. --cpu kombiniert werden\n"
+"3. FREQuenzen können in Hz, kHz (Standard), MHz, GHz oder THz eingegeben\n"
+"   werden, indem der Wert und unmittelbar anschließend (ohne Leerzeichen!)\n"
+"   die Einheit angegeben werden. (Bsp: 1GHz )\n"
+"   (FREQuenz in kHz =^ MHz * 1000 =^ GHz * 1000000).\n"
+
+#: utils/cpufreq-set.c:57
+#, c-format
+msgid ""
+"Error setting new values. Common errors:\n"
+"- Do you have proper administration rights? (super-user?)\n"
+"- Is the governor you requested available and modprobed?\n"
+"- Trying to set an invalid policy?\n"
+"- Trying to set a specific frequency, but userspace governor is not "
+"available,\n"
+"   for example because of hardware which cannot be set to a specific "
+"frequency\n"
+"   or because the userspace governor isn't loaded?\n"
+msgstr ""
+"Beim Einstellen ist ein Fehler aufgetreten. Typische Fehlerquellen sind:\n"
+"- nicht ausreichende Rechte (Administrator)\n"
+"- der Regler ist nicht verfügbar bzw. nicht geladen\n"
+"- die angegebene Taktik ist inkorrekt\n"
+"- eine spezifische Frequenz wurde angegeben, aber der Regler 'userspace'\n"
+"  kann entweder hardwarebedingt nicht genutzt werden oder ist nicht geladen\n"
+
+#: utils/cpufreq-set.c:170
+#, c-format
+msgid "wrong, unknown or unhandled CPU?\n"
+msgstr "unbekannte oder nicht regelbare CPU\n"
+
+#: utils/cpufreq-set.c:302
+#, c-format
+msgid ""
+"the -f/--freq parameter cannot be combined with -d/--min, -u/--max or\n"
+"-g/--governor parameters\n"
+msgstr ""
+"Der -f bzw. --freq-Parameter kann nicht mit den Parametern -d/--min, -u/--"
+"max\n"
+"oder -g/--governor kombiniert werden\n"
+
+#: utils/cpufreq-set.c:308
+#, c-format
+msgid ""
+"At least one parameter out of -f/--freq, -d/--min, -u/--max, and\n"
+"-g/--governor must be passed\n"
+msgstr ""
+"Es muss mindestens ein Parameter aus -f/--freq, -d/--min, -u/--max oder\n"
+"-g/--governor angegeben werden.\n"
+
+#: utils/cpufreq-set.c:347
+#, c-format
+msgid "Setting cpu: %d\n"
+msgstr ""
+
+#: utils/cpupower-set.c:22
+#, c-format
+msgid "Usage: cpupower set [ -b val ] [ -m val ] [ -s val ]\n"
+msgstr ""
+
+#: utils/cpupower-set.c:24
+#, c-format
+msgid ""
+"  -b, --perf-bias [VAL]    Sets CPU's power vs performance policy on some\n"
+"                           Intel models [0-15], see manpage for details\n"
+msgstr ""
+
+#: utils/cpupower-set.c:26
+#, c-format
+msgid ""
+"  -m, --sched-mc  [VAL]    Sets the kernel's multi core scheduler policy.\n"
+msgstr ""
+
+#: utils/cpupower-set.c:27
+#, c-format
+msgid ""
+"  -s, --sched-smt [VAL]    Sets the kernel's thread sibling scheduler "
+"policy.\n"
+msgstr ""
+
+#: utils/cpupower-set.c:80
+#, c-format
+msgid "--perf-bias param out of range [0-%d]\n"
+msgstr ""
+
+#: utils/cpupower-set.c:91
+#, c-format
+msgid "--sched-mc param out of range [0-%d]\n"
+msgstr ""
+
+#: utils/cpupower-set.c:102
+#, c-format
+msgid "--sched-smt param out of range [0-%d]\n"
+msgstr ""
+
+#: utils/cpupower-set.c:121
+#, c-format
+msgid "Error setting sched-mc %s\n"
+msgstr ""
+
+#: utils/cpupower-set.c:127
+#, c-format
+msgid "Error setting sched-smt %s\n"
+msgstr ""
+
+#: utils/cpupower-set.c:146
+#, c-format
+msgid "Error setting perf-bias value on CPU %d\n"
+msgstr ""
+
+#: utils/cpupower-info.c:21
+#, c-format
+msgid "Usage: cpupower info [ -b ] [ -m ] [ -s ]\n"
+msgstr ""
+
+#: utils/cpupower-info.c:23
+#, c-format
+msgid ""
+"  -b, --perf-bias    Gets CPU's power vs performance policy on some\n"
+"                           Intel models [0-15], see manpage for details\n"
+msgstr ""
+
+#: utils/cpupower-info.c:25
+#, fuzzy, c-format
+msgid "  -m, --sched-mc     Gets the kernel's multi core scheduler policy.\n"
+msgstr "  -p, --policy         Findet die momentane Taktik heraus *\n"
+
+#: utils/cpupower-info.c:26
+#, c-format
+msgid ""
+"  -s, --sched-smt    Gets the kernel's thread sibling scheduler policy.\n"
+msgstr ""
+
+#: utils/cpupower-info.c:28
+#, c-format
+msgid ""
+"\n"
+"Passing no option will show all info, by default only on core 0\n"
+msgstr ""
+
+#: utils/cpupower-info.c:102
+#, c-format
+msgid "System's multi core scheduler setting: "
+msgstr ""
+
+#. if sysfs file is missing it's: errno == ENOENT
+#: utils/cpupower-info.c:105 utils/cpupower-info.c:114
+#, c-format
+msgid "not supported\n"
+msgstr ""
+
+#: utils/cpupower-info.c:111
+#, c-format
+msgid "System's thread sibling scheduler setting: "
+msgstr ""
+
+#: utils/cpupower-info.c:126
+#, c-format
+msgid "Intel's performance bias setting needs root privileges\n"
+msgstr ""
+
+#: utils/cpupower-info.c:128
+#, c-format
+msgid "System does not support Intel's performance bias setting\n"
+msgstr ""
+
+#: utils/cpupower-info.c:147
+#, c-format
+msgid "Could not read perf-bias value\n"
+msgstr ""
+
+#: utils/cpupower-info.c:150
+#, c-format
+msgid "perf-bias: %d\n"
+msgstr ""
+
+#: utils/cpuidle-info.c:28
+#, fuzzy, c-format
+msgid "Analyzing CPU %d:\n"
+msgstr "analysiere CPU %d:\n"
+
+#: utils/cpuidle-info.c:32
+#, c-format
+msgid "CPU %u: No idle states\n"
+msgstr ""
+
+#: utils/cpuidle-info.c:36
+#, c-format
+msgid "CPU %u: Can't read idle state info\n"
+msgstr ""
+
+#: utils/cpuidle-info.c:41
+#, c-format
+msgid "Could not determine max idle state %u\n"
+msgstr ""
+
+#: utils/cpuidle-info.c:46
+#, c-format
+msgid "Number of idle states: %d\n"
+msgstr ""
+
+#: utils/cpuidle-info.c:48
+#, fuzzy, c-format
+msgid "Available idle states:"
+msgstr "  mögliche Taktfrequenzen: "
+
+#: utils/cpuidle-info.c:71
+#, c-format
+msgid "Flags/Description: %s\n"
+msgstr ""
+
+#: utils/cpuidle-info.c:74
+#, c-format
+msgid "Latency: %lu\n"
+msgstr ""
+
+#: utils/cpuidle-info.c:76
+#, c-format
+msgid "Usage: %lu\n"
+msgstr ""
+
+#: utils/cpuidle-info.c:78
+#, c-format
+msgid "Duration: %llu\n"
+msgstr ""
+
+#: utils/cpuidle-info.c:90
+#, c-format
+msgid "Could not determine cpuidle driver\n"
+msgstr ""
+
+#: utils/cpuidle-info.c:94
+#, fuzzy, c-format
+msgid "CPUidle driver: %s\n"
+msgstr "  Treiber: %s\n"
+
+#: utils/cpuidle-info.c:99
+#, c-format
+msgid "Could not determine cpuidle governor\n"
+msgstr ""
+
+#: utils/cpuidle-info.c:103
+#, c-format
+msgid "CPUidle governor: %s\n"
+msgstr ""
+
+#: utils/cpuidle-info.c:122
+#, c-format
+msgid "CPU %u: Can't read C-state info\n"
+msgstr ""
+
+#. printf("Cstates: %d\n", cstates);
+#: utils/cpuidle-info.c:127
+#, c-format
+msgid "active state:            C0\n"
+msgstr ""
+
+#: utils/cpuidle-info.c:128
+#, c-format
+msgid "max_cstate:              C%u\n"
+msgstr ""
+
+#: utils/cpuidle-info.c:129
+#, fuzzy, c-format
+msgid "maximum allowed latency: %lu usec\n"
+msgstr "  Maximale Dauer eines Taktfrequenzwechsels: "
+
+#: utils/cpuidle-info.c:130
+#, c-format
+msgid "states:\t\n"
+msgstr ""
+
+#: utils/cpuidle-info.c:132
+#, c-format
+msgid "    C%d:                  type[C%d] "
+msgstr ""
+
+#: utils/cpuidle-info.c:134
+#, c-format
+msgid "promotion[--] demotion[--] "
+msgstr ""
+
+#: utils/cpuidle-info.c:135
+#, c-format
+msgid "latency[%03lu] "
+msgstr ""
+
+#: utils/cpuidle-info.c:137
+#, c-format
+msgid "usage[%08lu] "
+msgstr ""
+
+#: utils/cpuidle-info.c:139
+#, c-format
+msgid "duration[%020Lu] \n"
+msgstr ""
+
+#: utils/cpuidle-info.c:147
+#, fuzzy, c-format
+msgid "Usage: cpupower idleinfo [options]\n"
+msgstr "Aufruf: cpufreq-info [Optionen]\n"
+
+#: utils/cpuidle-info.c:149
+#, fuzzy, c-format
+msgid "  -s, --silent         Only show general C-state information\n"
+msgstr ""
+"  -e, --debug          Erzeugt detaillierte Informationen, hilfreich\n"
+"                       zum Aufspüren von Fehlern\n"
+
+#: utils/cpuidle-info.c:150
+#, fuzzy, c-format
+msgid ""
+"  -o, --proc           Prints out information like provided by the /proc/"
+"acpi/processor/*/power\n"
+"                       interface in older kernels\n"
+msgstr ""
+"  -o, --proc           Erzeugt Informationen in einem ähnlichem Format zu "
+"dem\n"
+"                       der /proc/cpufreq-Datei in 2.4. und frühen 2.6.\n"
+"                       Kernel-Versionen\n"
+
+#: utils/cpuidle-info.c:209
+#, fuzzy, c-format
+msgid "You can't specify more than one output-specific argument\n"
+msgstr ""
+"Man kann nicht mehr als einen --cpu-Parameter und/oder mehr als einen\n"
+"informationsspezifischen Parameter gleichzeitig angeben\n"
+
+#~ msgid ""
+#~ "  -c CPU, --cpu CPU    CPU number which information shall be determined "
+#~ "about\n"
+#~ msgstr ""
+#~ "  -c CPU, --cpu CPU    Nummer der CPU, über die Informationen "
+#~ "herausgefunden werden sollen\n"
+
+#~ msgid ""
+#~ "  -c CPU, --cpu CPU        number of CPU where cpufreq settings shall be "
+#~ "modified\n"
+#~ msgstr ""
+#~ "  -c CPU, --cpu CPU        Nummer der CPU, deren Taktfrequenz-"
+#~ "Einstellung\n"
+#~ "                           werden soll\n"
diff --git a/tools/power/cpupower/po/fr.po b/tools/power/cpupower/po/fr.po
new file mode 100644
index 00000000000..245ad20a9bf
--- /dev/null
+++ b/tools/power/cpupower/po/fr.po
@@ -0,0 +1,947 @@
+# French translations for cpufrequtils package
+# Copyright (C) 2004 THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the cpufrequtils package.
+# Ducrot Bruno <ducrot@poupinou.org>, 2004.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: cpufrequtils 0.1-pre2\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-03-08 17:03+0100\n"
+"PO-Revision-Date: 2004-11-17 15:53+1000\n"
+"Last-Translator: Bruno Ducrot <ducrot@poupinou.org>\n"
+"Language-Team: NONE\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-1\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: utils/idle_monitor/nhm_idle.c:36
+msgid "Processor Core C3"
+msgstr ""
+
+#: utils/idle_monitor/nhm_idle.c:43
+msgid "Processor Core C6"
+msgstr ""
+
+#: utils/idle_monitor/nhm_idle.c:51
+msgid "Processor Package C3"
+msgstr ""
+
+#: utils/idle_monitor/nhm_idle.c:58 utils/idle_monitor/amd_fam14h_idle.c:70
+msgid "Processor Package C6"
+msgstr ""
+
+#: utils/idle_monitor/snb_idle.c:33
+msgid "Processor Core C7"
+msgstr ""
+
+#: utils/idle_monitor/snb_idle.c:40
+msgid "Processor Package C2"
+msgstr ""
+
+#: utils/idle_monitor/snb_idle.c:47
+msgid "Processor Package C7"
+msgstr ""
+
+#: utils/idle_monitor/amd_fam14h_idle.c:56
+msgid "Package in sleep state (PC1 or deeper)"
+msgstr ""
+
+#: utils/idle_monitor/amd_fam14h_idle.c:63
+msgid "Processor Package C1"
+msgstr ""
+
+#: utils/idle_monitor/amd_fam14h_idle.c:77
+msgid "North Bridge P1 boolean counter (returns 0 or 1)"
+msgstr ""
+
+#: utils/idle_monitor/mperf_monitor.c:35
+msgid "Processor Core not idle"
+msgstr ""
+
+#: utils/idle_monitor/mperf_monitor.c:42
+msgid "Processor Core in an idle state"
+msgstr ""
+
+#: utils/idle_monitor/mperf_monitor.c:50
+msgid "Average Frequency (including boost) in MHz"
+msgstr ""
+
+#: utils/idle_monitor/cpupower-monitor.c:66
+#, c-format
+msgid ""
+"cpupower monitor: [-h] [ [-t] | [-l] | [-m <mon1>,[<mon2>] ] ] [-i "
+"interval_sec | -c command ...]\n"
+msgstr ""
+
+#: utils/idle_monitor/cpupower-monitor.c:69
+#, c-format
+msgid ""
+"cpupower monitor: [-v] [-h] [ [-t] | [-l] | [-m <mon1>,[<mon2>] ] ] [-i "
+"interval_sec | -c command ...]\n"
+msgstr ""
+
+#: utils/idle_monitor/cpupower-monitor.c:71
+#, c-format
+msgid "\t -v: be more verbose\n"
+msgstr ""
+
+#: utils/idle_monitor/cpupower-monitor.c:73
+#, c-format
+msgid "\t -h: print this help\n"
+msgstr ""
+
+#: utils/idle_monitor/cpupower-monitor.c:74
+#, c-format
+msgid "\t -i: time intervall to measure for in seconds (default 1)\n"
+msgstr ""
+
+#: utils/idle_monitor/cpupower-monitor.c:75
+#, c-format
+msgid "\t -t: show CPU topology/hierarchy\n"
+msgstr ""
+
+#: utils/idle_monitor/cpupower-monitor.c:76
+#, c-format
+msgid "\t -l: list available CPU sleep monitors (for use with -m)\n"
+msgstr ""
+
+#: utils/idle_monitor/cpupower-monitor.c:77
+#, c-format
+msgid "\t -m: show specific CPU sleep monitors only (in same order)\n"
+msgstr ""
+
+#: utils/idle_monitor/cpupower-monitor.c:79
+#, c-format
+msgid ""
+"only one of: -t, -l, -m are allowed\n"
+"If none of them is passed,"
+msgstr ""
+
+#: utils/idle_monitor/cpupower-monitor.c:80
+#, c-format
+msgid " all supported monitors are shown\n"
+msgstr ""
+
+#: utils/idle_monitor/cpupower-monitor.c:197
+#, c-format
+msgid "Monitor %s, Counter %s has no count function. Implementation error\n"
+msgstr ""
+
+#: utils/idle_monitor/cpupower-monitor.c:207
+#, c-format
+msgid " *is offline\n"
+msgstr ""
+
+#: utils/idle_monitor/cpupower-monitor.c:236
+#, c-format
+msgid "%s: max monitor name length (%d) exceeded\n"
+msgstr ""
+
+#: utils/idle_monitor/cpupower-monitor.c:250
+#, c-format
+msgid "No matching monitor found in %s, try -l option\n"
+msgstr ""
+
+#: utils/idle_monitor/cpupower-monitor.c:266
+#, c-format
+msgid "Monitor \"%s\" (%d states) - Might overflow after %u s\n"
+msgstr ""
+
+#: utils/idle_monitor/cpupower-monitor.c:319
+#, c-format
+msgid "%s took %.5f seconds and exited with status %d\n"
+msgstr ""
+
+#: utils/idle_monitor/cpupower-monitor.c:406
+#, c-format
+msgid "Cannot read number of available processors\n"
+msgstr ""
+
+#: utils/idle_monitor/cpupower-monitor.c:417
+#, c-format
+msgid "Available monitor %s needs root access\n"
+msgstr ""
+
+#: utils/idle_monitor/cpupower-monitor.c:428
+#, c-format
+msgid "No HW Cstate monitors found\n"
+msgstr ""
+
+#: utils/cpupower.c:78
+#, c-format
+msgid "cpupower [ -c cpulist ] subcommand [ARGS]\n"
+msgstr ""
+
+#: utils/cpupower.c:79
+#, c-format
+msgid "cpupower --version\n"
+msgstr ""
+
+#: utils/cpupower.c:80
+#, c-format
+msgid "Supported subcommands are:\n"
+msgstr ""
+
+#: utils/cpupower.c:83
+#, c-format
+msgid ""
+"\n"
+"Some subcommands can make use of the -c cpulist option.\n"
+msgstr ""
+
+#: utils/cpupower.c:84
+#, c-format
+msgid "Look at the general cpupower manpage how to use it\n"
+msgstr ""
+
+#: utils/cpupower.c:85
+#, c-format
+msgid "and read up the subcommand's manpage whether it is supported.\n"
+msgstr ""
+
+#: utils/cpupower.c:86
+#, c-format
+msgid ""
+"\n"
+"Use cpupower help subcommand for getting help for above subcommands.\n"
+msgstr ""
+
+#: utils/cpupower.c:91
+#, c-format
+msgid "Report errors and bugs to %s, please.\n"
+msgstr "Veuillez rapportez les erreurs et les bogues à %s, s'il vous plait.\n"
+
+#: utils/cpupower.c:114
+#, c-format
+msgid "Error parsing cpu list\n"
+msgstr ""
+
+#: utils/cpupower.c:172
+#, c-format
+msgid "Subcommand %s needs root privileges\n"
+msgstr ""
+
+#: utils/cpufreq-info.c:31
+#, c-format
+msgid "Couldn't count the number of CPUs (%s: %s), assuming 1\n"
+msgstr "Détermination du nombre de CPUs (%s : %s) impossible.  Assume 1\n"
+
+#: utils/cpufreq-info.c:63
+#, c-format
+msgid ""
+"          minimum CPU frequency  -  maximum CPU frequency  -  governor\n"
+msgstr ""
+"         Fréquence CPU minimale - Fréquence CPU maximale  - régulateur\n"
+
+#: utils/cpufreq-info.c:151
+#, c-format
+msgid "Error while evaluating Boost Capabilities on CPU %d -- are you root?\n"
+msgstr ""
+
+#. P state changes via MSR are identified via cpuid 80000007
+#. on Intel and AMD, but we assume boost capable machines can do that
+#. if (cpuid_eax(0x80000000) >= 0x80000007
+#. && (cpuid_edx(0x80000007) & (1 << 7)))
+#.
+#: utils/cpufreq-info.c:161
+#, c-format
+msgid "  boost state support: \n"
+msgstr ""
+
+#: utils/cpufreq-info.c:163
+#, c-format
+msgid "    Supported: %s\n"
+msgstr ""
+
+#: utils/cpufreq-info.c:163 utils/cpufreq-info.c:164
+msgid "yes"
+msgstr ""
+
+#: utils/cpufreq-info.c:163 utils/cpufreq-info.c:164
+msgid "no"
+msgstr ""
+
+#: utils/cpufreq-info.c:164
+#, fuzzy, c-format
+msgid "    Active: %s\n"
+msgstr "  pilote : %s\n"
+
+#: utils/cpufreq-info.c:177
+#, c-format
+msgid "    Boost States: %d\n"
+msgstr ""
+
+#: utils/cpufreq-info.c:178
+#, c-format
+msgid "    Total States: %d\n"
+msgstr ""
+
+#: utils/cpufreq-info.c:181
+#, c-format
+msgid "    Pstate-Pb%d: %luMHz (boost state)\n"
+msgstr ""
+
+#: utils/cpufreq-info.c:184
+#, c-format
+msgid "    Pstate-P%d:  %luMHz\n"
+msgstr ""
+
+#: utils/cpufreq-info.c:211
+#, c-format
+msgid "  no or unknown cpufreq driver is active on this CPU\n"
+msgstr "  pas de pilotes cpufreq reconnu pour ce CPU\n"
+
+#: utils/cpufreq-info.c:213
+#, c-format
+msgid "  driver: %s\n"
+msgstr "  pilote : %s\n"
+
+#: utils/cpufreq-info.c:219
+#, fuzzy, c-format
+msgid "  CPUs which run at the same hardware frequency: "
+msgstr "  CPUs qui doivent changer de fréquences en même temps : "
+
+#: utils/cpufreq-info.c:230
+#, fuzzy, c-format
+msgid "  CPUs which need to have their frequency coordinated by software: "
+msgstr "  CPUs qui doivent changer de fréquences en même temps : "
+
+#: utils/cpufreq-info.c:241
+#, c-format
+msgid "  maximum transition latency: "
+msgstr ""
+
+#: utils/cpufreq-info.c:247
+#, c-format
+msgid "  hardware limits: "
+msgstr "  limitation matérielle : "
+
+#: utils/cpufreq-info.c:256
+#, c-format
+msgid "  available frequency steps: "
+msgstr "  plage de fréquence : "
+
+#: utils/cpufreq-info.c:269
+#, c-format
+msgid "  available cpufreq governors: "
+msgstr "  régulateurs disponibles : "
+
+#: utils/cpufreq-info.c:280
+#, c-format
+msgid "  current policy: frequency should be within "
+msgstr "  tactique actuelle : la fréquence doit être comprise entre "
+
+#: utils/cpufreq-info.c:282
+#, c-format
+msgid " and "
+msgstr " et "
+
+#: utils/cpufreq-info.c:286
+#, c-format
+msgid ""
+"The governor \"%s\" may decide which speed to use\n"
+"                  within this range.\n"
+msgstr ""
+"Le régulateur \"%s\" est libre de choisir la vitesse\n"
+"                  dans cette plage de fréquences.\n"
+
+#: utils/cpufreq-info.c:293
+#, c-format
+msgid "  current CPU frequency is "
+msgstr "  la fréquence actuelle de ce CPU est "
+
+#: utils/cpufreq-info.c:296
+#, c-format
+msgid " (asserted by call to hardware)"
+msgstr " (vérifié par un appel direct du matériel)"
+
+#: utils/cpufreq-info.c:304
+#, c-format
+msgid "  cpufreq stats: "
+msgstr "  des statistique concernant cpufreq:"
+
+#: utils/cpufreq-info.c:472
+#, fuzzy, c-format
+msgid "Usage: cpupower freqinfo [options]\n"
+msgstr "Usage : cpufreq-info [options]\n"
+
+#: utils/cpufreq-info.c:473 utils/cpufreq-set.c:26 utils/cpupower-set.c:23
+#: utils/cpupower-info.c:22 utils/cpuidle-info.c:148
+#, c-format
+msgid "Options:\n"
+msgstr "Options :\n"
+
+#: utils/cpufreq-info.c:474
+#, fuzzy, c-format
+msgid "  -e, --debug          Prints out debug information [default]\n"
+msgstr "  -e, --debug          Afficher les informations de déboguage\n"
+
+#: utils/cpufreq-info.c:475
+#, c-format
+msgid ""
+"  -f, --freq           Get frequency the CPU currently runs at, according\n"
+"                       to the cpufreq core *\n"
+msgstr ""
+"  -f, --freq           Obtenir la fréquence actuelle du CPU selon le point\n"
+"                       de vue du coeur du système de cpufreq *\n"
+
+#: utils/cpufreq-info.c:477
+#, c-format
+msgid ""
+"  -w, --hwfreq         Get frequency the CPU currently runs at, by reading\n"
+"                       it from hardware (only available to root) *\n"
+msgstr ""
+"  -w, --hwfreq         Obtenir la fréquence actuelle du CPU directement par\n"
+"                       le matériel (doit être root) *\n"
+
+#: utils/cpufreq-info.c:479
+#, c-format
+msgid ""
+"  -l, --hwlimits       Determine the minimum and maximum CPU frequency "
+"allowed *\n"
+msgstr ""
+"  -l, --hwlimits       Affiche les fréquences minimales et maximales du CPU "
+"*\n"
+
+#: utils/cpufreq-info.c:480
+#, c-format
+msgid "  -d, --driver         Determines the used cpufreq kernel driver *\n"
+msgstr "  -d, --driver         Affiche le pilote cpufreq utilisé *\n"
+
+#: utils/cpufreq-info.c:481
+#, c-format
+msgid "  -p, --policy         Gets the currently used cpufreq policy *\n"
+msgstr "  -p, --policy         Affiche la tactique actuelle de cpufreq *\n"
+
+#: utils/cpufreq-info.c:482
+#, c-format
+msgid "  -g, --governors      Determines available cpufreq governors *\n"
+msgstr ""
+"  -g, --governors      Affiche les régulateurs disponibles de cpufreq *\n"
+
+#: utils/cpufreq-info.c:483
+#, fuzzy, c-format
+msgid ""
+"  -r, --related-cpus   Determines which CPUs run at the same hardware "
+"frequency *\n"
+msgstr ""
+"  -a, --affected-cpus   Affiche quels sont les CPUs qui doivent changer de\n"
+"                        fréquences en même temps *\n"
+
+#: utils/cpufreq-info.c:484
+#, fuzzy, c-format
+msgid ""
+"  -a, --affected-cpus  Determines which CPUs need to have their frequency\n"
+"                       coordinated by software *\n"
+msgstr ""
+"  -a, --affected-cpus   Affiche quels sont les CPUs qui doivent changer de\n"
+"                        fréquences en même temps *\n"
+
+#: utils/cpufreq-info.c:486
+#, c-format
+msgid "  -s, --stats          Shows cpufreq statistics if available\n"
+msgstr ""
+"  -s, --stats          Indique des statistiques concernant cpufreq, si\n"
+"                       disponibles\n"
+
+#: utils/cpufreq-info.c:487
+#, fuzzy, c-format
+msgid ""
+"  -y, --latency        Determines the maximum latency on CPU frequency "
+"changes *\n"
+msgstr ""
+"  -l, --hwlimits       Affiche les fréquences minimales et maximales du CPU "
+"*\n"
+
+#: utils/cpufreq-info.c:488
+#, c-format
+msgid "  -b, --boost          Checks for turbo or boost modes  *\n"
+msgstr ""
+
+#: utils/cpufreq-info.c:489
+#, c-format
+msgid ""
+"  -o, --proc           Prints out information like provided by the /proc/"
+"cpufreq\n"
+"                       interface in 2.4. and early 2.6. kernels\n"
+msgstr ""
+"  -o, --proc           Affiche les informations en utilisant l'interface\n"
+"                       fournie par /proc/cpufreq, présente dans les "
+"versions\n"
+"                       2.4 et les anciennes versions 2.6 du noyau\n"
+
+#: utils/cpufreq-info.c:491
+#, fuzzy, c-format
+msgid ""
+"  -m, --human          human-readable output for the -f, -w, -s and -y "
+"parameters\n"
+msgstr ""
+"  -m, --human           affiche dans un format lisible pour un humain\n"
+"                        pour les options -f, -w et -s (MHz, GHz)\n"
+
+#: utils/cpufreq-info.c:492 utils/cpuidle-info.c:152
+#, c-format
+msgid "  -h, --help           Prints out this screen\n"
+msgstr "  -h, --help           affiche l'aide-mémoire\n"
+
+#: utils/cpufreq-info.c:495
+#, c-format
+msgid ""
+"If no argument or only the -c, --cpu parameter is given, debug output about\n"
+"cpufreq is printed which is useful e.g. for reporting bugs.\n"
+msgstr ""
+"Par défaut, les informations de déboguage seront affichées si aucun\n"
+"argument, ou bien si seulement l'argument -c (--cpu) est donné, afin de\n"
+"faciliter les rapports de bogues par exemple\n"
+
+#: utils/cpufreq-info.c:497
+#, c-format
+msgid ""
+"For the arguments marked with *, omitting the -c or --cpu argument is\n"
+"equivalent to setting it to zero\n"
+msgstr "Les arguments avec un * utiliseront le CPU 0 si -c (--cpu) est omis\n"
+
+#: utils/cpufreq-info.c:580
+#, c-format
+msgid ""
+"The argument passed to this tool can't be combined with passing a --cpu "
+"argument\n"
+msgstr "Cette option est incompatible avec --cpu\n"
+
+#: utils/cpufreq-info.c:596
+#, c-format
+msgid ""
+"You can't specify more than one --cpu parameter and/or\n"
+"more than one output-specific argument\n"
+msgstr ""
+"On ne peut indiquer plus d'un paramètre --cpu, tout comme l'on ne peut\n"
+"spécifier plus d'un argument de formatage\n"
+
+#: utils/cpufreq-info.c:600 utils/cpufreq-set.c:82 utils/cpupower-set.c:42
+#: utils/cpupower-info.c:42 utils/cpuidle-info.c:213
+#, c-format
+msgid "invalid or unknown argument\n"
+msgstr "option invalide\n"
+
+#: utils/cpufreq-info.c:617
+#, c-format
+msgid "couldn't analyze CPU %d as it doesn't seem to be present\n"
+msgstr "analyse du CPU %d impossible puisqu'il ne semble pas être présent\n"
+
+#: utils/cpufreq-info.c:620 utils/cpupower-info.c:142
+#, c-format
+msgid "analyzing CPU %d:\n"
+msgstr "analyse du CPU %d :\n"
+
+#: utils/cpufreq-set.c:25
+#, fuzzy, c-format
+msgid "Usage: cpupower frequency-set [options]\n"
+msgstr "Usage : cpufreq-set [options]\n"
+
+#: utils/cpufreq-set.c:27
+#, c-format
+msgid ""
+"  -d FREQ, --min FREQ      new minimum CPU frequency the governor may "
+"select\n"
+msgstr ""
+"  -d FREQ, --min FREQ       nouvelle fréquence minimale du CPU à utiliser\n"
+"                            par le régulateur\n"
+
+#: utils/cpufreq-set.c:28
+#, c-format
+msgid ""
+"  -u FREQ, --max FREQ      new maximum CPU frequency the governor may "
+"select\n"
+msgstr ""
+"  -u FREQ, --max FREQ       nouvelle fréquence maximale du CPU à utiliser\n"
+"                            par le régulateur\n"
+
+#: utils/cpufreq-set.c:29
+#, c-format
+msgid "  -g GOV, --governor GOV   new cpufreq governor\n"
+msgstr "  -g GOV, --governor GOV   active le régulateur GOV\n"
+
+#: utils/cpufreq-set.c:30
+#, c-format
+msgid ""
+"  -f FREQ, --freq FREQ     specific frequency to be set. Requires userspace\n"
+"                           governor to be available and loaded\n"
+msgstr ""
+"  -f FREQ, --freq FREQ     fixe la fréquence du processeur à FREQ. Il faut\n"
+"                           que le régulateur « userspace » soit disponible \n"
+"                           et activé.\n"
+
+#: utils/cpufreq-set.c:32
+#, c-format
+msgid "  -r, --related            Switches all hardware-related CPUs\n"
+msgstr ""
+
+#: utils/cpufreq-set.c:33 utils/cpupower-set.c:28 utils/cpupower-info.c:27
+#, fuzzy, c-format
+msgid "  -h, --help               Prints out this screen\n"
+msgstr "  -h, --help           affiche l'aide-mémoire\n"
+
+#: utils/cpufreq-set.c:35
+#, fuzzy, c-format
+msgid ""
+"Notes:\n"
+"1. Omitting the -c or --cpu argument is equivalent to setting it to \"all\"\n"
+msgstr "Les arguments avec un * utiliseront le CPU 0 si -c (--cpu) est omis\n"
+
+#: utils/cpufreq-set.c:37
+#, fuzzy, c-format
+msgid ""
+"2. The -f FREQ, --freq FREQ parameter cannot be combined with any other "
+"parameter\n"
+"   except the -c CPU, --cpu CPU parameter\n"
+"3. FREQuencies can be passed in Hz, kHz (default), MHz, GHz, or THz\n"
+"   by postfixing the value with the wanted unit name, without any space\n"
+"   (FREQuency in kHz =^ Hz * 0.001 =^ MHz * 1000 =^ GHz * 1000000).\n"
+msgstr ""
+"Remarque :\n"
+"1. Le CPU numéro 0 sera utilisé par défaut si -c (ou --cpu) est omis ;\n"
+"2. l'argument -f FREQ (ou --freq FREQ) ne peut être utilisé qu'avec --cpu ;\n"
+"3. on pourra préciser l'unité des fréquences en postfixant sans aucune "
+"espace\n"
+"   les valeurs par hz, kHz (par défaut), MHz, GHz ou THz\n"
+"   (kHz =^ Hz * 0.001 =^ MHz * 1000 =^ GHz * 1000000).\n"
+
+#: utils/cpufreq-set.c:57
+#, c-format
+msgid ""
+"Error setting new values. Common errors:\n"
+"- Do you have proper administration rights? (super-user?)\n"
+"- Is the governor you requested available and modprobed?\n"
+"- Trying to set an invalid policy?\n"
+"- Trying to set a specific frequency, but userspace governor is not "
+"available,\n"
+"   for example because of hardware which cannot be set to a specific "
+"frequency\n"
+"   or because the userspace governor isn't loaded?\n"
+msgstr ""
+"En ajustant les nouveaux paramètres, une erreur est apparue. Les sources\n"
+"d'erreur typique sont :\n"
+"- droit d'administration insuffisant (êtes-vous root ?) ;\n"
+"- le régulateur choisi n'est pas disponible, ou bien n'est pas disponible "
+"en\n"
+"  tant que module noyau ;\n"
+"- la tactique n'est pas disponible ;\n"
+"- vous voulez utiliser l'option -f/--freq, mais le régulateur « userspace »\n"
+"  n'est pas disponible, par exemple parce que le matériel ne le supporte\n"
+"  pas, ou bien n'est tout simplement pas chargé.\n"
+
+#: utils/cpufreq-set.c:170
+#, c-format
+msgid "wrong, unknown or unhandled CPU?\n"
+msgstr "CPU inconnu ou non supporté ?\n"
+
+#: utils/cpufreq-set.c:302
+#, c-format
+msgid ""
+"the -f/--freq parameter cannot be combined with -d/--min, -u/--max or\n"
+"-g/--governor parameters\n"
+msgstr ""
+"l'option -f/--freq est incompatible avec les options -d/--min, -u/--max et\n"
+"-g/--governor\n"
+
+#: utils/cpufreq-set.c:308
+#, c-format
+msgid ""
+"At least one parameter out of -f/--freq, -d/--min, -u/--max, and\n"
+"-g/--governor must be passed\n"
+msgstr ""
+"L'un de ces paramètres est obligatoire : -f/--freq, -d/--min, -u/--max et\n"
+"-g/--governor\n"
+
+#: utils/cpufreq-set.c:347
+#, c-format
+msgid "Setting cpu: %d\n"
+msgstr ""
+
+#: utils/cpupower-set.c:22
+#, c-format
+msgid "Usage: cpupower set [ -b val ] [ -m val ] [ -s val ]\n"
+msgstr ""
+
+#: utils/cpupower-set.c:24
+#, c-format
+msgid ""
+"  -b, --perf-bias [VAL]    Sets CPU's power vs performance policy on some\n"
+"                           Intel models [0-15], see manpage for details\n"
+msgstr ""
+
+#: utils/cpupower-set.c:26
+#, c-format
+msgid ""
+"  -m, --sched-mc  [VAL]    Sets the kernel's multi core scheduler policy.\n"
+msgstr ""
+
+#: utils/cpupower-set.c:27
+#, c-format
+msgid ""
+"  -s, --sched-smt [VAL]    Sets the kernel's thread sibling scheduler "
+"policy.\n"
+msgstr ""
+
+#: utils/cpupower-set.c:80
+#, c-format
+msgid "--perf-bias param out of range [0-%d]\n"
+msgstr ""
+
+#: utils/cpupower-set.c:91
+#, c-format
+msgid "--sched-mc param out of range [0-%d]\n"
+msgstr ""
+
+#: utils/cpupower-set.c:102
+#, c-format
+msgid "--sched-smt param out of range [0-%d]\n"
+msgstr ""
+
+#: utils/cpupower-set.c:121
+#, c-format
+msgid "Error setting sched-mc %s\n"
+msgstr ""
+
+#: utils/cpupower-set.c:127
+#, c-format
+msgid "Error setting sched-smt %s\n"
+msgstr ""
+
+#: utils/cpupower-set.c:146
+#, c-format
+msgid "Error setting perf-bias value on CPU %d\n"
+msgstr ""
+
+#: utils/cpupower-info.c:21
+#, c-format
+msgid "Usage: cpupower info [ -b ] [ -m ] [ -s ]\n"
+msgstr ""
+
+#: utils/cpupower-info.c:23
+#, c-format
+msgid ""
+"  -b, --perf-bias    Gets CPU's power vs performance policy on some\n"
+"                           Intel models [0-15], see manpage for details\n"
+msgstr ""
+
+#: utils/cpupower-info.c:25
+#, fuzzy, c-format
+msgid "  -m, --sched-mc     Gets the kernel's multi core scheduler policy.\n"
+msgstr "  -p, --policy         Affiche la tactique actuelle de cpufreq *\n"
+
+#: utils/cpupower-info.c:26
+#, c-format
+msgid ""
+"  -s, --sched-smt    Gets the kernel's thread sibling scheduler policy.\n"
+msgstr ""
+
+#: utils/cpupower-info.c:28
+#, c-format
+msgid ""
+"\n"
+"Passing no option will show all info, by default only on core 0\n"
+msgstr ""
+
+#: utils/cpupower-info.c:102
+#, c-format
+msgid "System's multi core scheduler setting: "
+msgstr ""
+
+#. if sysfs file is missing it's: errno == ENOENT
+#: utils/cpupower-info.c:105 utils/cpupower-info.c:114
+#, c-format
+msgid "not supported\n"
+msgstr ""
+
+#: utils/cpupower-info.c:111
+#, c-format
+msgid "System's thread sibling scheduler setting: "
+msgstr ""
+
+#: utils/cpupower-info.c:126
+#, c-format
+msgid "Intel's performance bias setting needs root privileges\n"
+msgstr ""
+
+#: utils/cpupower-info.c:128
+#, c-format
+msgid "System does not support Intel's performance bias setting\n"
+msgstr ""
+
+#: utils/cpupower-info.c:147
+#, c-format
+msgid "Could not read perf-bias value\n"
+msgstr ""
+
+#: utils/cpupower-info.c:150
+#, c-format
+msgid "perf-bias: %d\n"
+msgstr ""
+
+#: utils/cpuidle-info.c:28
+#, fuzzy, c-format
+msgid "Analyzing CPU %d:\n"
+msgstr "analyse du CPU %d :\n"
+
+#: utils/cpuidle-info.c:32
+#, c-format
+msgid "CPU %u: No idle states\n"
+msgstr ""
+
+#: utils/cpuidle-info.c:36
+#, c-format
+msgid "CPU %u: Can't read idle state info\n"
+msgstr ""
+
+#: utils/cpuidle-info.c:41
+#, c-format
+msgid "Could not determine max idle state %u\n"
+msgstr ""
+
+#: utils/cpuidle-info.c:46
+#, c-format
+msgid "Number of idle states: %d\n"
+msgstr ""
+
+#: utils/cpuidle-info.c:48
+#, fuzzy, c-format
+msgid "Available idle states:"
+msgstr "  plage de fréquence : "
+
+#: utils/cpuidle-info.c:71
+#, c-format
+msgid "Flags/Description: %s\n"
+msgstr ""
+
+#: utils/cpuidle-info.c:74
+#, c-format
+msgid "Latency: %lu\n"
+msgstr ""
+
+#: utils/cpuidle-info.c:76
+#, c-format
+msgid "Usage: %lu\n"
+msgstr ""
+
+#: utils/cpuidle-info.c:78
+#, c-format
+msgid "Duration: %llu\n"
+msgstr ""
+
+#: utils/cpuidle-info.c:90
+#, c-format
+msgid "Could not determine cpuidle driver\n"
+msgstr ""
+
+#: utils/cpuidle-info.c:94
+#, fuzzy, c-format
+msgid "CPUidle driver: %s\n"
+msgstr "  pilote : %s\n"
+
+#: utils/cpuidle-info.c:99
+#, c-format
+msgid "Could not determine cpuidle governor\n"
+msgstr ""
+
+#: utils/cpuidle-info.c:103
+#, c-format
+msgid "CPUidle governor: %s\n"
+msgstr ""
+
+#: utils/cpuidle-info.c:122
+#, c-format
+msgid "CPU %u: Can't read C-state info\n"
+msgstr ""
+
+#. printf("Cstates: %d\n", cstates);
+#: utils/cpuidle-info.c:127
+#, c-format
+msgid "active state:            C0\n"
+msgstr ""
+
+#: utils/cpuidle-info.c:128
+#, c-format
+msgid "max_cstate:              C%u\n"
+msgstr ""
+
+#: utils/cpuidle-info.c:129
+#, c-format
+msgid "maximum allowed latency: %lu usec\n"
+msgstr ""
+
+#: utils/cpuidle-info.c:130
+#, c-format
+msgid "states:\t\n"
+msgstr ""
+
+#: utils/cpuidle-info.c:132
+#, c-format
+msgid "    C%d:                  type[C%d] "
+msgstr ""
+
+#: utils/cpuidle-info.c:134
+#, c-format
+msgid "promotion[--] demotion[--] "
+msgstr ""
+
+#: utils/cpuidle-info.c:135
+#, c-format
+msgid "latency[%03lu] "
+msgstr ""
+
+#: utils/cpuidle-info.c:137
+#, c-format
+msgid "usage[%08lu] "
+msgstr ""
+
+#: utils/cpuidle-info.c:139
+#, c-format
+msgid "duration[%020Lu] \n"
+msgstr ""
+
+#: utils/cpuidle-info.c:147
+#, fuzzy, c-format
+msgid "Usage: cpupower idleinfo [options]\n"
+msgstr "Usage : cpufreq-info [options]\n"
+
+#: utils/cpuidle-info.c:149
+#, fuzzy, c-format
+msgid "  -s, --silent         Only show general C-state information\n"
+msgstr "  -e, --debug          Afficher les informations de déboguage\n"
+
+#: utils/cpuidle-info.c:150
+#, fuzzy, c-format
+msgid ""
+"  -o, --proc           Prints out information like provided by the /proc/"
+"acpi/processor/*/power\n"
+"                       interface in older kernels\n"
+msgstr ""
+"  -o, --proc           Affiche les informations en utilisant l'interface\n"
+"                       fournie par /proc/cpufreq, présente dans les "
+"versions\n"
+"                       2.4 et les anciennes versions 2.6 du noyau\n"
+
+#: utils/cpuidle-info.c:209
+#, fuzzy, c-format
+msgid "You can't specify more than one output-specific argument\n"
+msgstr ""
+"On ne peut indiquer plus d'un paramètre --cpu, tout comme l'on ne peut\n"
+"spécifier plus d'un argument de formatage\n"
+
+#~ msgid ""
+#~ "  -c CPU, --cpu CPU    CPU number which information shall be determined "
+#~ "about\n"
+#~ msgstr ""
+#~ "  -c CPU, --cpu CPU    Numéro du CPU pour lequel l'information sera "
+#~ "affichée\n"
+
+#~ msgid ""
+#~ "  -c CPU, --cpu CPU        number of CPU where cpufreq settings shall be "
+#~ "modified\n"
+#~ msgstr ""
+#~ "  -c CPU, --cpu CPU        numéro du CPU à prendre en compte pour les\n"
+#~ "                           changements\n"
diff --git a/tools/power/cpupower/po/it.po b/tools/power/cpupower/po/it.po
new file mode 100644
index 00000000000..f80c4ddb9bd
--- /dev/null
+++ b/tools/power/cpupower/po/it.po
@@ -0,0 +1,961 @@
+# Italian translations for cpufrequtils package
+# Copyright (C) 2004-2009
+# This file is distributed under the same license as the cpufrequtils package.
+# Mattia Dongili <malattia@gmail.com>.
+#
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: cpufrequtils 0.3\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-03-08 17:03+0100\n"
+"PO-Revision-Date: 2009-08-15 12:00+0900\n"
+"Last-Translator: Mattia Dongili <malattia@gmail.com>\n"
+"Language-Team: NONE\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: utils/idle_monitor/nhm_idle.c:36
+msgid "Processor Core C3"
+msgstr ""
+
+#: utils/idle_monitor/nhm_idle.c:43
+msgid "Processor Core C6"
+msgstr ""
+
+#: utils/idle_monitor/nhm_idle.c:51
+msgid "Processor Package C3"
+msgstr ""
+
+#: utils/idle_monitor/nhm_idle.c:58 utils/idle_monitor/amd_fam14h_idle.c:70
+msgid "Processor Package C6"
+msgstr ""
+
+#: utils/idle_monitor/snb_idle.c:33
+msgid "Processor Core C7"
+msgstr ""
+
+#: utils/idle_monitor/snb_idle.c:40
+msgid "Processor Package C2"
+msgstr ""
+
+#: utils/idle_monitor/snb_idle.c:47
+msgid "Processor Package C7"
+msgstr ""
+
+#: utils/idle_monitor/amd_fam14h_idle.c:56
+msgid "Package in sleep state (PC1 or deeper)"
+msgstr ""
+
+#: utils/idle_monitor/amd_fam14h_idle.c:63
+msgid "Processor Package C1"
+msgstr ""
+
+#: utils/idle_monitor/amd_fam14h_idle.c:77
+msgid "North Bridge P1 boolean counter (returns 0 or 1)"
+msgstr ""
+
+#: utils/idle_monitor/mperf_monitor.c:35
+msgid "Processor Core not idle"
+msgstr ""
+
+#: utils/idle_monitor/mperf_monitor.c:42
+msgid "Processor Core in an idle state"
+msgstr ""
+
+#: utils/idle_monitor/mperf_monitor.c:50
+msgid "Average Frequency (including boost) in MHz"
+msgstr ""
+
+#: utils/idle_monitor/cpupower-monitor.c:66
+#, c-format
+msgid ""
+"cpupower monitor: [-h] [ [-t] | [-l] | [-m <mon1>,[<mon2>] ] ] [-i "
+"interval_sec | -c command ...]\n"
+msgstr ""
+
+#: utils/idle_monitor/cpupower-monitor.c:69
+#, c-format
+msgid ""
+"cpupower monitor: [-v] [-h] [ [-t] | [-l] | [-m <mon1>,[<mon2>] ] ] [-i "
+"interval_sec | -c command ...]\n"
+msgstr ""
+
+#: utils/idle_monitor/cpupower-monitor.c:71
+#, c-format
+msgid "\t -v: be more verbose\n"
+msgstr ""
+
+#: utils/idle_monitor/cpupower-monitor.c:73
+#, c-format
+msgid "\t -h: print this help\n"
+msgstr ""
+
+#: utils/idle_monitor/cpupower-monitor.c:74
+#, c-format
+msgid "\t -i: time intervall to measure for in seconds (default 1)\n"
+msgstr ""
+
+#: utils/idle_monitor/cpupower-monitor.c:75
+#, c-format
+msgid "\t -t: show CPU topology/hierarchy\n"
+msgstr ""
+
+#: utils/idle_monitor/cpupower-monitor.c:76
+#, c-format
+msgid "\t -l: list available CPU sleep monitors (for use with -m)\n"
+msgstr ""
+
+#: utils/idle_monitor/cpupower-monitor.c:77
+#, c-format
+msgid "\t -m: show specific CPU sleep monitors only (in same order)\n"
+msgstr ""
+
+#: utils/idle_monitor/cpupower-monitor.c:79
+#, c-format
+msgid ""
+"only one of: -t, -l, -m are allowed\n"
+"If none of them is passed,"
+msgstr ""
+
+#: utils/idle_monitor/cpupower-monitor.c:80
+#, c-format
+msgid " all supported monitors are shown\n"
+msgstr ""
+
+#: utils/idle_monitor/cpupower-monitor.c:197
+#, c-format
+msgid "Monitor %s, Counter %s has no count function. Implementation error\n"
+msgstr ""
+
+#: utils/idle_monitor/cpupower-monitor.c:207
+#, c-format
+msgid " *is offline\n"
+msgstr ""
+
+#: utils/idle_monitor/cpupower-monitor.c:236
+#, c-format
+msgid "%s: max monitor name length (%d) exceeded\n"
+msgstr ""
+
+#: utils/idle_monitor/cpupower-monitor.c:250
+#, c-format
+msgid "No matching monitor found in %s, try -l option\n"
+msgstr ""
+
+#: utils/idle_monitor/cpupower-monitor.c:266
+#, c-format
+msgid "Monitor \"%s\" (%d states) - Might overflow after %u s\n"
+msgstr ""
+
+#: utils/idle_monitor/cpupower-monitor.c:319
+#, c-format
+msgid "%s took %.5f seconds and exited with status %d\n"
+msgstr ""
+
+#: utils/idle_monitor/cpupower-monitor.c:406
+#, c-format
+msgid "Cannot read number of available processors\n"
+msgstr ""
+
+#: utils/idle_monitor/cpupower-monitor.c:417
+#, c-format
+msgid "Available monitor %s needs root access\n"
+msgstr ""
+
+#: utils/idle_monitor/cpupower-monitor.c:428
+#, c-format
+msgid "No HW Cstate monitors found\n"
+msgstr ""
+
+#: utils/cpupower.c:78
+#, c-format
+msgid "cpupower [ -c cpulist ] subcommand [ARGS]\n"
+msgstr ""
+
+#: utils/cpupower.c:79
+#, c-format
+msgid "cpupower --version\n"
+msgstr ""
+
+#: utils/cpupower.c:80
+#, c-format
+msgid "Supported subcommands are:\n"
+msgstr ""
+
+#: utils/cpupower.c:83
+#, c-format
+msgid ""
+"\n"
+"Some subcommands can make use of the -c cpulist option.\n"
+msgstr ""
+
+#: utils/cpupower.c:84
+#, c-format
+msgid "Look at the general cpupower manpage how to use it\n"
+msgstr ""
+
+#: utils/cpupower.c:85
+#, c-format
+msgid "and read up the subcommand's manpage whether it is supported.\n"
+msgstr ""
+
+#: utils/cpupower.c:86
+#, c-format
+msgid ""
+"\n"
+"Use cpupower help subcommand for getting help for above subcommands.\n"
+msgstr ""
+
+#: utils/cpupower.c:91
+#, c-format
+msgid "Report errors and bugs to %s, please.\n"
+msgstr "Per favore, comunicare errori e malfunzionamenti a %s.\n"
+
+#: utils/cpupower.c:114
+#, c-format
+msgid "Error parsing cpu list\n"
+msgstr ""
+
+#: utils/cpupower.c:172
+#, c-format
+msgid "Subcommand %s needs root privileges\n"
+msgstr ""
+
+#: utils/cpufreq-info.c:31
+#, c-format
+msgid "Couldn't count the number of CPUs (%s: %s), assuming 1\n"
+msgstr "Impossibile determinare il numero di CPU (%s: %s), assumo sia 1\n"
+
+#: utils/cpufreq-info.c:63
+#, c-format
+msgid ""
+"          minimum CPU frequency  -  maximum CPU frequency  -  governor\n"
+msgstr ""
+"          frequenza minima CPU   -  frequenza massima CPU  -  gestore\n"
+
+#: utils/cpufreq-info.c:151
+#, c-format
+msgid "Error while evaluating Boost Capabilities on CPU %d -- are you root?\n"
+msgstr ""
+
+#. P state changes via MSR are identified via cpuid 80000007
+#. on Intel and AMD, but we assume boost capable machines can do that
+#. if (cpuid_eax(0x80000000) >= 0x80000007
+#. && (cpuid_edx(0x80000007) & (1 << 7)))
+#.
+#: utils/cpufreq-info.c:161
+#, c-format
+msgid "  boost state support: \n"
+msgstr ""
+
+#: utils/cpufreq-info.c:163
+#, c-format
+msgid "    Supported: %s\n"
+msgstr ""
+
+#: utils/cpufreq-info.c:163 utils/cpufreq-info.c:164
+msgid "yes"
+msgstr ""
+
+#: utils/cpufreq-info.c:163 utils/cpufreq-info.c:164
+msgid "no"
+msgstr ""
+
+#: utils/cpufreq-info.c:164
+#, fuzzy, c-format
+msgid "    Active: %s\n"
+msgstr "  modulo %s\n"
+
+#: utils/cpufreq-info.c:177
+#, c-format
+msgid "    Boost States: %d\n"
+msgstr ""
+
+#: utils/cpufreq-info.c:178
+#, c-format
+msgid "    Total States: %d\n"
+msgstr ""
+
+#: utils/cpufreq-info.c:181
+#, c-format
+msgid "    Pstate-Pb%d: %luMHz (boost state)\n"
+msgstr ""
+
+#: utils/cpufreq-info.c:184
+#, c-format
+msgid "    Pstate-P%d:  %luMHz\n"
+msgstr ""
+
+#: utils/cpufreq-info.c:211
+#, c-format
+msgid "  no or unknown cpufreq driver is active on this CPU\n"
+msgstr "  nessun modulo o modulo cpufreq sconosciuto per questa CPU\n"
+
+#: utils/cpufreq-info.c:213
+#, c-format
+msgid "  driver: %s\n"
+msgstr "  modulo %s\n"
+
+#: utils/cpufreq-info.c:219
+#, c-format
+msgid "  CPUs which run at the same hardware frequency: "
+msgstr "  CPU che operano alla stessa frequenza hardware: "
+
+#: utils/cpufreq-info.c:230
+#, c-format
+msgid "  CPUs which need to have their frequency coordinated by software: "
+msgstr "  CPU che è necessario siano coordinate dal software: "
+
+#: utils/cpufreq-info.c:241
+#, c-format
+msgid "  maximum transition latency: "
+msgstr "  latenza massima durante la transizione: "
+
+#: utils/cpufreq-info.c:247
+#, c-format
+msgid "  hardware limits: "
+msgstr "  limiti hardware: "
+
+#: utils/cpufreq-info.c:256
+#, c-format
+msgid "  available frequency steps: "
+msgstr "  frequenze disponibili: "
+
+#: utils/cpufreq-info.c:269
+#, c-format
+msgid "  available cpufreq governors: "
+msgstr "  gestori disponibili: "
+
+#: utils/cpufreq-info.c:280
+#, c-format
+msgid "  current policy: frequency should be within "
+msgstr "  gestore attuale: la frequenza deve mantenersi tra "
+
+#: utils/cpufreq-info.c:282
+#, c-format
+msgid " and "
+msgstr " e "
+
+#: utils/cpufreq-info.c:286
+#, c-format
+msgid ""
+"The governor \"%s\" may decide which speed to use\n"
+"                  within this range.\n"
+msgstr ""
+" Il gestore \"%s\" può decidere quale velocità usare\n"
+"                  in questo intervallo.\n"
+
+#: utils/cpufreq-info.c:293
+#, c-format
+msgid "  current CPU frequency is "
+msgstr "  la frequenza attuale della CPU è "
+
+#: utils/cpufreq-info.c:296
+#, c-format
+msgid " (asserted by call to hardware)"
+msgstr " (ottenuta da una chiamata diretta all'hardware)"
+
+#: utils/cpufreq-info.c:304
+#, c-format
+msgid "  cpufreq stats: "
+msgstr " statistiche cpufreq:"
+
+#: utils/cpufreq-info.c:472
+#, fuzzy, c-format
+msgid "Usage: cpupower freqinfo [options]\n"
+msgstr "Uso: cpufreq-info [opzioni]\n"
+
+#: utils/cpufreq-info.c:473 utils/cpufreq-set.c:26 utils/cpupower-set.c:23
+#: utils/cpupower-info.c:22 utils/cpuidle-info.c:148
+#, c-format
+msgid "Options:\n"
+msgstr "Opzioni:\n"
+
+#: utils/cpufreq-info.c:474
+#, fuzzy, c-format
+msgid "  -e, --debug          Prints out debug information [default]\n"
+msgstr "  -e, --debug          Mostra informazioni di debug\n"
+
+#: utils/cpufreq-info.c:475
+#, c-format
+msgid ""
+"  -f, --freq           Get frequency the CPU currently runs at, according\n"
+"                       to the cpufreq core *\n"
+msgstr ""
+"  -f, --freq           Mostra la frequenza attuale della CPU secondo\n"
+"                       il modulo cpufreq *\n"
+
+#: utils/cpufreq-info.c:477
+#, c-format
+msgid ""
+"  -w, --hwfreq         Get frequency the CPU currently runs at, by reading\n"
+"                       it from hardware (only available to root) *\n"
+msgstr ""
+"  -w, --hwfreq         Mostra la frequenza attuale della CPU leggendola\n"
+"                       dall'hardware (disponibile solo per l'utente root) *\n"
+
+#: utils/cpufreq-info.c:479
+#, c-format
+msgid ""
+"  -l, --hwlimits       Determine the minimum and maximum CPU frequency "
+"allowed *\n"
+msgstr ""
+"  -l, --hwlimits       Determina le frequenze minima e massima possibili per "
+"la CPU *\n"
+
+#: utils/cpufreq-info.c:480
+#, c-format
+msgid "  -d, --driver         Determines the used cpufreq kernel driver *\n"
+msgstr ""
+"  -d, --driver         Determina il modulo cpufreq del kernel in uso *\n"
+
+#: utils/cpufreq-info.c:481
+#, c-format
+msgid "  -p, --policy         Gets the currently used cpufreq policy *\n"
+msgstr ""
+"  -p, --policy         Mostra il gestore cpufreq attualmente in uso *\n"
+
+#: utils/cpufreq-info.c:482
+#, c-format
+msgid "  -g, --governors      Determines available cpufreq governors *\n"
+msgstr "  -g, --governors      Determina i gestori cpufreq disponibili *\n"
+
+#: utils/cpufreq-info.c:483
+#, c-format
+msgid ""
+"  -r, --related-cpus   Determines which CPUs run at the same hardware "
+"frequency *\n"
+msgstr ""
+"  -r, --related-cpus   Determina quali CPU operano alla stessa frequenza *\n"
+
+#: utils/cpufreq-info.c:484
+#, c-format
+msgid ""
+"  -a, --affected-cpus  Determines which CPUs need to have their frequency\n"
+"                       coordinated by software *\n"
+msgstr ""
+"  -a, --affected-cpus  Determina quali CPU devono avere la frequenza\n"
+"                       coordinata dal software *\n"
+
+#: utils/cpufreq-info.c:486
+#, c-format
+msgid "  -s, --stats          Shows cpufreq statistics if available\n"
+msgstr "  -s, --stats          Mostra le statistiche se disponibili\n"
+
+#: utils/cpufreq-info.c:487
+#, c-format
+msgid ""
+"  -y, --latency        Determines the maximum latency on CPU frequency "
+"changes *\n"
+msgstr ""
+"  -y, --latency        Determina la latenza massima durante i cambi di "
+"frequenza *\n"
+
+#: utils/cpufreq-info.c:488
+#, c-format
+msgid "  -b, --boost          Checks for turbo or boost modes  *\n"
+msgstr ""
+
+#: utils/cpufreq-info.c:489
+#, c-format
+msgid ""
+"  -o, --proc           Prints out information like provided by the /proc/"
+"cpufreq\n"
+"                       interface in 2.4. and early 2.6. kernels\n"
+msgstr ""
+"  -o, --proc           Stampa le informazioni come se provenissero dalla\n"
+"                       interfaccia cpufreq /proc/ presente nei kernel\n"
+"                       2.4 ed i primi 2.6\n"
+
+#: utils/cpufreq-info.c:491
+#, c-format
+msgid ""
+"  -m, --human          human-readable output for the -f, -w, -s and -y "
+"parameters\n"
+msgstr ""
+"  -m, --human          formatta l'output delle opzioni -f, -w, -s e -y in "
+"maniera\n"
+"                       leggibile da un essere umano\n"
+
+#: utils/cpufreq-info.c:492 utils/cpuidle-info.c:152
+#, c-format
+msgid "  -h, --help           Prints out this screen\n"
+msgstr "  -h, --help           Stampa questa schermata\n"
+
+#: utils/cpufreq-info.c:495
+#, c-format
+msgid ""
+"If no argument or only the -c, --cpu parameter is given, debug output about\n"
+"cpufreq is printed which is useful e.g. for reporting bugs.\n"
+msgstr ""
+"Se non viene specificata nessuna opzione o viene specificata solo l'opzione -"
+"c, --cpu,\n"
+"le informazioni di debug per cpufreq saranno utili ad esempio a riportare i "
+"bug.\n"
+
+#: utils/cpufreq-info.c:497
+#, c-format
+msgid ""
+"For the arguments marked with *, omitting the -c or --cpu argument is\n"
+"equivalent to setting it to zero\n"
+msgstr ""
+"Per le opzioni segnalate con *, omettere l'opzione -c o --cpu è come "
+"specificarla\n"
+"con il valore 0\n"
+
+#: utils/cpufreq-info.c:580
+#, c-format
+msgid ""
+"The argument passed to this tool can't be combined with passing a --cpu "
+"argument\n"
+msgstr ""
+"L'opzione specificata a questo programma non può essere combinata con --cpu\n"
+
+#: utils/cpufreq-info.c:596
+#, c-format
+msgid ""
+"You can't specify more than one --cpu parameter and/or\n"
+"more than one output-specific argument\n"
+msgstr ""
+"Non è possibile specificare più di una volta l'opzione --cpu e/o\n"
+"specificare più di un parametro di output specifico\n"
+
+#: utils/cpufreq-info.c:600 utils/cpufreq-set.c:82 utils/cpupower-set.c:42
+#: utils/cpupower-info.c:42 utils/cpuidle-info.c:213
+#, c-format
+msgid "invalid or unknown argument\n"
+msgstr "opzione sconosciuta o non valida\n"
+
+#: utils/cpufreq-info.c:617
+#, c-format
+msgid "couldn't analyze CPU %d as it doesn't seem to be present\n"
+msgstr "impossibile analizzare la CPU %d poiché non sembra essere presente\n"
+
+#: utils/cpufreq-info.c:620 utils/cpupower-info.c:142
+#, c-format
+msgid "analyzing CPU %d:\n"
+msgstr "analisi della CPU %d:\n"
+
+#: utils/cpufreq-set.c:25
+#, fuzzy, c-format
+msgid "Usage: cpupower frequency-set [options]\n"
+msgstr "Uso: cpufreq-set [opzioni]\n"
+
+#: utils/cpufreq-set.c:27
+#, c-format
+msgid ""
+"  -d FREQ, --min FREQ      new minimum CPU frequency the governor may "
+"select\n"
+msgstr ""
+"  -d FREQ, --min FREQ      la nuova frequenza minima che il gestore cpufreq "
+"può scegliere\n"
+
+#: utils/cpufreq-set.c:28
+#, c-format
+msgid ""
+"  -u FREQ, --max FREQ      new maximum CPU frequency the governor may "
+"select\n"
+msgstr ""
+"  -u FREQ, --max FREQ      la nuova frequenza massima che il gestore cpufreq "
+"può scegliere\n"
+
+#: utils/cpufreq-set.c:29
+#, c-format
+msgid "  -g GOV, --governor GOV   new cpufreq governor\n"
+msgstr "  -g GOV, --governor GOV   nuovo gestore cpufreq\n"
+
+#: utils/cpufreq-set.c:30
+#, c-format
+msgid ""
+"  -f FREQ, --freq FREQ     specific frequency to be set. Requires userspace\n"
+"                           governor to be available and loaded\n"
+msgstr ""
+"  -f FREQ, --freq FREQ     specifica la frequenza a cui impostare la CPU.\n"
+"                           È necessario che il gestore userspace sia "
+"disponibile e caricato\n"
+
+#: utils/cpufreq-set.c:32
+#, c-format
+msgid "  -r, --related            Switches all hardware-related CPUs\n"
+msgstr ""
+"  -r, --related            Modifica tutte le CPU coordinate dall'hardware\n"
+
+#: utils/cpufreq-set.c:33 utils/cpupower-set.c:28 utils/cpupower-info.c:27
+#, c-format
+msgid "  -h, --help               Prints out this screen\n"
+msgstr "  -h, --help               Stampa questa schermata\n"
+
+#: utils/cpufreq-set.c:35
+#, fuzzy, c-format
+msgid ""
+"Notes:\n"
+"1. Omitting the -c or --cpu argument is equivalent to setting it to \"all\"\n"
+msgstr ""
+"Per le opzioni segnalate con *, omettere l'opzione -c o --cpu è come "
+"specificarla\n"
+"con il valore 0\n"
+
+#: utils/cpufreq-set.c:37
+#, fuzzy, c-format
+msgid ""
+"2. The -f FREQ, --freq FREQ parameter cannot be combined with any other "
+"parameter\n"
+"   except the -c CPU, --cpu CPU parameter\n"
+"3. FREQuencies can be passed in Hz, kHz (default), MHz, GHz, or THz\n"
+"   by postfixing the value with the wanted unit name, without any space\n"
+"   (FREQuency in kHz =^ Hz * 0.001 =^ MHz * 1000 =^ GHz * 1000000).\n"
+msgstr ""
+"Note:\n"
+"1. Omettere l'opzione -c o --cpu è equivalente a impostarlo a 0\n"
+"2. l'opzione -f FREQ, --freq FREQ non può essere specificata con altre "
+"opzioni\n"
+"   ad eccezione dell'opzione -c CPU o --cpu CPU\n"
+"3. le FREQuenze possono essere specuficate in  Hz, kHz (default), MHz, GHz, "
+"or THz\n"
+"   postponendo l'unità di misura al valore senza nessuno spazio fra loro\n"
+"   (FREQuenza in kHz =^ Hz * 0.001 =^ MHz * 1000 =^ GHz * 1000000).\n"
+
+#: utils/cpufreq-set.c:57
+#, c-format
+msgid ""
+"Error setting new values. Common errors:\n"
+"- Do you have proper administration rights? (super-user?)\n"
+"- Is the governor you requested available and modprobed?\n"
+"- Trying to set an invalid policy?\n"
+"- Trying to set a specific frequency, but userspace governor is not "
+"available,\n"
+"   for example because of hardware which cannot be set to a specific "
+"frequency\n"
+"   or because the userspace governor isn't loaded?\n"
+msgstr ""
+"Si sono verificati degli errori impostando i nuovi valori.\n"
+"Alcuni errori comuni possono essere:\n"
+"- Hai i necessari diritti di amministrazione? (super-user?)\n"
+"- Il gestore che hai richiesto è disponibile e caricato?\n"
+"- Stai provando ad impostare una politica di gestione non valida?\n"
+"- Stai provando a impostare una specifica frequenza ma il gestore\n"
+"  userspace non è disponibile, per esempio a causa dell'hardware\n"
+"  che non supporta frequenze fisse o a causa del fatto che\n"
+"  il gestore userspace non è caricato?\n"
+
+#: utils/cpufreq-set.c:170
+#, c-format
+msgid "wrong, unknown or unhandled CPU?\n"
+msgstr "CPU errata, sconosciuta o non gestita?\n"
+
+#: utils/cpufreq-set.c:302
+#, c-format
+msgid ""
+"the -f/--freq parameter cannot be combined with -d/--min, -u/--max or\n"
+"-g/--governor parameters\n"
+msgstr ""
+"l'opzione -f/--freq non può venire combinata con i parametri\n"
+" -d/--min, -u/--max o -g/--governor\n"
+
+#: utils/cpufreq-set.c:308
+#, c-format
+msgid ""
+"At least one parameter out of -f/--freq, -d/--min, -u/--max, and\n"
+"-g/--governor must be passed\n"
+msgstr ""
+"Almeno una delle opzioni -f/--freq, -d/--min, -u/--max, e -g/--governor\n"
+"deve essere specificata\n"
+
+#: utils/cpufreq-set.c:347
+#, c-format
+msgid "Setting cpu: %d\n"
+msgstr ""
+
+#: utils/cpupower-set.c:22
+#, c-format
+msgid "Usage: cpupower set [ -b val ] [ -m val ] [ -s val ]\n"
+msgstr ""
+
+#: utils/cpupower-set.c:24
+#, c-format
+msgid ""
+"  -b, --perf-bias [VAL]    Sets CPU's power vs performance policy on some\n"
+"                           Intel models [0-15], see manpage for details\n"
+msgstr ""
+
+#: utils/cpupower-set.c:26
+#, c-format
+msgid ""
+"  -m, --sched-mc  [VAL]    Sets the kernel's multi core scheduler policy.\n"
+msgstr ""
+
+#: utils/cpupower-set.c:27
+#, c-format
+msgid ""
+"  -s, --sched-smt [VAL]    Sets the kernel's thread sibling scheduler "
+"policy.\n"
+msgstr ""
+
+#: utils/cpupower-set.c:80
+#, c-format
+msgid "--perf-bias param out of range [0-%d]\n"
+msgstr ""
+
+#: utils/cpupower-set.c:91
+#, c-format
+msgid "--sched-mc param out of range [0-%d]\n"
+msgstr ""
+
+#: utils/cpupower-set.c:102
+#, c-format
+msgid "--sched-smt param out of range [0-%d]\n"
+msgstr ""
+
+#: utils/cpupower-set.c:121
+#, c-format
+msgid "Error setting sched-mc %s\n"
+msgstr ""
+
+#: utils/cpupower-set.c:127
+#, c-format
+msgid "Error setting sched-smt %s\n"
+msgstr ""
+
+#: utils/cpupower-set.c:146
+#, c-format
+msgid "Error setting perf-bias value on CPU %d\n"
+msgstr ""
+
+#: utils/cpupower-info.c:21
+#, c-format
+msgid "Usage: cpupower info [ -b ] [ -m ] [ -s ]\n"
+msgstr ""
+
+#: utils/cpupower-info.c:23
+#, c-format
+msgid ""
+"  -b, --perf-bias    Gets CPU's power vs performance policy on some\n"
+"                           Intel models [0-15], see manpage for details\n"
+msgstr ""
+
+#: utils/cpupower-info.c:25
+#, fuzzy, c-format
+msgid "  -m, --sched-mc     Gets the kernel's multi core scheduler policy.\n"
+msgstr ""
+"  -p, --policy         Mostra il gestore cpufreq attualmente in uso *\n"
+
+#: utils/cpupower-info.c:26
+#, c-format
+msgid ""
+"  -s, --sched-smt    Gets the kernel's thread sibling scheduler policy.\n"
+msgstr ""
+
+#: utils/cpupower-info.c:28
+#, c-format
+msgid ""
+"\n"
+"Passing no option will show all info, by default only on core 0\n"
+msgstr ""
+
+#: utils/cpupower-info.c:102
+#, c-format
+msgid "System's multi core scheduler setting: "
+msgstr ""
+
+#. if sysfs file is missing it's: errno == ENOENT
+#: utils/cpupower-info.c:105 utils/cpupower-info.c:114
+#, c-format
+msgid "not supported\n"
+msgstr ""
+
+#: utils/cpupower-info.c:111
+#, c-format
+msgid "System's thread sibling scheduler setting: "
+msgstr ""
+
+#: utils/cpupower-info.c:126
+#, c-format
+msgid "Intel's performance bias setting needs root privileges\n"
+msgstr ""
+
+#: utils/cpupower-info.c:128
+#, c-format
+msgid "System does not support Intel's performance bias setting\n"
+msgstr ""
+
+#: utils/cpupower-info.c:147
+#, c-format
+msgid "Could not read perf-bias value\n"
+msgstr ""
+
+#: utils/cpupower-info.c:150
+#, c-format
+msgid "perf-bias: %d\n"
+msgstr ""
+
+#: utils/cpuidle-info.c:28
+#, fuzzy, c-format
+msgid "Analyzing CPU %d:\n"
+msgstr "analisi della CPU %d:\n"
+
+#: utils/cpuidle-info.c:32
+#, c-format
+msgid "CPU %u: No idle states\n"
+msgstr ""
+
+#: utils/cpuidle-info.c:36
+#, c-format
+msgid "CPU %u: Can't read idle state info\n"
+msgstr ""
+
+#: utils/cpuidle-info.c:41
+#, c-format
+msgid "Could not determine max idle state %u\n"
+msgstr ""
+
+#: utils/cpuidle-info.c:46
+#, c-format
+msgid "Number of idle states: %d\n"
+msgstr ""
+
+#: utils/cpuidle-info.c:48
+#, fuzzy, c-format
+msgid "Available idle states:"
+msgstr "  frequenze disponibili: "
+
+#: utils/cpuidle-info.c:71
+#, c-format
+msgid "Flags/Description: %s\n"
+msgstr ""
+
+#: utils/cpuidle-info.c:74
+#, c-format
+msgid "Latency: %lu\n"
+msgstr ""
+
+#: utils/cpuidle-info.c:76
+#, c-format
+msgid "Usage: %lu\n"
+msgstr ""
+
+#: utils/cpuidle-info.c:78
+#, c-format
+msgid "Duration: %llu\n"
+msgstr ""
+
+#: utils/cpuidle-info.c:90
+#, c-format
+msgid "Could not determine cpuidle driver\n"
+msgstr ""
+
+#: utils/cpuidle-info.c:94
+#, fuzzy, c-format
+msgid "CPUidle driver: %s\n"
+msgstr "  modulo %s\n"
+
+#: utils/cpuidle-info.c:99
+#, c-format
+msgid "Could not determine cpuidle governor\n"
+msgstr ""
+
+#: utils/cpuidle-info.c:103
+#, c-format
+msgid "CPUidle governor: %s\n"
+msgstr ""
+
+#: utils/cpuidle-info.c:122
+#, c-format
+msgid "CPU %u: Can't read C-state info\n"
+msgstr ""
+
+#. printf("Cstates: %d\n", cstates);
+#: utils/cpuidle-info.c:127
+#, c-format
+msgid "active state:            C0\n"
+msgstr ""
+
+#: utils/cpuidle-info.c:128
+#, c-format
+msgid "max_cstate:              C%u\n"
+msgstr ""
+
+#: utils/cpuidle-info.c:129
+#, fuzzy, c-format
+msgid "maximum allowed latency: %lu usec\n"
+msgstr "  latenza massima durante la transizione: "
+
+#: utils/cpuidle-info.c:130
+#, c-format
+msgid "states:\t\n"
+msgstr ""
+
+#: utils/cpuidle-info.c:132
+#, c-format
+msgid "    C%d:                  type[C%d] "
+msgstr ""
+
+#: utils/cpuidle-info.c:134
+#, c-format
+msgid "promotion[--] demotion[--] "
+msgstr ""
+
+#: utils/cpuidle-info.c:135
+#, c-format
+msgid "latency[%03lu] "
+msgstr ""
+
+#: utils/cpuidle-info.c:137
+#, c-format
+msgid "usage[%08lu] "
+msgstr ""
+
+#: utils/cpuidle-info.c:139
+#, c-format
+msgid "duration[%020Lu] \n"
+msgstr ""
+
+#: utils/cpuidle-info.c:147
+#, fuzzy, c-format
+msgid "Usage: cpupower idleinfo [options]\n"
+msgstr "Uso: cpufreq-info [opzioni]\n"
+
+#: utils/cpuidle-info.c:149
+#, fuzzy, c-format
+msgid "  -s, --silent         Only show general C-state information\n"
+msgstr "  -e, --debug          Mostra informazioni di debug\n"
+
+#: utils/cpuidle-info.c:150
+#, fuzzy, c-format
+msgid ""
+"  -o, --proc           Prints out information like provided by the /proc/"
+"acpi/processor/*/power\n"
+"                       interface in older kernels\n"
+msgstr ""
+"  -o, --proc           Stampa le informazioni come se provenissero dalla\n"
+"                       interfaccia cpufreq /proc/ presente nei kernel\n"
+"                       2.4 ed i primi 2.6\n"
+
+#: utils/cpuidle-info.c:209
+#, fuzzy, c-format
+msgid "You can't specify more than one output-specific argument\n"
+msgstr ""
+"Non è possibile specificare più di una volta l'opzione --cpu e/o\n"
+"specificare più di un parametro di output specifico\n"
+
+#~ msgid ""
+#~ "  -c CPU, --cpu CPU    CPU number which information shall be determined "
+#~ "about\n"
+#~ msgstr ""
+#~ "  -c CPU, --cpu CPU    Numero di CPU per la quale ottenere le "
+#~ "informazioni\n"
+
+#~ msgid ""
+#~ "  -c CPU, --cpu CPU        number of CPU where cpufreq settings shall be "
+#~ "modified\n"
+#~ msgstr ""
+#~ "  -c CPU, --cpu CPU        numero di CPU per la quale modificare le "
+#~ "impostazioni\n"
+
+#, fuzzy
+#~ msgid "  CPUs which coordinate software frequency requirements: "
+#~ msgstr ""
+#~ "  CPU per le quali e` necessario cambiare la frequenza "
+#~ "contemporaneamente: "
diff --git a/tools/power/cpupower/po/pt.po b/tools/power/cpupower/po/pt.po
new file mode 100644
index 00000000000..990f5267ffe
--- /dev/null
+++ b/tools/power/cpupower/po/pt.po
@@ -0,0 +1,957 @@
+# Brazilian Portuguese translations for cpufrequtils package
+# Copyright (C) 2008 THE cpufrequtils'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the cpufrequtils package.
+# Claudio Eduardo <claudioeddy@gmail.com>, 2009.
+#
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: cpufrequtils 004\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-03-08 17:03+0100\n"
+"PO-Revision-Date: 2008-06-14 22:16-0400\n"
+"Last-Translator: Claudio Eduardo <claudioeddy@gmail.com>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: utils/idle_monitor/nhm_idle.c:36
+msgid "Processor Core C3"
+msgstr ""
+
+#: utils/idle_monitor/nhm_idle.c:43
+msgid "Processor Core C6"
+msgstr ""
+
+#: utils/idle_monitor/nhm_idle.c:51
+msgid "Processor Package C3"
+msgstr ""
+
+#: utils/idle_monitor/nhm_idle.c:58 utils/idle_monitor/amd_fam14h_idle.c:70
+msgid "Processor Package C6"
+msgstr ""
+
+#: utils/idle_monitor/snb_idle.c:33
+msgid "Processor Core C7"
+msgstr ""
+
+#: utils/idle_monitor/snb_idle.c:40
+msgid "Processor Package C2"
+msgstr ""
+
+#: utils/idle_monitor/snb_idle.c:47
+msgid "Processor Package C7"
+msgstr ""
+
+#: utils/idle_monitor/amd_fam14h_idle.c:56
+msgid "Package in sleep state (PC1 or deeper)"
+msgstr ""
+
+#: utils/idle_monitor/amd_fam14h_idle.c:63
+msgid "Processor Package C1"
+msgstr ""
+
+#: utils/idle_monitor/amd_fam14h_idle.c:77
+msgid "North Bridge P1 boolean counter (returns 0 or 1)"
+msgstr ""
+
+#: utils/idle_monitor/mperf_monitor.c:35
+msgid "Processor Core not idle"
+msgstr ""
+
+#: utils/idle_monitor/mperf_monitor.c:42
+msgid "Processor Core in an idle state"
+msgstr ""
+
+#: utils/idle_monitor/mperf_monitor.c:50
+msgid "Average Frequency (including boost) in MHz"
+msgstr ""
+
+#: utils/idle_monitor/cpupower-monitor.c:66
+#, c-format
+msgid ""
+"cpupower monitor: [-h] [ [-t] | [-l] | [-m <mon1>,[<mon2>] ] ] [-i "
+"interval_sec | -c command ...]\n"
+msgstr ""
+
+#: utils/idle_monitor/cpupower-monitor.c:69
+#, c-format
+msgid ""
+"cpupower monitor: [-v] [-h] [ [-t] | [-l] | [-m <mon1>,[<mon2>] ] ] [-i "
+"interval_sec | -c command ...]\n"
+msgstr ""
+
+#: utils/idle_monitor/cpupower-monitor.c:71
+#, c-format
+msgid "\t -v: be more verbose\n"
+msgstr ""
+
+#: utils/idle_monitor/cpupower-monitor.c:73
+#, c-format
+msgid "\t -h: print this help\n"
+msgstr ""
+
+#: utils/idle_monitor/cpupower-monitor.c:74
+#, c-format
+msgid "\t -i: time intervall to measure for in seconds (default 1)\n"
+msgstr ""
+
+#: utils/idle_monitor/cpupower-monitor.c:75
+#, c-format
+msgid "\t -t: show CPU topology/hierarchy\n"
+msgstr ""
+
+#: utils/idle_monitor/cpupower-monitor.c:76
+#, c-format
+msgid "\t -l: list available CPU sleep monitors (for use with -m)\n"
+msgstr ""
+
+#: utils/idle_monitor/cpupower-monitor.c:77
+#, c-format
+msgid "\t -m: show specific CPU sleep monitors only (in same order)\n"
+msgstr ""
+
+#: utils/idle_monitor/cpupower-monitor.c:79
+#, c-format
+msgid ""
+"only one of: -t, -l, -m are allowed\n"
+"If none of them is passed,"
+msgstr ""
+
+#: utils/idle_monitor/cpupower-monitor.c:80
+#, c-format
+msgid " all supported monitors are shown\n"
+msgstr ""
+
+#: utils/idle_monitor/cpupower-monitor.c:197
+#, c-format
+msgid "Monitor %s, Counter %s has no count function. Implementation error\n"
+msgstr ""
+
+#: utils/idle_monitor/cpupower-monitor.c:207
+#, c-format
+msgid " *is offline\n"
+msgstr ""
+
+#: utils/idle_monitor/cpupower-monitor.c:236
+#, c-format
+msgid "%s: max monitor name length (%d) exceeded\n"
+msgstr ""
+
+#: utils/idle_monitor/cpupower-monitor.c:250
+#, c-format
+msgid "No matching monitor found in %s, try -l option\n"
+msgstr ""
+
+#: utils/idle_monitor/cpupower-monitor.c:266
+#, c-format
+msgid "Monitor \"%s\" (%d states) - Might overflow after %u s\n"
+msgstr ""
+
+#: utils/idle_monitor/cpupower-monitor.c:319
+#, c-format
+msgid "%s took %.5f seconds and exited with status %d\n"
+msgstr ""
+
+#: utils/idle_monitor/cpupower-monitor.c:406
+#, c-format
+msgid "Cannot read number of available processors\n"
+msgstr ""
+
+#: utils/idle_monitor/cpupower-monitor.c:417
+#, c-format
+msgid "Available monitor %s needs root access\n"
+msgstr ""
+
+#: utils/idle_monitor/cpupower-monitor.c:428
+#, c-format
+msgid "No HW Cstate monitors found\n"
+msgstr ""
+
+#: utils/cpupower.c:78
+#, c-format
+msgid "cpupower [ -c cpulist ] subcommand [ARGS]\n"
+msgstr ""
+
+#: utils/cpupower.c:79
+#, c-format
+msgid "cpupower --version\n"
+msgstr ""
+
+#: utils/cpupower.c:80
+#, c-format
+msgid "Supported subcommands are:\n"
+msgstr ""
+
+#: utils/cpupower.c:83
+#, c-format
+msgid ""
+"\n"
+"Some subcommands can make use of the -c cpulist option.\n"
+msgstr ""
+
+#: utils/cpupower.c:84
+#, c-format
+msgid "Look at the general cpupower manpage how to use it\n"
+msgstr ""
+
+#: utils/cpupower.c:85
+#, c-format
+msgid "and read up the subcommand's manpage whether it is supported.\n"
+msgstr ""
+
+#: utils/cpupower.c:86
+#, c-format
+msgid ""
+"\n"
+"Use cpupower help subcommand for getting help for above subcommands.\n"
+msgstr ""
+
+#: utils/cpupower.c:91
+#, c-format
+msgid "Report errors and bugs to %s, please.\n"
+msgstr "Reporte erros e bugs para %s, por favor.\n"
+
+#: utils/cpupower.c:114
+#, c-format
+msgid "Error parsing cpu list\n"
+msgstr ""
+
+#: utils/cpupower.c:172
+#, c-format
+msgid "Subcommand %s needs root privileges\n"
+msgstr ""
+
+#: utils/cpufreq-info.c:31
+#, c-format
+msgid "Couldn't count the number of CPUs (%s: %s), assuming 1\n"
+msgstr "Não foi possível contar o número de CPUs (%s: %s), assumindo 1\n"
+
+#: utils/cpufreq-info.c:63
+#, c-format
+msgid ""
+"          minimum CPU frequency  -  maximum CPU frequency  -  governor\n"
+msgstr ""
+"          frequência mínina do CPU  -  frequência máxima do CPU  -  "
+"regulador\n"
+
+#: utils/cpufreq-info.c:151
+#, c-format
+msgid "Error while evaluating Boost Capabilities on CPU %d -- are you root?\n"
+msgstr ""
+
+#. P state changes via MSR are identified via cpuid 80000007
+#. on Intel and AMD, but we assume boost capable machines can do that
+#. if (cpuid_eax(0x80000000) >= 0x80000007
+#. && (cpuid_edx(0x80000007) & (1 << 7)))
+#.
+#: utils/cpufreq-info.c:161
+#, c-format
+msgid "  boost state support: \n"
+msgstr ""
+
+#: utils/cpufreq-info.c:163
+#, c-format
+msgid "    Supported: %s\n"
+msgstr ""
+
+#: utils/cpufreq-info.c:163 utils/cpufreq-info.c:164
+msgid "yes"
+msgstr ""
+
+#: utils/cpufreq-info.c:163 utils/cpufreq-info.c:164
+msgid "no"
+msgstr ""
+
+#: utils/cpufreq-info.c:164
+#, fuzzy, c-format
+msgid "    Active: %s\n"
+msgstr "  driver: %s\n"
+
+#: utils/cpufreq-info.c:177
+#, c-format
+msgid "    Boost States: %d\n"
+msgstr ""
+
+#: utils/cpufreq-info.c:178
+#, c-format
+msgid "    Total States: %d\n"
+msgstr ""
+
+#: utils/cpufreq-info.c:181
+#, c-format
+msgid "    Pstate-Pb%d: %luMHz (boost state)\n"
+msgstr ""
+
+#: utils/cpufreq-info.c:184
+#, c-format
+msgid "    Pstate-P%d:  %luMHz\n"
+msgstr ""
+
+#: utils/cpufreq-info.c:211
+#, c-format
+msgid "  no or unknown cpufreq driver is active on this CPU\n"
+msgstr "  nenhum ou driver do cpufreq deconhecido está ativo nesse CPU\n"
+
+#: utils/cpufreq-info.c:213
+#, c-format
+msgid "  driver: %s\n"
+msgstr "  driver: %s\n"
+
+#: utils/cpufreq-info.c:219
+#, c-format
+msgid "  CPUs which run at the same hardware frequency: "
+msgstr "  CPUs que rodam na mesma frequência de hardware: "
+
+#: utils/cpufreq-info.c:230
+#, c-format
+msgid "  CPUs which need to have their frequency coordinated by software: "
+msgstr "  CPUs que precisam ter suas frequências coordenadas por software: "
+
+#: utils/cpufreq-info.c:241
+#, c-format
+msgid "  maximum transition latency: "
+msgstr "  maior latência de transição: "
+
+#: utils/cpufreq-info.c:247
+#, c-format
+msgid "  hardware limits: "
+msgstr "  limites do hardware: "
+
+#: utils/cpufreq-info.c:256
+#, c-format
+msgid "  available frequency steps: "
+msgstr "  níveis de frequência disponíveis: "
+
+#: utils/cpufreq-info.c:269
+#, c-format
+msgid "  available cpufreq governors: "
+msgstr "  reguladores do cpufreq disponíveis: "
+
+#: utils/cpufreq-info.c:280
+#, c-format
+msgid "  current policy: frequency should be within "
+msgstr "  política de frequência atual deve estar entre "
+
+#: utils/cpufreq-info.c:282
+#, c-format
+msgid " and "
+msgstr " e "
+
+#: utils/cpufreq-info.c:286
+#, c-format
+msgid ""
+"The governor \"%s\" may decide which speed to use\n"
+"                  within this range.\n"
+msgstr ""
+"O regulador \"%s\" deve decidir qual velocidade usar\n"
+"                  dentro desse limite.\n"
+
+#: utils/cpufreq-info.c:293
+#, c-format
+msgid "  current CPU frequency is "
+msgstr "  frequência atual do CPU é "
+
+#: utils/cpufreq-info.c:296
+#, c-format
+msgid " (asserted by call to hardware)"
+msgstr " (declarado por chamada ao hardware)"
+
+#: utils/cpufreq-info.c:304
+#, c-format
+msgid "  cpufreq stats: "
+msgstr "  status do cpufreq: "
+
+#: utils/cpufreq-info.c:472
+#, fuzzy, c-format
+msgid "Usage: cpupower freqinfo [options]\n"
+msgstr "Uso: cpufreq-info [opções]\n"
+
+#: utils/cpufreq-info.c:473 utils/cpufreq-set.c:26 utils/cpupower-set.c:23
+#: utils/cpupower-info.c:22 utils/cpuidle-info.c:148
+#, c-format
+msgid "Options:\n"
+msgstr "Opções:\n"
+
+#: utils/cpufreq-info.c:474
+#, fuzzy, c-format
+msgid "  -e, --debug          Prints out debug information [default]\n"
+msgstr "  -e, --debug          Mostra informação de debug\n"
+
+#: utils/cpufreq-info.c:475
+#, c-format
+msgid ""
+"  -f, --freq           Get frequency the CPU currently runs at, according\n"
+"                       to the cpufreq core *\n"
+msgstr ""
+"  -f, --freq           Obtem a frequência na qual o CPU roda no momento, de "
+"acordo\n"
+"                       com o núcleo do cpufreq *\n"
+
+#: utils/cpufreq-info.c:477
+#, c-format
+msgid ""
+"  -w, --hwfreq         Get frequency the CPU currently runs at, by reading\n"
+"                       it from hardware (only available to root) *\n"
+msgstr ""
+"  -w, --hwfreq         Obtem a frequência na qual o CPU está operando no "
+"momento,\n"
+"                       através de leitura no hardware (disponível somente "
+"para root) *\n"
+
+#: utils/cpufreq-info.c:479
+#, c-format
+msgid ""
+"  -l, --hwlimits       Determine the minimum and maximum CPU frequency "
+"allowed *\n"
+msgstr ""
+"  -l, --hwlimits       Determina a frequência mínima e máxima do CPU "
+"permitida *\n"
+
+#: utils/cpufreq-info.c:480
+#, c-format
+msgid "  -d, --driver         Determines the used cpufreq kernel driver *\n"
+msgstr ""
+"  -d,  --driver         Determina o driver do kernel do cpufreq usado *\n"
+
+#: utils/cpufreq-info.c:481
+#, c-format
+msgid "  -p, --policy         Gets the currently used cpufreq policy *\n"
+msgstr ""
+"--p, --policy         Obtem a política do cpufreq em uso no momento *\n"
+
+#: utils/cpufreq-info.c:482
+#, c-format
+msgid "  -g, --governors      Determines available cpufreq governors *\n"
+msgstr ""
+"  -g, --governors      Determina reguladores do cpufreq disponíveis *\n"
+
+#: utils/cpufreq-info.c:483
+#, c-format
+msgid ""
+"  -r, --related-cpus   Determines which CPUs run at the same hardware "
+"frequency *\n"
+msgstr ""
+"  -r, --related-cpus   Determina quais CPUs rodam na mesma frequência de "
+"hardware *\n"
+
+#: utils/cpufreq-info.c:484
+#, c-format
+msgid ""
+"  -a, --affected-cpus  Determines which CPUs need to have their frequency\n"
+"                       coordinated by software *\n"
+msgstr ""
+"  -a, --affected-cpus  Determina quais CPUs precisam ter suas frequências\n"
+"                       coordenadas por software *\n"
+
+#: utils/cpufreq-info.c:486
+#, c-format
+msgid "  -s, --stats          Shows cpufreq statistics if available\n"
+msgstr "  -s, --stats          Mostra estatísticas do cpufreq se disponíveis\n"
+
+#: utils/cpufreq-info.c:487
+#, c-format
+msgid ""
+"  -y, --latency        Determines the maximum latency on CPU frequency "
+"changes *\n"
+msgstr ""
+"  -y, --latency        Determina a latência máxima nas trocas de frequência "
+"do CPU *\n"
+
+#: utils/cpufreq-info.c:488
+#, c-format
+msgid "  -b, --boost          Checks for turbo or boost modes  *\n"
+msgstr ""
+
+#: utils/cpufreq-info.c:489
+#, c-format
+msgid ""
+"  -o, --proc           Prints out information like provided by the /proc/"
+"cpufreq\n"
+"                       interface in 2.4. and early 2.6. kernels\n"
+msgstr ""
+"  -o, --proc           Mostra informação do tipo provida pela interface /"
+"proc/cpufreq\n"
+"                       em kernels 2.4. e mais recentes 2.6\n"
+
+#: utils/cpufreq-info.c:491
+#, c-format
+msgid ""
+"  -m, --human          human-readable output for the -f, -w, -s and -y "
+"parameters\n"
+msgstr ""
+"  -m, --human          saída legível para humanos para os parâmetros -f, -w, "
+"-s e -y\n"
+
+#: utils/cpufreq-info.c:492 utils/cpuidle-info.c:152
+#, c-format
+msgid "  -h, --help           Prints out this screen\n"
+msgstr " -h, --help           Imprime essa tela\n"
+
+#: utils/cpufreq-info.c:495
+#, c-format
+msgid ""
+"If no argument or only the -c, --cpu parameter is given, debug output about\n"
+"cpufreq is printed which is useful e.g. for reporting bugs.\n"
+msgstr ""
+"Se nenhum argumento ou somente o parâmetro -c, --cpu é dado, informação de "
+"debug sobre\n"
+"o cpufreq é mostrada, o que é útil por exemplo para reportar bugs.\n"
+
+#: utils/cpufreq-info.c:497
+#, c-format
+msgid ""
+"For the arguments marked with *, omitting the -c or --cpu argument is\n"
+"equivalent to setting it to zero\n"
+msgstr ""
+"Para os argumentos marcados com *, omitir o argumento -c ou --cpu é\n"
+"equivalente a setá-lo como zero\n"
+
+#: utils/cpufreq-info.c:580
+#, c-format
+msgid ""
+"The argument passed to this tool can't be combined with passing a --cpu "
+"argument\n"
+msgstr ""
+"O argumento usado pra essa ferramenta não pode ser combinado com um "
+"argumento --cpu\n"
+
+#: utils/cpufreq-info.c:596
+#, c-format
+msgid ""
+"You can't specify more than one --cpu parameter and/or\n"
+"more than one output-specific argument\n"
+msgstr ""
+"Você não pode especificar mais do que um parâmetro --cpu e/ou\n"
+"mais do que um argumento de saída específico\n"
+
+#: utils/cpufreq-info.c:600 utils/cpufreq-set.c:82 utils/cpupower-set.c:42
+#: utils/cpupower-info.c:42 utils/cpuidle-info.c:213
+#, c-format
+msgid "invalid or unknown argument\n"
+msgstr "argumento inválido ou desconhecido\n"
+
+#: utils/cpufreq-info.c:617
+#, c-format
+msgid "couldn't analyze CPU %d as it doesn't seem to be present\n"
+msgstr ""
+"não foi possível analisar o CPU % já que o mesmo parece não estar presente\n"
+
+#: utils/cpufreq-info.c:620 utils/cpupower-info.c:142
+#, c-format
+msgid "analyzing CPU %d:\n"
+msgstr "analisando o CPU %d:\n"
+
+#: utils/cpufreq-set.c:25
+#, fuzzy, c-format
+msgid "Usage: cpupower frequency-set [options]\n"
+msgstr "Uso: cpufreq-set [opções]\n"
+
+#: utils/cpufreq-set.c:27
+#, c-format
+msgid ""
+"  -d FREQ, --min FREQ      new minimum CPU frequency the governor may "
+"select\n"
+msgstr ""
+"  -d FREQ, --min FREQ      nova frequência mínima do CPU que o regulador "
+"deve selecionar\n"
+
+#: utils/cpufreq-set.c:28
+#, c-format
+msgid ""
+"  -u FREQ, --max FREQ      new maximum CPU frequency the governor may "
+"select\n"
+msgstr ""
+"  -u FREQ, --max FREQ      nova frequência máxima do CPU que o regulador "
+"deve escolher\n"
+
+#: utils/cpufreq-set.c:29
+#, c-format
+msgid "  -g GOV, --governor GOV   new cpufreq governor\n"
+msgstr "  -g GOV, --governor GOV   novo regulador do cpufreq\n"
+
+#: utils/cpufreq-set.c:30
+#, c-format
+msgid ""
+"  -f FREQ, --freq FREQ     specific frequency to be set. Requires userspace\n"
+"                           governor to be available and loaded\n"
+msgstr ""
+"  -f FREQ, --freq FREQ     frequência específica para ser setada. Necessita "
+"que o regulador em\n"
+"                           nível de usuário esteja disponível e carregado\n"
+
+#: utils/cpufreq-set.c:32
+#, c-format
+msgid "  -r, --related            Switches all hardware-related CPUs\n"
+msgstr ""
+"  -r, --related            Modifica todos os CPUs relacionados ao hardware\n"
+
+#: utils/cpufreq-set.c:33 utils/cpupower-set.c:28 utils/cpupower-info.c:27
+#, c-format
+msgid "  -h, --help               Prints out this screen\n"
+msgstr " -h, --help           Mostra essa tela\n"
+
+#: utils/cpufreq-set.c:35
+#, fuzzy, c-format
+msgid ""
+"Notes:\n"
+"1. Omitting the -c or --cpu argument is equivalent to setting it to \"all\"\n"
+msgstr ""
+"Para os argumentos marcados com *, omitir o argumento -c ou --cpu é\n"
+"equivalente a setá-lo como zero\n"
+
+#: utils/cpufreq-set.c:37
+#, fuzzy, c-format
+msgid ""
+"2. The -f FREQ, --freq FREQ parameter cannot be combined with any other "
+"parameter\n"
+"   except the -c CPU, --cpu CPU parameter\n"
+"3. FREQuencies can be passed in Hz, kHz (default), MHz, GHz, or THz\n"
+"   by postfixing the value with the wanted unit name, without any space\n"
+"   (FREQuency in kHz =^ Hz * 0.001 =^ MHz * 1000 =^ GHz * 1000000).\n"
+msgstr ""
+"Notas:\n"
+"1. Omitir o argumento -c or --cpu é equivalente a setá-lo como zero\n"
+"2. O parâmetro -f FREQ, --freq FREQ não pode ser combinado com qualquer "
+"outro parâmetro\n"
+"   exceto com o parâmetro -c CPU, --cpu CPU\n"
+"3. FREQuências podem ser usadas em Hz, kHz (padrão), MHz, GHz, o THz\n"
+"   colocando o nome desejado da unidade após o valor, sem qualquer espaço\n"
+"   (FREQuência em kHz =^ Hz * 0.001 =^ MHz * 1000 =^ GHz * 1000000).\n"
+
+#: utils/cpufreq-set.c:57
+#, c-format
+msgid ""
+"Error setting new values. Common errors:\n"
+"- Do you have proper administration rights? (super-user?)\n"
+"- Is the governor you requested available and modprobed?\n"
+"- Trying to set an invalid policy?\n"
+"- Trying to set a specific frequency, but userspace governor is not "
+"available,\n"
+"   for example because of hardware which cannot be set to a specific "
+"frequency\n"
+"   or because the userspace governor isn't loaded?\n"
+msgstr ""
+"Erro ao setar novos valores. Erros comuns:\n"
+"- Você tem direitos administrativos necessários? (super-usuário?)\n"
+"- O regulador que você requesitou está disponível e foi \"modprobed\"?\n"
+"- Tentando setar uma política inválida?\n"
+"- Tentando setar uma frequência específica, mas o regulador em nível de "
+"usuário não está disponível,\n"
+"   por exemplo devido ao hardware que não pode ser setado pra uma frequência "
+"específica\n"
+"   ou porque o regulador em nível de usuário não foi carregado?\n"
+
+#: utils/cpufreq-set.c:170
+#, c-format
+msgid "wrong, unknown or unhandled CPU?\n"
+msgstr "CPU errado, desconhecido ou inesperado?\n"
+
+#: utils/cpufreq-set.c:302
+#, c-format
+msgid ""
+"the -f/--freq parameter cannot be combined with -d/--min, -u/--max or\n"
+"-g/--governor parameters\n"
+msgstr ""
+"o parâmetro -f/--freq não pode ser combinado com os parâmetros -d/--min, -"
+"u/--max ou\n"
+"-g/--governor\n"
+
+#: utils/cpufreq-set.c:308
+#, c-format
+msgid ""
+"At least one parameter out of -f/--freq, -d/--min, -u/--max, and\n"
+"-g/--governor must be passed\n"
+msgstr ""
+"Pelo menos um parâmetro entre -f/--freq, -d/--min, -u/--max, e\n"
+"-g/--governor deve ser usado\n"
+
+#: utils/cpufreq-set.c:347
+#, c-format
+msgid "Setting cpu: %d\n"
+msgstr ""
+
+#: utils/cpupower-set.c:22
+#, c-format
+msgid "Usage: cpupower set [ -b val ] [ -m val ] [ -s val ]\n"
+msgstr ""
+
+#: utils/cpupower-set.c:24
+#, c-format
+msgid ""
+"  -b, --perf-bias [VAL]    Sets CPU's power vs performance policy on some\n"
+"                           Intel models [0-15], see manpage for details\n"
+msgstr ""
+
+#: utils/cpupower-set.c:26
+#, c-format
+msgid ""
+"  -m, --sched-mc  [VAL]    Sets the kernel's multi core scheduler policy.\n"
+msgstr ""
+
+#: utils/cpupower-set.c:27
+#, c-format
+msgid ""
+"  -s, --sched-smt [VAL]    Sets the kernel's thread sibling scheduler "
+"policy.\n"
+msgstr ""
+
+#: utils/cpupower-set.c:80
+#, c-format
+msgid "--perf-bias param out of range [0-%d]\n"
+msgstr ""
+
+#: utils/cpupower-set.c:91
+#, c-format
+msgid "--sched-mc param out of range [0-%d]\n"
+msgstr ""
+
+#: utils/cpupower-set.c:102
+#, c-format
+msgid "--sched-smt param out of range [0-%d]\n"
+msgstr ""
+
+#: utils/cpupower-set.c:121
+#, c-format
+msgid "Error setting sched-mc %s\n"
+msgstr ""
+
+#: utils/cpupower-set.c:127
+#, c-format
+msgid "Error setting sched-smt %s\n"
+msgstr ""
+
+#: utils/cpupower-set.c:146
+#, c-format
+msgid "Error setting perf-bias value on CPU %d\n"
+msgstr ""
+
+#: utils/cpupower-info.c:21
+#, c-format
+msgid "Usage: cpupower info [ -b ] [ -m ] [ -s ]\n"
+msgstr ""
+
+#: utils/cpupower-info.c:23
+#, c-format
+msgid ""
+"  -b, --perf-bias    Gets CPU's power vs performance policy on some\n"
+"                           Intel models [0-15], see manpage for details\n"
+msgstr ""
+
+#: utils/cpupower-info.c:25
+#, fuzzy, c-format
+msgid "  -m, --sched-mc     Gets the kernel's multi core scheduler policy.\n"
+msgstr ""
+"--p, --policy         Obtem a política do cpufreq em uso no momento *\n"
+
+#: utils/cpupower-info.c:26
+#, c-format
+msgid ""
+"  -s, --sched-smt    Gets the kernel's thread sibling scheduler policy.\n"
+msgstr ""
+
+#: utils/cpupower-info.c:28
+#, c-format
+msgid ""
+"\n"
+"Passing no option will show all info, by default only on core 0\n"
+msgstr ""
+
+#: utils/cpupower-info.c:102
+#, c-format
+msgid "System's multi core scheduler setting: "
+msgstr ""
+
+#. if sysfs file is missing it's: errno == ENOENT
+#: utils/cpupower-info.c:105 utils/cpupower-info.c:114
+#, c-format
+msgid "not supported\n"
+msgstr ""
+
+#: utils/cpupower-info.c:111
+#, c-format
+msgid "System's thread sibling scheduler setting: "
+msgstr ""
+
+#: utils/cpupower-info.c:126
+#, c-format
+msgid "Intel's performance bias setting needs root privileges\n"
+msgstr ""
+
+#: utils/cpupower-info.c:128
+#, c-format
+msgid "System does not support Intel's performance bias setting\n"
+msgstr ""
+
+#: utils/cpupower-info.c:147
+#, c-format
+msgid "Could not read perf-bias value\n"
+msgstr ""
+
+#: utils/cpupower-info.c:150
+#, c-format
+msgid "perf-bias: %d\n"
+msgstr ""
+
+#: utils/cpuidle-info.c:28
+#, fuzzy, c-format
+msgid "Analyzing CPU %d:\n"
+msgstr "analisando o CPU %d:\n"
+
+#: utils/cpuidle-info.c:32
+#, c-format
+msgid "CPU %u: No idle states\n"
+msgstr ""
+
+#: utils/cpuidle-info.c:36
+#, c-format
+msgid "CPU %u: Can't read idle state info\n"
+msgstr ""
+
+#: utils/cpuidle-info.c:41
+#, c-format
+msgid "Could not determine max idle state %u\n"
+msgstr ""
+
+#: utils/cpuidle-info.c:46
+#, c-format
+msgid "Number of idle states: %d\n"
+msgstr ""
+
+#: utils/cpuidle-info.c:48
+#, fuzzy, c-format
+msgid "Available idle states:"
+msgstr "  níveis de frequência disponíveis: "
+
+#: utils/cpuidle-info.c:71
+#, c-format
+msgid "Flags/Description: %s\n"
+msgstr ""
+
+#: utils/cpuidle-info.c:74
+#, c-format
+msgid "Latency: %lu\n"
+msgstr ""
+
+#: utils/cpuidle-info.c:76
+#, c-format
+msgid "Usage: %lu\n"
+msgstr ""
+
+#: utils/cpuidle-info.c:78
+#, c-format
+msgid "Duration: %llu\n"
+msgstr ""
+
+#: utils/cpuidle-info.c:90
+#, c-format
+msgid "Could not determine cpuidle driver\n"
+msgstr ""
+
+#: utils/cpuidle-info.c:94
+#, fuzzy, c-format
+msgid "CPUidle driver: %s\n"
+msgstr "  driver: %s\n"
+
+#: utils/cpuidle-info.c:99
+#, c-format
+msgid "Could not determine cpuidle governor\n"
+msgstr ""
+
+#: utils/cpuidle-info.c:103
+#, c-format
+msgid "CPUidle governor: %s\n"
+msgstr ""
+
+#: utils/cpuidle-info.c:122
+#, c-format
+msgid "CPU %u: Can't read C-state info\n"
+msgstr ""
+
+#. printf("Cstates: %d\n", cstates);
+#: utils/cpuidle-info.c:127
+#, c-format
+msgid "active state:            C0\n"
+msgstr ""
+
+#: utils/cpuidle-info.c:128
+#, c-format
+msgid "max_cstate:              C%u\n"
+msgstr ""
+
+#: utils/cpuidle-info.c:129
+#, fuzzy, c-format
+msgid "maximum allowed latency: %lu usec\n"
+msgstr "  maior latência de transição: "
+
+#: utils/cpuidle-info.c:130
+#, c-format
+msgid "states:\t\n"
+msgstr ""
+
+#: utils/cpuidle-info.c:132
+#, c-format
+msgid "    C%d:                  type[C%d] "
+msgstr ""
+
+#: utils/cpuidle-info.c:134
+#, c-format
+msgid "promotion[--] demotion[--] "
+msgstr ""
+
+#: utils/cpuidle-info.c:135
+#, c-format
+msgid "latency[%03lu] "
+msgstr ""
+
+#: utils/cpuidle-info.c:137
+#, c-format
+msgid "usage[%08lu] "
+msgstr ""
+
+#: utils/cpuidle-info.c:139
+#, c-format
+msgid "duration[%020Lu] \n"
+msgstr ""
+
+#: utils/cpuidle-info.c:147
+#, fuzzy, c-format
+msgid "Usage: cpupower idleinfo [options]\n"
+msgstr "Uso: cpufreq-info [opções]\n"
+
+#: utils/cpuidle-info.c:149
+#, fuzzy, c-format
+msgid "  -s, --silent         Only show general C-state information\n"
+msgstr "  -e, --debug          Mostra informação de debug\n"
+
+#: utils/cpuidle-info.c:150
+#, fuzzy, c-format
+msgid ""
+"  -o, --proc           Prints out information like provided by the /proc/"
+"acpi/processor/*/power\n"
+"                       interface in older kernels\n"
+msgstr ""
+"  -o, --proc           Mostra informação do tipo provida pela interface /"
+"proc/cpufreq\n"
+"                       em kernels 2.4. e mais recentes 2.6\n"
+
+#: utils/cpuidle-info.c:209
+#, fuzzy, c-format
+msgid "You can't specify more than one output-specific argument\n"
+msgstr ""
+"Você não pode especificar mais do que um parâmetro --cpu e/ou\n"
+"mais do que um argumento de saída específico\n"
+
+#~ msgid ""
+#~ "  -c CPU, --cpu CPU    CPU number which information shall be determined "
+#~ "about\n"
+#~ msgstr ""
+#~ "  -c CPU, --cpu CPU    número do CPU sobre o qual as inforções devem ser "
+#~ "determinadas\n"
+
+#~ msgid ""
+#~ "  -c CPU, --cpu CPU        number of CPU where cpufreq settings shall be "
+#~ "modified\n"
+#~ msgstr ""
+#~ "  -c CPU, --cpu CPU        número do CPU onde as configurações do cpufreq "
+#~ "vão ser modificadas\n"
diff --git a/tools/power/cpupower/utils/builtin.h b/tools/power/cpupower/utils/builtin.h
new file mode 100644
index 00000000000..c10496fbe3c
--- /dev/null
+++ b/tools/power/cpupower/utils/builtin.h
@@ -0,0 +1,11 @@
+#ifndef BUILTIN_H
+#define BUILTIN_H
+
+extern int cmd_set(int argc, const char **argv);
+extern int cmd_info(int argc, const char **argv);
+extern int cmd_freq_set(int argc, const char **argv);
+extern int cmd_freq_info(int argc, const char **argv);
+extern int cmd_idle_info(int argc, const char **argv);
+extern int cmd_monitor(int argc, const char **argv);
+
+#endif
diff --git a/tools/power/cpupower/utils/cpufreq-info.c b/tools/power/cpupower/utils/cpufreq-info.c
new file mode 100644
index 00000000000..28953c9a7bd
--- /dev/null
+++ b/tools/power/cpupower/utils/cpufreq-info.c
@@ -0,0 +1,668 @@
+/*
+ *  (C) 2004-2009  Dominik Brodowski <linux@dominikbrodowski.de>
+ *
+ *  Licensed under the terms of the GNU GPL License version 2.
+ */
+
+
+#include <unistd.h>
+#include <stdio.h>
+#include <errno.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include <getopt.h>
+
+#include "cpufreq.h"
+#include "helpers/helpers.h"
+#include "helpers/bitmask.h"
+
+#define LINE_LEN 10
+
+static unsigned int count_cpus(void)
+{
+        FILE *fp;
+        char value[LINE_LEN];
+        unsigned int ret = 0;
+        unsigned int cpunr = 0;
+
+        fp = fopen("/proc/stat", "r");
+        if (!fp) {
+                printf(_("Couldn't count the number of CPUs (%s: %s), assuming 1\n"), "/proc/stat", strerror(errno));
+                return 1;
+        }
+
+        while (!feof(fp)) {
+                if (!fgets(value, LINE_LEN, fp))
+                        continue;
+                value[LINE_LEN - 1] = '\0';
+                if (strlen(value) < (LINE_LEN - 2))
+                        continue;
+                if (strstr(value, "cpu "))
+                        continue;
+                if (sscanf(value, "cpu%d ", &cpunr) != 1)
+                        continue;
+                if (cpunr > ret)
+                        ret = cpunr;
+        }
+        fclose(fp);
+
+        /* cpu count starts from 0, on error return 1 (UP) */
+        return ret + 1;
+}
+
+
+static void proc_cpufreq_output(void)
+{
+        unsigned int cpu, nr_cpus;
+        struct cpufreq_policy *policy;
+        unsigned int min_pctg = 0;
+        unsigned int max_pctg = 0;
+        unsigned long min, max;
+
+        printf(_("          minimum CPU frequency  -  maximum CPU frequency  -  governor\n"));
+
+        nr_cpus = count_cpus();
+        for (cpu = 0; cpu < nr_cpus; cpu++) {
+                policy = cpufreq_get_policy(cpu);
+                if (!policy)
+                        continue;
+
+                if (cpufreq_get_hardware_limits(cpu, &min, &max)) {
+                        max = 0;
+                } else {
+                        min_pctg = (policy->min * 100) / max;
+                        max_pctg = (policy->max * 100) / max;
+                }
+                printf("CPU%3d    %9lu kHz (%3d %%)  -  %9lu kHz (%3d %%)  -  %s\n",
+                        cpu , policy->min, max ? min_pctg : 0, policy->max,
+                        max ? max_pctg : 0, policy->governor);
+
+                cpufreq_put_policy(policy);
+        }
+}
+
+static void print_speed(unsigned long speed)
+{
+        unsigned long tmp;
+
+        if (speed > 1000000) {
+                tmp = speed % 10000;
+                if (tmp >= 5000)
+                        speed += 10000;
+                printf("%u.%02u GHz", ((unsigned int) speed/1000000),
+                        ((unsigned int) (speed%1000000)/10000));
+        } else if (speed > 100000) {
+                tmp = speed % 1000;
+                if (tmp >= 500)
+                        speed += 1000;
+                printf("%u MHz", ((unsigned int) speed / 1000));
+        } else if (speed > 1000) {
+                tmp = speed % 100;
+                if (tmp >= 50)
+                        speed += 100;
+                printf("%u.%01u MHz", ((unsigned int) speed/1000),
+                        ((unsigned int) (speed%1000)/100));
+        } else
+                printf("%lu kHz", speed);
+
+        return;
+}
+
+static void print_duration(unsigned long duration)
+{
+        unsigned long tmp;
+
+        if (duration > 1000000) {
+                tmp = duration % 10000;
+                if (tmp >= 5000)
+                        duration += 10000;
+                printf("%u.%02u ms", ((unsigned int) duration/1000000),
+                        ((unsigned int) (duration%1000000)/10000));
+        } else if (duration > 100000) {
+                tmp = duration % 1000;
+                if (tmp >= 500)
+                        duration += 1000;
+                printf("%u us", ((unsigned int) duration / 1000));
+        } else if (duration > 1000) {
+                tmp = duration % 100;
+                if (tmp >= 50)
+                        duration += 100;
+                printf("%u.%01u us", ((unsigned int) duration/1000),
+                        ((unsigned int) (duration%1000)/100));
+        } else
+                printf("%lu ns", duration);
+
+        return;
+}
+
+/* --boost / -b */
+
+static int get_boost_mode(unsigned int cpu)
+{
+        int support, active, b_states = 0, ret, pstate_no, i;
+        /* ToDo: Make this more global */
+        unsigned long pstates[MAX_HW_PSTATES] = {0,};
+
+        if (cpupower_cpu_info.vendor != X86_VENDOR_AMD &&
+            cpupower_cpu_info.vendor != X86_VENDOR_INTEL)
+                return 0;
+
+        ret = cpufreq_has_boost_support(cpu, &support, &active, &b_states);
+        if (ret) {
+                printf(_("Error while evaluating Boost Capabilities"
+                                " on CPU %d -- are you root?\n"), cpu);
+                return ret;
+        }
+        /* P state changes via MSR are identified via cpuid 80000007
+           on Intel and AMD, but we assume boost capable machines can do that
+           if (cpuid_eax(0x80000000) >= 0x80000007
+           && (cpuid_edx(0x80000007) & (1 << 7)))
+        */
+
+        printf(_("  boost state support:\n"));
+
+        printf(_("    Supported: %s\n"), support ? _("yes") : _("no"));
+        printf(_("    Active: %s\n"), active ? _("yes") : _("no"));
+
+        if (cpupower_cpu_info.vendor == X86_VENDOR_AMD &&
+            cpupower_cpu_info.family >= 0x10) {
+                ret = decode_pstates(cpu, cpupower_cpu_info.family, b_states,
+                                     pstates, &pstate_no);
+                if (ret)
+                        return ret;
+
+                printf(_("    Boost States: %d\n"), b_states);
+                printf(_("    Total States: %d\n"), pstate_no);
+                for (i = 0; i < pstate_no; i++) {
+                        if (i < b_states)
+                                printf(_("    Pstate-Pb%d: %luMHz (boost state)"
+                                         "\n"), i, pstates[i]);
+                        else
+                                printf(_("    Pstate-P%d:  %luMHz\n"),
+                                       i - b_states, pstates[i]);
+                }
+        } else if (cpupower_cpu_info.caps & CPUPOWER_CAP_HAS_TURBO_RATIO) {
+                double bclk;
+                unsigned long long intel_turbo_ratio = 0;
+                unsigned int ratio;
+
+                /* Any way to autodetect this ? */
+                if (cpupower_cpu_info.caps & CPUPOWER_CAP_IS_SNB)
+                        bclk = 100.00;
+                else
+                        bclk = 133.33;
+                intel_turbo_ratio = msr_intel_get_turbo_ratio(cpu);
+                dprint ("    Ratio: 0x%llx - bclk: %f\n",
+                        intel_turbo_ratio, bclk);
+
+                ratio = (intel_turbo_ratio >> 24) & 0xFF;
+                if (ratio)
+                        printf(_("    %.0f MHz max turbo 4 active cores\n"),
+                               ratio * bclk);
+
+                ratio = (intel_turbo_ratio >> 16) & 0xFF;
+                if (ratio)
+                        printf(_("    %.0f MHz max turbo 3 active cores\n"),
+                               ratio * bclk);
+
+                ratio = (intel_turbo_ratio >> 8) & 0xFF;
+                if (ratio)
+                        printf(_("    %.0f MHz max turbo 2 active cores\n"),
+                               ratio * bclk);
+
+                ratio = (intel_turbo_ratio >> 0) & 0xFF;
+                if (ratio)
+                        printf(_("    %.0f MHz max turbo 1 active cores\n"),
+                               ratio * bclk);
+        }
+        return 0;
+}
+
+static void debug_output_one(unsigned int cpu)
+{
+        char *driver;
+        struct cpufreq_affected_cpus *cpus;
+        struct cpufreq_available_frequencies *freqs;
+        unsigned long min, max, freq_kernel, freq_hardware;
+        unsigned long total_trans, latency;
+        unsigned long long total_time;
+        struct cpufreq_policy *policy;
+        struct cpufreq_available_governors *governors;
+        struct cpufreq_stats *stats;
+
+        if (cpufreq_cpu_exists(cpu))
+                return;
+
+        freq_kernel = cpufreq_get_freq_kernel(cpu);
+        freq_hardware = cpufreq_get_freq_hardware(cpu);
+
+        driver = cpufreq_get_driver(cpu);
+        if (!driver) {
+                printf(_("  no or unknown cpufreq driver is active on this CPU\n"));
+        } else {
+                printf(_("  driver: %s\n"), driver);
+                cpufreq_put_driver(driver);
+        }
+
+        cpus = cpufreq_get_related_cpus(cpu);
+        if (cpus) {
+                printf(_("  CPUs which run at the same hardware frequency: "));
+                while (cpus->next) {
+                        printf("%d ", cpus->cpu);
+                        cpus = cpus->next;
+                }
+                printf("%d\n", cpus->cpu);
+                cpufreq_put_related_cpus(cpus);
+        }
+
+        cpus = cpufreq_get_affected_cpus(cpu);
+        if (cpus) {
+                printf(_("  CPUs which need to have their frequency coordinated by software: "));
+                while (cpus->next) {
+                        printf("%d ", cpus->cpu);
+                        cpus = cpus->next;
+                }
+                printf("%d\n", cpus->cpu);
+                cpufreq_put_affected_cpus(cpus);
+        }
+
+        latency = cpufreq_get_transition_latency(cpu);
+        if (latency) {
+                printf(_("  maximum transition latency: "));
+                print_duration(latency);
+                printf(".\n");
+        }
+
+        if (!(cpufreq_get_hardware_limits(cpu, &min, &max))) {
+                printf(_("  hardware limits: "));
+                print_speed(min);
+                printf(" - ");
+                print_speed(max);
+                printf("\n");
+        }
+
+        freqs = cpufreq_get_available_frequencies(cpu);
+        if (freqs) {
+                printf(_("  available frequency steps: "));
+                while (freqs->next) {
+                        print_speed(freqs->frequency);
+                        printf(", ");
+                        freqs = freqs->next;
+                }
+                print_speed(freqs->frequency);
+                printf("\n");
+                cpufreq_put_available_frequencies(freqs);
+        }
+
+        governors = cpufreq_get_available_governors(cpu);
+        if (governors) {
+                printf(_("  available cpufreq governors: "));
+                while (governors->next) {
+                        printf("%s, ", governors->governor);
+                        governors = governors->next;
+                }
+                printf("%s\n", governors->governor);
+                cpufreq_put_available_governors(governors);
+        }
+
+        policy = cpufreq_get_policy(cpu);
+        if (policy) {
+                printf(_("  current policy: frequency should be within "));
+                print_speed(policy->min);
+                printf(_(" and "));
+                print_speed(policy->max);
+
+                printf(".\n                  ");
+                printf(_("The governor \"%s\" may"
+                       " decide which speed to use\n                  within this range.\n"),
+                       policy->governor);
+                cpufreq_put_policy(policy);
+        }
+
+        if (freq_kernel || freq_hardware) {
+                printf(_("  current CPU frequency is "));
+                if (freq_hardware) {
+                        print_speed(freq_hardware);
+                        printf(_(" (asserted by call to hardware)"));
+                } else
+                        print_speed(freq_kernel);
+                printf(".\n");
+        }
+        stats = cpufreq_get_stats(cpu, &total_time);
+        if (stats) {
+                printf(_("  cpufreq stats: "));
+                while (stats) {
+                        print_speed(stats->frequency);
+                        printf(":%.2f%%", (100.0 * stats->time_in_state) / total_time);
+                        stats = stats->next;
+                        if (stats)
+                                printf(", ");
+                }
+                cpufreq_put_stats(stats);
+                total_trans = cpufreq_get_transitions(cpu);
+                if (total_trans)
+                        printf("  (%lu)\n", total_trans);
+                else
+                        printf("\n");
+        }
+        get_boost_mode(cpu);
+
+}
+
+/* --freq / -f */
+
+static int get_freq_kernel(unsigned int cpu, unsigned int human)
+{
+        unsigned long freq = cpufreq_get_freq_kernel(cpu);
+        if (!freq)
+                return -EINVAL;
+        if (human) {
+                print_speed(freq);
+                printf("\n");
+        } else
+                printf("%lu\n", freq);
+        return 0;
+}
+
+
+/* --hwfreq / -w */
+
+static int get_freq_hardware(unsigned int cpu, unsigned int human)
+{
+        unsigned long freq = cpufreq_get_freq_hardware(cpu);
+        if (!freq)
+                return -EINVAL;
+        if (human) {
+                print_speed(freq);
+                printf("\n");
+        } else
+                printf("%lu\n", freq);
+        return 0;
+}
+
+/* --hwlimits / -l */
+
+static int get_hardware_limits(unsigned int cpu)
+{
+        unsigned long min, max;
+        if (cpufreq_get_hardware_limits(cpu, &min, &max))
+                return -EINVAL;
+        printf("%lu %lu\n", min, max);
+        return 0;
+}
+
+/* --driver / -d */
+
+static int get_driver(unsigned int cpu)
+{
+        char *driver = cpufreq_get_driver(cpu);
+        if (!driver)
+                return -EINVAL;
+        printf("%s\n", driver);
+        cpufreq_put_driver(driver);
+        return 0;
+}
+
+/* --policy / -p */
+
+static int get_policy(unsigned int cpu)
+{
+        struct cpufreq_policy *policy = cpufreq_get_policy(cpu);
+        if (!policy)
+                return -EINVAL;
+        printf("%lu %lu %s\n", policy->min, policy->max, policy->governor);
+        cpufreq_put_policy(policy);
+        return 0;
+}
+
+/* --governors / -g */
+
+static int get_available_governors(unsigned int cpu)
+{
+        struct cpufreq_available_governors *governors =
+                cpufreq_get_available_governors(cpu);
+        if (!governors)
+                return -EINVAL;
+
+        while (governors->next) {
+                printf("%s ", governors->governor);
+                governors = governors->next;
+        }
+        printf("%s\n", governors->governor);
+        cpufreq_put_available_governors(governors);
+        return 0;
+}
+
+
+/* --affected-cpus  / -a */
+
+static int get_affected_cpus(unsigned int cpu)
+{
+        struct cpufreq_affected_cpus *cpus = cpufreq_get_affected_cpus(cpu);
+        if (!cpus)
+                return -EINVAL;
+
+        while (cpus->next) {
+                printf("%d ", cpus->cpu);
+                cpus = cpus->next;
+        }
+        printf("%d\n", cpus->cpu);
+        cpufreq_put_affected_cpus(cpus);
+        return 0;
+}
+
+/* --related-cpus  / -r */
+
+static int get_related_cpus(unsigned int cpu)
+{
+        struct cpufreq_affected_cpus *cpus = cpufreq_get_related_cpus(cpu);
+        if (!cpus)
+                return -EINVAL;
+
+        while (cpus->next) {
+                printf("%d ", cpus->cpu);
+                cpus = cpus->next;
+        }
+        printf("%d\n", cpus->cpu);
+        cpufreq_put_related_cpus(cpus);
+        return 0;
+}
+
+/* --stats / -s */
+
+static int get_freq_stats(unsigned int cpu, unsigned int human)
+{
+        unsigned long total_trans = cpufreq_get_transitions(cpu);
+        unsigned long long total_time;
+        struct cpufreq_stats *stats = cpufreq_get_stats(cpu, &total_time);
+        while (stats) {
+                if (human) {
+                        print_speed(stats->frequency);
+                        printf(":%.2f%%",
+                                (100.0 * stats->time_in_state) / total_time);
+                } else
+                        printf("%lu:%llu",
+                                stats->frequency, stats->time_in_state);
+                stats = stats->next;
+                if (stats)
+                        printf(", ");
+        }
+        cpufreq_put_stats(stats);
+        if (total_trans)
+                printf("  (%lu)\n", total_trans);
+        return 0;
+}
+
+/* --latency / -y */
+
+static int get_latency(unsigned int cpu, unsigned int human)
+{
+        unsigned long latency = cpufreq_get_transition_latency(cpu);
+        if (!latency)
+                return -EINVAL;
+
+        if (human) {
+                print_duration(latency);
+                printf("\n");
+        } else
+                printf("%lu\n", latency);
+        return 0;
+}
+
+static struct option info_opts[] = {
+        { .name = "debug",      .has_arg = no_argument,         .flag = NULL,   .val = 'e'},
+        { .name = "boost",      .has_arg = no_argument,         .flag = NULL,   .val = 'b'},
+        { .name = "freq",       .has_arg = no_argument,         .flag = NULL,   .val = 'f'},
+        { .name = "hwfreq",     .has_arg = no_argument,         .flag = NULL,   .val = 'w'},
+        { .name = "hwlimits",   .has_arg = no_argument,         .flag = NULL,   .val = 'l'},
+        { .name = "driver",     .has_arg = no_argument,         .flag = NULL,   .val = 'd'},
+        { .name = "policy",     .has_arg = no_argument,         .flag = NULL,   .val = 'p'},
+        { .name = "governors",  .has_arg = no_argument,         .flag = NULL,   .val = 'g'},
+        { .name = "related-cpus", .has_arg = no_argument,       .flag = NULL,   .val = 'r'},
+        { .name = "affected-cpus",.has_arg = no_argument,       .flag = NULL,   .val = 'a'},
+        { .name = "stats",      .has_arg = no_argument,         .flag = NULL,   .val = 's'},
+        { .name = "latency",    .has_arg = no_argument,         .flag = NULL,   .val = 'y'},
+        { .name = "proc",       .has_arg = no_argument,         .flag = NULL,   .val = 'o'},
+        { .name = "human",      .has_arg = no_argument,         .flag = NULL,   .val = 'm'},
+        { },
+};
+
+int cmd_freq_info(int argc, char **argv)
+{
+        extern char *optarg;
+        extern int optind, opterr, optopt;
+        int ret = 0, cont = 1;
+        unsigned int cpu = 0;
+        unsigned int human = 0;
+        int output_param = 0;
+
+        do {
+                ret = getopt_long(argc, argv, "oefwldpgrasmyb", info_opts, NULL);
+                switch (ret) {
+                case '?':
+                        output_param = '?';
+                        cont = 0;
+                        break;
+                case -1:
+                        cont = 0;
+                        break;
+                case 'b':
+                case 'o':
+                case 'a':
+                case 'r':
+                case 'g':
+                case 'p':
+                case 'd':
+                case 'l':
+                case 'w':
+                case 'f':
+                case 'e':
+                case 's':
+                case 'y':
+                        if (output_param) {
+                                output_param = -1;
+                                cont = 0;
+                                break;
+                        }
+                        output_param = ret;
+                        break;
+                case 'm':
+                        if (human) {
+                                output_param = -1;
+                                cont = 0;
+                                break;
+                        }
+                        human = 1;
+                        break;
+                default:
+                        fprintf(stderr, "invalid or unknown argument\n");
+                        return EXIT_FAILURE;
+                }
+        } while (cont);
+
+        switch (output_param) {
+        case 'o':
+                if (!bitmask_isallclear(cpus_chosen)) {
+                        printf(_("The argument passed to this tool can't be "
+                                 "combined with passing a --cpu argument\n"));
+                        return -EINVAL;
+                }
+                break;
+        case 0:
+                output_param = 'e';
+        }
+
+        ret = 0;
+
+        /* Default is: show output of CPU 0 only */
+        if (bitmask_isallclear(cpus_chosen))
+                bitmask_setbit(cpus_chosen, 0);
+
+        switch (output_param) {
+        case -1:
+                printf(_("You can't specify more than one --cpu parameter and/or\n"
+                       "more than one output-specific argument\n"));
+                return -EINVAL;
+        case '?':
+                printf(_("invalid or unknown argument\n"));
+                return -EINVAL;
+        case 'o':
+                proc_cpufreq_output();
+                return EXIT_SUCCESS;
+        }
+
+        for (cpu = bitmask_first(cpus_chosen);
+             cpu <= bitmask_last(cpus_chosen); cpu++) {
+
+                if (!bitmask_isbitset(cpus_chosen, cpu))
+                        continue;
+                if (cpufreq_cpu_exists(cpu)) {
+                        printf(_("couldn't analyze CPU %d as it doesn't seem to be present\n"), cpu);
+                        continue;
+                }
+                printf(_("analyzing CPU %d:\n"), cpu);
+
+                switch (output_param) {
+                case 'b':
+                        get_boost_mode(cpu);
+                        break;
+                case 'e':
+                        debug_output_one(cpu);
+                        break;
+                case 'a':
+                        ret = get_affected_cpus(cpu);
+                        break;
+                case 'r':
+                        ret = get_related_cpus(cpu);
+                        break;
+                case 'g':
+                        ret = get_available_governors(cpu);
+                        break;
+                case 'p':
+                        ret = get_policy(cpu);
+                        break;
+                case 'd':
+                        ret = get_driver(cpu);
+                        break;
+                case 'l':
+                        ret = get_hardware_limits(cpu);
+                        break;
+                case 'w':
+                        ret = get_freq_hardware(cpu, human);
+                        break;
+                case 'f':
+                        ret = get_freq_kernel(cpu, human);
+                        break;
+                case 's':
+                        ret = get_freq_stats(cpu, human);
+                        break;
+                case 'y':
+                        ret = get_latency(cpu, human);
+                        break;
+                }
+                if (ret)
+                        return ret;
+        }
+        return ret;
+}
diff --git a/tools/power/cpupower/utils/cpufreq-set.c b/tools/power/cpupower/utils/cpufreq-set.c
new file mode 100644
index 00000000000..dd1539eb8c6
--- /dev/null
+++ b/tools/power/cpupower/utils/cpufreq-set.c
@@ -0,0 +1,331 @@
+/*
+ *  (C) 2004-2009  Dominik Brodowski <linux@dominikbrodowski.de>
+ *
+ *  Licensed under the terms of the GNU GPL License version 2.
+ */
+
+
+#include <unistd.h>
+#include <stdio.h>
+#include <errno.h>
+#include <stdlib.h>
+#include <limits.h>
+#include <string.h>
+#include <ctype.h>
+
+#include <getopt.h>
+
+#include "cpufreq.h"
+#include "helpers/helpers.h"
+
+#define NORM_FREQ_LEN 32
+
+static struct option set_opts[] = {
+        { .name = "min",        .has_arg = required_argument,   .flag = NULL,   .val = 'd'},
+        { .name = "max",        .has_arg = required_argument,   .flag = NULL,   .val = 'u'},
+        { .name = "governor",   .has_arg = required_argument,   .flag = NULL,   .val = 'g'},
+        { .name = "freq",       .has_arg = required_argument,   .flag = NULL,   .val = 'f'},
+        { .name = "related",    .has_arg = no_argument,         .flag = NULL,   .val='r'},
+        { },
+};
+
+static void print_error(void)
+{
+        printf(_("Error setting new values. Common errors:\n"
+                        "- Do you have proper administration rights? (super-user?)\n"
+                        "- Is the governor you requested available and modprobed?\n"
+                        "- Trying to set an invalid policy?\n"
+                        "- Trying to set a specific frequency, but userspace governor is not available,\n"
+                        "   for example because of hardware which cannot be set to a specific frequency\n"
+                        "   or because the userspace governor isn't loaded?\n"));
+};
+
+struct freq_units {
+        char            *str_unit;
+        int             power_of_ten;
+};
+
+const struct freq_units def_units[] = {
+        {"hz", -3},
+        {"khz", 0}, /* default */
+        {"mhz", 3},
+        {"ghz", 6},
+        {"thz", 9},
+        {NULL, 0}
+};
+
+static void print_unknown_arg(void)
+{
+        printf(_("invalid or unknown argument\n"));
+}
+
+static unsigned long string_to_frequency(const char *str)
+{
+        char normalized[NORM_FREQ_LEN];
+        const struct freq_units *unit;
+        const char *scan;
+        char *end;
+        unsigned long freq;
+        int power = 0, match_count = 0, i, cp, pad;
+
+        while (*str == '0')
+                str++;
+
+        for (scan = str; isdigit(*scan) || *scan == '.'; scan++) {
+                if (*scan == '.' && match_count == 0)
+                        match_count = 1;
+                else if (*scan == '.' && match_count == 1)
+                        return 0;
+        }
+
+        if (*scan) {
+                match_count = 0;
+                for (unit = def_units; unit->str_unit; unit++) {
+                        for (i = 0;
+                             scan[i] && tolower(scan[i]) == unit->str_unit[i];
+                             ++i)
+                                continue;
+                        if (scan[i])
+                                continue;
+                        match_count++;
+                        power = unit->power_of_ten;
+                }
+                if (match_count != 1)
+                        return 0;
+        }
+
+        /* count the number of digits to be copied */
+        for (cp = 0; isdigit(str[cp]); cp++)
+                continue;
+
+        if (str[cp] == '.') {
+                while (power > -1 && isdigit(str[cp+1]))
+                        cp++, power--;
+        }
+        if (power >= -1)        /* not enough => pad */
+                pad = power + 1;
+        else                    /* to much => strip */
+                pad = 0, cp += power + 1;
+        /* check bounds */
+        if (cp <= 0 || cp + pad > NORM_FREQ_LEN - 1)
+                return 0;
+
+        /* copy digits */
+        for (i = 0; i < cp; i++, str++) {
+                if (*str == '.')
+                        str++;
+                normalized[i] = *str;
+        }
+        /* and pad */
+        for (; i < cp + pad; i++)
+                normalized[i] = '0';
+
+        /* round up, down ? */
+        match_count = (normalized[i-1] >= '5');
+        /* and drop the decimal part */
+        normalized[i-1] = 0; /* cp > 0 && pad >= 0 ==> i > 0 */
+
+        /* final conversion (and applying rounding) */
+        errno = 0;
+        freq = strtoul(normalized, &end, 10);
+        if (errno)
+                return 0;
+        else {
+                if (match_count && freq != ULONG_MAX)
+                        freq++;
+                return freq;
+        }
+}
+
+static int do_new_policy(unsigned int cpu, struct cpufreq_policy *new_pol)
+{
+        struct cpufreq_policy *cur_pol = cpufreq_get_policy(cpu);
+        int ret;
+
+        if (!cur_pol) {
+                printf(_("wrong, unknown or unhandled CPU?\n"));
+                return -EINVAL;
+        }
+
+        if (!new_pol->min)
+                new_pol->min = cur_pol->min;
+
+        if (!new_pol->max)
+                new_pol->max = cur_pol->max;
+
+        if (!new_pol->governor)
+                new_pol->governor = cur_pol->governor;
+
+        ret = cpufreq_set_policy(cpu, new_pol);
+
+        cpufreq_put_policy(cur_pol);
+
+        return ret;
+}
+
+
+static int do_one_cpu(unsigned int cpu, struct cpufreq_policy *new_pol,
+                unsigned long freq, unsigned int pc)
+{
+        switch (pc) {
+        case 0:
+                return cpufreq_set_frequency(cpu, freq);
+
+        case 1:
+                /* if only one value of a policy is to be changed, we can
+                 * use a "fast path".
+                 */
+                if (new_pol->min)
+                        return cpufreq_modify_policy_min(cpu, new_pol->min);
+                else if (new_pol->max)
+                        return cpufreq_modify_policy_max(cpu, new_pol->max);
+                else if (new_pol->governor)
+                        return cpufreq_modify_policy_governor(cpu,
+                                                        new_pol->governor);
+
+        default:
+                /* slow path */
+                return do_new_policy(cpu, new_pol);
+        }
+}
+
+int cmd_freq_set(int argc, char **argv)
+{
+        extern char *optarg;
+        extern int optind, opterr, optopt;
+        int ret = 0, cont = 1;
+        int double_parm = 0, related = 0, policychange = 0;
+        unsigned long freq = 0;
+        char gov[20];
+        unsigned int cpu;
+
+        struct cpufreq_policy new_pol = {
+                .min = 0,
+                .max = 0,
+                .governor = NULL,
+        };
+
+        /* parameter parsing */
+        do {
+                ret = getopt_long(argc, argv, "d:u:g:f:r", set_opts, NULL);
+                switch (ret) {
+                case '?':
+                        print_unknown_arg();
+                        return -EINVAL;
+                case -1:
+                        cont = 0;
+                        break;
+                case 'r':
+                        if (related)
+                                double_parm++;
+                        related++;
+                        break;
+                case 'd':
+                        if (new_pol.min)
+                                double_parm++;
+                        policychange++;
+                        new_pol.min = string_to_frequency(optarg);
+                        if (new_pol.min == 0) {
+                                print_unknown_arg();
+                                return -EINVAL;
+                        }
+                        break;
+                case 'u':
+                        if (new_pol.max)
+                                double_parm++;
+                        policychange++;
+                        new_pol.max = string_to_frequency(optarg);
+                        if (new_pol.max == 0) {
+                                print_unknown_arg();
+                                return -EINVAL;
+                        }
+                        break;
+                case 'f':
+                        if (freq)
+                                double_parm++;
+                        freq = string_to_frequency(optarg);
+                        if (freq == 0) {
+                                print_unknown_arg();
+                                return -EINVAL;
+                        }
+                        break;
+                case 'g':
+                        if (new_pol.governor)
+                                double_parm++;
+                        policychange++;
+                        if ((strlen(optarg) < 3) || (strlen(optarg) > 18)) {
+                                print_unknown_arg();
+                                return -EINVAL;
+                        }
+                        if ((sscanf(optarg, "%s", gov)) != 1) {
+                                print_unknown_arg();
+                                return -EINVAL;
+                        }
+                        new_pol.governor = gov;
+                        break;
+                }
+        } while (cont);
+
+        /* parameter checking */
+        if (double_parm) {
+                printf("the same parameter was passed more than once\n");
+                return -EINVAL;
+        }
+
+        if (freq && policychange) {
+                printf(_("the -f/--freq parameter cannot be combined with -d/--min, -u/--max or\n"
+                                "-g/--governor parameters\n"));
+                return -EINVAL;
+        }
+
+        if (!freq && !policychange) {
+                printf(_("At least one parameter out of -f/--freq, -d/--min, -u/--max, and\n"
+                                "-g/--governor must be passed\n"));
+                return -EINVAL;
+        }
+
+        /* Default is: set all CPUs */
+        if (bitmask_isallclear(cpus_chosen))
+                bitmask_setall(cpus_chosen);
+
+        /* Also set frequency settings for related CPUs if -r is passed */
+        if (related) {
+                for (cpu = bitmask_first(cpus_chosen);
+                     cpu <= bitmask_last(cpus_chosen); cpu++) {
+                        struct cpufreq_affected_cpus *cpus;
+
+                        if (!bitmask_isbitset(cpus_chosen, cpu) ||
+                            cpufreq_cpu_exists(cpu))
+                                continue;
+
+                        cpus = cpufreq_get_related_cpus(cpu);
+                        if (!cpus)
+                                break;
+                        while (cpus->next) {
+                                bitmask_setbit(cpus_chosen, cpus->cpu);
+                                cpus = cpus->next;
+                        }
+                        cpufreq_put_related_cpus(cpus);
+                }
+        }
+
+
+        /* loop over CPUs */
+        for (cpu = bitmask_first(cpus_chosen);
+             cpu <= bitmask_last(cpus_chosen); cpu++) {
+
+                if (!bitmask_isbitset(cpus_chosen, cpu) ||
+                    cpufreq_cpu_exists(cpu))
+                        continue;
+
+                printf(_("Setting cpu: %d\n"), cpu);
+                ret = do_one_cpu(cpu, &new_pol, freq, policychange);
+                if (ret)
+                        break;
+        }
+
+        if (ret)
+                print_error();
+
+        return ret;
+}
diff --git a/tools/power/cpupower/utils/cpuidle-info.c b/tools/power/cpupower/utils/cpuidle-info.c
new file mode 100644
index 00000000000..b028267c137
--- /dev/null
+++ b/tools/power/cpupower/utils/cpuidle-info.c
@@ -0,0 +1,222 @@
+/*
+ *  (C) 2004-2009  Dominik Brodowski <linux@dominikbrodowski.de>
+ *  (C) 2010       Thomas Renninger <trenn@suse.de>
+ *
+ *  Licensed under the terms of the GNU GPL License version 2.
+ */
+
+
+#include <unistd.h>
+#include <stdio.h>
+#include <errno.h>
+#include <stdlib.h>
+#include <string.h>
+#include <getopt.h>
+#include <cpufreq.h>
+
+#include "helpers/helpers.h"
+#include "helpers/sysfs.h"
+#include "helpers/bitmask.h"
+
+#define LINE_LEN 10
+
+static void cpuidle_cpu_output(unsigned int cpu, int verbose)
+{
+        int idlestates, idlestate;
+        char *tmp;
+
+        printf(_ ("Analyzing CPU %d:\n"), cpu);
+
+        idlestates = sysfs_get_idlestate_count(cpu);
+        if (idlestates == 0) {
+                printf(_("CPU %u: No idle states\n"), cpu);
+                return;
+        } else if (idlestates <= 0) {
+                printf(_("CPU %u: Can't read idle state info\n"), cpu);
+                return;
+        }
+        tmp = sysfs_get_idlestate_name(cpu, idlestates - 1);
+        if (!tmp) {
+                printf(_("Could not determine max idle state %u\n"),
+                       idlestates - 1);
+                return;
+        }
+
+        printf(_("Number of idle states: %d\n"), idlestates);
+
+        printf(_("Available idle states:"));
+        for (idlestate = 1; idlestate < idlestates; idlestate++) {
+                tmp = sysfs_get_idlestate_name(cpu, idlestate);
+                if (!tmp)
+                        continue;
+                printf(" %s", tmp);
+                free(tmp);
+        }
+        printf("\n");
+
+        if (!verbose)
+                return;
+
+        for (idlestate = 1; idlestate < idlestates; idlestate++) {
+                tmp = sysfs_get_idlestate_name(cpu, idlestate);
+                if (!tmp)
+                        continue;
+                printf("%s:\n", tmp);
+                free(tmp);
+
+                tmp = sysfs_get_idlestate_desc(cpu, idlestate);
+                if (!tmp)
+                        continue;
+                printf(_("Flags/Description: %s\n"), tmp);
+                free(tmp);
+
+                printf(_("Latency: %lu\n"),
+                       sysfs_get_idlestate_latency(cpu, idlestate));
+                printf(_("Usage: %lu\n"),
+                       sysfs_get_idlestate_usage(cpu, idlestate));
+                printf(_("Duration: %llu\n"),
+                       sysfs_get_idlestate_time(cpu, idlestate));
+        }
+        printf("\n");
+}
+
+static void cpuidle_general_output(void)
+{
+        char *tmp;
+
+        tmp = sysfs_get_cpuidle_driver();
+        if (!tmp) {
+                printf(_("Could not determine cpuidle driver\n"));
+                return;
+        }
+
+        printf(_("CPUidle driver: %s\n"), tmp);
+        free(tmp);
+
+        tmp = sysfs_get_cpuidle_governor();
+        if (!tmp) {
+                printf(_("Could not determine cpuidle governor\n"));
+                return;
+        }
+
+        printf(_("CPUidle governor: %s\n"), tmp);
+        free(tmp);
+}
+
+static void proc_cpuidle_cpu_output(unsigned int cpu)
+{
+        long max_allowed_cstate = 2000000000;
+        int cstates, cstate;
+
+        cstates = sysfs_get_idlestate_count(cpu);
+        if (cstates == 0) {
+                /*
+                 * Go on and print same useless info as you'd see with
+                 * cat /proc/acpi/processor/../power
+                 *      printf(_("CPU %u: No C-states available\n"), cpu);
+                 *      return;
+                 */
+        } else if (cstates <= 0) {
+                printf(_("CPU %u: Can't read C-state info\n"), cpu);
+                return;
+        }
+        /* printf("Cstates: %d\n", cstates); */
+
+        printf(_("active state:            C0\n"));
+        printf(_("max_cstate:              C%u\n"), cstates-1);
+        printf(_("maximum allowed latency: %lu usec\n"), max_allowed_cstate);
+        printf(_("states:\t\n"));
+        for (cstate = 1; cstate < cstates; cstate++) {
+                printf(_("    C%d:                  "
+                         "type[C%d] "), cstate, cstate);
+                printf(_("promotion[--] demotion[--] "));
+                printf(_("latency[%03lu] "),
+                       sysfs_get_idlestate_latency(cpu, cstate));
+                printf(_("usage[%08lu] "),
+                       sysfs_get_idlestate_usage(cpu, cstate));
+                printf(_("duration[%020Lu] \n"),
+                       sysfs_get_idlestate_time(cpu, cstate));
+        }
+}
+
+static struct option info_opts[] = {
+        { .name = "silent",     .has_arg = no_argument, .flag = NULL,   .val = 's'},
+        { .name = "proc",       .has_arg = no_argument, .flag = NULL,   .val = 'o'},
+        { },
+};
+
+static inline void cpuidle_exit(int fail)
+{
+        exit(EXIT_FAILURE);
+}
+
+int cmd_idle_info(int argc, char **argv)
+{
+        extern char *optarg;
+        extern int optind, opterr, optopt;
+        int ret = 0, cont = 1, output_param = 0, verbose = 1;
+        unsigned int cpu = 0;
+
+        do {
+                ret = getopt_long(argc, argv, "os", info_opts, NULL);
+                if (ret == -1)
+                        break;
+                switch (ret) {
+                case '?':
+                        output_param = '?';
+                        cont = 0;
+                        break;
+                case 's':
+                        verbose = 0;
+                        break;
+                case -1:
+                        cont = 0;
+                        break;
+                case 'o':
+                        if (output_param) {
+                                output_param = -1;
+                                cont = 0;
+                                break;
+                        }
+                        output_param = ret;
+                        break;
+                }
+        } while (cont);
+
+        switch (output_param) {
+        case -1:
+                printf(_("You can't specify more than one "
+                         "output-specific argument\n"));
+                cpuidle_exit(EXIT_FAILURE);
+        case '?':
+                printf(_("invalid or unknown argument\n"));
+                cpuidle_exit(EXIT_FAILURE);
+        }
+
+        /* Default is: show output of CPU 0 only */
+        if (bitmask_isallclear(cpus_chosen))
+                bitmask_setbit(cpus_chosen, 0);
+
+        if (output_param == 0)
+                cpuidle_general_output();
+
+        for (cpu = bitmask_first(cpus_chosen);
+             cpu <= bitmask_last(cpus_chosen); cpu++) {
+
+                if (!bitmask_isbitset(cpus_chosen, cpu) ||
+                    cpufreq_cpu_exists(cpu))
+                        continue;
+
+                switch (output_param) {
+
+                case 'o':
+                        proc_cpuidle_cpu_output(cpu);
+                        break;
+                case 0:
+                        printf("\n");
+                        cpuidle_cpu_output(cpu, verbose);
+                        break;
+                }
+        }
+        return EXIT_SUCCESS;
+}
diff --git a/tools/power/cpupower/utils/cpupower-info.c b/tools/power/cpupower/utils/cpupower-info.c
new file mode 100644
index 00000000000..3f68632c28c
--- /dev/null
+++ b/tools/power/cpupower/utils/cpupower-info.c
@@ -0,0 +1,135 @@
+/*
+ *  (C) 2011 Thomas Renninger <trenn@suse.de>, Novell Inc.
+ *
+ *  Licensed under the terms of the GNU GPL License version 2.
+ */
+
+
+#include <unistd.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <errno.h>
+#include <string.h>
+#include <getopt.h>
+
+#include <cpufreq.h>
+#include "helpers/helpers.h"
+#include "helpers/sysfs.h"
+
+static struct option set_opts[] = {
+        { .name = "perf-bias",  .has_arg = optional_argument,   .flag = NULL,   .val = 'b'},
+        { .name = "sched-mc",   .has_arg = optional_argument,   .flag = NULL,   .val = 'm'},
+        { .name = "sched-smt",  .has_arg = optional_argument,   .flag = NULL,   .val = 's'},
+        { },
+};
+
+static void print_wrong_arg_exit(void)
+{
+        printf(_("invalid or unknown argument\n"));
+        exit(EXIT_FAILURE);
+}
+
+int cmd_info(int argc, char **argv)
+{
+        extern char *optarg;
+        extern int optind, opterr, optopt;
+        unsigned int cpu;
+
+        union {
+                struct {
+                        int sched_mc:1;
+                        int sched_smt:1;
+                        int perf_bias:1;
+                };
+                int params;
+        } params = {};
+        int ret = 0;
+
+        setlocale(LC_ALL, "");
+        textdomain(PACKAGE);
+
+        /* parameter parsing */
+        while ((ret = getopt_long(argc, argv, "msb", set_opts, NULL)) != -1) {
+                switch (ret) {
+                case 'b':
+                        if (params.perf_bias)
+                                print_wrong_arg_exit();
+                        params.perf_bias = 1;
+                        break;
+                case 'm':
+                        if (params.sched_mc)
+                                print_wrong_arg_exit();
+                        params.sched_mc = 1;
+                        break;
+                case 's':
+                        if (params.sched_smt)
+                                print_wrong_arg_exit();
+                        params.sched_smt = 1;
+                        break;
+                default:
+                        print_wrong_arg_exit();
+                }
+        };
+
+        if (!params.params)
+                params.params = 0x7;
+
+        /* Default is: show output of CPU 0 only */
+        if (bitmask_isallclear(cpus_chosen))
+                bitmask_setbit(cpus_chosen, 0);
+
+        if (params.sched_mc) {
+                ret = sysfs_get_sched("mc");
+                printf(_("System's multi core scheduler setting: "));
+                if (ret < 0)
+                        /* if sysfs file is missing it's: errno == ENOENT */
+                        printf(_("not supported\n"));
+                else
+                        printf("%d\n", ret);
+        }
+        if (params.sched_smt) {
+                ret = sysfs_get_sched("smt");
+                printf(_("System's thread sibling scheduler setting: "));
+                if (ret < 0)
+                        /* if sysfs file is missing it's: errno == ENOENT */
+                        printf(_("not supported\n"));
+                else
+                        printf("%d\n", ret);
+        }
+
+        /* Add more per cpu options here */
+        if (!params.perf_bias)
+                return ret;
+
+        if (params.perf_bias) {
+                if (!run_as_root) {
+                        params.perf_bias = 0;
+                        printf(_("Intel's performance bias setting needs root privileges\n"));
+                } else if (!(cpupower_cpu_info.caps & CPUPOWER_CAP_PERF_BIAS)) {
+                        printf(_("System does not support Intel's performance"
+                                 " bias setting\n"));
+                        params.perf_bias = 0;
+                }
+        }
+
+        /* loop over CPUs */
+        for (cpu = bitmask_first(cpus_chosen);
+             cpu <= bitmask_last(cpus_chosen); cpu++) {
+
+                if (!bitmask_isbitset(cpus_chosen, cpu) ||
+                    cpufreq_cpu_exists(cpu))
+                        continue;
+
+                printf(_("analyzing CPU %d:\n"), cpu);
+
+                if (params.perf_bias) {
+                        ret = msr_intel_get_perf_bias(cpu);
+                        if (ret < 0) {
+                                printf(_("Could not read perf-bias value\n"));
+                                break;
+                        } else
+                                printf(_("perf-bias: %d\n"), ret);
+                }
+        }
+        return ret;
+}
diff --git a/tools/power/cpupower/utils/cpupower-set.c b/tools/power/cpupower/utils/cpupower-set.c
new file mode 100644
index 00000000000..dc4de376211
--- /dev/null
+++ b/tools/power/cpupower/utils/cpupower-set.c
@@ -0,0 +1,134 @@
+/*
+ *  (C) 2011 Thomas Renninger <trenn@suse.de>, Novell Inc.
+ *
+ *  Licensed under the terms of the GNU GPL License version 2.
+ */
+
+
+#include <unistd.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <errno.h>
+#include <string.h>
+#include <getopt.h>
+
+#include <cpufreq.h>
+#include "helpers/helpers.h"
+#include "helpers/sysfs.h"
+#include "helpers/bitmask.h"
+
+static struct option set_opts[] = {
+        { .name = "perf-bias",  .has_arg = optional_argument,   .flag = NULL,   .val = 'b'},
+        { .name = "sched-mc",   .has_arg = optional_argument,   .flag = NULL,   .val = 'm'},
+        { .name = "sched-smt",  .has_arg = optional_argument,   .flag = NULL,   .val = 's'},
+        { },
+};
+
+static void print_wrong_arg_exit(void)
+{
+        printf(_("invalid or unknown argument\n"));
+        exit(EXIT_FAILURE);
+}
+
+int cmd_set(int argc, char **argv)
+{
+        extern char *optarg;
+        extern int optind, opterr, optopt;
+        unsigned int cpu;
+
+        union {
+                struct {
+                        int sched_mc:1;
+                        int sched_smt:1;
+                        int perf_bias:1;
+                };
+                int params;
+        } params;
+        int sched_mc = 0, sched_smt = 0, perf_bias = 0;
+        int ret = 0;
+
+        setlocale(LC_ALL, "");
+        textdomain(PACKAGE);
+
+        params.params = 0;
+        /* parameter parsing */
+        while ((ret = getopt_long(argc, argv, "m:s:b:",
+                                                set_opts, NULL)) != -1) {
+                switch (ret) {
+                case 'b':
+                        if (params.perf_bias)
+                                print_wrong_arg_exit();
+                        perf_bias = atoi(optarg);
+                        if (perf_bias < 0 || perf_bias > 15) {
+                                printf(_("--perf-bias param out "
+                                         "of range [0-%d]\n"), 15);
+                                print_wrong_arg_exit();
+                        }
+                        params.perf_bias = 1;
+                        break;
+                case 'm':
+                        if (params.sched_mc)
+                                print_wrong_arg_exit();
+                        sched_mc = atoi(optarg);
+                        if (sched_mc < 0 || sched_mc > 2) {
+                                printf(_("--sched-mc param out "
+                                         "of range [0-%d]\n"), 2);
+                                print_wrong_arg_exit();
+                        }
+                        params.sched_mc = 1;
+                        break;
+                case 's':
+                        if (params.sched_smt)
+                                print_wrong_arg_exit();
+                        sched_smt = atoi(optarg);
+                        if (sched_smt < 0 || sched_smt > 2) {
+                                printf(_("--sched-smt param out "
+                                         "of range [0-%d]\n"), 2);
+                                print_wrong_arg_exit();
+                        }
+                        params.sched_smt = 1;
+                        break;
+                default:
+                        print_wrong_arg_exit();
+                }
+        };
+
+        if (!params.params)
+                print_wrong_arg_exit();
+
+        if (params.sched_mc) {
+                ret = sysfs_set_sched("mc", sched_mc);
+                if (ret)
+                        fprintf(stderr, _("Error setting sched-mc %s\n"),
+                                (ret == -ENODEV) ? "not supported" : "");
+        }
+        if (params.sched_smt) {
+                ret = sysfs_set_sched("smt", sched_smt);
+                if (ret)
+                        fprintf(stderr, _("Error setting sched-smt %s\n"),
+                                (ret == -ENODEV) ? "not supported" : "");
+        }
+
+        /* Default is: set all CPUs */
+        if (bitmask_isallclear(cpus_chosen))
+                bitmask_setall(cpus_chosen);
+
+        /* loop over CPUs */
+        for (cpu = bitmask_first(cpus_chosen);
+             cpu <= bitmask_last(cpus_chosen); cpu++) {
+
+                if (!bitmask_isbitset(cpus_chosen, cpu) ||
+                    cpufreq_cpu_exists(cpu))
+                        continue;
+
+                if (params.perf_bias) {
+                        ret = msr_intel_set_perf_bias(cpu, perf_bias);
+                        if (ret) {
+                                fprintf(stderr, _("Error setting perf-bias "
+                                                  "value on CPU %d\n"), cpu);
+                                break;
+                        }
+                }
+        }
+        return ret;
+}
diff --git a/tools/power/cpupower/utils/cpupower.c b/tools/power/cpupower/utils/cpupower.c
new file mode 100644
index 00000000000..52bee591c1c
--- /dev/null
+++ b/tools/power/cpupower/utils/cpupower.c
@@ -0,0 +1,214 @@
+/*
+ *  (C) 2010,2011       Thomas Renninger <trenn@suse.de>, Novell Inc.
+ *
+ *  Licensed under the terms of the GNU GPL License version 2.
+ *
+ *  Ideas taken over from the perf userspace tool (included in the Linus
+ *  kernel git repo): subcommand builtins and param parsing.
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <errno.h>
+
+#include "builtin.h"
+#include "helpers/helpers.h"
+#include "helpers/bitmask.h"
+
+struct cmd_struct {
+        const char *cmd;
+        int (*main)(int, const char **);
+        int needs_root;
+};
+
+#define ARRAY_SIZE(x) (sizeof(x)/sizeof(x[0]))
+
+static int cmd_help(int argc, const char **argv);
+
+/* Global cpu_info object available for all binaries
+ * Info only retrieved from CPU 0
+ *
+ * Values will be zero/unknown on non X86 archs
+ */
+struct cpupower_cpu_info cpupower_cpu_info;
+int run_as_root;
+/* Affected cpus chosen by -c/--cpu param */
+struct bitmask *cpus_chosen;
+
+#ifdef DEBUG
+int be_verbose;
+#endif
+
+static void print_help(void);
+
+static struct cmd_struct commands[] = {
+        { "frequency-info",     cmd_freq_info,  0       },
+        { "frequency-set",      cmd_freq_set,   1       },
+        { "idle-info",          cmd_idle_info,  0       },
+        { "set",                cmd_set,        1       },
+        { "info",               cmd_info,       0       },
+        { "monitor",            cmd_monitor,    0       },
+        { "help",               cmd_help,       0       },
+        /*      { "bench",      cmd_bench,      1       }, */
+};
+
+static void print_help(void)
+{
+        unsigned int i;
+
+#ifdef DEBUG
+        printf(_("Usage:\tcpupower [-d|--debug] [-c|--cpu cpulist ] <command> [<args>]\n"));
+#else
+        printf(_("Usage:\tcpupower [-c|--cpu cpulist ] <command> [<args>]\n"));
+#endif
+        printf(_("Supported commands are:\n"));
+        for (i = 0; i < ARRAY_SIZE(commands); i++)
+                printf("\t%s\n", commands[i].cmd);
+        printf(_("\nNot all commands can make use of the -c cpulist option.\n"));
+        printf(_("\nUse 'cpupower help <command>' for getting help for above commands.\n"));
+}
+
+static int print_man_page(const char *subpage)
+{
+        int len;
+        char *page;
+
+        len = 10; /* enough for "cpupower-" */
+        if (subpage != NULL)
+                len += strlen(subpage);
+
+        page = malloc(len);
+        if (!page)
+                return -ENOMEM;
+
+        sprintf(page, "cpupower");
+        if ((subpage != NULL) && strcmp(subpage, "help")) {
+                strcat(page, "-");
+                strcat(page, subpage);
+        }
+
+        execlp("man", "man", page, NULL);
+
+        /* should not be reached */
+        return -EINVAL;
+}
+
+static int cmd_help(int argc, const char **argv)
+{
+        if (argc > 1) {
+                print_man_page(argv[1]); /* exits within execlp() */
+                return EXIT_FAILURE;
+        }
+
+        print_help();
+        return EXIT_SUCCESS;
+}
+
+static void print_version(void)
+{
+        printf(PACKAGE " " VERSION "\n");
+        printf(_("Report errors and bugs to %s, please.\n"), PACKAGE_BUGREPORT);
+}
+
+static void handle_options(int *argc, const char ***argv)
+{
+        int ret, x, new_argc = 0;
+
+        if (*argc < 1)
+                return;
+
+        for (x = 0;  x < *argc && ((*argv)[x])[0] == '-'; x++) {
+                const char *param = (*argv)[x];
+                if (!strcmp(param, "-h") || !strcmp(param, "--help")) {
+                        print_help();
+                        exit(EXIT_SUCCESS);
+                } else if (!strcmp(param, "-c") || !strcmp(param, "--cpu")) {
+                        if (*argc < 2) {
+                                print_help();
+                                exit(EXIT_FAILURE);
+                        }
+                        if (!strcmp((*argv)[x+1], "all"))
+                                bitmask_setall(cpus_chosen);
+                        else {
+                                ret = bitmask_parselist(
+                                                (*argv)[x+1], cpus_chosen);
+                                if (ret < 0) {
+                                        fprintf(stderr, _("Error parsing cpu "
+                                                          "list\n"));
+                                        exit(EXIT_FAILURE);
+                                }
+                        }
+                        x += 1;
+                        /* Cut out param: cpupower -c 1 info -> cpupower info */
+                        new_argc += 2;
+                        continue;
+                } else if (!strcmp(param, "-v") ||
+                        !strcmp(param, "--version")) {
+                        print_version();
+                        exit(EXIT_SUCCESS);
+#ifdef DEBUG
+                } else if (!strcmp(param, "-d") || !strcmp(param, "--debug")) {
+                        be_verbose = 1;
+                        new_argc++;
+                        continue;
+#endif
+                } else {
+                        fprintf(stderr, "Unknown option: %s\n", param);
+                        print_help();
+                        exit(EXIT_FAILURE);
+                }
+        }
+        *argc -= new_argc;
+        *argv += new_argc;
+}
+
+int main(int argc, const char *argv[])
+{
+        const char *cmd;
+        unsigned int i, ret;
+
+        cpus_chosen = bitmask_alloc(sysconf(_SC_NPROCESSORS_CONF));
+
+        argc--;
+        argv += 1;
+
+        handle_options(&argc, &argv);
+
+        cmd = argv[0];
+
+        if (argc < 1) {
+                print_help();
+                return EXIT_FAILURE;
+        }
+
+        setlocale(LC_ALL, "");
+        textdomain(PACKAGE);
+
+        /* Turn "perf cmd --help" into "perf help cmd" */
+        if (argc > 1 && !strcmp(argv[1], "--help")) {
+                argv[1] = argv[0];
+                argv[0] = cmd = "help";
+        }
+
+        get_cpu_info(0, &cpupower_cpu_info);
+        run_as_root = !getuid();
+
+        for (i = 0; i < ARRAY_SIZE(commands); i++) {
+                struct cmd_struct *p = commands + i;
+                if (strcmp(p->cmd, cmd))
+                        continue;
+                if (!run_as_root && p->needs_root) {
+                        fprintf(stderr, _("Subcommand %s needs root "
+                                          "privileges\n"), cmd);
+                        return EXIT_FAILURE;
+                }
+                ret = p->main(argc, argv);
+                if (cpus_chosen)
+                        bitmask_free(cpus_chosen);
+                return ret;
+        }
+        print_help();
+        return EXIT_FAILURE;
+}
diff --git a/tools/power/cpupower/utils/helpers/amd.c b/tools/power/cpupower/utils/helpers/amd.c
new file mode 100644
index 00000000000..87d5605bdda
--- /dev/null
+++ b/tools/power/cpupower/utils/helpers/amd.c
@@ -0,0 +1,137 @@
+#if defined(__i386__) || defined(__x86_64__)
+#include <unistd.h>
+#include <errno.h>
+#include <stdio.h>
+#include <stdint.h>
+
+#include <pci/pci.h>
+
+#include "helpers/helpers.h"
+
+#define MSR_AMD_PSTATE_STATUS   0xc0010063
+#define MSR_AMD_PSTATE          0xc0010064
+#define MSR_AMD_PSTATE_LIMIT    0xc0010061
+
+union msr_pstate {
+        struct {
+                unsigned fid:6;
+                unsigned did:3;
+                unsigned vid:7;
+                unsigned res1:6;
+                unsigned nbdid:1;
+                unsigned res2:2;
+                unsigned nbvid:7;
+                unsigned iddval:8;
+                unsigned idddiv:2;
+                unsigned res3:21;
+                unsigned en:1;
+        } bits;
+        unsigned long long val;
+};
+
+static int get_did(int family, union msr_pstate pstate)
+{
+        int t;
+
+        if (family == 0x12)
+                t = pstate.val & 0xf;
+        else
+                t = pstate.bits.did;
+
+        return t;
+}
+
+static int get_cof(int family, union msr_pstate pstate)
+{
+        int t;
+        int fid, did;
+
+        did = get_did(family, pstate);
+
+        t = 0x10;
+        fid = pstate.bits.fid;
+        if (family == 0x11)
+                t = 0x8;
+
+        return (100 * (fid + t)) >> did;
+}
+
+/* Needs:
+ * cpu          -> the cpu that gets evaluated
+ * cpu_family   -> The cpu's family (0x10, 0x12,...)
+ * boots_states -> how much boost states the machines support
+ *
+ * Fills up:
+ * pstates -> a pointer to an array of size MAX_HW_PSTATES
+ *            must be initialized with zeros.
+ *            All available  HW pstates (including boost states)
+ * no      -> amount of pstates above array got filled up with
+ *
+ * returns zero on success, -1 on failure
+ */
+int decode_pstates(unsigned int cpu, unsigned int cpu_family,
+                   int boost_states, unsigned long *pstates, int *no)
+{
+        int i, psmax, pscur;
+        union msr_pstate pstate;
+        unsigned long long val;
+
+        /* Only read out frequencies from HW when CPU might be boostable
+           to keep the code as short and clean as possible.
+           Otherwise frequencies are exported via ACPI tables.
+        */
+        if (cpu_family < 0x10 || cpu_family == 0x14)
+                return -1;
+
+        if (read_msr(cpu, MSR_AMD_PSTATE_LIMIT, &val))
+                return -1;
+
+        psmax = (val >> 4) & 0x7;
+
+        if (read_msr(cpu, MSR_AMD_PSTATE_STATUS, &val))
+                return -1;
+
+        pscur = val & 0x7;
+
+        pscur += boost_states;
+        psmax += boost_states;
+        for (i = 0; i <= psmax; i++) {
+                if (i >= MAX_HW_PSTATES) {
+                        fprintf(stderr, "HW pstates [%d] exceeding max [%d]\n",
+                                psmax, MAX_HW_PSTATES);
+                        return -1;
+                }
+                if (read_msr(cpu, MSR_AMD_PSTATE + i, &pstate.val))
+                        return -1;
+                pstates[i] = get_cof(cpu_family, pstate);
+        }
+        *no = i;
+        return 0;
+}
+
+int amd_pci_get_num_boost_states(int *active, int *states)
+{
+        struct pci_access *pci_acc;
+        int vendor_id = 0x1022;
+        int boost_dev_ids[4] = {0x1204, 0x1604, 0x1704, 0};
+        struct pci_dev *device;
+        uint8_t val = 0;
+
+        *active = *states = 0;
+
+        device = pci_acc_init(&pci_acc, vendor_id, boost_dev_ids);
+
+        if (device == NULL)
+                return -ENODEV;
+
+        val = pci_read_byte(device, 0x15c);
+        if (val & 3)
+                *active = 1;
+        else
+                *active = 0;
+        *states = (val >> 2) & 7;
+
+        pci_cleanup(pci_acc);
+        return 0;
+}
+#endif /* defined(__i386__) || defined(__x86_64__) */
diff --git a/tools/power/cpupower/utils/helpers/bitmask.c b/tools/power/cpupower/utils/helpers/bitmask.c
new file mode 100644
index 00000000000..5c074c60f90
--- /dev/null
+++ b/tools/power/cpupower/utils/helpers/bitmask.c
@@ -0,0 +1,292 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include <helpers/bitmask.h>
+
+/* How many bits in an unsigned long */
+#define bitsperlong (8 * sizeof(unsigned long))
+
+/* howmany(a,b) : how many elements of size b needed to hold all of a */
+#define howmany(x, y) (((x)+((y)-1))/(y))
+
+/* How many longs in mask of n bits */
+#define longsperbits(n) howmany(n, bitsperlong)
+
+#define max(a, b) ((a) > (b) ? (a) : (b))
+
+/*
+ * Allocate and free `struct bitmask *`
+ */
+
+/* Allocate a new `struct bitmask` with a size of n bits */
+struct bitmask *bitmask_alloc(unsigned int n)
+{
+        struct bitmask *bmp;
+
+        bmp = malloc(sizeof(*bmp));
+        if (bmp == 0)
+                return 0;
+        bmp->size = n;
+        bmp->maskp = calloc(longsperbits(n), sizeof(unsigned long));
+        if (bmp->maskp == 0) {
+                free(bmp);
+                return 0;
+        }
+        return bmp;
+}
+
+/* Free `struct bitmask` */
+void bitmask_free(struct bitmask *bmp)
+{
+        if (bmp == 0)
+                return;
+        free(bmp->maskp);
+        bmp->maskp = (unsigned long *)0xdeadcdef;  /* double free tripwire */
+        free(bmp);
+}
+
+/*
+ * The routines _getbit() and _setbit() are the only
+ * routines that actually understand the layout of bmp->maskp[].
+ *
+ * On little endian architectures, this could simply be an array of
+ * bytes.  But the kernel layout of bitmasks _is_ visible to userspace
+ * via the sched_(set/get)affinity calls in Linux 2.6, and on big
+ * endian architectures, it is painfully obvious that this is an
+ * array of unsigned longs.
+ */
+
+/* Return the value (0 or 1) of bit n in bitmask bmp */
+static unsigned int _getbit(const struct bitmask *bmp, unsigned int n)
+{
+        if (n < bmp->size)
+                return (bmp->maskp[n/bitsperlong] >> (n % bitsperlong)) & 1;
+        else
+                return 0;
+}
+
+/* Set bit n in bitmask bmp to value v (0 or 1) */
+static void _setbit(struct bitmask *bmp, unsigned int n, unsigned int v)
+{
+        if (n < bmp->size) {
+                if (v)
+                        bmp->maskp[n/bitsperlong] |= 1UL << (n % bitsperlong);
+                else
+                        bmp->maskp[n/bitsperlong] &=
+                                ~(1UL << (n % bitsperlong));
+        }
+}
+
+/*
+ * When parsing bitmask lists, only allow numbers, separated by one
+ * of the allowed next characters.
+ *
+ * The parameter 'sret' is the return from a sscanf "%u%c".  It is
+ * -1 if the sscanf input string was empty.  It is 0 if the first
+ * character in the sscanf input string was not a decimal number.
+ * It is 1 if the unsigned number matching the "%u" was the end of the
+ * input string.  It is 2 if one or more additional characters followed
+ * the matched unsigned number.  If it is 2, then 'nextc' is the first
+ * character following the number.  The parameter 'ok_next_chars'
+ * is the nul-terminated list of allowed next characters.
+ *
+ * The mask term just scanned was ok if and only if either the numbers
+ * matching the %u were all of the input or if the next character in
+ * the input past the numbers was one of the allowed next characters.
+ */
+static int scan_was_ok(int sret, char nextc, const char *ok_next_chars)
+{
+        return sret == 1 ||
+                (sret == 2 && strchr(ok_next_chars, nextc) != NULL);
+}
+
+static const char *nexttoken(const char *q,  int sep)
+{
+        if (q)
+                q = strchr(q, sep);
+        if (q)
+                q++;
+        return q;
+}
+
+/* Set a single bit i in bitmask */
+struct bitmask *bitmask_setbit(struct bitmask *bmp, unsigned int i)
+{
+        _setbit(bmp, i, 1);
+        return bmp;
+}
+
+/* Set all bits in bitmask: bmp = ~0 */
+struct bitmask *bitmask_setall(struct bitmask *bmp)
+{
+        unsigned int i;
+        for (i = 0; i < bmp->size; i++)
+                _setbit(bmp, i, 1);
+        return bmp;
+}
+
+/* Clear all bits in bitmask: bmp = 0 */
+struct bitmask *bitmask_clearall(struct bitmask *bmp)
+{
+        unsigned int i;
+        for (i = 0; i < bmp->size; i++)
+                _setbit(bmp, i, 0);
+        return bmp;
+}
+
+/* True if all bits are clear */
+int bitmask_isallclear(const struct bitmask *bmp)
+{
+        unsigned int i;
+        for (i = 0; i < bmp->size; i++)
+                if (_getbit(bmp, i))
+                        return 0;
+        return 1;
+}
+
+/* True if specified bit i is set */
+int bitmask_isbitset(const struct bitmask *bmp, unsigned int i)
+{
+        return _getbit(bmp, i);
+}
+
+/* Number of lowest set bit (min) */
+unsigned int bitmask_first(const struct bitmask *bmp)
+{
+        return bitmask_next(bmp, 0);
+}
+
+/* Number of highest set bit (max) */
+unsigned int bitmask_last(const struct bitmask *bmp)
+{
+        unsigned int i;
+        unsigned int m = bmp->size;
+        for (i = 0; i < bmp->size; i++)
+                if (_getbit(bmp, i))
+                        m = i;
+        return m;
+}
+
+/* Number of next set bit at or above given bit i */
+unsigned int bitmask_next(const struct bitmask *bmp, unsigned int i)
+{
+        unsigned int n;
+        for (n = i; n < bmp->size; n++)
+                if (_getbit(bmp, n))
+                        break;
+        return n;
+}
+
+/*
+ * Parses a comma-separated list of numbers and ranges of numbers,
+ * with optional ':%u' strides modifying ranges, into provided bitmask.
+ * Some examples of input lists and their equivalent simple list:
+ *      Input           Equivalent to
+ *      0-3             0,1,2,3
+ *      0-7:2           0,2,4,6
+ *      1,3,5-7         1,3,5,6,7
+ *      0-3:2,8-15:4    0,2,8,12
+ */
+int bitmask_parselist(const char *buf, struct bitmask *bmp)
+{
+        const char *p, *q;
+
+        bitmask_clearall(bmp);
+
+        q = buf;
+        while (p = q, q = nexttoken(q, ','), p) {
+                unsigned int a;         /* begin of range */
+                unsigned int b;         /* end of range */
+                unsigned int s;         /* stride */
+                const char *c1, *c2;    /* next tokens after '-' or ',' */
+                char nextc;             /* char after sscanf %u match */
+                int sret;               /* sscanf return (number of matches) */
+
+                sret = sscanf(p, "%u%c", &a, &nextc);
+                if (!scan_was_ok(sret, nextc, ",-"))
+                        goto err;
+                b = a;
+                s = 1;
+                c1 = nexttoken(p, '-');
+                c2 = nexttoken(p, ',');
+                if (c1 != NULL && (c2 == NULL || c1 < c2)) {
+                        sret = sscanf(c1, "%u%c", &b, &nextc);
+                        if (!scan_was_ok(sret, nextc, ",:"))
+                                goto err;
+                        c1 = nexttoken(c1, ':');
+                        if (c1 != NULL && (c2 == NULL || c1 < c2)) {
+                                sret = sscanf(c1, "%u%c", &s, &nextc);
+                                if (!scan_was_ok(sret, nextc, ","))
+                                        goto err;
+                        }
+                }
+                if (!(a <= b))
+                        goto err;
+                if (b >= bmp->size)
+                        goto err;
+                while (a <= b) {
+                        _setbit(bmp, a, 1);
+                        a += s;
+                }
+        }
+        return 0;
+err:
+        bitmask_clearall(bmp);
+        return -1;
+}
+
+/*
+ * emit(buf, buflen, rbot, rtop, len)
+ *
+ * Helper routine for bitmask_displaylist().  Write decimal number
+ * or range to buf+len, suppressing output past buf+buflen, with optional
+ * comma-prefix.  Return len of what would be written to buf, if it
+ * all fit.
+ */
+
+static inline int emit(char *buf, int buflen, int rbot, int rtop, int len)
+{
+        if (len > 0)
+                len += snprintf(buf + len, max(buflen - len, 0), ",");
+        if (rbot == rtop)
+                len += snprintf(buf + len, max(buflen - len, 0), "%d", rbot);
+        else
+                len += snprintf(buf + len, max(buflen - len, 0), "%d-%d",
+                                rbot, rtop);
+        return len;
+}
+
+/*
+ * Write decimal list representation of bmp to buf.
+ *
+ * Output format is a comma-separated list of decimal numbers and
+ * ranges.  Consecutively set bits are shown as two hyphen-separated
+ * decimal numbers, the smallest and largest bit numbers set in
+ * the range.  Output format is compatible with the format
+ * accepted as input by bitmap_parselist().
+ *
+ * The return value is the number of characters which would be
+ * generated for the given input, excluding the trailing '\0', as
+ * per ISO C99.
+ */
+
+int bitmask_displaylist(char *buf, int buflen, const struct bitmask *bmp)
+{
+        int len = 0;
+        /* current bit is 'cur', most recently seen range is [rbot, rtop] */
+        unsigned int cur, rbot, rtop;
+
+        if (buflen > 0)
+                *buf = 0;
+        rbot = cur = bitmask_first(bmp);
+        while (cur < bmp->size) {
+                rtop = cur;
+                cur = bitmask_next(bmp, cur+1);
+                if (cur >= bmp->size || cur > rtop + 1) {
+                        len = emit(buf, buflen, rbot, rtop, len);
+                        rbot = cur;
+                }
+        }
+        return len;
+}
diff --git a/tools/power/cpupower/utils/helpers/bitmask.h b/tools/power/cpupower/utils/helpers/bitmask.h
new file mode 100644
index 00000000000..eb289df4105
--- /dev/null
+++ b/tools/power/cpupower/utils/helpers/bitmask.h
@@ -0,0 +1,33 @@
+#ifndef __CPUPOWER_BITMASK__
+#define __CPUPOWER_BITMASK__
+
+/* Taken over from libbitmask, a project initiated from sgi:
+ * Url:            http://oss.sgi.com/projects/cpusets/
+ * Unfortunately it's not very widespread, therefore relevant parts are
+ * pasted here.
+ */
+
+struct bitmask {
+        unsigned int size;
+        unsigned long *maskp;
+};
+
+struct bitmask *bitmask_alloc(unsigned int n);
+void bitmask_free(struct bitmask *bmp);
+
+struct bitmask *bitmask_setbit(struct bitmask *bmp, unsigned int i);
+struct bitmask *bitmask_setall(struct bitmask *bmp);
+struct bitmask *bitmask_clearall(struct bitmask *bmp);
+
+unsigned int bitmask_first(const struct bitmask *bmp);
+unsigned int bitmask_next(const struct bitmask *bmp, unsigned int i);
+unsigned int bitmask_last(const struct bitmask *bmp);
+int bitmask_isallclear(const struct bitmask *bmp);
+int bitmask_isbitset(const struct bitmask *bmp, unsigned int i);
+
+int bitmask_parselist(const char *buf, struct bitmask *bmp);
+int bitmask_displaylist(char *buf, int len, const struct bitmask *bmp);
+
+
+
+#endif /*__CPUPOWER_BITMASK__ */
diff --git a/tools/power/cpupower/utils/helpers/cpuid.c b/tools/power/cpupower/utils/helpers/cpuid.c
new file mode 100644
index 00000000000..906895d21cc
--- /dev/null
+++ b/tools/power/cpupower/utils/helpers/cpuid.c
@@ -0,0 +1,176 @@
+#include <stdio.h>
+#include <errno.h>
+#include <string.h>
+#include <unistd.h>
+#include <stdlib.h>
+
+#include "helpers/helpers.h"
+
+static const char *cpu_vendor_table[X86_VENDOR_MAX] = {
+        "Unknown", "GenuineIntel", "AuthenticAMD",
+};
+
+#if defined(__i386__) || defined(__x86_64__)
+
+/* from gcc */
+#include <cpuid.h>
+
+/*
+ * CPUID functions returning a single datum
+ *
+ * Define unsigned int cpuid_e[abcd]x(unsigned int op)
+ */
+#define cpuid_func(reg)                                 \
+        unsigned int cpuid_##reg(unsigned int op)       \
+        {                                               \
+        unsigned int eax, ebx, ecx, edx;                \
+        __cpuid(op, eax, ebx, ecx, edx);                \
+        return reg;                                     \
+        }
+cpuid_func(eax);
+cpuid_func(ebx);
+cpuid_func(ecx);
+cpuid_func(edx);
+
+#endif /* defined(__i386__) || defined(__x86_64__) */
+
+/* get_cpu_info
+ *
+ * Extract CPU vendor, family, model, stepping info from /proc/cpuinfo
+ *
+ * Returns 0 on success or a negativ error code
+ *
+ * TBD: Should there be a cpuid alternative for this if /proc is not mounted?
+ */
+int get_cpu_info(unsigned int cpu, struct cpupower_cpu_info *cpu_info)
+{
+        FILE *fp;
+        char value[64];
+        unsigned int proc, x;
+        unsigned int unknown = 0xffffff;
+        unsigned int cpuid_level, ext_cpuid_level;
+
+        int ret = -EINVAL;
+
+        cpu_info->vendor                = X86_VENDOR_UNKNOWN;
+        cpu_info->family                = unknown;
+        cpu_info->model                 = unknown;
+        cpu_info->stepping              = unknown;
+        cpu_info->caps                  = 0;
+
+        fp = fopen("/proc/cpuinfo", "r");
+        if (!fp)
+                return -EIO;
+
+        while (!feof(fp)) {
+                if (!fgets(value, 64, fp))
+                        continue;
+                value[63 - 1] = '\0';
+
+                if (!strncmp(value, "processor\t: ", 12))
+                        sscanf(value, "processor\t: %u", &proc);
+
+                if (proc != cpu)
+                        continue;
+
+                /* Get CPU vendor */
+                if (!strncmp(value, "vendor_id", 9)) {
+                        for (x = 1; x < X86_VENDOR_MAX; x++) {
+                                if (strstr(value, cpu_vendor_table[x]))
+                                        cpu_info->vendor = x;
+                        }
+                /* Get CPU family, etc. */
+                } else if (!strncmp(value, "cpu family\t: ", 13)) {
+                        sscanf(value, "cpu family\t: %u",
+                               &cpu_info->family);
+                } else if (!strncmp(value, "model\t\t: ", 9)) {
+                        sscanf(value, "model\t\t: %u",
+                               &cpu_info->model);
+                } else if (!strncmp(value, "stepping\t: ", 10)) {
+                        sscanf(value, "stepping\t: %u",
+                               &cpu_info->stepping);
+
+                        /* Exit -> all values must have been set */
+                        if (cpu_info->vendor == X86_VENDOR_UNKNOWN ||
+                            cpu_info->family == unknown ||
+                            cpu_info->model == unknown ||
+                            cpu_info->stepping == unknown) {
+                                ret = -EINVAL;
+                                goto out;
+                        }
+
+                        ret = 0;
+                        goto out;
+                }
+        }
+        ret = -ENODEV;
+out:
+        fclose(fp);
+        /* Get some useful CPU capabilities from cpuid */
+        if (cpu_info->vendor != X86_VENDOR_AMD &&
+            cpu_info->vendor != X86_VENDOR_INTEL)
+                return ret;
+
+        cpuid_level     = cpuid_eax(0);
+        ext_cpuid_level = cpuid_eax(0x80000000);
+
+        /* Invariant TSC */
+        if (ext_cpuid_level >= 0x80000007 &&
+            (cpuid_edx(0x80000007) & (1 << 8)))
+                cpu_info->caps |= CPUPOWER_CAP_INV_TSC;
+
+        /* Aperf/Mperf registers support */
+        if (cpuid_level >= 6 && (cpuid_ecx(6) & 0x1))
+                cpu_info->caps |= CPUPOWER_CAP_APERF;
+
+        /* AMD Boost state enable/disable register */
+        if (cpu_info->vendor == X86_VENDOR_AMD) {
+                if (ext_cpuid_level >= 0x80000007 &&
+                    (cpuid_edx(0x80000007) & (1 << 9)))
+                        cpu_info->caps |= CPUPOWER_CAP_AMD_CBP;
+        }
+
+        if (cpu_info->vendor == X86_VENDOR_INTEL) {
+                if (cpuid_level >= 6 &&
+                    (cpuid_eax(6) & (1 << 1)))
+                        cpu_info->caps |= CPUPOWER_CAP_INTEL_IDA;
+        }
+
+        if (cpu_info->vendor == X86_VENDOR_INTEL) {
+                /* Intel's perf-bias MSR support */
+                if (cpuid_level >= 6 && (cpuid_ecx(6) & (1 << 3)))
+                        cpu_info->caps |= CPUPOWER_CAP_PERF_BIAS;
+
+                /* Intel's Turbo Ratio Limit support */
+                if (cpu_info->family == 6) {
+                        switch (cpu_info->model) {
+                        case 0x1A:      /* Core i7, Xeon 5500 series
+                                         * Bloomfield, Gainstown NHM-EP
+                                         */
+                        case 0x1E:      /* Core i7 and i5 Processor
+                                         * Clarksfield, Lynnfield, Jasper Forest
+                                         */
+                        case 0x1F:      /* Core i7 and i5 Processor - Nehalem */
+                        case 0x25:      /* Westmere Client
+                                         * Clarkdale, Arrandale
+                                         */
+                        case 0x2C:      /* Westmere EP - Gulftown */
+                                cpu_info->caps |= CPUPOWER_CAP_HAS_TURBO_RATIO;
+                        case 0x2A:      /* SNB */
+                        case 0x2D:      /* SNB Xeon */
+                                cpu_info->caps |= CPUPOWER_CAP_HAS_TURBO_RATIO;
+                                cpu_info->caps |= CPUPOWER_CAP_IS_SNB;
+                                break;
+                        case 0x2E:      /* Nehalem-EX Xeon - Beckton */
+                        case 0x2F:      /* Westmere-EX Xeon - Eagleton */
+                        default:
+                                break;
+                        }
+                }
+        }
+
+        /*      printf("ID: %u - Extid: 0x%x - Caps: 0x%llx\n",
+                cpuid_level, ext_cpuid_level, cpu_info->caps);
+        */
+        return ret;
+}
diff --git a/tools/power/cpupower/utils/helpers/helpers.h b/tools/power/cpupower/utils/helpers/helpers.h
new file mode 100644
index 00000000000..2747e738efb
--- /dev/null
+++ b/tools/power/cpupower/utils/helpers/helpers.h
@@ -0,0 +1,190 @@
+/*
+ *  (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"
+
+/* 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 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             0x00000011
+#define CPUPOWER_CAP_INTEL_IDA          0x00000012
+
+#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 negativ error code
+ * Only used on x86, below global's struct values are zero/unknown on
+ * other archs
+ */
+extern int get_cpu_info(unsigned int cpu, struct cpupower_cpu_info *cpu_info);
+extern struct cpupower_cpu_info cpupower_cpu_info;
+/* cpuid and cpuinfo helpers  **************************/
+
+
+/* CPU topology/hierarchy parsing ******************/
+struct cpupower_topology {
+        /* Amount of CPU cores, packages and threads per core in the system */
+        unsigned int cores;
+        unsigned int pkgs;
+        unsigned int threads; /* per core */
+
+        /* Array gets mallocated with cores entries, holding per core info */
+        struct {
+                int pkg;
+                int core;
+                int cpu;
+
+                /* flags */
+                unsigned int is_online:1;
+        } *core_info;
+};
+
+extern int get_cpu_topology(struct cpupower_topology *cpu_top);
+extern void cpu_topology_release(struct cpupower_topology cpu_top);
+/* CPU topology/hierarchy parsing ******************/
+
+/* 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 vendor_id,
+                                    int *dev_ids);
+
+/* 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__ */
diff --git a/tools/power/cpupower/utils/helpers/misc.c b/tools/power/cpupower/utils/helpers/misc.c
new file mode 100644
index 00000000000..1609243f5c6
--- /dev/null
+++ b/tools/power/cpupower/utils/helpers/misc.c
@@ -0,0 +1,27 @@
+#if defined(__i386__) || defined(__x86_64__)
+
+#include "helpers/helpers.h"
+
+int cpufreq_has_boost_support(unsigned int cpu, int *support, int *active,
+                        int *states)
+{
+        struct cpupower_cpu_info cpu_info;
+        int ret;
+
+        *support = *active = *states = 0;
+
+        ret = get_cpu_info(0, &cpu_info);
+        if (ret)
+                return ret;
+
+        if (cpupower_cpu_info.caps & CPUPOWER_CAP_AMD_CBP) {
+                *support = 1;
+                amd_pci_get_num_boost_states(active, states);
+                if (ret <= 0)
+                        return ret;
+                *support = 1;
+        } else if (cpupower_cpu_info.caps & CPUPOWER_CAP_INTEL_IDA)
+                *support = *active = 1;
+        return 0;
+}
+#endif /* #if defined(__i386__) || defined(__x86_64__) */
diff --git a/tools/power/cpupower/utils/helpers/msr.c b/tools/power/cpupower/utils/helpers/msr.c
new file mode 100644
index 00000000000..31a4b24a8bc
--- /dev/null
+++ b/tools/power/cpupower/utils/helpers/msr.c
@@ -0,0 +1,115 @@
+#if defined(__i386__) || defined(__x86_64__)
+
+#include <fcntl.h>
+#include <stdio.h>
+#include <unistd.h>
+#include <stdint.h>
+
+#include "helpers/helpers.h"
+
+/* Intel specific MSRs */
+#define MSR_IA32_PERF_STATUS            0x198
+#define MSR_IA32_MISC_ENABLES           0x1a0
+#define MSR_IA32_ENERGY_PERF_BIAS       0x1b0
+#define MSR_NEHALEM_TURBO_RATIO_LIMIT   0x1ad
+
+/*
+ * read_msr
+ *
+ * Will return 0 on success and -1 on failure.
+ * Possible errno values could be:
+ * EFAULT -If the read/write did not fully complete
+ * EIO    -If the CPU does not support MSRs
+ * ENXIO  -If the CPU does not exist
+ */
+
+int read_msr(int cpu, unsigned int idx, unsigned long long *val)
+{
+        int fd;
+        char msr_file_name[64];
+
+        sprintf(msr_file_name, "/dev/cpu/%d/msr", cpu);
+        fd = open(msr_file_name, O_RDONLY);
+        if (fd < 0)
+                return -1;
+        if (lseek(fd, idx, SEEK_CUR) == -1)
+                goto err;
+        if (read(fd, val, sizeof *val) != sizeof *val)
+                goto err;
+        close(fd);
+        return 0;
+ err:
+        close(fd);
+        return -1;
+}
+
+/*
+ * write_msr
+ *
+ * Will return 0 on success and -1 on failure.
+ * Possible errno values could be:
+ * EFAULT -If the read/write did not fully complete
+ * EIO    -If the CPU does not support MSRs
+ * ENXIO  -If the CPU does not exist
+ */
+int write_msr(int cpu, unsigned int idx, unsigned long long val)
+{
+        int fd;
+        char msr_file_name[64];
+
+        sprintf(msr_file_name, "/dev/cpu/%d/msr", cpu);
+        fd = open(msr_file_name, O_WRONLY);
+        if (fd < 0)
+                return -1;
+        if (lseek(fd, idx, SEEK_CUR) == -1)
+                goto err;
+        if (write(fd, &val, sizeof val) != sizeof val)
+                goto err;
+        close(fd);
+        return 0;
+ err:
+        close(fd);
+        return -1;
+}
+
+int msr_intel_get_perf_bias(unsigned int cpu)
+{
+        unsigned long long val;
+        int ret;
+
+        if (!(cpupower_cpu_info.caps & CPUPOWER_CAP_PERF_BIAS))
+                return -1;
+
+        ret = read_msr(cpu, MSR_IA32_ENERGY_PERF_BIAS, &val);
+        if (ret)
+                return ret;
+        return val;
+}
+
+int msr_intel_set_perf_bias(unsigned int cpu, unsigned int val)
+{
+        int ret;
+
+        if (!(cpupower_cpu_info.caps & CPUPOWER_CAP_PERF_BIAS))
+                return -1;
+
+        ret = write_msr(cpu, MSR_IA32_ENERGY_PERF_BIAS, val);
+        if (ret)
+                return ret;
+        return 0;
+}
+
+unsigned long long msr_intel_get_turbo_ratio(unsigned int cpu)
+{
+        unsigned long long val;
+        int ret;
+
+        if (!(cpupower_cpu_info.caps & CPUPOWER_CAP_HAS_TURBO_RATIO))
+                return -1;
+
+        ret = read_msr(cpu, MSR_NEHALEM_TURBO_RATIO_LIMIT, &val);
+        if (ret)
+                return ret;
+        return val;
+}
+#endif
diff --git a/tools/power/cpupower/utils/helpers/pci.c b/tools/power/cpupower/utils/helpers/pci.c
new file mode 100644
index 00000000000..cd2eb6fe41c
--- /dev/null
+++ b/tools/power/cpupower/utils/helpers/pci.c
@@ -0,0 +1,44 @@
+#if defined(__i386__) || defined(__x86_64__)
+
+#include <helpers/helpers.h>
+
+/*
+ * pci_acc_init
+ *
+ * PCI access helper function depending on libpci
+ *
+ * **pacc : if a valid pci_dev is returned
+ *         *pacc must be passed to pci_acc_cleanup to free it
+ *
+ * vendor_id : the pci vendor id matching the pci device to access
+ * dev_ids :   device ids matching the pci device to access
+ *
+ * Returns :
+ * struct pci_dev which can be used with pci_{read,write}_* functions
+ *                to access the PCI config space of matching pci devices
+ */
+struct pci_dev *pci_acc_init(struct pci_access **pacc, int vendor_id,
+                                    int *dev_ids)
+{
+        struct pci_filter filter_nb_link = { -1, -1, -1, -1, vendor_id, 0};
+        struct pci_dev *device;
+        unsigned int i;
+
+        *pacc = pci_alloc();
+        if (*pacc == NULL)
+                return NULL;
+
+        pci_init(*pacc);
+        pci_scan_bus(*pacc);
+
+        for (i = 0; dev_ids[i] != 0; i++) {
+                filter_nb_link.device = dev_ids[i];
+                for (device = (*pacc)->devices; device; device = device->next) {
+                        if (pci_filter_match(&filter_nb_link, device))
+                                return device;
+                }
+        }
+        pci_cleanup(*pacc);
+        return NULL;
+}
+#endif /* defined(__i386__) || defined(__x86_64__) */
diff --git a/tools/power/cpupower/utils/helpers/sysfs.c b/tools/power/cpupower/utils/helpers/sysfs.c
new file mode 100644
index 00000000000..c6343024a61
--- /dev/null
+++ b/tools/power/cpupower/utils/helpers/sysfs.c
@@ -0,0 +1,408 @@
+/*
+ *  (C) 2004-2009  Dominik Brodowski <linux@dominikbrodowski.de>
+ *  (C) 2011       Thomas Renninger <trenn@novell.com> Novell Inc.
+ *
+ *  Licensed under the terms of the GNU GPL License version 2.
+ */
+
+#include <stdio.h>
+#include <errno.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <unistd.h>
+
+#include "helpers/sysfs.h"
+
+unsigned int sysfs_read_file(const char *path, char *buf, size_t buflen)
+{
+        int fd;
+        ssize_t numread;
+
+        fd = open(path, O_RDONLY);
+        if (fd == -1)
+                return 0;
+
+        numread = read(fd, buf, buflen - 1);
+        if (numread < 1) {
+                close(fd);
+                return 0;
+        }
+
+        buf[numread] = '\0';
+        close(fd);
+
+        return (unsigned int) numread;
+}
+
+static unsigned int sysfs_write_file(const char *path,
+                                     const char *value, size_t len)
+{
+        int fd;
+        ssize_t numwrite;
+
+        fd = open(path, O_WRONLY);
+        if (fd == -1)
+                return 0;
+
+        numwrite = write(fd, value, len);
+        if (numwrite < 1) {
+                close(fd);
+                return 0;
+        }
+        close(fd);
+        return (unsigned int) numwrite;
+}
+
+/*
+ * Detect whether a CPU is online
+ *
+ * Returns:
+ *     1 -> if CPU is online
+ *     0 -> if CPU is offline
+ *     negative errno values in error case
+ */
+int sysfs_is_cpu_online(unsigned int cpu)
+{
+        char path[SYSFS_PATH_MAX];
+        int fd;
+        ssize_t numread;
+        unsigned long long value;
+        char linebuf[MAX_LINE_LEN];
+        char *endp;
+        struct stat statbuf;
+
+        snprintf(path, sizeof(path), PATH_TO_CPU "cpu%u", cpu);
+
+        if (stat(path, &statbuf) != 0)
+                return 0;
+
+        /*
+         * kernel without CONFIG_HOTPLUG_CPU
+         * -> cpuX directory exists, but not cpuX/online file
+         */
+        snprintf(path, sizeof(path), PATH_TO_CPU "cpu%u/online", cpu);
+        if (stat(path, &statbuf) != 0)
+                return 1;
+
+        fd = open(path, O_RDONLY);
+        if (fd == -1)
+                return -errno;
+
+        numread = read(fd, linebuf, MAX_LINE_LEN - 1);
+        if (numread < 1) {
+                close(fd);
+                return -EIO;
+        }
+        linebuf[numread] = '\0';
+        close(fd);
+
+        value = strtoull(linebuf, &endp, 0);
+        if (value > 1 || value < 0)
+                return -EINVAL;
+
+        return value;
+}
+
+/* CPUidle idlestate specific /sys/devices/system/cpu/cpuX/cpuidle/ access */
+
+/*
+ * helper function to read file from /sys into given buffer
+ * fname is a relative path under "cpuX/cpuidle/stateX/" dir
+ * cstates starting with 0, C0 is not counted as cstate.
+ * This means if you want C1 info, pass 0 as idlestate param
+ */
+unsigned int sysfs_idlestate_read_file(unsigned int cpu, unsigned int idlestate,
+                             const char *fname, char *buf, size_t buflen)
+{
+        char path[SYSFS_PATH_MAX];
+        int fd;
+        ssize_t numread;
+
+        snprintf(path, sizeof(path), PATH_TO_CPU "cpu%u/cpuidle/state%u/%s",
+                 cpu, idlestate, fname);
+
+        fd = open(path, O_RDONLY);
+        if (fd == -1)
+                return 0;
+
+        numread = read(fd, buf, buflen - 1);
+        if (numread < 1) {
+                close(fd);
+                return 0;
+        }
+
+        buf[numread] = '\0';
+        close(fd);
+
+        return (unsigned int) numread;
+}
+
+/* read access to files which contain one numeric value */
+
+enum idlestate_value {
+        IDLESTATE_USAGE,
+        IDLESTATE_POWER,
+        IDLESTATE_LATENCY,
+        IDLESTATE_TIME,
+        MAX_IDLESTATE_VALUE_FILES
+};
+
+static const char *idlestate_value_files[MAX_IDLESTATE_VALUE_FILES] = {
+        [IDLESTATE_USAGE] = "usage",
+        [IDLESTATE_POWER] = "power",
+        [IDLESTATE_LATENCY] = "latency",
+        [IDLESTATE_TIME]  = "time",
+};
+
+static unsigned long long sysfs_idlestate_get_one_value(unsigned int cpu,
+                                                     unsigned int idlestate,
+                                                     enum idlestate_value which)
+{
+        unsigned long long value;
+        unsigned int len;
+        char linebuf[MAX_LINE_LEN];
+        char *endp;
+
+        if (which >= MAX_IDLESTATE_VALUE_FILES)
+                return 0;
+
+        len = sysfs_idlestate_read_file(cpu, idlestate,
+                                        idlestate_value_files[which],
+                                        linebuf, sizeof(linebuf));
+        if (len == 0)
+                return 0;
+
+        value = strtoull(linebuf, &endp, 0);
+
+        if (endp == linebuf || errno == ERANGE)
+                return 0;
+
+        return value;
+}
+
+/* read access to files which contain one string */
+
+enum idlestate_string {
+        IDLESTATE_DESC,
+        IDLESTATE_NAME,
+        MAX_IDLESTATE_STRING_FILES
+};
+
+static const char *idlestate_string_files[MAX_IDLESTATE_STRING_FILES] = {
+        [IDLESTATE_DESC] = "desc",
+        [IDLESTATE_NAME] = "name",
+};
+
+
+static char *sysfs_idlestate_get_one_string(unsigned int cpu,
+                                        unsigned int idlestate,
+                                        enum idlestate_string which)
+{
+        char linebuf[MAX_LINE_LEN];
+        char *result;
+        unsigned int len;
+
+        if (which >= MAX_IDLESTATE_STRING_FILES)
+                return NULL;
+
+        len = sysfs_idlestate_read_file(cpu, idlestate,
+                                        idlestate_string_files[which],
+                                        linebuf, sizeof(linebuf));
+        if (len == 0)
+                return NULL;
+
+        result = strdup(linebuf);
+        if (result == NULL)
+                return NULL;
+
+        if (result[strlen(result) - 1] == '\n')
+                result[strlen(result) - 1] = '\0';
+
+        return result;
+}
+
+unsigned long sysfs_get_idlestate_latency(unsigned int cpu,
+                                        unsigned int idlestate)
+{
+        return sysfs_idlestate_get_one_value(cpu, idlestate, IDLESTATE_LATENCY);
+}
+
+unsigned long sysfs_get_idlestate_usage(unsigned int cpu,
+                                        unsigned int idlestate)
+{
+        return sysfs_idlestate_get_one_value(cpu, idlestate, IDLESTATE_USAGE);
+}
+
+unsigned long long sysfs_get_idlestate_time(unsigned int cpu,
+                                        unsigned int idlestate)
+{
+        return sysfs_idlestate_get_one_value(cpu, idlestate, IDLESTATE_TIME);
+}
+
+char *sysfs_get_idlestate_name(unsigned int cpu, unsigned int idlestate)
+{
+        return sysfs_idlestate_get_one_string(cpu, idlestate, IDLESTATE_NAME);
+}
+
+char *sysfs_get_idlestate_desc(unsigned int cpu, unsigned int idlestate)
+{
+        return sysfs_idlestate_get_one_string(cpu, idlestate, IDLESTATE_DESC);
+}
+
+/*
+ * Returns number of supported C-states of CPU core cpu
+ * Negativ in error case
+ * Zero if cpuidle does not export any C-states
+ */
+int sysfs_get_idlestate_count(unsigned int cpu)
+{
+        char file[SYSFS_PATH_MAX];
+        struct stat statbuf;
+        int idlestates = 1;
+
+
+        snprintf(file, SYSFS_PATH_MAX, PATH_TO_CPU "cpuidle");
+        if (stat(file, &statbuf) != 0 || !S_ISDIR(statbuf.st_mode))
+                return -ENODEV;
+
+        snprintf(file, SYSFS_PATH_MAX, PATH_TO_CPU "cpu%u/cpuidle/state0", cpu);
+        if (stat(file, &statbuf) != 0 || !S_ISDIR(statbuf.st_mode))
+                return 0;
+
+        while (stat(file, &statbuf) == 0 && S_ISDIR(statbuf.st_mode)) {
+                snprintf(file, SYSFS_PATH_MAX, PATH_TO_CPU
+                         "cpu%u/cpuidle/state%d", cpu, idlestates);
+                idlestates++;
+        }
+        idlestates--;
+        return idlestates;
+}
+
+/* CPUidle general /sys/devices/system/cpu/cpuidle/ sysfs access ********/
+
+/*
+ * helper function to read file from /sys into given buffer
+ * fname is a relative path under "cpu/cpuidle/" dir
+ */
+static unsigned int sysfs_cpuidle_read_file(const char *fname, char *buf,
+                                            size_t buflen)
+{
+        char path[SYSFS_PATH_MAX];
+
+        snprintf(path, sizeof(path), PATH_TO_CPU "cpuidle/%s", fname);
+
+        return sysfs_read_file(path, buf, buflen);
+}
+
+
+
+/* read access to files which contain one string */
+
+enum cpuidle_string {
+        CPUIDLE_GOVERNOR,
+        CPUIDLE_GOVERNOR_RO,
+        CPUIDLE_DRIVER,
+        MAX_CPUIDLE_STRING_FILES
+};
+
+static const char *cpuidle_string_files[MAX_CPUIDLE_STRING_FILES] = {
+        [CPUIDLE_GOVERNOR]      = "current_governor",
+        [CPUIDLE_GOVERNOR_RO]   = "current_governor_ro",
+        [CPUIDLE_DRIVER]        = "current_driver",
+};
+
+
+static char *sysfs_cpuidle_get_one_string(enum cpuidle_string which)
+{
+        char linebuf[MAX_LINE_LEN];
+        char *result;
+        unsigned int len;
+
+        if (which >= MAX_CPUIDLE_STRING_FILES)
+                return NULL;
+
+        len = sysfs_cpuidle_read_file(cpuidle_string_files[which],
+                                linebuf, sizeof(linebuf));
+        if (len == 0)
+                return NULL;
+
+        result = strdup(linebuf);
+        if (result == NULL)
+                return NULL;
+
+        if (result[strlen(result) - 1] == '\n')
+                result[strlen(result) - 1] = '\0';
+
+        return result;
+}
+
+char *sysfs_get_cpuidle_governor(void)
+{
+        char *tmp = sysfs_cpuidle_get_one_string(CPUIDLE_GOVERNOR_RO);
+        if (!tmp)
+                return sysfs_cpuidle_get_one_string(CPUIDLE_GOVERNOR);
+        else
+                return tmp;
+}
+
+char *sysfs_get_cpuidle_driver(void)
+{
+        return sysfs_cpuidle_get_one_string(CPUIDLE_DRIVER);
+}
+/* CPUidle idlestate specific /sys/devices/system/cpu/cpuX/cpuidle/ access */
+
+/*
+ * Get sched_mc or sched_smt settings
+ * Pass "mc" or "smt" as argument
+ *
+ * Returns negative value on failure
+ */
+int sysfs_get_sched(const char *smt_mc)
+{
+        unsigned long value;
+        char linebuf[MAX_LINE_LEN];
+        char *endp;
+        char path[SYSFS_PATH_MAX];
+
+        if (strcmp("mc", smt_mc) && strcmp("smt", smt_mc))
+                return -EINVAL;
+
+        snprintf(path, sizeof(path),
+                PATH_TO_CPU "sched_%s_power_savings", smt_mc);
+        if (sysfs_read_file(path, linebuf, MAX_LINE_LEN) == 0)
+                return -1;
+        value = strtoul(linebuf, &endp, 0);
+        if (endp == linebuf || errno == ERANGE)
+                return -1;
+        return value;
+}
+
+/*
+ * Get sched_mc or sched_smt settings
+ * Pass "mc" or "smt" as argument
+ *
+ * Returns negative value on failure
+ */
+int sysfs_set_sched(const char *smt_mc, int val)
+{
+        char linebuf[MAX_LINE_LEN];
+        char path[SYSFS_PATH_MAX];
+        struct stat statbuf;
+
+        if (strcmp("mc", smt_mc) && strcmp("smt", smt_mc))
+                return -EINVAL;
+
+        snprintf(path, sizeof(path),
+                PATH_TO_CPU "sched_%s_power_savings", smt_mc);
+        sprintf(linebuf, "%d", val);
+
+        if (stat(path, &statbuf) != 0)
+                return -ENODEV;
+
+        if (sysfs_write_file(path, linebuf, MAX_LINE_LEN) == 0)
+                return -1;
+        return 0;
+}
diff --git a/tools/power/cpupower/utils/helpers/sysfs.h b/tools/power/cpupower/utils/helpers/sysfs.h
new file mode 100644
index 00000000000..8cb797bbceb
--- /dev/null
+++ b/tools/power/cpupower/utils/helpers/sysfs.h
@@ -0,0 +1,30 @@
+#ifndef __CPUPOWER_HELPERS_SYSFS_H__
+#define __CPUPOWER_HELPERS_SYSFS_H__
+
+#define PATH_TO_CPU "/sys/devices/system/cpu/"
+#define MAX_LINE_LEN 255
+#define SYSFS_PATH_MAX 255
+
+extern unsigned int sysfs_read_file(const char *path, char *buf, size_t buflen);
+
+extern int sysfs_is_cpu_online(unsigned int cpu);
+
+extern unsigned long sysfs_get_idlestate_latency(unsigned int cpu,
+                                                unsigned int idlestate);
+extern unsigned long sysfs_get_idlestate_usage(unsigned int cpu,
+                                        unsigned int idlestate);
+extern unsigned long long sysfs_get_idlestate_time(unsigned int cpu,
+                                                unsigned int idlestate);
+extern char *sysfs_get_idlestate_name(unsigned int cpu,
+                                unsigned int idlestate);
+extern char *sysfs_get_idlestate_desc(unsigned int cpu,
+                                unsigned int idlestate);
+extern int sysfs_get_idlestate_count(unsigned int cpu);
+
+extern char *sysfs_get_cpuidle_governor(void);
+extern char *sysfs_get_cpuidle_driver(void);
+
+extern int sysfs_get_sched(const char *smt_mc);
+extern int sysfs_set_sched(const char *smt_mc, int val);
+
+#endif /* __CPUPOWER_HELPERS_SYSFS_H__ */
diff --git a/tools/power/cpupower/utils/helpers/topology.c b/tools/power/cpupower/utils/helpers/topology.c
new file mode 100644
index 00000000000..4eae2c47ba4
--- /dev/null
+++ b/tools/power/cpupower/utils/helpers/topology.c
@@ -0,0 +1,111 @@
+/*
+ *  (C) 2010,2011       Thomas Renninger <trenn@suse.de>, Novell Inc.
+ *
+ *  Licensed under the terms of the GNU GPL License version 2.
+ *
+ * ToDo: Needs to be done more properly for AMD/Intel specifics
+ */
+
+/* Helper struct for qsort, must be in sync with cpupower_topology.cpu_info */
+/* Be careful: Need to pass unsigned to the sort, so that offlined cores are
+   in the end, but double check for -1 for offlined cpus at other places */
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <unistd.h>
+#include <errno.h>
+#include <fcntl.h>
+
+#include <helpers/helpers.h>
+#include <helpers/sysfs.h>
+
+/* returns -1 on failure, 0 on success */
+int sysfs_topology_read_file(unsigned int cpu, const char *fname)
+{
+        unsigned long value;
+        char linebuf[MAX_LINE_LEN];
+        char *endp;
+        char path[SYSFS_PATH_MAX];
+
+        snprintf(path, sizeof(path), PATH_TO_CPU "cpu%u/topology/%s",
+                         cpu, fname);
+        if (sysfs_read_file(path, linebuf, MAX_LINE_LEN) == 0)
+                return -1;
+        value = strtoul(linebuf, &endp, 0);
+        if (endp == linebuf || errno == ERANGE)
+                return -1;
+        return value;
+}
+
+struct cpuid_core_info {
+        unsigned int pkg;
+        unsigned int thread;
+        unsigned int cpu;
+        /* flags */
+        unsigned int is_online:1;
+};
+
+static int __compare(const void *t1, const void *t2)
+{
+        struct cpuid_core_info *top1 = (struct cpuid_core_info *)t1;
+        struct cpuid_core_info *top2 = (struct cpuid_core_info *)t2;
+        if (top1->pkg < top2->pkg)
+                return -1;
+        else if (top1->pkg > top2->pkg)
+                return 1;
+        else if (top1->thread < top2->thread)
+                return -1;
+        else if (top1->thread > top2->thread)
+                return 1;
+        else if (top1->cpu < top2->cpu)
+                return -1;
+        else if (top1->cpu > top2->cpu)
+                return 1;
+        else
+                return 0;
+}
+
+/*
+ * Returns amount of cpus, negative on error, cpu_top must be
+ * passed to cpu_topology_release to free resources
+ *
+ * Array is sorted after ->pkg, ->core, then ->cpu
+ */
+int get_cpu_topology(struct cpupower_topology *cpu_top)
+{
+        int cpu, cpus = sysconf(_SC_NPROCESSORS_CONF);
+
+        cpu_top->core_info = malloc(sizeof(struct cpupower_topology) * cpus);
+        if (cpu_top->core_info == NULL)
+                return -ENOMEM;
+        cpu_top->pkgs = cpu_top->cores = 0;
+        for (cpu = 0; cpu < cpus; cpu++) {
+                cpu_top->core_info[cpu].cpu = cpu;
+                cpu_top->core_info[cpu].is_online = sysfs_is_cpu_online(cpu);
+                cpu_top->core_info[cpu].pkg =
+                        sysfs_topology_read_file(cpu, "physical_package_id");
+                if ((int)cpu_top->core_info[cpu].pkg != -1 &&
+                    cpu_top->core_info[cpu].pkg > cpu_top->pkgs)
+                        cpu_top->pkgs = cpu_top->core_info[cpu].pkg;
+                cpu_top->core_info[cpu].core =
+                        sysfs_topology_read_file(cpu, "core_id");
+        }
+        cpu_top->pkgs++;
+
+        qsort(cpu_top->core_info, cpus, sizeof(struct cpuid_core_info),
+              __compare);
+
+        /* Intel's cores count is not consecutively numbered, there may
+         * be a core_id of 3, but none of 2. Assume there always is 0
+         * Get amount of cores by counting duplicates in a package
+        for (cpu = 0; cpu_top->core_info[cpu].pkg = 0 && cpu < cpus; cpu++) {
+                if (cpu_top->core_info[cpu].core == 0)
+        cpu_top->cores++;
+        */
+        return cpus;
+}
+
+void cpu_topology_release(struct cpupower_topology cpu_top)
+{
+        free(cpu_top.core_info);
+}
diff --git a/tools/power/cpupower/utils/idle_monitor/amd_fam14h_idle.c b/tools/power/cpupower/utils/idle_monitor/amd_fam14h_idle.c
new file mode 100644
index 00000000000..202e555988b
--- /dev/null
+++ b/tools/power/cpupower/utils/idle_monitor/amd_fam14h_idle.c
@@ -0,0 +1,338 @@
+/*
+ *  (C) 2010,2011      Thomas Renninger <trenn@suse.de>, Novell Inc.
+ *
+ *  Licensed under the terms of the GNU GPL License version 2.
+ *
+ *  PCI initialization based on example code from:
+ *  Andreas Herrmann <andreas.herrmann3@amd.com>
+ */
+
+#if defined(__i386__) || defined(__x86_64__)
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdint.h>
+#include <time.h>
+#include <string.h>
+
+#include <pci/pci.h>
+
+#include "idle_monitor/cpupower-monitor.h"
+#include "helpers/helpers.h"
+
+/******** PCI parts could go into own file and get shared ***************/
+
+#define PCI_NON_PC0_OFFSET      0xb0
+#define PCI_PC1_OFFSET          0xb4
+#define PCI_PC6_OFFSET          0xb8
+
+#define PCI_MONITOR_ENABLE_REG  0xe0
+
+#define PCI_NON_PC0_ENABLE_BIT  0
+#define PCI_PC1_ENABLE_BIT      1
+#define PCI_PC6_ENABLE_BIT      2
+
+#define PCI_NBP1_STAT_OFFSET    0x98
+#define PCI_NBP1_ACTIVE_BIT     2
+#define PCI_NBP1_ENTERED_BIT    1
+
+#define PCI_NBP1_CAP_OFFSET     0x90
+#define PCI_NBP1_CAPABLE_BIT    31
+
+#define OVERFLOW_MS             343597 /* 32 bit register filled at 12500 HZ
+                                          (1 tick per 80ns) */
+
+enum amd_fam14h_states {NON_PC0 = 0, PC1, PC6, NBP1,
+                        AMD_FAM14H_STATE_NUM};
+
+static int fam14h_get_count_percent(unsigned int self_id, double *percent,
+                                    unsigned int cpu);
+static int fam14h_nbp1_count(unsigned int id, unsigned long long *count,
+                             unsigned int cpu);
+
+static cstate_t amd_fam14h_cstates[AMD_FAM14H_STATE_NUM] = {
+        {
+                .name                   = "!PC0",
+                .desc                   = N_("Package in sleep state (PC1 or deeper)"),
+                .id                     = NON_PC0,
+                .range                  = RANGE_PACKAGE,
+                .get_count_percent      = fam14h_get_count_percent,
+        },
+        {
+                .name                   = "PC1",
+                .desc                   = N_("Processor Package C1"),
+                .id                     = PC1,
+                .range                  = RANGE_PACKAGE,
+                .get_count_percent      = fam14h_get_count_percent,
+        },
+        {
+                .name                   = "PC6",
+                .desc                   = N_("Processor Package C6"),
+                .id                     = PC6,
+                .range                  = RANGE_PACKAGE,
+                .get_count_percent      = fam14h_get_count_percent,
+        },
+        {
+                .name                   = "NBP1",
+                .desc                   = N_("North Bridge P1 boolean counter (returns 0 or 1)"),
+                .id                     = NBP1,
+                .range                  = RANGE_PACKAGE,
+                .get_count              = fam14h_nbp1_count,
+        },
+};
+
+static struct pci_access *pci_acc;
+static int pci_vendor_id = 0x1022;
+static int pci_dev_ids[2] = {0x1716, 0};
+static struct pci_dev *amd_fam14h_pci_dev;
+
+static int nbp1_entered;
+
+struct timespec start_time;
+static unsigned long long timediff;
+
+#ifdef DEBUG
+struct timespec dbg_time;
+long dbg_timediff;
+#endif
+
+static unsigned long long *previous_count[AMD_FAM14H_STATE_NUM];
+static unsigned long long *current_count[AMD_FAM14H_STATE_NUM];
+
+static int amd_fam14h_get_pci_info(struct cstate *state,
+                                   unsigned int *pci_offset,
+                                   unsigned int *enable_bit,
+                                   unsigned int cpu)
+{
+        switch (state->id) {
+        case NON_PC0:
+                *enable_bit = PCI_NON_PC0_ENABLE_BIT;
+                *pci_offset = PCI_NON_PC0_OFFSET;
+                break;
+        case PC1:
+                *enable_bit = PCI_PC1_ENABLE_BIT;
+                *pci_offset = PCI_PC1_OFFSET;
+                break;
+        case PC6:
+                *enable_bit = PCI_PC6_ENABLE_BIT;
+                *pci_offset = PCI_PC6_OFFSET;
+                break;
+        case NBP1:
+                *enable_bit = PCI_NBP1_ENTERED_BIT;
+                *pci_offset = PCI_NBP1_STAT_OFFSET;
+                break;
+        default:
+                return -1;
+        };
+        return 0;
+}
+
+static int amd_fam14h_init(cstate_t *state, unsigned int cpu)
+{
+        int enable_bit, pci_offset, ret;
+        uint32_t val;
+
+        ret = amd_fam14h_get_pci_info(state, &pci_offset, &enable_bit, cpu);
+        if (ret)
+                return ret;
+
+        /* NBP1 needs extra treating -> write 1 to D18F6x98 bit 1 for init */
+        if (state->id == NBP1) {
+                val = pci_read_long(amd_fam14h_pci_dev, pci_offset);
+                val |= 1 << enable_bit;
+                val = pci_write_long(amd_fam14h_pci_dev, pci_offset, val);
+                return ret;
+        }
+
+        /* Enable monitor */
+        val = pci_read_long(amd_fam14h_pci_dev, PCI_MONITOR_ENABLE_REG);
+        dprint("Init %s: read at offset: 0x%x val: %u\n", state->name,
+               PCI_MONITOR_ENABLE_REG, (unsigned int) val);
+        val |= 1 << enable_bit;
+        pci_write_long(amd_fam14h_pci_dev, PCI_MONITOR_ENABLE_REG, val);
+
+        dprint("Init %s: offset: 0x%x enable_bit: %d - val: %u (%u)\n",
+               state->name, PCI_MONITOR_ENABLE_REG, enable_bit,
+               (unsigned int) val, cpu);
+
+        /* Set counter to zero */
+        pci_write_long(amd_fam14h_pci_dev, pci_offset, 0);
+        previous_count[state->id][cpu] = 0;
+
+        return 0;
+}
+
+static int amd_fam14h_disable(cstate_t *state, unsigned int cpu)
+{
+        int enable_bit, pci_offset, ret;
+        uint32_t val;
+
+        ret = amd_fam14h_get_pci_info(state, &pci_offset, &enable_bit, cpu);
+        if (ret)
+                return ret;
+
+        val = pci_read_long(amd_fam14h_pci_dev, pci_offset);
+        dprint("%s: offset: 0x%x %u\n", state->name, pci_offset, val);
+        if (state->id == NBP1) {
+                /* was the bit whether NBP1 got entered set? */
+                nbp1_entered = (val & (1 << PCI_NBP1_ACTIVE_BIT)) |
+                        (val & (1 << PCI_NBP1_ENTERED_BIT));
+
+                dprint("NBP1 was %sentered - 0x%x - enable_bit: "
+                       "%d - pci_offset: 0x%x\n",
+                       nbp1_entered ? "" : "not ",
+                       val, enable_bit, pci_offset);
+                return ret;
+        }
+        current_count[state->id][cpu] = val;
+
+        dprint("%s: Current -  %llu (%u)\n", state->name,
+               current_count[state->id][cpu], cpu);
+        dprint("%s: Previous - %llu (%u)\n", state->name,
+               previous_count[state->id][cpu], cpu);
+
+        val = pci_read_long(amd_fam14h_pci_dev, PCI_MONITOR_ENABLE_REG);
+        val &= ~(1 << enable_bit);
+        pci_write_long(amd_fam14h_pci_dev, PCI_MONITOR_ENABLE_REG, val);
+
+        return 0;
+}
+
+static int fam14h_nbp1_count(unsigned int id, unsigned long long *count,
+                             unsigned int cpu)
+{
+        if (id == NBP1) {
+                if (nbp1_entered)
+                        *count = 1;
+                else
+                        *count = 0;
+                return 0;
+        }
+        return -1;
+}
+static int fam14h_get_count_percent(unsigned int id, double *percent,
+                                    unsigned int cpu)
+{
+        unsigned long diff;
+
+        if (id >= AMD_FAM14H_STATE_NUM)
+                return -1;
+        /* residency count in 80ns -> divide through 12.5 to get us residency */
+        diff = current_count[id][cpu] - previous_count[id][cpu];
+
+        if (timediff == 0)
+                *percent = 0.0;
+        else
+                *percent = 100.0 * diff / timediff / 12.5;
+
+        dprint("Timediff: %llu - res~: %lu us - percent: %.2f %%\n",
+               timediff, diff * 10 / 125, *percent);
+
+        return 0;
+}
+
+static int amd_fam14h_start(void)
+{
+        int num, cpu;
+        clock_gettime(CLOCK_REALTIME, &start_time);
+        for (num = 0; num < AMD_FAM14H_STATE_NUM; num++) {
+                for (cpu = 0; cpu < cpu_count; cpu++)
+                        amd_fam14h_init(&amd_fam14h_cstates[num], cpu);
+        }
+#ifdef DEBUG
+        clock_gettime(CLOCK_REALTIME, &dbg_time);
+        dbg_timediff = timespec_diff_us(start_time, dbg_time);
+        dprint("Enabling counters took: %lu us\n",
+               dbg_timediff);
+#endif
+        return 0;
+}
+
+static int amd_fam14h_stop(void)
+{
+        int num, cpu;
+        struct timespec end_time;
+
+        clock_gettime(CLOCK_REALTIME, &end_time);
+
+        for (num = 0; num < AMD_FAM14H_STATE_NUM; num++) {
+                for (cpu = 0; cpu < cpu_count; cpu++)
+                        amd_fam14h_disable(&amd_fam14h_cstates[num], cpu);
+        }
+#ifdef DEBUG
+        clock_gettime(CLOCK_REALTIME, &dbg_time);
+        dbg_timediff = timespec_diff_us(end_time, dbg_time);
+        dprint("Disabling counters took: %lu ns\n", dbg_timediff);
+#endif
+        timediff = timespec_diff_us(start_time, end_time);
+        if (timediff / 1000 > OVERFLOW_MS)
+                print_overflow_err((unsigned int)timediff / 1000000,
+                                   OVERFLOW_MS / 1000);
+
+        return 0;
+}
+
+static int is_nbp1_capable(void)
+{
+        uint32_t val;
+        val = pci_read_long(amd_fam14h_pci_dev, PCI_NBP1_CAP_OFFSET);
+        return val & (1 << 31);
+}
+
+struct cpuidle_monitor *amd_fam14h_register(void)
+{
+        int num;
+
+        if (cpupower_cpu_info.vendor != X86_VENDOR_AMD)
+                return NULL;
+
+        if (cpupower_cpu_info.family == 0x14) {
+                if (cpu_count <= 0 || cpu_count > 2) {
+                        fprintf(stderr, "AMD fam14h: Invalid cpu count: %d\n",
+                                cpu_count);
+                        return NULL;
+                }
+        } else
+                return NULL;
+
+        /* We do not alloc for nbp1 machine wide counter */
+        for (num = 0; num < AMD_FAM14H_STATE_NUM - 1; num++) {
+                previous_count[num] = calloc(cpu_count,
+                                              sizeof(unsigned long long));
+                current_count[num]  = calloc(cpu_count,
+                                              sizeof(unsigned long long));
+        }
+
+        amd_fam14h_pci_dev = pci_acc_init(&pci_acc, pci_vendor_id, pci_dev_ids);
+        if (amd_fam14h_pci_dev == NULL || pci_acc == NULL)
+                return NULL;
+
+        if (!is_nbp1_capable())
+                amd_fam14h_monitor.hw_states_num = AMD_FAM14H_STATE_NUM - 1;
+
+        amd_fam14h_monitor.name_len = strlen(amd_fam14h_monitor.name);
+        return &amd_fam14h_monitor;
+}
+
+static void amd_fam14h_unregister(void)
+{
+        int num;
+        for (num = 0; num < AMD_FAM14H_STATE_NUM - 1; num++) {
+                free(previous_count[num]);
+                free(current_count[num]);
+        }
+        pci_cleanup(pci_acc);
+}
+
+struct cpuidle_monitor amd_fam14h_monitor = {
+        .name                   = "Ontario",
+        .hw_states              = amd_fam14h_cstates,
+        .hw_states_num          = AMD_FAM14H_STATE_NUM,
+        .start                  = amd_fam14h_start,
+        .stop                   = amd_fam14h_stop,
+        .do_register            = amd_fam14h_register,
+        .unregister             = amd_fam14h_unregister,
+        .needs_root             = 1,
+        .overflow_s             = OVERFLOW_MS / 1000,
+};
+#endif /* #if defined(__i386__) || defined(__x86_64__) */
diff --git a/tools/power/cpupower/utils/idle_monitor/cpuidle_sysfs.c b/tools/power/cpupower/utils/idle_monitor/cpuidle_sysfs.c
new file mode 100644
index 00000000000..bcd22a1a397
--- /dev/null
+++ b/tools/power/cpupower/utils/idle_monitor/cpuidle_sysfs.c
@@ -0,0 +1,196 @@
+/*
+ *  (C) 2010,2011       Thomas Renninger <trenn@suse.de>, Novell Inc
+ *
+ *  Licensed under the terms of the GNU GPL License version 2.
+ *
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdint.h>
+#include <string.h>
+#include <limits.h>
+
+#include "helpers/sysfs.h"
+#include "helpers/helpers.h"
+#include "idle_monitor/cpupower-monitor.h"
+
+#define CPUIDLE_STATES_MAX 10
+static cstate_t cpuidle_cstates[CPUIDLE_STATES_MAX];
+struct cpuidle_monitor cpuidle_sysfs_monitor;
+
+static unsigned long long **previous_count;
+static unsigned long long **current_count;
+struct timespec start_time;
+static unsigned long long timediff;
+
+static int cpuidle_get_count_percent(unsigned int id, double *percent,
+                                     unsigned int cpu)
+{
+        unsigned long long statediff = current_count[cpu][id]
+                - previous_count[cpu][id];
+        dprint("%s: - diff: %llu - percent: %f (%u)\n",
+               cpuidle_cstates[id].name, timediff, *percent, cpu);
+
+        if (timediff == 0)
+                *percent = 0.0;
+        else
+                *percent = ((100.0 * statediff) / timediff);
+
+        dprint("%s: - timediff: %llu - statediff: %llu - percent: %f (%u)\n",
+               cpuidle_cstates[id].name, timediff, statediff, *percent, cpu);
+
+        return 0;
+}
+
+static int cpuidle_start(void)
+{
+        int cpu, state;
+        clock_gettime(CLOCK_REALTIME, &start_time);
+        for (cpu = 0; cpu < cpu_count; cpu++) {
+                for (state = 0; state < cpuidle_sysfs_monitor.hw_states_num;
+                     state++) {
+                        previous_count[cpu][state] =
+                                sysfs_get_idlestate_time(cpu, state);
+                        dprint("CPU %d - State: %d - Val: %llu\n",
+                               cpu, state, previous_count[cpu][state]);
+                }
+        };
+        return 0;
+}
+
+static int cpuidle_stop(void)
+{
+        int cpu, state;
+        struct timespec end_time;
+        clock_gettime(CLOCK_REALTIME, &end_time);
+        timediff = timespec_diff_us(start_time, end_time);
+
+        for (cpu = 0; cpu < cpu_count; cpu++) {
+                for (state = 0; state < cpuidle_sysfs_monitor.hw_states_num;
+                     state++) {
+                        current_count[cpu][state] =
+                                sysfs_get_idlestate_time(cpu, state);
+                        dprint("CPU %d - State: %d - Val: %llu\n",
+                               cpu, state, previous_count[cpu][state]);
+                }
+        };
+        return 0;
+}
+
+void fix_up_intel_idle_driver_name(char *tmp, int num)
+{
+        /* fix up cpuidle name for intel idle driver */
+        if (!strncmp(tmp, "NHM-", 4)) {
+                switch (num) {
+                case 1:
+                        strcpy(tmp, "C1");
+                        break;
+                case 2:
+                        strcpy(tmp, "C3");
+                        break;
+                case 3:
+                        strcpy(tmp, "C6");
+                        break;
+                }
+        } else if (!strncmp(tmp, "SNB-", 4)) {
+                switch (num) {
+                case 1:
+                        strcpy(tmp, "C1");
+                        break;
+                case 2:
+                        strcpy(tmp, "C3");
+                        break;
+                case 3:
+                        strcpy(tmp, "C6");
+                        break;
+                case 4:
+                        strcpy(tmp, "C7");
+                        break;
+                }
+        } else if (!strncmp(tmp, "ATM-", 4)) {
+                switch (num) {
+                case 1:
+                        strcpy(tmp, "C1");
+                        break;
+                case 2:
+                        strcpy(tmp, "C2");
+                        break;
+                case 3:
+                        strcpy(tmp, "C4");
+                        break;
+                case 4:
+                        strcpy(tmp, "C6");
+                        break;
+                }
+        }
+}
+
+static struct cpuidle_monitor *cpuidle_register(void)
+{
+        int num;
+        char *tmp;
+
+        /* Assume idle state count is the same for all CPUs */
+        cpuidle_sysfs_monitor.hw_states_num = sysfs_get_idlestate_count(0);
+
+        if (cpuidle_sysfs_monitor.hw_states_num <= 0)
+                return NULL;
+
+        for (num = 0; num < cpuidle_sysfs_monitor.hw_states_num; num++) {
+                tmp = sysfs_get_idlestate_name(0, num);
+                if (tmp == NULL)
+                        continue;
+
+                fix_up_intel_idle_driver_name(tmp, num);
+                strncpy(cpuidle_cstates[num].name, tmp, CSTATE_NAME_LEN - 1);
+                free(tmp);
+
+                tmp = sysfs_get_idlestate_desc(0, num);
+                if (tmp == NULL)
+                        continue;
+                strncpy(cpuidle_cstates[num].desc, tmp, CSTATE_DESC_LEN - 1);
+                free(tmp);
+
+                cpuidle_cstates[num].range = RANGE_THREAD;
+                cpuidle_cstates[num].id = num;
+                cpuidle_cstates[num].get_count_percent =
+                        cpuidle_get_count_percent;
+        };
+
+        /* Free this at program termination */
+        previous_count = malloc(sizeof(long long *) * cpu_count);
+        current_count = malloc(sizeof(long long *) * cpu_count);
+        for (num = 0; num < cpu_count; num++) {
+                previous_count[num] = malloc(sizeof(long long) *
+                                        cpuidle_sysfs_monitor.hw_states_num);
+                current_count[num] = malloc(sizeof(long long) *
+                                        cpuidle_sysfs_monitor.hw_states_num);
+        }
+
+        cpuidle_sysfs_monitor.name_len = strlen(cpuidle_sysfs_monitor.name);
+        return &cpuidle_sysfs_monitor;
+}
+
+void cpuidle_unregister(void)
+{
+        int num;
+
+        for (num = 0; num < cpu_count; num++) {
+                free(previous_count[num]);
+                free(current_count[num]);
+        }
+        free(previous_count);
+        free(current_count);
+}
+
+struct cpuidle_monitor cpuidle_sysfs_monitor = {
+        .name                   = "Idle_Stats",
+        .hw_states              = cpuidle_cstates,
+        .start                  = cpuidle_start,
+        .stop                   = cpuidle_stop,
+        .do_register            = cpuidle_register,
+        .unregister             = cpuidle_unregister,
+        .needs_root             = 0,
+        .overflow_s             = UINT_MAX,
+};
diff --git a/tools/power/cpupower/utils/idle_monitor/cpupower-monitor.c b/tools/power/cpupower/utils/idle_monitor/cpupower-monitor.c
new file mode 100644
index 00000000000..0d6571e418d
--- /dev/null
+++ b/tools/power/cpupower/utils/idle_monitor/cpupower-monitor.c
@@ -0,0 +1,440 @@
+/*
+ *  (C) 2010,2011       Thomas Renninger <trenn@suse.de>, Novell Inc.
+ *
+ *  Licensed under the terms of the GNU GPL License version 2.
+ *
+ *  Output format inspired by Len Brown's <lenb@kernel.org> turbostat tool.
+ *
+ */
+
+
+#include <stdio.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
+#include <signal.h>
+#include <sys/types.h>
+#include <sys/wait.h>
+#include <libgen.h>
+
+#include "idle_monitor/cpupower-monitor.h"
+#include "idle_monitor/idle_monitors.h"
+#include "helpers/helpers.h"
+
+/* Define pointers to all monitors.  */
+#define DEF(x) & x ## _monitor ,
+struct cpuidle_monitor *all_monitors[] = {
+#include "idle_monitors.def"
+0
+};
+
+static struct cpuidle_monitor *monitors[MONITORS_MAX];
+static unsigned int avail_monitors;
+
+static char *progname;
+
+enum operation_mode_e { list = 1, show, show_all };
+static int mode;
+static int interval = 1;
+static char *show_monitors_param;
+static struct cpupower_topology cpu_top;
+
+/* ToDo: Document this in the manpage */
+static char range_abbr[RANGE_MAX] = { 'T', 'C', 'P', 'M', };
+
+static void print_wrong_arg_exit(void)
+{
+        printf(_("invalid or unknown argument\n"));
+        exit(EXIT_FAILURE);
+}
+
+long long timespec_diff_us(struct timespec start, struct timespec end)
+{
+        struct timespec temp;
+        if ((end.tv_nsec - start.tv_nsec) < 0) {
+                temp.tv_sec = end.tv_sec - start.tv_sec - 1;
+                temp.tv_nsec = 1000000000 + end.tv_nsec - start.tv_nsec;
+        } else {
+                temp.tv_sec = end.tv_sec - start.tv_sec;
+                temp.tv_nsec = end.tv_nsec - start.tv_nsec;
+        }
+        return (temp.tv_sec * 1000000) + (temp.tv_nsec / 1000);
+}
+
+void print_n_spaces(int n)
+{
+        int x;
+        for (x = 0; x < n; x++)
+                printf(" ");
+}
+
+/* size of s must be at least n + 1 */
+int fill_string_with_spaces(char *s, int n)
+{
+        int len = strlen(s);
+        if (len > n)
+                return -1;
+        for (; len < n; len++)
+                s[len] = ' ';
+        s[len] = '\0';
+        return 0;
+}
+
+void print_header(int topology_depth)
+{
+        int unsigned mon;
+        int state, need_len, pr_mon_len;
+        cstate_t s;
+        char buf[128] = "";
+        int percent_width = 4;
+
+        fill_string_with_spaces(buf, topology_depth * 5 - 1);
+        printf("%s|", buf);
+
+        for (mon = 0; mon < avail_monitors; mon++) {
+                pr_mon_len = 0;
+                need_len = monitors[mon]->hw_states_num * (percent_width + 3)
+                        - 1;
+                if (mon != 0) {
+                        printf("|| ");
+                        need_len--;
+                }
+                sprintf(buf, "%s", monitors[mon]->name);
+                fill_string_with_spaces(buf, need_len);
+                printf("%s", buf);
+        }
+        printf("\n");
+
+        if (topology_depth > 2)
+                printf("PKG |");
+        if (topology_depth > 1)
+                printf("CORE|");
+        if (topology_depth > 0)
+                printf("CPU |");
+
+        for (mon = 0; mon < avail_monitors; mon++) {
+                if (mon != 0)
+                        printf("|| ");
+                else
+                        printf(" ");
+                for (state = 0; state < monitors[mon]->hw_states_num; state++) {
+                        if (state != 0)
+                                printf(" | ");
+                        s = monitors[mon]->hw_states[state];
+                        sprintf(buf, "%s", s.name);
+                        fill_string_with_spaces(buf, percent_width);
+                        printf("%s", buf);
+                }
+                printf(" ");
+        }
+        printf("\n");
+}
+
+
+void print_results(int topology_depth, int cpu)
+{
+        unsigned int mon;
+        int state, ret;
+        double percent;
+        unsigned long long result;
+        cstate_t s;
+
+        /* Be careful CPUs may got resorted for pkg value do not just use cpu */
+        if (!bitmask_isbitset(cpus_chosen, cpu_top.core_info[cpu].cpu))
+                return;
+
+        if (topology_depth > 2)
+                printf("%4d|", cpu_top.core_info[cpu].pkg);
+        if (topology_depth > 1)
+                printf("%4d|", cpu_top.core_info[cpu].core);
+        if (topology_depth > 0)
+                printf("%4d|", cpu_top.core_info[cpu].cpu);
+
+        for (mon = 0; mon < avail_monitors; mon++) {
+                if (mon != 0)
+                        printf("||");
+
+                for (state = 0; state < monitors[mon]->hw_states_num; state++) {
+                        if (state != 0)
+                                printf("|");
+
+                        s = monitors[mon]->hw_states[state];
+
+                        if (s.get_count_percent) {
+                                ret = s.get_count_percent(s.id, &percent,
+                                                  cpu_top.core_info[cpu].cpu);
+                                if (ret)
+                                        printf("******");
+                                else if (percent >= 100.0)
+                                        printf("%6.1f", percent);
+                                else
+                                        printf("%6.2f", percent);
+                        } else if (s.get_count) {
+                                ret = s.get_count(s.id, &result,
+                                                  cpu_top.core_info[cpu].cpu);
+                                if (ret)
+                                        printf("******");
+                                else
+                                        printf("%6llu", result);
+                        } else {
+                                printf(_("Monitor %s, Counter %s has no count "
+                                         "function. Implementation error\n"),
+                                       monitors[mon]->name, s.name);
+                                exit(EXIT_FAILURE);
+                        }
+                }
+        }
+        /*
+         * The monitor could still provide useful data, for example
+         * AMD HW counters partly sit in PCI config space.
+         * It's up to the monitor plug-in to check .is_online, this one
+         * is just for additional info.
+         */
+        if (!cpu_top.core_info[cpu].is_online) {
+                printf(_(" *is offline\n"));
+                return;
+        } else
+                printf("\n");
+}
+
+
+/* param: string passed by -m param (The list of monitors to show)
+ *
+ * Monitors must have been registered already, matching monitors
+ * are picked out and available monitors array is overridden
+ * with matching ones
+ *
+ * Monitors get sorted in the same order the user passes them
+*/
+
+static void parse_monitor_param(char *param)
+{
+        unsigned int num;
+        int mon, hits = 0;
+        char *tmp = param, *token;
+        struct cpuidle_monitor *tmp_mons[MONITORS_MAX];
+
+
+        for (mon = 0; mon < MONITORS_MAX; mon++, tmp = NULL) {
+                token = strtok(tmp, ",");
+                if (token == NULL)
+                        break;
+                if (strlen(token) >= MONITOR_NAME_LEN) {
+                        printf(_("%s: max monitor name length"
+                                 " (%d) exceeded\n"), token, MONITOR_NAME_LEN);
+                        continue;
+                }
+
+                for (num = 0; num < avail_monitors; num++) {
+                        if (!strcmp(monitors[num]->name, token)) {
+                                dprint("Found requested monitor: %s\n", token);
+                                tmp_mons[hits] = monitors[num];
+                                hits++;
+                        }
+                }
+        }
+        if (hits == 0) {
+                printf(_("No matching monitor found in %s, "
+                         "try -l option\n"), param);
+                exit(EXIT_FAILURE);
+        }
+        /* Override detected/registerd monitors array with requested one */
+        memcpy(monitors, tmp_mons,
+                sizeof(struct cpuidle_monitor *) * MONITORS_MAX);
+        avail_monitors = hits;
+}
+
+void list_monitors(void)
+{
+        unsigned int mon;
+        int state;
+        cstate_t s;
+
+        for (mon = 0; mon < avail_monitors; mon++) {
+                printf(_("Monitor \"%s\" (%d states) - Might overflow after %u "
+                         "s\n"),
+                        monitors[mon]->name, monitors[mon]->hw_states_num,
+                        monitors[mon]->overflow_s);
+
+                for (state = 0; state < monitors[mon]->hw_states_num; state++) {
+                        s = monitors[mon]->hw_states[state];
+                        /*
+                         * ToDo show more state capabilities:
+                         * percent, time (granlarity)
+                         */
+                        printf("%s\t[%c] -> %s\n", s.name, range_abbr[s.range],
+                               gettext(s.desc));
+                }
+        }
+}
+
+int fork_it(char **argv)
+{
+        int status;
+        unsigned int num;
+        unsigned long long timediff;
+        pid_t child_pid;
+        struct timespec start, end;
+
+        child_pid = fork();
+        clock_gettime(CLOCK_REALTIME, &start);
+
+        for (num = 0; num < avail_monitors; num++)
+                monitors[num]->start();
+
+        if (!child_pid) {
+                /* child */
+                execvp(argv[0], argv);
+        } else {
+                /* parent */
+                if (child_pid == -1) {
+                        perror("fork");
+                        exit(1);
+                }
+
+                signal(SIGINT, SIG_IGN);
+                signal(SIGQUIT, SIG_IGN);
+                if (waitpid(child_pid, &status, 0) == -1) {
+                        perror("wait");
+                        exit(1);
+                }
+        }
+        clock_gettime(CLOCK_REALTIME, &end);
+        for (num = 0; num < avail_monitors; num++)
+                monitors[num]->stop();
+
+        timediff = timespec_diff_us(start, end);
+        if (WIFEXITED(status))
+                printf(_("%s took %.5f seconds and exited with status %d\n"),
+                        argv[0], timediff / (1000.0 * 1000),
+                        WEXITSTATUS(status));
+        return 0;
+}
+
+int do_interval_measure(int i)
+{
+        unsigned int num;
+
+        for (num = 0; num < avail_monitors; num++) {
+                dprint("HW C-state residency monitor: %s - States: %d\n",
+                       monitors[num]->name, monitors[num]->hw_states_num);
+                monitors[num]->start();
+        }
+        sleep(i);
+        for (num = 0; num < avail_monitors; num++)
+                monitors[num]->stop();
+
+        return 0;
+}
+
+static void cmdline(int argc, char *argv[])
+{
+        int opt;
+        progname = basename(argv[0]);
+
+        while ((opt = getopt(argc, argv, "+li:m:")) != -1) {
+                switch (opt) {
+                case 'l':
+                        if (mode)
+                                print_wrong_arg_exit();
+                        mode = list;
+                        break;
+                case 'i':
+                        /* only allow -i with -m or no option */
+                        if (mode && mode != show)
+                                print_wrong_arg_exit();
+                        interval = atoi(optarg);
+                        break;
+                case 'm':
+                        if (mode)
+                                print_wrong_arg_exit();
+                        mode = show;
+                        show_monitors_param = optarg;
+                        break;
+                default:
+                        print_wrong_arg_exit();
+                }
+        }
+        if (!mode)
+                mode = show_all;
+}
+
+int cmd_monitor(int argc, char **argv)
+{
+        unsigned int num;
+        struct cpuidle_monitor *test_mon;
+        int cpu;
+
+        cmdline(argc, argv);
+        cpu_count = get_cpu_topology(&cpu_top);
+        if (cpu_count < 0) {
+                printf(_("Cannot read number of available processors\n"));
+                return EXIT_FAILURE;
+        }
+
+        /* Default is: monitor all CPUs */
+        if (bitmask_isallclear(cpus_chosen))
+                bitmask_setall(cpus_chosen);
+
+        dprint("System has up to %d CPU cores\n", cpu_count);
+
+        for (num = 0; all_monitors[num]; num++) {
+                dprint("Try to register: %s\n", all_monitors[num]->name);
+                test_mon = all_monitors[num]->do_register();
+                if (test_mon) {
+                        if (test_mon->needs_root && !run_as_root) {
+                                fprintf(stderr, _("Available monitor %s needs "
+                                          "root access\n"), test_mon->name);
+                                continue;
+                        }
+                        monitors[avail_monitors] = test_mon;
+                        dprint("%s registered\n", all_monitors[num]->name);
+                        avail_monitors++;
+                }
+        }
+
+        if (avail_monitors == 0) {
+                printf(_("No HW Cstate monitors found\n"));
+                return 1;
+        }
+
+        if (mode == list) {
+                list_monitors();
+                exit(EXIT_SUCCESS);
+        }
+
+        if (mode == show)
+                parse_monitor_param(show_monitors_param);
+
+        dprint("Packages: %d - Cores: %d - CPUs: %d\n",
+               cpu_top.pkgs, cpu_top.cores, cpu_count);
+
+        /*
+         * if any params left, it must be a command to fork
+         */
+        if (argc - optind)
+                fork_it(argv + optind);
+        else
+                do_interval_measure(interval);
+
+        /* ToDo: Topology parsing needs fixing first to do
+           this more generically */
+        if (cpu_top.pkgs > 1)
+                print_header(3);
+        else
+                print_header(1);
+
+        for (cpu = 0; cpu < cpu_count; cpu++) {
+                if (cpu_top.pkgs > 1)
+                        print_results(3, cpu);
+                else
+                        print_results(1, cpu);
+        }
+
+        for (num = 0; num < avail_monitors; num++)
+                monitors[num]->unregister();
+
+        cpu_topology_release(cpu_top);
+        return 0;
+}
diff --git a/tools/power/cpupower/utils/idle_monitor/cpupower-monitor.h b/tools/power/cpupower/utils/idle_monitor/cpupower-monitor.h
new file mode 100644
index 00000000000..9312ee1f2db
--- /dev/null
+++ b/tools/power/cpupower/utils/idle_monitor/cpupower-monitor.h
@@ -0,0 +1,68 @@
+/*
+ *  (C) 2010,2011       Thomas Renninger <trenn@suse.de>, Novell Inc.
+ *
+ *  Licensed under the terms of the GNU GPL License version 2.
+ *
+ */
+
+#ifndef __CPUIDLE_INFO_HW__
+#define __CPUIDLE_INFO_HW__
+
+#include <stdarg.h>
+#include <time.h>
+
+#include "idle_monitor/idle_monitors.h"
+
+#define MONITORS_MAX 20
+#define MONITOR_NAME_LEN 20
+#define CSTATE_NAME_LEN 5
+#define CSTATE_DESC_LEN 60
+
+int cpu_count;
+
+/* Hard to define the right names ...: */
+enum power_range_e {
+        RANGE_THREAD,   /* Lowest in topology hierarcy, AMD: core, Intel: thread
+                           kernel sysfs: cpu */
+        RANGE_CORE,     /* AMD: unit, Intel: core, kernel_sysfs: core_id */
+        RANGE_PACKAGE,  /* Package, processor socket */
+        RANGE_MACHINE,  /* Machine, platform wide */
+        RANGE_MAX };
+
+typedef struct cstate {
+        int  id;
+        enum power_range_e range;
+        char name[CSTATE_NAME_LEN];
+        char desc[CSTATE_DESC_LEN];
+
+        /* either provide a percentage or a general count */
+        int (*get_count_percent)(unsigned int self_id, double *percent,
+                                 unsigned int cpu);
+        int (*get_count)(unsigned int self_id, unsigned long long *count,
+                         unsigned int cpu);
+} cstate_t;
+
+struct cpuidle_monitor {
+        /* Name must not contain whitespaces */
+        char name[MONITOR_NAME_LEN];
+        int name_len;
+        int hw_states_num;
+        cstate_t *hw_states;
+        int (*start) (void);
+        int (*stop) (void);
+        struct cpuidle_monitor* (*do_register) (void);
+        void (*unregister)(void);
+        unsigned int overflow_s;
+        int needs_root;
+};
+
+extern long long timespec_diff_us(struct timespec start, struct timespec end);
+
+#define print_overflow_err(mes, ov)                                             \
+{                                                                               \
+        fprintf(stderr, gettext("Measure took %u seconds, but registers could " \
+                                "overflow at %u seconds, results "              \
+                                "could be inaccurate\n"), mes, ov);             \
+}
+
+#endif /* __CPUIDLE_INFO_HW__ */
diff --git a/tools/power/cpupower/utils/idle_monitor/idle_monitors.def b/tools/power/cpupower/utils/idle_monitor/idle_monitors.def
new file mode 100644
index 00000000000..e3f8d9b2b18
--- /dev/null
+++ b/tools/power/cpupower/utils/idle_monitor/idle_monitors.def
@@ -0,0 +1,7 @@
+#if defined(__i386__) || defined(__x86_64__)
+DEF(amd_fam14h)
+DEF(intel_nhm)
+DEF(intel_snb)
+DEF(mperf)
+#endif
+DEF(cpuidle_sysfs)
diff --git a/tools/power/cpupower/utils/idle_monitor/idle_monitors.h b/tools/power/cpupower/utils/idle_monitor/idle_monitors.h
new file mode 100644
index 00000000000..4fcdeb1e07e
--- /dev/null
+++ b/tools/power/cpupower/utils/idle_monitor/idle_monitors.h
@@ -0,0 +1,18 @@
+/*
+ *  (C) 2010,2011       Thomas Renninger <trenn@suse.de>, Novell Inc.
+ *
+ *  Licensed under the terms of the GNU GPL License version 2.
+ *
+ *  Based on the idea from Michael Matz <matz@suse.de>
+ *
+ */
+
+#ifndef _CPUIDLE_IDLE_MONITORS_H_
+#define _CPUIDLE_IDLE_MONITORS_H_
+
+#define DEF(x) extern struct cpuidle_monitor x ##_monitor;
+#include "idle_monitors.def"
+#undef DEF
+extern struct cpuidle_monitor *all_monitors[];
+
+#endif /* _CPUIDLE_IDLE_MONITORS_H_ */
diff --git a/tools/power/cpupower/utils/idle_monitor/mperf_monitor.c b/tools/power/cpupower/utils/idle_monitor/mperf_monitor.c
new file mode 100644
index 00000000000..5650ab5a2c2
--- /dev/null
+++ b/tools/power/cpupower/utils/idle_monitor/mperf_monitor.c
@@ -0,0 +1,338 @@
+/*
+ *  (C) 2010,2011       Thomas Renninger <trenn@suse.de>, Novell Inc.
+ *
+ *  Licensed under the terms of the GNU GPL License version 2.
+ */
+
+#if defined(__i386__) || defined(__x86_64__)
+
+#include <stdio.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
+#include <limits.h>
+
+#include <cpufreq.h>
+
+#include "helpers/helpers.h"
+#include "idle_monitor/cpupower-monitor.h"
+
+#define MSR_APERF       0xE8
+#define MSR_MPERF       0xE7
+
+#define MSR_TSC 0x10
+
+#define MSR_AMD_HWCR 0xc0010015
+
+enum mperf_id { C0 = 0, Cx, AVG_FREQ, MPERF_CSTATE_COUNT };
+
+static int mperf_get_count_percent(unsigned int self_id, double *percent,
+                                   unsigned int cpu);
+static int mperf_get_count_freq(unsigned int id, unsigned long long *count,
+                                unsigned int cpu);
+static struct timespec time_start, time_end;
+
+static cstate_t mperf_cstates[MPERF_CSTATE_COUNT] = {
+        {
+                .name                   = "C0",
+                .desc                   = N_("Processor Core not idle"),
+                .id                     = C0,
+                .range                  = RANGE_THREAD,
+                .get_count_percent      = mperf_get_count_percent,
+        },
+        {
+                .name                   = "Cx",
+                .desc                   = N_("Processor Core in an idle state"),
+                .id                     = Cx,
+                .range                  = RANGE_THREAD,
+                .get_count_percent      = mperf_get_count_percent,
+        },
+
+        {
+                .name                   = "Freq",
+                .desc                   = N_("Average Frequency (including boost) in MHz"),
+                .id                     = AVG_FREQ,
+                .range                  = RANGE_THREAD,
+                .get_count              = mperf_get_count_freq,
+        },
+};
+
+enum MAX_FREQ_MODE { MAX_FREQ_SYSFS, MAX_FREQ_TSC_REF };
+static int max_freq_mode;
+/*
+ * The max frequency mperf is ticking at (in C0), either retrieved via:
+ *   1) calculated after measurements if we know TSC ticks at mperf/P0 frequency
+ *   2) cpufreq /sys/devices/.../cpu0/cpufreq/cpuinfo_max_freq at init time
+ * 1. Is preferred as it also works without cpufreq subsystem (e.g. on Xen)
+ */
+static unsigned long max_frequency;
+
+static unsigned long long tsc_at_measure_start;
+static unsigned long long tsc_at_measure_end;
+static unsigned long long *mperf_previous_count;
+static unsigned long long *aperf_previous_count;
+static unsigned long long *mperf_current_count;
+static unsigned long long *aperf_current_count;
+
+/* valid flag for all CPUs. If a MSR read failed it will be zero */
+static int *is_valid;
+
+static int mperf_get_tsc(unsigned long long *tsc)
+{
+        int ret;
+        ret = read_msr(0, MSR_TSC, tsc);
+        if (ret)
+                dprint("Reading TSC MSR failed, returning %llu\n", *tsc);
+        return ret;
+}
+
+static int mperf_init_stats(unsigned int cpu)
+{
+        unsigned long long val;
+        int ret;
+
+        ret = read_msr(cpu, MSR_APERF, &val);
+        aperf_previous_count[cpu] = val;
+        ret |= read_msr(cpu, MSR_MPERF, &val);
+        mperf_previous_count[cpu] = val;
+        is_valid[cpu] = !ret;
+
+        return 0;
+}
+
+static int mperf_measure_stats(unsigned int cpu)
+{
+        unsigned long long val;
+        int ret;
+
+        ret = read_msr(cpu, MSR_APERF, &val);
+        aperf_current_count[cpu] = val;
+        ret |= read_msr(cpu, MSR_MPERF, &val);
+        mperf_current_count[cpu] = val;
+        is_valid[cpu] = !ret;
+
+        return 0;
+}
+
+static int mperf_get_count_percent(unsigned int id, double *percent,
+                                   unsigned int cpu)
+{
+        unsigned long long aperf_diff, mperf_diff, tsc_diff;
+        unsigned long long timediff;
+
+        if (!is_valid[cpu])
+                return -1;
+
+        if (id != C0 && id != Cx)
+                return -1;
+
+        mperf_diff = mperf_current_count[cpu] - mperf_previous_count[cpu];
+        aperf_diff = aperf_current_count[cpu] - aperf_previous_count[cpu];
+
+        if (max_freq_mode == MAX_FREQ_TSC_REF) {
+                tsc_diff = tsc_at_measure_end - tsc_at_measure_start;
+                *percent = 100.0 * mperf_diff / tsc_diff;
+                dprint("%s: TSC Ref - mperf_diff: %llu, tsc_diff: %llu\n",
+                       mperf_cstates[id].name, mperf_diff, tsc_diff);
+        } else if (max_freq_mode == MAX_FREQ_SYSFS) {
+                timediff = timespec_diff_us(time_start, time_end);
+                *percent = 100.0 * mperf_diff / timediff;
+                dprint("%s: MAXFREQ - mperf_diff: %llu, time_diff: %llu\n",
+                       mperf_cstates[id].name, mperf_diff, timediff);
+        } else
+                return -1;
+
+        if (id == Cx)
+                *percent = 100.0 - *percent;
+
+        dprint("%s: previous: %llu - current: %llu - (%u)\n",
+                mperf_cstates[id].name, mperf_diff, aperf_diff, cpu);
+        dprint("%s: %f\n", mperf_cstates[id].name, *percent);
+        return 0;
+}
+
+static int mperf_get_count_freq(unsigned int id, unsigned long long *count,
+                                unsigned int cpu)
+{
+        unsigned long long aperf_diff, mperf_diff, time_diff, tsc_diff;
+
+        if (id != AVG_FREQ)
+                return 1;
+
+        if (!is_valid[cpu])
+                return -1;
+
+        mperf_diff = mperf_current_count[cpu] - mperf_previous_count[cpu];
+        aperf_diff = aperf_current_count[cpu] - aperf_previous_count[cpu];
+
+        if (max_freq_mode == MAX_FREQ_TSC_REF) {
+                /* Calculate max_freq from TSC count */
+                tsc_diff = tsc_at_measure_end - tsc_at_measure_start;
+                time_diff = timespec_diff_us(time_start, time_end);
+                max_frequency = tsc_diff / time_diff;
+        }
+
+        *count = max_frequency * ((double)aperf_diff / mperf_diff);
+        dprint("%s: Average freq based on %s maximum frequency:\n",
+               mperf_cstates[id].name,
+               (max_freq_mode == MAX_FREQ_TSC_REF) ? "TSC calculated" : "sysfs read");
+        dprint("%max_frequency: %lu", max_frequency);
+        dprint("aperf_diff: %llu\n", aperf_diff);
+        dprint("mperf_diff: %llu\n", mperf_diff);
+        dprint("avg freq:   %llu\n", *count);
+        return 0;
+}
+
+static int mperf_start(void)
+{
+        int cpu;
+        unsigned long long dbg;
+
+        clock_gettime(CLOCK_REALTIME, &time_start);
+        mperf_get_tsc(&tsc_at_measure_start);
+
+        for (cpu = 0; cpu < cpu_count; cpu++)
+                mperf_init_stats(cpu);
+
+        mperf_get_tsc(&dbg);
+        dprint("TSC diff: %llu\n", dbg - tsc_at_measure_start);
+        return 0;
+}
+
+static int mperf_stop(void)
+{
+        unsigned long long dbg;
+        int cpu;
+
+        for (cpu = 0; cpu < cpu_count; cpu++)
+                mperf_measure_stats(cpu);
+
+        mperf_get_tsc(&tsc_at_measure_end);
+        clock_gettime(CLOCK_REALTIME, &time_end);
+
+        mperf_get_tsc(&dbg);
+        dprint("TSC diff: %llu\n", dbg - tsc_at_measure_end);
+
+        return 0;
+}
+
+/*
+ * Mperf register is defined to tick at P0 (maximum) frequency
+ *
+ * Instead of reading out P0 which can be tricky to read out from HW,
+ * we use TSC counter if it reliably ticks at P0/mperf frequency.
+ *
+ * Still try to fall back to:
+ * /sys/devices/system/cpu/cpu0/cpufreq/cpuinfo_max_freq
+ * on older Intel HW without invariant TSC feature.
+ * Or on AMD machines where TSC does not tick at P0 (do not exist yet, but
+ * it's still double checked (MSR_AMD_HWCR)).
+ *
+ * On these machines the user would still get useful mperf
+ * stats when acpi-cpufreq driver is loaded.
+ */
+static int init_maxfreq_mode(void)
+{
+        int ret;
+        unsigned long long hwcr;
+        unsigned long min;
+
+        if (!cpupower_cpu_info.caps & CPUPOWER_CAP_INV_TSC)
+                goto use_sysfs;
+
+        if (cpupower_cpu_info.vendor == X86_VENDOR_AMD) {
+                /* MSR_AMD_HWCR tells us whether TSC runs at P0/mperf
+                 * freq.
+                 * A test whether hwcr is accessable/available would be:
+                 * (cpupower_cpu_info.family > 0x10 ||
+                 *   cpupower_cpu_info.family == 0x10 &&
+                 *   cpupower_cpu_info.model >= 0x2))
+                 * This should be the case for all aperf/mperf
+                 * capable AMD machines and is therefore safe to test here.
+                 * Compare with Linus kernel git commit: acf01734b1747b1ec4
+                 */
+                ret = read_msr(0, MSR_AMD_HWCR, &hwcr);
+                /*
+                 * If the MSR read failed, assume a Xen system that did
+                 * not explicitly provide access to it and assume TSC works
+                */
+                if (ret != 0) {
+                        dprint("TSC read 0x%x failed - assume TSC working\n",
+                               MSR_AMD_HWCR);
+                        return 0;
+                } else if (1 & (hwcr >> 24)) {
+                        max_freq_mode = MAX_FREQ_TSC_REF;
+                        return 0;
+                } else { /* Use sysfs max frequency if available */ }
+        } else if (cpupower_cpu_info.vendor == X86_VENDOR_INTEL) {
+                /*
+                 * On Intel we assume mperf (in C0) is ticking at same
+                 * rate than TSC
+                 */
+                max_freq_mode = MAX_FREQ_TSC_REF;
+                return 0;
+        }
+use_sysfs:
+        if (cpufreq_get_hardware_limits(0, &min, &max_frequency)) {
+                dprint("Cannot retrieve max freq from cpufreq kernel "
+                       "subsystem\n");
+                return -1;
+        }
+        max_freq_mode = MAX_FREQ_SYSFS;
+        return 0;
+}
+
+/*
+ * This monitor provides:
+ *
+ * 1) Average frequency a CPU resided in
+ *    This always works if the CPU has aperf/mperf capabilities
+ *
+ * 2) C0 and Cx (any sleep state) time a CPU resided in
+ *    Works if mperf timer stops ticking in sleep states which
+ *    seem to be the case on all current HW.
+ * Both is directly retrieved from HW registers and is independent
+ * from kernel statistics.
+ */
+struct cpuidle_monitor mperf_monitor;
+struct cpuidle_monitor *mperf_register(void)
+{
+        if (!(cpupower_cpu_info.caps & CPUPOWER_CAP_APERF))
+                return NULL;
+
+        if (init_maxfreq_mode())
+                return NULL;
+
+        /* Free this at program termination */
+        is_valid = calloc(cpu_count, sizeof(int));
+        mperf_previous_count = calloc(cpu_count, sizeof(unsigned long long));
+        aperf_previous_count = calloc(cpu_count, sizeof(unsigned long long));
+        mperf_current_count = calloc(cpu_count, sizeof(unsigned long long));
+        aperf_current_count = calloc(cpu_count, sizeof(unsigned long long));
+
+        mperf_monitor.name_len = strlen(mperf_monitor.name);
+        return &mperf_monitor;
+}
+
+void mperf_unregister(void)
+{
+        free(mperf_previous_count);
+        free(aperf_previous_count);
+        free(mperf_current_count);
+        free(aperf_current_count);
+        free(is_valid);
+}
+
+struct cpuidle_monitor mperf_monitor = {
+        .name                   = "Mperf",
+        .hw_states_num          = MPERF_CSTATE_COUNT,
+        .hw_states              = mperf_cstates,
+        .start                  = mperf_start,
+        .stop                   = mperf_stop,
+        .do_register            = mperf_register,
+        .unregister             = mperf_unregister,
+        .needs_root             = 1,
+        .overflow_s             = 922000000 /* 922337203 seconds TSC overflow
+                                               at 20GHz */
+};
+#endif /* #if defined(__i386__) || defined(__x86_64__) */
diff --git a/tools/power/cpupower/utils/idle_monitor/nhm_idle.c b/tools/power/cpupower/utils/idle_monitor/nhm_idle.c
new file mode 100644
index 00000000000..d2a91dd0d56
--- /dev/null
+++ b/tools/power/cpupower/utils/idle_monitor/nhm_idle.c
@@ -0,0 +1,216 @@
+/*
+ *  (C) 2010,2011       Thomas Renninger <trenn@suse.de>, Novell Inc.
+ *
+ *  Licensed under the terms of the GNU GPL License version 2.
+ *
+ *  Based on Len Brown's <lenb@kernel.org> turbostat tool.
+ */
+
+#if defined(__i386__) || defined(__x86_64__)
+
+#include <stdio.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "helpers/helpers.h"
+#include "idle_monitor/cpupower-monitor.h"
+
+#define MSR_PKG_C3_RESIDENCY    0x3F8
+#define MSR_PKG_C6_RESIDENCY    0x3F9
+#define MSR_CORE_C3_RESIDENCY   0x3FC
+#define MSR_CORE_C6_RESIDENCY   0x3FD
+
+#define MSR_TSC 0x10
+
+#define NHM_CSTATE_COUNT 4
+
+enum intel_nhm_id { C3 = 0, C6, PC3, PC6, TSC = 0xFFFF };
+
+static int nhm_get_count_percent(unsigned int self_id, double *percent,
+                                 unsigned int cpu);
+
+static cstate_t nhm_cstates[NHM_CSTATE_COUNT] = {
+        {
+                .name                   = "C3",
+                .desc                   = N_("Processor Core C3"),
+                .id                     = C3,
+                .range                  = RANGE_CORE,
+                .get_count_percent      = nhm_get_count_percent,
+        },
+        {
+                .name                   = "C6",
+                .desc                   = N_("Processor Core C6"),
+                .id                     = C6,
+                .range                  = RANGE_CORE,
+                .get_count_percent      = nhm_get_count_percent,
+        },
+
+        {
+                .name                   = "PC3",
+                .desc                   = N_("Processor Package C3"),
+                .id                     = PC3,
+                .range                  = RANGE_PACKAGE,
+                .get_count_percent      = nhm_get_count_percent,
+        },
+        {
+                .name                   = "PC6",
+                .desc                   = N_("Processor Package C6"),
+                .id                     = PC6,
+                .range                  = RANGE_PACKAGE,
+                .get_count_percent      = nhm_get_count_percent,
+        },
+};
+
+static unsigned long long tsc_at_measure_start;
+static unsigned long long tsc_at_measure_end;
+static unsigned long long *previous_count[NHM_CSTATE_COUNT];
+static unsigned long long *current_count[NHM_CSTATE_COUNT];
+/* valid flag for all CPUs. If a MSR read failed it will be zero */
+static int *is_valid;
+
+static int nhm_get_count(enum intel_nhm_id id, unsigned long long *val,
+                        unsigned int cpu)
+{
+        int msr;
+
+        switch (id) {
+        case C3:
+                msr = MSR_CORE_C3_RESIDENCY;
+                break;
+        case C6:
+                msr = MSR_CORE_C6_RESIDENCY;
+                break;
+        case PC3:
+                msr = MSR_PKG_C3_RESIDENCY;
+                break;
+        case PC6:
+                msr = MSR_PKG_C6_RESIDENCY;
+                break;
+        case TSC:
+                msr = MSR_TSC;
+                break;
+        default:
+                return -1;
+        };
+        if (read_msr(cpu, msr, val))
+                return -1;
+
+        return 0;
+}
+
+static int nhm_get_count_percent(unsigned int id, double *percent,
+                                 unsigned int cpu)
+{
+        *percent = 0.0;
+
+        if (!is_valid[cpu])
+                return -1;
+
+        *percent = (100.0 *
+                (current_count[id][cpu] - previous_count[id][cpu])) /
+                (tsc_at_measure_end - tsc_at_measure_start);
+
+        dprint("%s: previous: %llu - current: %llu - (%u)\n",
+                nhm_cstates[id].name, previous_count[id][cpu],
+                current_count[id][cpu], cpu);
+
+        dprint("%s: tsc_diff: %llu - count_diff: %llu - percent: %2.f (%u)\n",
+               nhm_cstates[id].name,
+               (unsigned long long) tsc_at_measure_end - tsc_at_measure_start,
+               current_count[id][cpu] - previous_count[id][cpu],
+               *percent, cpu);
+
+        return 0;
+}
+
+static int nhm_start(void)
+{
+        int num, cpu;
+        unsigned long long dbg, val;
+
+        nhm_get_count(TSC, &tsc_at_measure_start, 0);
+
+        for (num = 0; num < NHM_CSTATE_COUNT; num++) {
+                for (cpu = 0; cpu < cpu_count; cpu++) {
+                        is_valid[cpu] = !nhm_get_count(num, &val, cpu);
+                        previous_count[num][cpu] = val;
+                }
+        }
+        nhm_get_count(TSC, &dbg, 0);
+        dprint("TSC diff: %llu\n", dbg - tsc_at_measure_start);
+        return 0;
+}
+
+static int nhm_stop(void)
+{
+        unsigned long long val;
+        unsigned long long dbg;
+        int num, cpu;
+
+        nhm_get_count(TSC, &tsc_at_measure_end, 0);
+
+        for (num = 0; num < NHM_CSTATE_COUNT; num++) {
+                for (cpu = 0; cpu < cpu_count; cpu++) {
+                        is_valid[cpu] = !nhm_get_count(num, &val, cpu);
+                        current_count[num][cpu] = val;
+                }
+        }
+        nhm_get_count(TSC, &dbg, 0);
+        dprint("TSC diff: %llu\n", dbg - tsc_at_measure_end);
+
+        return 0;
+}
+
+struct cpuidle_monitor intel_nhm_monitor;
+
+struct cpuidle_monitor *intel_nhm_register(void)
+{
+        int num;
+
+        if (cpupower_cpu_info.vendor != X86_VENDOR_INTEL)
+                return NULL;
+
+        if (!(cpupower_cpu_info.caps & CPUPOWER_CAP_INV_TSC))
+                return NULL;
+
+        if (!(cpupower_cpu_info.caps & CPUPOWER_CAP_APERF))
+                return NULL;
+
+        /* Free this at program termination */
+        is_valid = calloc(cpu_count, sizeof(int));
+        for (num = 0; num < NHM_CSTATE_COUNT; num++) {
+                previous_count[num] = calloc(cpu_count,
+                                        sizeof(unsigned long long));
+                current_count[num]  = calloc(cpu_count,
+                                        sizeof(unsigned long long));
+        }
+
+        intel_nhm_monitor.name_len = strlen(intel_nhm_monitor.name);
+        return &intel_nhm_monitor;
+}
+
+void intel_nhm_unregister(void)
+{
+        int num;
+
+        for (num = 0; num < NHM_CSTATE_COUNT; num++) {
+                free(previous_count[num]);
+                free(current_count[num]);
+        }
+        free(is_valid);
+}
+
+struct cpuidle_monitor intel_nhm_monitor = {
+        .name                   = "Nehalem",
+        .hw_states_num          = NHM_CSTATE_COUNT,
+        .hw_states              = nhm_cstates,
+        .start                  = nhm_start,
+        .stop                   = nhm_stop,
+        .do_register            = intel_nhm_register,
+        .unregister             = intel_nhm_unregister,
+        .needs_root             = 1,
+        .overflow_s             = 922000000 /* 922337203 seconds TSC overflow
+                                               at 20GHz */
+};
+#endif
diff --git a/tools/power/cpupower/utils/idle_monitor/snb_idle.c b/tools/power/cpupower/utils/idle_monitor/snb_idle.c
new file mode 100644
index 00000000000..a1bc07cd53e
--- /dev/null
+++ b/tools/power/cpupower/utils/idle_monitor/snb_idle.c
@@ -0,0 +1,190 @@
+/*
+ *  (C) 2010,2011       Thomas Renninger <trenn@suse.de>, Novell Inc.
+ *
+ *  Licensed under the terms of the GNU GPL License version 2.
+ *
+ *  Based on Len Brown's <lenb@kernel.org> turbostat tool.
+ */
+
+#if defined(__i386__) || defined(__x86_64__)
+
+#include <stdio.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "helpers/helpers.h"
+#include "idle_monitor/cpupower-monitor.h"
+
+#define MSR_PKG_C2_RESIDENCY    0x60D
+#define MSR_PKG_C7_RESIDENCY    0x3FA
+#define MSR_CORE_C7_RESIDENCY   0x3FE
+
+#define MSR_TSC 0x10
+
+enum intel_snb_id { C7 = 0, PC2, PC7, SNB_CSTATE_COUNT, TSC = 0xFFFF };
+
+static int snb_get_count_percent(unsigned int self_id, double *percent,
+                                 unsigned int cpu);
+
+static cstate_t snb_cstates[SNB_CSTATE_COUNT] = {
+        {
+                .name                   = "C7",
+                .desc                   = N_("Processor Core C7"),
+                .id                     = C7,
+                .range                  = RANGE_CORE,
+                .get_count_percent      = snb_get_count_percent,
+        },
+        {
+                .name                   = "PC2",
+                .desc                   = N_("Processor Package C2"),
+                .id                     = PC2,
+                .range                  = RANGE_PACKAGE,
+                .get_count_percent      = snb_get_count_percent,
+        },
+        {
+                .name                   = "PC7",
+                .desc                   = N_("Processor Package C7"),
+                .id                     = PC7,
+                .range                  = RANGE_PACKAGE,
+                .get_count_percent      = snb_get_count_percent,
+        },
+};
+
+static unsigned long long tsc_at_measure_start;
+static unsigned long long tsc_at_measure_end;
+static unsigned long long *previous_count[SNB_CSTATE_COUNT];
+static unsigned long long *current_count[SNB_CSTATE_COUNT];
+/* valid flag for all CPUs. If a MSR read failed it will be zero */
+static int *is_valid;
+
+static int snb_get_count(enum intel_snb_id id, unsigned long long *val,
+                        unsigned int cpu)
+{
+        int msr;
+
+        switch (id) {
+        case C7:
+                msr = MSR_CORE_C7_RESIDENCY;
+                break;
+        case PC2:
+                msr = MSR_PKG_C2_RESIDENCY;
+                break;
+        case PC7:
+                msr = MSR_PKG_C7_RESIDENCY;
+                break;
+        case TSC:
+                msr = MSR_TSC;
+                break;
+        default:
+                return -1;
+        };
+        if (read_msr(cpu, msr, val))
+                return -1;
+        return 0;
+}
+
+static int snb_get_count_percent(unsigned int id, double *percent,
+                                 unsigned int cpu)
+{
+        *percent = 0.0;
+
+        if (!is_valid[cpu])
+                return -1;
+
+        *percent = (100.0 *
+                (current_count[id][cpu] - previous_count[id][cpu])) /
+                (tsc_at_measure_end - tsc_at_measure_start);
+
+        dprint("%s: previous: %llu - current: %llu - (%u)\n",
+                snb_cstates[id].name, previous_count[id][cpu],
+                current_count[id][cpu], cpu);
+
+        dprint("%s: tsc_diff: %llu - count_diff: %llu - percent: %2.f (%u)\n",
+               snb_cstates[id].name,
+               (unsigned long long) tsc_at_measure_end - tsc_at_measure_start,
+               current_count[id][cpu] - previous_count[id][cpu],
+               *percent, cpu);
+
+        return 0;
+}
+
+static int snb_start(void)
+{
+        int num, cpu;
+        unsigned long long val;
+
+        for (num = 0; num < SNB_CSTATE_COUNT; num++) {
+                for (cpu = 0; cpu < cpu_count; cpu++) {
+                        snb_get_count(num, &val, cpu);
+                        previous_count[num][cpu] = val;
+                }
+        }
+        snb_get_count(TSC, &tsc_at_measure_start, 0);
+        return 0;
+}
+
+static int snb_stop(void)
+{
+        unsigned long long val;
+        int num, cpu;
+
+        snb_get_count(TSC, &tsc_at_measure_end, 0);
+
+        for (num = 0; num < SNB_CSTATE_COUNT; num++) {
+                for (cpu = 0; cpu < cpu_count; cpu++) {
+                        is_valid[cpu] = !snb_get_count(num, &val, cpu);
+                        current_count[num][cpu] = val;
+                }
+        }
+        return 0;
+}
+
+struct cpuidle_monitor intel_snb_monitor;
+
+static struct cpuidle_monitor *snb_register(void)
+{
+        int num;
+
+        if (cpupower_cpu_info.vendor != X86_VENDOR_INTEL
+            || cpupower_cpu_info.family != 6)
+                return NULL;
+
+        if (cpupower_cpu_info.model != 0x2A
+            && cpupower_cpu_info.model != 0x2D)
+                return NULL;
+
+        is_valid = calloc(cpu_count, sizeof(int));
+        for (num = 0; num < SNB_CSTATE_COUNT; num++) {
+                previous_count[num] = calloc(cpu_count,
+                                        sizeof(unsigned long long));
+                current_count[num]  = calloc(cpu_count,
+                                        sizeof(unsigned long long));
+        }
+        intel_snb_monitor.name_len = strlen(intel_snb_monitor.name);
+        return &intel_snb_monitor;
+}
+
+void snb_unregister(void)
+{
+        int num;
+        free(is_valid);
+        for (num = 0; num < SNB_CSTATE_COUNT; num++) {
+                free(previous_count[num]);
+                free(current_count[num]);
+        }
+}
+
+struct cpuidle_monitor intel_snb_monitor = {
+        .name                   = "SandyBridge",
+        .hw_states              = snb_cstates,
+        .hw_states_num          = SNB_CSTATE_COUNT,
+        .start                  = snb_start,
+        .stop                   = snb_stop,
+        .do_register            = snb_register,
+        .unregister             = snb_unregister,
+        .needs_root             = 1,
+        .overflow_s             = 922000000 /* 922337203 seconds TSC overflow
+                                               at 20GHz */
+};
+#endif /* defined(__i386__) || defined(__x86_64__) */
diff --git a/tools/power/cpupower/utils/version-gen.sh b/tools/power/cpupower/utils/version-gen.sh
new file mode 100755
index 00000000000..5ec41c55699
--- /dev/null
+++ b/tools/power/cpupower/utils/version-gen.sh
@@ -0,0 +1,35 @@
+#!/bin/sh
+#
+# Script which prints out the version to use for building cpupowerutils.
+# Must be called from tools/power/cpupower/
+# 
+# Heavily based on tools/perf/util/PERF-VERSION-GEN .
+
+LF='
+'
+
+# First check if there is a .git to get the version from git describe
+# otherwise try to get the version from the kernel makefile
+if test -d ../../../.git -o -f ../../../.git &&
+        VN=$(git describe --abbrev=4 HEAD 2>/dev/null) &&
+        case "$VN" in
+        *$LF*) (exit 1) ;;
+        v[0-9]*)
+                git update-index -q --refresh
+                test -z "$(git diff-index --name-only HEAD --)" ||
+                VN="$VN-dirty" ;;
+        esac
+then
+        VN=$(echo "$VN" | sed -e 's/-/./g');
+else
+        eval $(grep '^VERSION[[:space:]]*=' ../../../Makefile|tr -d ' ')
+        eval $(grep '^PATCHLEVEL[[:space:]]*=' ../../../Makefile|tr -d ' ')
+        eval $(grep '^SUBLEVEL[[:space:]]*=' ../../../Makefile|tr -d ' ')
+        eval $(grep '^EXTRAVERSION[[:space:]]*=' ../../../Makefile|tr -d ' ')
+
+        VN="${VERSION}.${PATCHLEVEL}.${SUBLEVEL}${EXTRAVERSION}"
+fi
+
+VN=$(expr "$VN" : v*'\(.*\)')
+
+echo $VN
diff --git a/tools/power/x86/turbostat/turbostat.c b/tools/power/x86/turbostat/turbostat.c
index 6d8ef4a3a9b..8b2d37b59c9 100644
--- a/tools/power/x86/turbostat/turbostat.c
+++ b/tools/power/x86/turbostat/turbostat.c
@@ -128,34 +128,34 @@ unsigned long long get_msr(int cpu, off_t offset)
 void print_header(void)
 {
         if (show_pkg)
-                fprintf(stderr, "pkg ");
+                fprintf(stderr, "pk");
         if (show_core)
-                fprintf(stderr, "core");
+                fprintf(stderr, " cr");
         if (show_cpu)
                 fprintf(stderr, " CPU");
         if (do_nhm_cstates)
-                fprintf(stderr, "   %%c0 ");
+                fprintf(stderr, "    %%c0 ");
         if (has_aperf)
-                fprintf(stderr, "  GHz");
+                fprintf(stderr, " GHz");
         fprintf(stderr, "  TSC");
         if (do_nhm_cstates)
-                fprintf(stderr, "   %%c1 ");
+                fprintf(stderr, "    %%c1");
         if (do_nhm_cstates)
-                fprintf(stderr, "   %%c3 ");
+                fprintf(stderr, "    %%c3");
         if (do_nhm_cstates)
-                fprintf(stderr, "   %%c6 ");
+                fprintf(stderr, "    %%c6");
         if (do_snb_cstates)
-                fprintf(stderr, "   %%c7 ");
+                fprintf(stderr, "    %%c7");
         if (do_snb_cstates)
-                fprintf(stderr, "  %%pc2 ");
+                fprintf(stderr, "  %%pc2");
         if (do_nhm_cstates)
-                fprintf(stderr, "  %%pc3 ");
+                fprintf(stderr, "  %%pc3");
         if (do_nhm_cstates)
-                fprintf(stderr, "  %%pc6 ");
+                fprintf(stderr, "  %%pc6");
         if (do_snb_cstates)
-                fprintf(stderr, "  %%pc7 ");
+                fprintf(stderr, "  %%pc7");
         if (extra_msr_offset)
-                fprintf(stderr, "       MSR 0x%x ", extra_msr_offset);
+                fprintf(stderr, "        MSR 0x%x ", extra_msr_offset);
 
         putc('\n', stderr);
 }
@@ -194,14 +194,14 @@ void print_cnt(struct counters *p)
         /* topology columns, print blanks on 1st (average) line */
         if (p == cnt_average) {
                 if (show_pkg)
-                        fprintf(stderr, "    ");
+                        fprintf(stderr, " ");
                 if (show_core)
                         fprintf(stderr, "    ");
                 if (show_cpu)
                         fprintf(stderr, "    ");
         } else {
                 if (show_pkg)
-                        fprintf(stderr, "%4d", p->pkg);
+                        fprintf(stderr, "%d", p->pkg);
                 if (show_core)
                         fprintf(stderr, "%4d", p->core);
                 if (show_cpu)
@@ -241,22 +241,22 @@ void print_cnt(struct counters *p)
                 if (!skip_c1)
                         fprintf(stderr, "%7.2f", 100.0 * p->c1/p->tsc);
                 else
-                        fprintf(stderr, "   ****");
+                        fprintf(stderr, "  ****");
         }
         if (do_nhm_cstates)
-                fprintf(stderr, "%7.2f", 100.0 * p->c3/p->tsc);
+                fprintf(stderr, " %6.2f", 100.0 * p->c3/p->tsc);
         if (do_nhm_cstates)
-                fprintf(stderr, "%7.2f", 100.0 * p->c6/p->tsc);
+                fprintf(stderr, " %6.2f", 100.0 * p->c6/p->tsc);
         if (do_snb_cstates)
-                fprintf(stderr, "%7.2f", 100.0 * p->c7/p->tsc);
+                fprintf(stderr, " %6.2f", 100.0 * p->c7/p->tsc);
         if (do_snb_cstates)
-                fprintf(stderr, "%7.2f", 100.0 * p->pc2/p->tsc);
+                fprintf(stderr, " %5.2f", 100.0 * p->pc2/p->tsc);
         if (do_nhm_cstates)
-                fprintf(stderr, "%7.2f", 100.0 * p->pc3/p->tsc);
+                fprintf(stderr, " %5.2f", 100.0 * p->pc3/p->tsc);
         if (do_nhm_cstates)
-                fprintf(stderr, "%7.2f", 100.0 * p->pc6/p->tsc);
+                fprintf(stderr, " %5.2f", 100.0 * p->pc6/p->tsc);
         if (do_snb_cstates)
-                fprintf(stderr, "%7.2f", 100.0 * p->pc7/p->tsc);
+                fprintf(stderr, " %5.2f", 100.0 * p->pc7/p->tsc);
         if (extra_msr_offset)
                 fprintf(stderr, "  0x%016llx", p->extra_msr);
         putc('\n', stderr);
diff --git a/tools/power/x86/x86_energy_perf_policy/x86_energy_perf_policy.c b/tools/power/x86/x86_energy_perf_policy/x86_energy_perf_policy.c
index 2618ef2ba31..33c5c7ee148 100644
--- a/tools/power/x86/x86_energy_perf_policy/x86_energy_perf_policy.c
+++ b/tools/power/x86/x86_energy_perf_policy/x86_energy_perf_policy.c
@@ -137,7 +137,6 @@ void cmdline(int argc, char **argv)
 void validate_cpuid(void)
 {
         unsigned int eax, ebx, ecx, edx, max_level;
-        char brand[16];
         unsigned int fms, family, model, stepping;
 
         eax = ebx = ecx = edx = 0;
@@ -160,8 +159,8 @@ void validate_cpuid(void)
                 model += ((fms >> 16) & 0xf) << 4;
 
         if (verbose > 1)
-                printf("CPUID %s %d levels family:model:stepping "
-                        "0x%x:%x:%x (%d:%d:%d)\n", brand, max_level,
+                printf("CPUID %d levels family:model:stepping "
+                        "0x%x:%x:%x (%d:%d:%d)\n", max_level,
                         family, model, stepping, family, model, stepping);
 
         if (!(edx & (1 << 5))) {
diff --git a/tools/slub/slabinfo.c b/tools/slub/slabinfo.c
index 516551c9f17..868cc93f7ac 100644
--- a/tools/slub/slabinfo.c
+++ b/tools/slub/slabinfo.c
@@ -2,8 +2,9 @@
  * Slabinfo: Tool to get reports about slabs
  *
  * (C) 2007 sgi, Christoph Lameter
+ * (C) 2011 Linux Foundation, Christoph Lameter
  *
- * Compile by:
+ * Compile with:
  *
  * gcc -o slabinfo slabinfo.c
  */
@@ -39,6 +40,8 @@ struct slabinfo {
         unsigned long cpuslab_flush, deactivate_full, deactivate_empty;
         unsigned long deactivate_to_head, deactivate_to_tail;
         unsigned long deactivate_remote_frees, order_fallback;
+        unsigned long cmpxchg_double_cpu_fail, cmpxchg_double_fail;
+        unsigned long alloc_node_mismatch, deactivate_bypass;
         int numa[MAX_NODES];
         int numa_partial[MAX_NODES];
 } slabinfo[MAX_SLABS];
@@ -99,7 +102,7 @@ static void fatal(const char *x, ...)
 
 static void usage(void)
 {
-        printf("slabinfo 5/7/2007. (c) 2007 sgi.\n\n"
+        printf("slabinfo 4/15/2011. (c) 2007 sgi/(c) 2011 Linux Foundation.\n\n"
                 "slabinfo [-ahnpvtsz] [-d debugopts] [slab-regexp]\n"
                 "-a|--aliases           Show aliases\n"
                 "-A|--activity          Most active slabs first\n"
@@ -293,7 +296,7 @@ int line = 0;
 static void first_line(void)
 {
         if (show_activity)
-                printf("Name                   Objects      Alloc       Free   %%Fast Fallb O\n");
+                printf("Name                   Objects      Alloc       Free   %%Fast Fallb O CmpX   UL\n");
         else
                 printf("Name                   Objects Objsize    Space "
                         "Slabs/Part/Cpu  O/S O %%Fr %%Ef Flg\n");
@@ -379,14 +382,14 @@ static void show_tracking(struct slabinfo *s)
         printf("\n%s: Kernel object allocation\n", s->name);
         printf("-----------------------------------------------------------------------\n");
         if (read_slab_obj(s, "alloc_calls"))
-                printf(buffer);
+                printf("%s", buffer);
         else
                 printf("No Data\n");
 
         printf("\n%s: Kernel object freeing\n", s->name);
         printf("------------------------------------------------------------------------\n");
         if (read_slab_obj(s, "free_calls"))
-                printf(buffer);
+                printf("%s", buffer);
         else
                 printf("No Data\n");
 
@@ -400,7 +403,7 @@ static void ops(struct slabinfo *s)
         if (read_slab_obj(s, "ops")) {
                 printf("\n%s: kmem_cache operations\n", s->name);
                 printf("--------------------------------------------\n");
-                printf(buffer);
+                printf("%s", buffer);
         } else
                 printf("\n%s has no kmem_cache operations\n", s->name);
 }
@@ -462,19 +465,32 @@ static void slab_stats(struct slabinfo *s)
         if (s->cpuslab_flush)
                 printf("Flushes %8lu\n", s->cpuslab_flush);
 
-        if (s->alloc_refill)
-                printf("Refill %8lu\n", s->alloc_refill);
-
         total = s->deactivate_full + s->deactivate_empty +
-                        s->deactivate_to_head + s->deactivate_to_tail;
-
-        if (total)
-                printf("Deactivate Full=%lu(%lu%%) Empty=%lu(%lu%%) "
-                        "ToHead=%lu(%lu%%) ToTail=%lu(%lu%%)\n",
-                        s->deactivate_full, (s->deactivate_full * 100) / total,
-                        s->deactivate_empty, (s->deactivate_empty * 100) / total,
-                        s->deactivate_to_head, (s->deactivate_to_head * 100) / total,
+                        s->deactivate_to_head + s->deactivate_to_tail + s->deactivate_bypass;
+
+        if (total) {
+                printf("\nSlab Deactivation             Ocurrences  %%\n");
+                printf("-------------------------------------------------\n");
+                printf("Slab full                     %7lu  %3lu%%\n",
+                        s->deactivate_full, (s->deactivate_full * 100) / total);
+                printf("Slab empty                    %7lu  %3lu%%\n",
+                        s->deactivate_empty, (s->deactivate_empty * 100) / total);
+                printf("Moved to head of partial list %7lu  %3lu%%\n",
+                        s->deactivate_to_head, (s->deactivate_to_head * 100) / total);
+                printf("Moved to tail of partial list %7lu  %3lu%%\n",
                         s->deactivate_to_tail, (s->deactivate_to_tail * 100) / total);
+                printf("Deactivation bypass           %7lu  %3lu%%\n",
+                        s->deactivate_bypass, (s->deactivate_bypass * 100) / total);
+                printf("Refilled from foreign frees   %7lu  %3lu%%\n",
+                        s->alloc_refill, (s->alloc_refill * 100) / total);
+                printf("Node mismatch                 %7lu  %3lu%%\n",
+                        s->alloc_node_mismatch, (s->alloc_node_mismatch * 100) / total);
+        }
+
+        if (s->cmpxchg_double_fail || s->cmpxchg_double_cpu_fail)
+                printf("\nCmpxchg_double Looping\n------------------------\n");
+                printf("Locked Cmpxchg Double redos   %lu\nUnlocked Cmpxchg Double redos %lu\n",
+                        s->cmpxchg_double_fail, s->cmpxchg_double_cpu_fail);
 }
 
 static void report(struct slabinfo *s)
@@ -573,12 +589,13 @@ static void slabcache(struct slabinfo *s)
                 total_alloc = s->alloc_fastpath + s->alloc_slowpath;
                 total_free = s->free_fastpath + s->free_slowpath;
 
-                printf("%-21s %8ld %10ld %10ld %3ld %3ld %5ld %1d\n",
+                printf("%-21s %8ld %10ld %10ld %3ld %3ld %5ld %1d %4ld %4ld\n",
                         s->name, s->objects,
                         total_alloc, total_free,
                         total_alloc ? (s->alloc_fastpath * 100 / total_alloc) : 0,
                         total_free ? (s->free_fastpath * 100 / total_free) : 0,
-                        s->order_fallback, s->order);
+                        s->order_fallback, s->order, s->cmpxchg_double_fail,
+                        s->cmpxchg_double_cpu_fail);
         }
         else
                 printf("%-21s %8ld %7d %8s %14s %4d %1d %3ld %3ld %s\n",
@@ -1190,6 +1207,10 @@ static void read_slab_dir(void)
                         slab->deactivate_to_tail = get_obj("deactivate_to_tail");
                         slab->deactivate_remote_frees = get_obj("deactivate_remote_frees");
                         slab->order_fallback = get_obj("order_fallback");
+                        slab->cmpxchg_double_cpu_fail = get_obj("cmpxchg_double_cpu_fail");
+                        slab->cmpxchg_double_fail = get_obj("cmpxchg_double_fail");
+                        slab->alloc_node_mismatch = get_obj("alloc_node_mismatch");
+                        slab->deactivate_bypass = get_obj("deactivate_bypass");
                         chdir("..");
                         if (slab->name[0] == ':')
                                 alias_targets++;
diff --git a/tools/testing/ktest/ktest.pl b/tools/testing/ktest/ktest.pl
index cef28e6632b..8d02ccb10c5 100755
--- a/tools/testing/ktest/ktest.pl
+++ b/tools/testing/ktest/ktest.pl
@@ -27,7 +27,7 @@ $default{"TEST_TYPE"}		= "test";
 $default{"BUILD_TYPE"}          = "randconfig";
 $default{"MAKE_CMD"}            = "make";
 $default{"TIMEOUT"}             = 120;
-$default{"TMP_DIR"}             = "/tmp/ktest";
+$default{"TMP_DIR"}             = "/tmp/ktest/\${MACHINE}";
 $default{"SLEEP_TIME"}          = 60;   # sleep time between tests
 $default{"BUILD_NOCLEAN"}       = 0;
 $default{"REBOOT_ON_ERROR"}     = 0;
@@ -41,6 +41,7 @@ $default{"CLEAR_LOG"}		= 0;
 $default{"BISECT_MANUAL"}       = 0;
 $default{"BISECT_SKIP"}         = 1;
 $default{"SUCCESS_LINE"}        = "login:";
+$default{"DETECT_TRIPLE_FAULT"} = 1;
 $default{"BOOTED_TIMEOUT"}      = 1;
 $default{"DIE_ON_FAILURE"}      = 1;
 $default{"SSH_EXEC"}            = "ssh \$SSH_USER\@\$MACHINE \$SSH_COMMAND";
@@ -62,6 +63,10 @@ my $output_config;
 my $test_type;
 my $build_type;
 my $build_options;
+my $pre_build;
+my $post_build;
+my $pre_build_die;
+my $post_build_die;
 my $reboot_type;
 my $reboot_script;
 my $power_cycle;
@@ -81,12 +86,17 @@ my $make;
 my $post_install;
 my $noclean;
 my $minconfig;
+my $start_minconfig;
+my $start_minconfig_defined;
+my $output_minconfig;
+my $ignore_config;
 my $addconfig;
 my $in_bisect = 0;
 my $bisect_bad = "";
 my $reverse_bisect;
 my $bisect_manual;
 my $bisect_skip;
+my $config_bisect_good;
 my $in_patchcheck = 0;
 my $run_test;
 my $redirect;
@@ -98,9 +108,12 @@ my $monitor_cnt = 0;
 my $sleep_time;
 my $bisect_sleep_time;
 my $patchcheck_sleep_time;
+my $ignore_warnings;
 my $store_failures;
+my $test_name;
 my $timeout;
 my $booted_timeout;
+my $detect_triplefault;
 my $console;
 my $success_line;
 my $stop_after_success;
@@ -115,6 +128,7 @@ my $successes = 0;
 my %entered_configs;
 my %config_help;
 my %variable;
+my %force_config;
 
 $config_help{"MACHINE"} = << "EOF"
  The machine hostname that you will test.
@@ -204,6 +218,26 @@ $config_help{"REBOOT_SCRIPT"} = << "EOF"
 EOF
     ;
 
+sub read_yn {
+    my ($prompt) = @_;
+
+    my $ans;
+
+    for (;;) {
+        print "$prompt [Y/n] ";
+        $ans = <STDIN>;
+        chomp $ans;
+        if ($ans =~ /^\s*$/) {
+            $ans = "y";
+        }
+        last if ($ans =~ /^y$/i || $ans =~ /^n$/i);
+        print "Please answer either 'y' or 'n'.\n";
+    }
+    if ($ans !~ /^y$/i) {
+        return 0;
+    }
+    return 1;
+}
 
 sub get_ktest_config {
     my ($config) = @_;
@@ -335,6 +369,7 @@ sub read_config {
     my $num_tests_set = 0;
     my $skip = 0;
     my $rest;
+    my $test_case = 0;
 
     while (<IN>) {
 
@@ -360,6 +395,7 @@ sub read_config {
                 $rest = $1;
                 $skip = 1;
             } else {
+                $test_case = 1;
                 $skip = 0;
             }
 
@@ -464,6 +500,15 @@ sub read_config {
     # make sure we have all mandatory configs
     get_ktest_configs;
 
+    # was a test specified?
+    if (!$test_case) {
+        print "No test case specified.\n";
+        print "What test case would you like to run?\n";
+        my $ans = <STDIN>;
+        chomp $ans;
+        $default{"TEST_TYPE"} = $ans;
+    }
+
     # set any defaults
 
     foreach my $default (keys %default) {
@@ -473,6 +518,69 @@ sub read_config {
     }
 }
 
+sub __eval_option {
+    my ($option, $i) = @_;
+
+    # Add space to evaluate the character before $
+    $option = " $option";
+    my $retval = "";
+
+    while ($option =~ /(.*?[^\\])\$\{(.*?)\}(.*)/) {
+        my $start = $1;
+        my $var = $2;
+        my $end = $3;
+
+        # Append beginning of line
+        $retval = "$retval$start";
+
+        # If the iteration option OPT[$i] exists, then use that.
+        # otherwise see if the default OPT (without [$i]) exists.
+
+        my $o = "$var\[$i\]";
+
+        if (defined($opt{$o})) {
+            $o = $opt{$o};
+            $retval = "$retval$o";
+        } elsif (defined($opt{$var})) {
+            $o = $opt{$var};
+            $retval = "$retval$o";
+        } else {
+            $retval = "$retval\$\{$var\}";
+        }
+
+        $option = $end;
+    }
+
+    $retval = "$retval$option";
+
+    $retval =~ s/^ //;
+
+    return $retval;
+}
+
+sub eval_option {
+    my ($option, $i) = @_;
+
+    my $prev = "";
+
+    # Since an option can evaluate to another option,
+    # keep iterating until we do not evaluate any more
+    # options.
+    my $r = 0;
+    while ($prev ne $option) {
+        # Check for recursive evaluations.
+        # 100 deep should be more than enough.
+        if ($r++ > 100) {
+            die "Over 100 evaluations accurred with $option\n" .
+                "Check for recursive variables\n";
+        }
+        $prev = $option;
+        $option = __eval_option($option, $i);
+    }
+
+    return $option;
+}
+
 sub _logit {
     if (defined($opt{"LOG_FILE"})) {
         open(OUT, ">> $opt{LOG_FILE}") or die "Can't write to $opt{LOG_FILE}";
@@ -617,9 +725,15 @@ sub fail {
             end_monitor;
         }
 
+        my $name = "";
+
+        if (defined($test_name)) {
+            $name = " ($test_name)";
+        }
+
         doprint "%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%\n";
         doprint "%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%\n";
-        doprint "KTEST RESULT: TEST $i Failed: ", @_, "\n";
+        doprint "KTEST RESULT: TEST $i$name Failed: ", @_, "\n";
         doprint "%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%\n";
         doprint "%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%\n";
 
@@ -836,17 +950,35 @@ sub monitor {
     my $failure_start;
     my $monitor_start = time;
     my $done = 0;
+    my $version_found = 0;
 
     while (!$done) {
 
-        if ($booted) {
+        if ($bug && defined($stop_after_failure) &&
+            $stop_after_failure >= 0) {
+            my $time = $stop_after_failure - (time - $failure_start);
+            $line = wait_for_input($monitor_fp, $time);
+            if (!defined($line)) {
+                doprint "bug timed out after $booted_timeout seconds\n";
+                doprint "Test forced to stop after $stop_after_failure seconds after failure\n";
+                last;
+            }
+        } elsif ($booted) {
             $line = wait_for_input($monitor_fp, $booted_timeout);
+            if (!defined($line)) {
+                my $s = $booted_timeout == 1 ? "" : "s";
+                doprint "Successful boot found: break after $booted_timeout second$s\n";
+                last;
+            }
         } else {
             $line = wait_for_input($monitor_fp);
+            if (!defined($line)) {
+                my $s = $timeout == 1 ? "" : "s";
+                doprint "Timed out after $timeout second$s\n";
+                last;
+            }
         }
 
-        last if (!defined($line));
-
         doprint $line;
         print DMESG $line;
 
@@ -896,6 +1028,22 @@ sub monitor {
             $bug = 1;
         }
 
+        # Detect triple faults by testing the banner
+        if ($full_line =~ /\bLinux version (\S+).*\n/) {
+            if ($1 eq $version) {
+                $version_found = 1;
+            } elsif ($version_found && $detect_triplefault) {
+                # We already booted into the kernel we are testing,
+                # but now we booted into another kernel?
+                # Consider this a triple fault.
+                doprint "Aleady booted in Linux kernel $version, but now\n";
+                doprint "we booted into Linux kernel $1.\n";
+                doprint "Assuming that this is a triple fault.\n";
+                doprint "To disable this: set DETECT_TRIPLE_FAULT to 0\n";
+                last;
+            }
+        }
+
         if ($line =~ /\n/) {
             $full_line = "";
         }
@@ -923,6 +1071,16 @@ sub monitor {
     return 1;
 }
 
+sub do_post_install {
+
+    return if (!defined($post_install));
+
+    my $cp_post_install = $post_install;
+    $cp_post_install =~ s/\$KERNEL_VERSION/$version/g;
+    run_command "$cp_post_install" or
+        dodie "Failed to run post install";
+}
+
 sub install {
 
     run_scp "$outputdir/$build_target", "$target_image" or
@@ -942,6 +1100,7 @@ sub install {
     close(IN);
 
     if (!$install_mods) {
+        do_post_install;
         doprint "No modules needed\n";
         return;
     }
@@ -964,17 +1123,29 @@ sub install {
 
     unlink "$tmpdir/$modtar";
 
-    run_ssh "'(cd / && tar xf /tmp/$modtar)'" or
+    run_ssh "'(cd / && tar xjf /tmp/$modtar)'" or
         dodie "failed to tar modules";
 
     run_ssh "rm -f /tmp/$modtar";
 
-    return if (!defined($post_install));
+    do_post_install;
+}
 
-    my $cp_post_install = $post_install;
-    $cp_post_install =~ s/\$KERNEL_VERSION/$version/g;
-    run_command "$cp_post_install" or
-        dodie "Failed to run post install";
+sub get_version {
+    # get the release name
+    doprint "$make kernelrelease ... ";
+    $version = `$make kernelrelease | tail -1`;
+    chomp($version);
+    doprint "$version\n";
+}
+
+sub start_monitor_and_boot {
+    get_grub_index;
+    get_version;
+    install;
+
+    start_monitor;
+    return monitor;
 }
 
 sub check_buildlog {
@@ -1009,24 +1180,84 @@ sub check_buildlog {
     return 1;
 }
 
+sub apply_min_config {
+    my $outconfig = "$output_config.new";
+
+    # Read the config file and remove anything that
+    # is in the force_config hash (from minconfig and others)
+    # then add the force config back.
+
+    doprint "Applying minimum configurations into $output_config.new\n";
+
+    open (OUT, ">$outconfig") or
+        dodie "Can't create $outconfig";
+
+    if (-f $output_config) {
+        open (IN, $output_config) or
+            dodie "Failed to open $output_config";
+        while (<IN>) {
+            if (/^(# )?(CONFIG_[^\s=]*)/) {
+                next if (defined($force_config{$2}));
+            }
+            print OUT;
+        }
+        close IN;
+    }
+    foreach my $config (keys %force_config) {
+        print OUT "$force_config{$config}\n";
+    }
+    close OUT;
+
+    run_command "mv $outconfig $output_config";
+}
+
 sub make_oldconfig {
-    my ($defconfig) = @_;
 
-    if (!run_command "$defconfig $make oldnoconfig") {
+    my @force_list = keys %force_config;
+
+    if ($#force_list >= 0) {
+        apply_min_config;
+    }
+
+    if (!run_command "$make oldnoconfig") {
         # Perhaps oldnoconfig doesn't exist in this version of the kernel
         # try a yes '' | oldconfig
         doprint "oldnoconfig failed, trying yes '' | make oldconfig\n";
-        run_command "yes '' | $defconfig $make oldconfig" or
+        run_command "yes '' | $make oldconfig" or
             dodie "failed make config oldconfig";
     }
 }
 
+# read a config file and use this to force new configs.
+sub load_force_config {
+    my ($config) = @_;
+
+    open(IN, $config) or
+        dodie "failed to read $config";
+    while (<IN>) {
+        chomp;
+        if (/^(CONFIG[^\s=]*)(\s*=.*)/) {
+            $force_config{$1} = $_;
+        } elsif (/^# (CONFIG_\S*) is not set/) {
+            $force_config{$1} = $_;
+        }
+    }
+    close IN;
+}
+
 sub build {
     my ($type) = @_;
-    my $defconfig = "";
 
     unlink $buildlog;
 
+    if (defined($pre_build)) {
+        my $ret = run_command $pre_build;
+        if (!$ret && defined($pre_build_die) &&
+            $pre_build_die) {
+            dodie "failed to pre_build\n";
+        }
+    }
+
     if ($type =~ /^useconfig:(.*)/) {
         run_command "cp $1 $output_config" or
             dodie "could not copy $1 to .config";
@@ -1063,24 +1294,33 @@ sub build {
     close(OUT);
 
     if (defined($minconfig)) {
-        $defconfig = "KCONFIG_ALLCONFIG=$minconfig";
+        load_force_config($minconfig);
     }
 
-    if ($type eq "oldnoconfig") {
-        make_oldconfig $defconfig;
-    } else {
-        run_command "$defconfig $make $type" or
+    if ($type ne "oldnoconfig") {
+        run_command "$make $type" or
             dodie "failed make config";
     }
+    # Run old config regardless, to enforce min configurations
+    make_oldconfig;
 
     $redirect = "$buildlog";
-    if (!run_command "$make $build_options") {
-        undef $redirect;
+    my $build_ret = run_command "$make $build_options";
+    undef $redirect;
+
+    if (defined($post_build)) {
+        my $ret = run_command $post_build;
+        if (!$ret && defined($post_build_die) &&
+            $post_build_die) {
+            dodie "failed to post_build\n";
+        }
+    }
+
+    if (!$build_ret) {
         # bisect may need this to pass
         return 0 if ($in_bisect);
         fail "failed build" and return 0;
     }
-    undef $redirect;
 
     return 1;
 }
@@ -1102,9 +1342,15 @@ sub success {
 
     $successes++;
 
+    my $name = "";
+
+    if (defined($test_name)) {
+        $name = " ($test_name)";
+    }
+
     doprint "\n\n*******************************************\n";
     doprint     "*******************************************\n";
-    doprint     "KTEST RESULT: TEST $i SUCCESS!!!!         **\n";
+    doprint     "KTEST RESULT: TEST $i$name SUCCESS!!!!         **\n";
     doprint     "*******************************************\n";
     doprint     "*******************************************\n";
 
@@ -1117,14 +1363,6 @@ sub success {
     }
 }
 
-sub get_version {
-    # get the release name
-    doprint "$make kernelrelease ... ";
-    $version = `$make kernelrelease | tail -1`;
-    chomp($version);
-    doprint "$version\n";
-}
-
 sub answer_bisect {
     for (;;) {
         doprint "Pass or fail? [p/f]";
@@ -1289,12 +1527,7 @@ sub run_bisect_test {
         dodie "Failed on build" if $failed;
 
         # Now boot the box
-        get_grub_index;
-        get_version;
-        install;
-
-        start_monitor;
-        monitor or $failed = 1;
+        start_monitor_and_boot or $failed = 1;
 
         if ($type ne "boot") {
             if ($failed && $bisect_skip) {
@@ -1473,21 +1706,27 @@ my %null_config;
 
 my %dependency;
 
-sub process_config_ignore {
-    my ($config) = @_;
+sub assign_configs {
+    my ($hash, $config) = @_;
 
     open (IN, $config)
         or dodie "Failed to read $config";
 
     while (<IN>) {
         if (/^((CONFIG\S*)=.*)/) {
-            $config_ignore{$2} = $1;
+            ${$hash}{$2} = $1;
         }
     }
 
     close(IN);
 }
 
+sub process_config_ignore {
+    my ($config) = @_;
+
+    assign_configs \%config_ignore, $config;
+}
+
 sub read_current_config {
     my ($config_ref) = @_;
 
@@ -1546,7 +1785,7 @@ sub create_config {
     close(OUT);
 
 #    exit;
-    make_oldconfig "";
+    make_oldconfig;
 }
 
 sub compare_configs {
@@ -1718,6 +1957,10 @@ sub config_bisect {
 
     my $tmpconfig = "$tmpdir/use_config";
 
+    if (defined($config_bisect_good)) {
+        process_config_ignore $config_bisect_good;
+    }
+
     # Make the file with the bad config and the min config
     if (defined($minconfig)) {
         # read the min config for things to ignore
@@ -1727,15 +1970,8 @@ sub config_bisect {
         unlink $tmpconfig;
     }
 
-    # Add other configs
-    if (defined($addconfig)) {
-        run_command "cat $addconfig >> $tmpconfig" or
-            dodie "failed to append $addconfig";
-    }
-
-    my $defconfig = "";
     if (-f $tmpconfig) {
-        $defconfig = "KCONFIG_ALLCONFIG=$tmpconfig";
+        load_force_config($tmpconfig);
         process_config_ignore $tmpconfig;
     }
 
@@ -1755,8 +1991,8 @@ sub config_bisect {
     }
     close(IN);
 
-    # Now run oldconfig with the minconfig (and addconfigs)
-    make_oldconfig $defconfig;
+    # Now run oldconfig with the minconfig
+    make_oldconfig;
 
     # check to see what we lost (or gained)
     open (IN, $output_config)
@@ -1882,6 +2118,13 @@ sub patchcheck {
     @list = reverse @list;
 
     my $save_clean = $noclean;
+    my %ignored_warnings;
+
+    if (defined($ignore_warnings)) {
+        foreach my $sha1 (split /\s+/, $ignore_warnings) {
+            $ignored_warnings{$sha1} = 1;
+        }
+    }
 
     $in_patchcheck = 1;
     foreach my $item (@list) {
@@ -1908,18 +2151,16 @@ sub patchcheck {
             build "oldconfig" or return 0;
         }
 
-        check_buildlog $sha1 or return 0;
 
-        next if ($type eq "build");
+        if (!defined($ignored_warnings{$sha1})) {
+            check_buildlog $sha1 or return 0;
+        }
 
-        get_grub_index;
-        get_version;
-        install;
+        next if ($type eq "build");
 
         my $failed = 0;
 
-        start_monitor;
-        monitor or $failed = 1;
+        start_monitor_and_boot or $failed = 1;
 
         if (!$failed && $type ne "boot"){
             do_run_test or $failed = 1;
@@ -1936,24 +2177,505 @@ sub patchcheck {
     return 1;
 }
 
+my %depends;
+my $iflevel = 0;
+my @ifdeps;
+
+# prevent recursion
+my %read_kconfigs;
+
+# taken from streamline_config.pl
+sub read_kconfig {
+    my ($kconfig) = @_;
+
+    my $state = "NONE";
+    my $config;
+    my @kconfigs;
+
+    my $cont = 0;
+    my $line;
+
+
+    if (! -f $kconfig) {
+        doprint "file $kconfig does not exist, skipping\n";
+        return;
+    }
+
+    open(KIN, "$kconfig")
+        or die "Can't open $kconfig";
+    while (<KIN>) {
+        chomp;
+
+        # Make sure that lines ending with \ continue
+        if ($cont) {
+            $_ = $line . " " . $_;
+        }
+
+        if (s/\\$//) {
+            $cont = 1;
+            $line = $_;
+            next;
+        }
+
+        $cont = 0;
+
+        # collect any Kconfig sources
+        if (/^source\s*"(.*)"/) {
+            $kconfigs[$#kconfigs+1] = $1;
+        }
+
+        # configs found
+        if (/^\s*(menu)?config\s+(\S+)\s*$/) {
+            $state = "NEW";
+            $config = $2;
+
+            for (my $i = 0; $i < $iflevel; $i++) {
+                if ($i) {
+                    $depends{$config} .= " " . $ifdeps[$i];
+                } else {
+                    $depends{$config} = $ifdeps[$i];
+                }
+                $state = "DEP";
+            }
+
+        # collect the depends for the config
+        } elsif ($state eq "NEW" && /^\s*depends\s+on\s+(.*)$/) {
+
+            if (defined($depends{$1})) {
+                $depends{$config} .= " " . $1;
+            } else {
+                $depends{$config} = $1;
+            }
+
+        # Get the configs that select this config
+        } elsif ($state ne "NONE" && /^\s*select\s+(\S+)/) {
+            if (defined($depends{$1})) {
+                $depends{$1} .= " " . $config;
+            } else {
+                $depends{$1} = $config;
+            }
+
+        # Check for if statements
+        } elsif (/^if\s+(.*\S)\s*$/) {
+            my $deps = $1;
+            # remove beginning and ending non text
+            $deps =~ s/^[^a-zA-Z0-9_]*//;
+            $deps =~ s/[^a-zA-Z0-9_]*$//;
+
+            my @deps = split /[^a-zA-Z0-9_]+/, $deps;
+
+            $ifdeps[$iflevel++] = join ':', @deps;
+
+        } elsif (/^endif/) {
+
+            $iflevel-- if ($iflevel);
+
+        # stop on "help"
+        } elsif (/^\s*help\s*$/) {
+            $state = "NONE";
+        }
+    }
+    close(KIN);
+
+    # read in any configs that were found.
+    foreach $kconfig (@kconfigs) {
+        if (!defined($read_kconfigs{$kconfig})) {
+            $read_kconfigs{$kconfig} = 1;
+            read_kconfig("$builddir/$kconfig");
+        }
+    }
+}
+
+sub read_depends {
+    # find out which arch this is by the kconfig file
+    open (IN, $output_config)
+        or dodie "Failed to read $output_config";
+    my $arch;
+    while (<IN>) {
+        if (m,Linux/(\S+)\s+\S+\s+Kernel Configuration,) {
+            $arch = $1;
+            last;
+        }
+    }
+    close IN;
+
+    if (!defined($arch)) {
+        doprint "Could not find arch from config file\n";
+        doprint "no dependencies used\n";
+        return;
+    }
+
+    # arch is really the subarch, we need to know
+    # what directory to look at.
+    if ($arch eq "i386" || $arch eq "x86_64") {
+        $arch = "x86";
+    } elsif ($arch =~ /^tile/) {
+        $arch = "tile";
+    }
+
+    my $kconfig = "$builddir/arch/$arch/Kconfig";
+
+    if (! -f $kconfig && $arch =~ /\d$/) {
+        my $orig = $arch;
+        # some subarchs have numbers, truncate them
+        $arch =~ s/\d*$//;
+        $kconfig = "$builddir/arch/$arch/Kconfig";
+        if (! -f $kconfig) {
+            doprint "No idea what arch dir $orig is for\n";
+            doprint "no dependencies used\n";
+            return;
+        }
+    }
+
+    read_kconfig($kconfig);
+}
+
+sub read_config_list {
+    my ($config) = @_;
+
+    open (IN, $config)
+        or dodie "Failed to read $config";
+
+    while (<IN>) {
+        if (/^((CONFIG\S*)=.*)/) {
+            if (!defined($config_ignore{$2})) {
+                $config_list{$2} = $1;
+            }
+        }
+    }
+
+    close(IN);
+}
+
+sub read_output_config {
+    my ($config) = @_;
+
+    assign_configs \%config_ignore, $config;
+}
+
+sub make_new_config {
+    my @configs = @_;
+
+    open (OUT, ">$output_config")
+        or dodie "Failed to write $output_config";
+
+    foreach my $config (@configs) {
+        print OUT "$config\n";
+    }
+    close OUT;
+}
+
+sub get_depends {
+    my ($dep) = @_;
+
+    my $kconfig = $dep;
+    $kconfig =~ s/CONFIG_//;
+
+    $dep = $depends{"$kconfig"};
+
+    # the dep string we have saves the dependencies as they
+    # were found, including expressions like ! && ||. We
+    # want to split this out into just an array of configs.
+
+    my $valid = "A-Za-z_0-9";
+
+    my @configs;
+
+    while ($dep =~ /[$valid]/) {
+
+        if ($dep =~ /^[^$valid]*([$valid]+)/) {
+            my $conf = "CONFIG_" . $1;
+
+            $configs[$#configs + 1] = $conf;
+
+            $dep =~ s/^[^$valid]*[$valid]+//;
+        } else {
+            die "this should never happen";
+        }
+    }
+
+    return @configs;
+}
+
+my %min_configs;
+my %keep_configs;
+my %save_configs;
+my %processed_configs;
+my %nochange_config;
+
+sub test_this_config {
+    my ($config) = @_;
+
+    my $found;
+
+    # if we already processed this config, skip it
+    if (defined($processed_configs{$config})) {
+        return undef;
+    }
+    $processed_configs{$config} = 1;
+
+    # if this config failed during this round, skip it
+    if (defined($nochange_config{$config})) {
+        return undef;
+    }
+
+    my $kconfig = $config;
+    $kconfig =~ s/CONFIG_//;
+
+    # Test dependencies first
+    if (defined($depends{"$kconfig"})) {
+        my @parents = get_depends $config;
+        foreach my $parent (@parents) {
+            # if the parent is in the min config, check it first
+            next if (!defined($min_configs{$parent}));
+            $found = test_this_config($parent);
+            if (defined($found)) {
+                return $found;
+            }
+        }
+    }
+
+    # Remove this config from the list of configs
+    # do a make oldnoconfig and then read the resulting
+    # .config to make sure it is missing the config that
+    # we had before
+    my %configs = %min_configs;
+    delete $configs{$config};
+    make_new_config ((values %configs), (values %keep_configs));
+    make_oldconfig;
+    undef %configs;
+    assign_configs \%configs, $output_config;
+
+    return $config if (!defined($configs{$config}));
+
+    doprint "disabling config $config did not change .config\n";
+
+    $nochange_config{$config} = 1;
+
+    return undef;
+}
+
+sub make_min_config {
+    my ($i) = @_;
+
+    if (!defined($output_minconfig)) {
+        fail "OUTPUT_MIN_CONFIG not defined" and return;
+    }
+
+    # If output_minconfig exists, and the start_minconfig
+    # came from min_config, than ask if we should use
+    # that instead.
+    if (-f $output_minconfig && !$start_minconfig_defined) {
+        print "$output_minconfig exists\n";
+        if (read_yn " Use it as minconfig?") {
+            $start_minconfig = $output_minconfig;
+        }
+    }
+
+    if (!defined($start_minconfig)) {
+        fail "START_MIN_CONFIG or MIN_CONFIG not defined" and return;
+    }
+
+    my $temp_config = "$tmpdir/temp_config";
+
+    # First things first. We build an allnoconfig to find
+    # out what the defaults are that we can't touch.
+    # Some are selections, but we really can't handle selections.
+
+    my $save_minconfig = $minconfig;
+    undef $minconfig;
+
+    run_command "$make allnoconfig" or return 0;
+
+    read_depends;
+
+    process_config_ignore $output_config;
+
+    undef %save_configs;
+    undef %min_configs;
+
+    if (defined($ignore_config)) {
+        # make sure the file exists
+        `touch $ignore_config`;
+        assign_configs \%save_configs, $ignore_config;
+    }
+
+    %keep_configs = %save_configs;
+
+    doprint "Load initial configs from $start_minconfig\n";
+
+    # Look at the current min configs, and save off all the
+    # ones that were set via the allnoconfig
+    assign_configs \%min_configs, $start_minconfig;
+
+    my @config_keys = keys %min_configs;
+
+    # Remove anything that was set by the make allnoconfig
+    # we shouldn't need them as they get set for us anyway.
+    foreach my $config (@config_keys) {
+        # Remove anything in the ignore_config
+        if (defined($keep_configs{$config})) {
+            my $file = $ignore_config;
+            $file =~ s,.*/(.*?)$,$1,;
+            doprint "$config set by $file ... ignored\n";
+            delete $min_configs{$config};
+            next;
+        }
+        # But make sure the settings are the same. If a min config
+        # sets a selection, we do not want to get rid of it if
+        # it is not the same as what we have. Just move it into
+        # the keep configs.
+        if (defined($config_ignore{$config})) {
+            if ($config_ignore{$config} ne $min_configs{$config}) {
+                doprint "$config is in allnoconfig as '$config_ignore{$config}'";
+                doprint " but it is '$min_configs{$config}' in minconfig .. keeping\n";
+                $keep_configs{$config} = $min_configs{$config};
+            } else {
+                doprint "$config set by allnoconfig ... ignored\n";
+            }
+            delete $min_configs{$config};
+        }
+    }
+
+    my $done = 0;
+    my $take_two = 0;
+
+    while (!$done) {
+
+        my $config;
+        my $found;
+
+        # Now disable each config one by one and do a make oldconfig
+        # till we find a config that changes our list.
+
+        # Put configs that did not modify the config at the end.
+        my @test_configs = keys %min_configs;
+        my $reset = 1;
+        for (my $i = 0; $i < $#test_configs; $i++) {
+            if (!defined($nochange_config{$test_configs[0]})) {
+                $reset = 0;
+                last;
+            }
+            # This config didn't change the .config last time.
+            # Place it at the end
+            my $config = shift @test_configs;
+            push @test_configs, $config;
+        }
+
+        # if every test config has failed to modify the .config file
+        # in the past, then reset and start over.
+        if ($reset) {
+            undef %nochange_config;
+        }
+
+        undef %processed_configs;
+
+        foreach my $config (@test_configs) {
+
+            $found = test_this_config $config;
+
+            last if (defined($found));
+
+            # oh well, try another config
+        }
+
+        if (!defined($found)) {
+            # we could have failed due to the nochange_config hash
+            # reset and try again
+            if (!$take_two) {
+                undef %nochange_config;
+                $take_two = 1;
+                next;
+            }
+            doprint "No more configs found that we can disable\n";
+            $done = 1;
+            last;
+        }
+        $take_two = 0;
+
+        $config = $found;
+
+        doprint "Test with $config disabled\n";
+
+        # set in_bisect to keep build and monitor from dieing
+        $in_bisect = 1;
+
+        my $failed = 0;
+        build "oldconfig";
+        start_monitor_and_boot or $failed = 1;
+        end_monitor;
+
+        $in_bisect = 0;
+
+        if ($failed) {
+            doprint "$min_configs{$config} is needed to boot the box... keeping\n";
+            # this config is needed, add it to the ignore list.
+            $keep_configs{$config} = $min_configs{$config};
+            $save_configs{$config} = $min_configs{$config};
+            delete $min_configs{$config};
+
+            # update new ignore configs
+            if (defined($ignore_config)) {
+                open (OUT, ">$temp_config")
+                    or die "Can't write to $temp_config";
+                foreach my $config (keys %save_configs) {
+                    print OUT "$save_configs{$config}\n";
+                }
+                close OUT;
+                run_command "mv $temp_config $ignore_config" or
+                    dodie "failed to copy update to $ignore_config";
+            }
+
+        } else {
+            # We booted without this config, remove it from the minconfigs.
+            doprint "$config is not needed, disabling\n";
+
+            delete $min_configs{$config};
+
+            # Also disable anything that is not enabled in this config
+            my %configs;
+            assign_configs \%configs, $output_config;
+            my @config_keys = keys %min_configs;
+            foreach my $config (@config_keys) {
+                if (!defined($configs{$config})) {
+                    doprint "$config is not set, disabling\n";
+                    delete $min_configs{$config};
+                }
+            }
+
+            # Save off all the current mandidory configs
+            open (OUT, ">$temp_config")
+                or die "Can't write to $temp_config";
+            foreach my $config (keys %keep_configs) {
+                print OUT "$keep_configs{$config}\n";
+            }
+            foreach my $config (keys %min_configs) {
+                print OUT "$min_configs{$config}\n";
+            }
+            close OUT;
+
+            run_command "mv $temp_config $output_minconfig" or
+                dodie "failed to copy update to $output_minconfig";
+        }
+
+        doprint "Reboot and wait $sleep_time seconds\n";
+        reboot;
+        start_monitor;
+        wait_for_monitor $sleep_time;
+        end_monitor;
+    }
+
+    success $i;
+    return 1;
+}
+
 $#ARGV < 1 or die "ktest.pl version: $VERSION\n   usage: ktest.pl config-file\n";
 
 if ($#ARGV == 0) {
     $ktest_config = $ARGV[0];
     if (! -f $ktest_config) {
         print "$ktest_config does not exist.\n";
-        my $ans;
-        for (;;) {
-            print "Create it? [Y/n] ";
-            $ans = <STDIN>;
-            chomp $ans;
-            if ($ans =~ /^\s*$/) {
-                $ans = "y";
-            }
-            last if ($ans =~ /^y$/i || $ans =~ /^n$/i);
-            print "Please answer either 'y' or 'n'.\n";
-        }
-        if ($ans !~ /^y$/i) {
+        if (!read_yn "Create it?") {
             exit 0;
         }
     }
@@ -1977,6 +2699,10 @@ EOF
 }
 read_config $ktest_config;
 
+if (defined($opt{"LOG_FILE"})) {
+    $opt{"LOG_FILE"} = eval_option($opt{"LOG_FILE"}, -1);
+}
+
 # Append any configs entered in manually to the config file.
 my @new_configs = keys %entered_configs;
 if ($#new_configs >= 0) {
@@ -2045,70 +2771,13 @@ sub __set_test_option {
     return undef;
 }
 
-sub eval_option {
-    my ($option, $i) = @_;
-
-    # Add space to evaluate the character before $
-    $option = " $option";
-    my $retval = "";
-
-    while ($option =~ /(.*?[^\\])\$\{(.*?)\}(.*)/) {
-        my $start = $1;
-        my $var = $2;
-        my $end = $3;
-
-        # Append beginning of line
-        $retval = "$retval$start";
-
-        # If the iteration option OPT[$i] exists, then use that.
-        # otherwise see if the default OPT (without [$i]) exists.
-
-        my $o = "$var\[$i\]";
-
-        if (defined($opt{$o})) {
-            $o = $opt{$o};
-            $retval = "$retval$o";
-        } elsif (defined($opt{$var})) {
-            $o = $opt{$var};
-            $retval = "$retval$o";
-        } else {
-            $retval = "$retval\$\{$var\}";
-        }
-
-        $option = $end;
-    }
-
-    $retval = "$retval$option";
-
-    $retval =~ s/^ //;
-
-    return $retval;
-}
-
 sub set_test_option {
     my ($name, $i) = @_;
 
     my $option = __set_test_option($name, $i);
     return $option if (!defined($option));
 
-    my $prev = "";
-
-    # Since an option can evaluate to another option,
-    # keep iterating until we do not evaluate any more
-    # options.
-    my $r = 0;
-    while ($prev ne $option) {
-        # Check for recursive evaluations.
-        # 100 deep should be more than enough.
-        if ($r++ > 100) {
-            die "Over 100 evaluations accurred with $name\n" .
-                "Check for recursive variables\n";
-        }
-        $prev = $option;
-        $option = eval_option($option, $i);
-    }
-
-    return $option;
+    return eval_option($option, $i);
 }
 
 # First we need to do is the builds
@@ -2126,10 +2795,17 @@ for (my $i = 1; $i <= $opt{"NUM_TESTS"}; $i++) {
     $test_type = set_test_option("TEST_TYPE", $i);
     $build_type = set_test_option("BUILD_TYPE", $i);
     $build_options = set_test_option("BUILD_OPTIONS", $i);
+    $pre_build = set_test_option("PRE_BUILD", $i);
+    $post_build = set_test_option("POST_BUILD", $i);
+    $pre_build_die = set_test_option("PRE_BUILD_DIE", $i);
+    $post_build_die = set_test_option("POST_BUILD_DIE", $i);
     $power_cycle = set_test_option("POWER_CYCLE", $i);
     $reboot = set_test_option("REBOOT", $i);
     $noclean = set_test_option("BUILD_NOCLEAN", $i);
     $minconfig = set_test_option("MIN_CONFIG", $i);
+    $output_minconfig = set_test_option("OUTPUT_MIN_CONFIG", $i);
+    $start_minconfig = set_test_option("START_MIN_CONFIG", $i);
+    $ignore_config = set_test_option("IGNORE_CONFIG", $i);
     $run_test = set_test_option("TEST", $i);
     $addconfig = set_test_option("ADD_CONFIG", $i);
     $reboot_type = set_test_option("REBOOT_TYPE", $i);
@@ -2145,12 +2821,16 @@ for (my $i = 1; $i <= $opt{"NUM_TESTS"}; $i++) {
     $sleep_time = set_test_option("SLEEP_TIME", $i);
     $bisect_sleep_time = set_test_option("BISECT_SLEEP_TIME", $i);
     $patchcheck_sleep_time = set_test_option("PATCHCHECK_SLEEP_TIME", $i);
+    $ignore_warnings = set_test_option("IGNORE_WARNINGS", $i);
     $bisect_manual = set_test_option("BISECT_MANUAL", $i);
     $bisect_skip = set_test_option("BISECT_SKIP", $i);
+    $config_bisect_good = set_test_option("CONFIG_BISECT_GOOD", $i);
     $store_failures = set_test_option("STORE_FAILURES", $i);
+    $test_name = set_test_option("TEST_NAME", $i);
     $timeout = set_test_option("TIMEOUT", $i);
     $booted_timeout = set_test_option("BOOTED_TIMEOUT", $i);
     $console = set_test_option("CONSOLE", $i);
+    $detect_triplefault = set_test_option("DETECT_TRIPLE_FAULT", $i);
     $success_line = set_test_option("SUCCESS_LINE", $i);
     $stop_after_success = set_test_option("STOP_AFTER_SUCCESS", $i);
     $stop_after_failure = set_test_option("STOP_AFTER_FAILURE", $i);
@@ -2161,6 +2841,13 @@ for (my $i = 1; $i <= $opt{"NUM_TESTS"}; $i++) {
     $target_image = set_test_option("TARGET_IMAGE", $i);
     $localversion = set_test_option("LOCALVERSION", $i);
 
+    $start_minconfig_defined = 1;
+
+    if (!defined($start_minconfig)) {
+        $start_minconfig_defined = 0;
+        $start_minconfig = $minconfig;
+    }
+
     chdir $builddir || die "can't change directory to $builddir";
 
     if (!-d $tmpdir) {
@@ -2193,6 +2880,10 @@ for (my $i = 1; $i <= $opt{"NUM_TESTS"}; $i++) {
         $run_type = $opt{"CONFIG_BISECT_TYPE[$i]"};
     }
 
+    if ($test_type eq "make_min_config") {
+        $run_type = "";
+    }
+
     # mistake in config file?
     if (!defined($run_type)) {
         $run_type = "ERROR";
@@ -2204,11 +2895,12 @@ for (my $i = 1; $i <= $opt{"NUM_TESTS"}; $i++) {
     unlink $dmesg;
     unlink $buildlog;
 
-    if (!defined($minconfig)) {
-        $minconfig = $addconfig;
-
-    } elsif (defined($addconfig)) {
-        run_command "cat $addconfig $minconfig > $tmpdir/add_config" or
+    if (defined($addconfig)) {
+        my $min = $minconfig;
+        if (!defined($minconfig)) {
+            $min = "";
+        }
+        run_command "cat $addconfig $min > $tmpdir/add_config" or
             dodie "Failed to create temp config";
         $minconfig = "$tmpdir/add_config";
     }
@@ -2228,6 +2920,9 @@ for (my $i = 1; $i <= $opt{"NUM_TESTS"}; $i++) {
     } elsif ($test_type eq "patchcheck") {
         patchcheck $i;
         next;
+    } elsif ($test_type eq "make_min_config") {
+        make_min_config $i;
+        next;
     }
 
     if ($build_type ne "nobuild") {
@@ -2235,13 +2930,8 @@ for (my $i = 1; $i <= $opt{"NUM_TESTS"}; $i++) {
     }
 
     if ($test_type ne "build") {
-        get_grub_index;
-        get_version;
-        install;
-
         my $failed = 0;
-        start_monitor;
-        monitor or $failed = 1;;
+        start_monitor_and_boot or $failed = 1;
 
         if (!$failed && $test_type ne "boot" && defined($run_test)) {
             do_run_test or $failed = 1;
diff --git a/tools/testing/ktest/sample.conf b/tools/testing/ktest/sample.conf
index 48cbcc80602..b8bcd14b5a4 100644
--- a/tools/testing/ktest/sample.conf
+++ b/tools/testing/ktest/sample.conf
@@ -293,6 +293,38 @@
 # or on some systems:
 #POST_INSTALL = ssh user@target /sbin/dracut -f /boot/initramfs-test.img $KERNEL_VERSION
 
+# If there is a script that you require to run before the build is done
+# you can specify it with PRE_BUILD.
+#
+# One example may be if you must add a temporary patch to the build to
+# fix a unrelated bug to perform a patchcheck test. This will apply the
+# patch before each build that is made. Use the POST_BUILD to do a git reset --hard
+# to remove the patch.
+#
+# (default undef)
+#PRE_BUILD = cd ${BUILD_DIR} && patch -p1 < /tmp/temp.patch
+
+# To specify if the test should fail if the PRE_BUILD fails,
+# PRE_BUILD_DIE needs to be set to 1. Otherwise the PRE_BUILD
+# result is ignored.
+# (default 0)
+# PRE_BUILD_DIE = 1
+
+# If there is a script that should run after the build is done
+# you can specify it with POST_BUILD.
+#
+# As the example in PRE_BUILD, POST_BUILD can be used to reset modifications
+# made by the PRE_BUILD.
+#
+# (default undef)
+#POST_BUILD = cd ${BUILD_DIR} && git reset --hard
+
+# To specify if the test should fail if the POST_BUILD fails,
+# POST_BUILD_DIE needs to be set to 1. Otherwise the POST_BUILD
+# result is ignored.
+# (default 0)
+#POST_BUILD_DIE = 1
+
 # Way to reboot the box to the test kernel.
 # Only valid options so far are "grub" and "script"
 # (default grub)
@@ -360,8 +392,8 @@
 #ADD_CONFIG = /home/test/config-broken
 
 # The location on the host where to write temp files
-# (default /tmp/ktest)
-#TMP_DIR = /tmp/ktest
+# (default /tmp/ktest/${MACHINE})
+#TMP_DIR = /tmp/ktest/${MACHINE}
 
 # Optional log file to write the status (recommended)
 #  Note, this is a DEFAULT section only option.
@@ -518,6 +550,16 @@
 # The variables SSH_USER and MACHINE are defined.
 #REBOOT = ssh $SSH_USER@$MACHINE reboot
 
+# The way triple faults are detected is by testing the kernel
+# banner. If the kernel banner for the kernel we are testing is
+# found, and then later a kernel banner for another kernel version
+# is found, it is considered that we encountered a triple fault,
+# and there is no panic or callback, but simply a reboot.
+# To disable this (because it did a false positive) set the following
+# to 0.
+# (default 1)
+#DETECT_TRIPLE_FAULT = 0
+
 #### Per test run options ####
 # The following options are only allowed in TEST_START sections.
 # They are ignored in the DEFAULTS sections.
@@ -535,6 +577,12 @@
 #  all preceding tests until a new CHECKOUT is set.
 #
 #
+# TEST_NAME = name
+#
+#  If you want the test to have a name that is displayed in
+#  the test result banner at the end of the test, then use this
+#  option. This is useful to search for the RESULT keyword and
+#  not have to translate a test number to a test in the config.
 #
 # For TEST_TYPE = patchcheck
 #
@@ -556,7 +604,12 @@
 #      build, boot, test.
 #
 #   Note, the build test will look for warnings, if a warning occurred
-#     in a file that a commit touches, the build will fail.
+#     in a file that a commit touches, the build will fail, unless
+#     IGNORE_WARNINGS is set for the given commit's sha1
+#
+#   IGNORE_WARNINGS can be used to disable the failure of patchcheck
+#     on a particuler commit (SHA1). You can add more than one commit
+#     by adding a list of SHA1s that are space delimited.
 #
 #   If BUILD_NOCLEAN is set, then make mrproper will not be run on
 #   any of the builds, just like all other TEST_TYPE tests. But
@@ -571,6 +624,7 @@
 #   PATCHCHECK_TYPE = boot
 #   PATCHCHECK_START = 747e94ae3d1b4c9bf5380e569f614eb9040b79e7
 #   PATCHCHECK_END = HEAD~2
+#   IGNORE_WARNINGS = 42f9c6b69b54946ffc0515f57d01dc7f5c0e4712 0c17ca2c7187f431d8ffc79e81addc730f33d128
 #
 #
 #
@@ -739,13 +793,18 @@
 #       boot    - bad builds but fails to boot
 #       test    - bad boots but fails a test
 #
-#   CONFIG_BISECT is the config that failed to boot
+#  CONFIG_BISECT is the config that failed to boot
 #
-#   If BISECT_MANUAL is set, it will pause between iterations.
-#   This is useful to use just ktest.pl just for the config bisect.
-#   If you set it to build, it will run the bisect and you can
-#   control what happens in between iterations. It will ask you if
-#   the test succeeded or not and continue the config bisect.
+#  If BISECT_MANUAL is set, it will pause between iterations.
+#  This is useful to use just ktest.pl just for the config bisect.
+#  If you set it to build, it will run the bisect and you can
+#  control what happens in between iterations. It will ask you if
+#  the test succeeded or not and continue the config bisect.
+#
+# CONFIG_BISECT_GOOD (optional)
+#  If you have a good config to start with, then you
+#  can specify it with CONFIG_BISECT_GOOD. Otherwise
+#  the MIN_CONFIG is the base.
 #
 # Example:
 #   TEST_START
@@ -755,3 +814,68 @@
 #   MIN_CONFIG = /home/test/config-min
 #   BISECT_MANUAL = 1
 #
+#
+#
+# For TEST_TYPE = make_min_config
+#
+#  After doing a make localyesconfig, your kernel configuration may
+#  not be the most useful minimum configuration. Having a true minimum
+#  config that you can use against other configs is very useful if
+#  someone else has a config that breaks on your code. By only forcing
+#  those configurations that are truly required to boot your machine
+#  will give you less of a chance that one of your set configurations
+#  will make the bug go away. This will give you a better chance to
+#  be able to reproduce the reported bug matching the broken config.
+#
+#  Note, this does take some time, and may require you to run the
+#  test over night, or perhaps over the weekend. But it also allows
+#  you to interrupt it, and gives you the current minimum config
+#  that was found till that time.
+#
+#  Note, this test automatically assumes a BUILD_TYPE of oldconfig
+#  and its test type acts like boot.
+#  TODO: add a test version that makes the config do more than just
+#   boot, like having network access.
+#
+#  To save time, the test does not just grab any option and test
+#  it. The Kconfig files are examined to determine the dependencies
+#  of the configs. If a config is chosen that depends on another
+#  config, that config will be checked first. By checking the
+#  parents first, we can eliminate whole groups of configs that
+#  may have been enabled.
+#
+#  For example, if a USB device config is chosen and depends on CONFIG_USB,
+#  the CONFIG_USB will be tested before the device. If CONFIG_USB is
+#  found not to be needed, it, as well as all configs that depend on
+#  it, will be disabled and removed from the current min_config.
+#
+#  OUTPUT_MIN_CONFIG is the path and filename of the file that will
+#   be created from the MIN_CONFIG. If you interrupt the test, set
+#   this file as your new min config, and use it to continue the test.
+#   This file does not need to exist on start of test.
+#   This file is not created until a config is found that can be removed.
+#   If this file exists, you will be prompted if you want to use it
+#   as the min_config (overriding MIN_CONFIG) if START_MIN_CONFIG
+#   is not defined.
+#   (required field)
+#
+#  START_MIN_CONFIG is the config to use to start the test with.
+#   you can set this as the same OUTPUT_MIN_CONFIG, but if you do
+#   the OUTPUT_MIN_CONFIG file must exist.
+#   (default MIN_CONFIG)
+#
+#  IGNORE_CONFIG is used to specify a config file that has configs that
+#   you already know must be set. Configs are written here that have
+#   been tested and proved to be required. It is best to define this
+#   file if you intend on interrupting the test and running it where
+#   it left off. New configs that it finds will be written to this file
+#   and will not be tested again in later runs.
+#   (optional)
+#
+# Example:
+#
+#  TEST_TYPE = make_min_config
+#  OUTPUT_MIN_CONFIG = /path/to/config-new-min
+#  START_MIN_CONFIG = /path/to/config-min
+#  IGNORE_CONFIG = /path/to/config-tested
+#
diff --git a/tools/testing/selftests/mqueue/.gitignore b/tools/testing/selftests/mqueue/.gitignore
new file mode 100644
index 00000000000..d8d42377205
--- /dev/null
+++ b/tools/testing/selftests/mqueue/.gitignore
@@ -0,0 +1,2 @@
+mq_open_tests
+mq_perf_tests
diff --git a/tools/virtio/linux/hrtimer.h b/tools/virtio/linux/hrtimer.h
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/tools/virtio/linux/hrtimer.h
diff --git a/tools/virtio/linux/module.h b/tools/virtio/linux/module.h
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/tools/virtio/linux/module.h