12 files changed, 163 insertions, 48 deletions

diff --git a/tools/lib/lockdep/run_tests.sh b/tools/lib/lockdep/run_tests.sh
index 5334ad9d39b7..1069d96248c1 100755
--- a/tools/lib/lockdep/run_tests.sh
+++ b/tools/lib/lockdep/run_tests.sh
@@ -3,7 +3,7 @@
 make &> /dev/null
 
 for i in `ls tests/*.c`; do
-        testname=$(basename -s .c "$i")
+        testname=$(basename "$i" .c)
         gcc -o tests/$testname -pthread -lpthread $i liblockdep.a -Iinclude -D__USE_LIBLOCKDEP &> /dev/null
         echo -ne "$testname... "
         if [ $(timeout 1 ./tests/$testname | wc -l) -gt 0 ]; then
@@ -11,11 +11,13 @@ for i in `ls tests/*.c`; do
         else
                 echo "FAILED!"
         fi
-        rm tests/$testname
+        if [ -f "tests/$testname" ]; then
+                rm tests/$testname
+        fi
 done
 
 for i in `ls tests/*.c`; do
-        testname=$(basename -s .c "$i")
+        testname=$(basename "$i" .c)
         gcc -o tests/$testname -pthread -lpthread -Iinclude $i &> /dev/null
         echo -ne "(PRELOAD) $testname... "
         if [ $(timeout 1 ./lockdep ./tests/$testname | wc -l) -gt 0 ]; then
@@ -23,5 +25,7 @@ for i in `ls tests/*.c`; do
         else
                 echo "FAILED!"
         fi
-        rm tests/$testname
+        if [ -f "tests/$testname" ]; then
+                rm tests/$testname
+        fi
 done
diff --git a/tools/perf/MANIFEST b/tools/perf/MANIFEST
index 2e1fa2357528..8c8c6b9ce915 100644
--- a/tools/perf/MANIFEST
+++ b/tools/perf/MANIFEST
@@ -74,6 +74,7 @@ arch/*/include/uapi/asm/unistd*.h
 arch/*/include/uapi/asm/perf_regs.h
 arch/*/lib/memcpy*.S
 arch/*/lib/memset*.S
+arch/*/include/asm/*features.h
 include/linux/poison.h
 include/linux/hw_breakpoint.h
 include/uapi/linux/perf_event.h
diff --git a/tools/perf/arch/powerpc/util/header.c b/tools/perf/arch/powerpc/util/header.c
index 6138bdef6e63..f8ccee132867 100644
--- a/tools/perf/arch/powerpc/util/header.c
+++ b/tools/perf/arch/powerpc/util/header.c
@@ -4,6 +4,8 @@
 #include <stdlib.h>
 #include <string.h>
 #include <linux/stringify.h>
+#include "header.h"
+#include "util.h"
 
 #define mfspr(rn)       ({unsigned long rval; \
                          asm volatile("mfspr %0," __stringify(rn) \
diff --git a/tools/perf/tests/perf-targz-src-pkg b/tools/perf/tests/perf-targz-src-pkg
index 238aa3927c71..f2d9c5fe58e0 100755
--- a/tools/perf/tests/perf-targz-src-pkg
+++ b/tools/perf/tests/perf-targz-src-pkg
@@ -15,7 +15,7 @@ TMP_DEST=$(mktemp -d)
 tar xf ${TARBALL} -C $TMP_DEST
 rm -f ${TARBALL}
 cd - > /dev/null
-make -C $TMP_DEST/perf*/tools/perf > /dev/null 2>&1
+make -C $TMP_DEST/perf*/tools/perf > /dev/null
 RC=$?
 rm -rf ${TMP_DEST}
 exit $RC
diff --git a/tools/perf/ui/browsers/hists.c b/tools/perf/ui/browsers/hists.c
index 4b9816555946..2a83414159a6 100644
--- a/tools/perf/ui/browsers/hists.c
+++ b/tools/perf/ui/browsers/hists.c
@@ -337,7 +337,7 @@ static void callchain_node__init_have_children(struct callchain_node *node,
         chain = list_entry(node->val.next, struct callchain_list, list);
         chain->has_children = has_sibling;
 
-        if (node->val.next != node->val.prev) {
+        if (!list_empty(&node->val)) {
                 chain = list_entry(node->val.prev, struct callchain_list, list);
                 chain->has_children = !RB_EMPTY_ROOT(&node->rb_root);
         }
diff --git a/tools/perf/util/event.c b/tools/perf/util/event.c
index 52cf479bc593..dad55d04ffdd 100644
--- a/tools/perf/util/event.c
+++ b/tools/perf/util/event.c
@@ -56,13 +56,22 @@ const char *perf_event__name(unsigned int id)
         return perf_event__names[id];
 }
 
-static struct perf_sample synth_sample = {
+static int perf_tool__process_synth_event(struct perf_tool *tool,
+                                          union perf_event *event,
+                                          struct machine *machine,
+                                          perf_event__handler_t process)
+{
+        struct perf_sample synth_sample = {
         .pid       = -1,
         .tid       = -1,
         .time      = -1,
         .stream_id = -1,
         .cpu       = -1,
         .period    = 1,
+        .cpumode   = event->header.misc & PERF_RECORD_MISC_CPUMODE_MASK,
+        };
+
+        return process(tool, event, &synth_sample, machine);
 };
 
 /*
@@ -186,7 +195,7 @@ pid_t perf_event__synthesize_comm(struct perf_tool *tool,
         if (perf_event__prepare_comm(event, pid, machine, &tgid, &ppid) != 0)
                 return -1;
 
-        if (process(tool, event, &synth_sample, machine) != 0)
+        if (perf_tool__process_synth_event(tool, event, machine, process) != 0)
                 return -1;
 
         return tgid;
@@ -218,7 +227,7 @@ static int perf_event__synthesize_fork(struct perf_tool *tool,
 
         event->fork.header.size = (sizeof(event->fork) + machine->id_hdr_size);
 
-        if (process(tool, event, &synth_sample, machine) != 0)
+        if (perf_tool__process_synth_event(tool, event, machine, process) != 0)
                 return -1;
 
         return 0;
@@ -344,7 +353,7 @@ out:
                 event->mmap2.pid = tgid;
                 event->mmap2.tid = pid;
 
-                if (process(tool, event, &synth_sample, machine) != 0) {
+                if (perf_tool__process_synth_event(tool, event, machine, process) != 0) {
                         rc = -1;
                         break;
                 }
@@ -402,7 +411,7 @@ int perf_event__synthesize_modules(struct perf_tool *tool,
 
                 memcpy(event->mmap.filename, pos->dso->long_name,
                        pos->dso->long_name_len + 1);
-                if (process(tool, event, &synth_sample, machine) != 0) {
+                if (perf_tool__process_synth_event(tool, event, machine, process) != 0) {
                         rc = -1;
                         break;
                 }
@@ -472,7 +481,7 @@ static int __event__synthesize_thread(union perf_event *comm_event,
                 /*
                  * Send the prepared comm event
                  */
-                if (process(tool, comm_event, &synth_sample, machine) != 0)
+                if (perf_tool__process_synth_event(tool, comm_event, machine, process) != 0)
                         break;
 
                 rc = 0;
@@ -701,7 +710,7 @@ int perf_event__synthesize_kernel_mmap(struct perf_tool *tool,
         event->mmap.len   = map->end - event->mmap.start;
         event->mmap.pid   = machine->pid;
 
-        err = process(tool, event, &synth_sample, machine);
+        err = perf_tool__process_synth_event(tool, event, machine, process);
         free(event);
 
         return err;
diff --git a/tools/perf/util/genelf.h b/tools/perf/util/genelf.h
index cd67e64a0494..2fbeb59c4bdd 100644
--- a/tools/perf/util/genelf.h
+++ b/tools/perf/util/genelf.h
@@ -9,36 +9,32 @@ int jit_add_debug_info(Elf *e, uint64_t code_addr, void *debug, int nr_debug_ent
 
 #if   defined(__arm__)
 #define GEN_ELF_ARCH    EM_ARM
-#define GEN_ELF_ENDIAN  ELFDATA2LSB
 #define GEN_ELF_CLASS   ELFCLASS32
 #elif defined(__aarch64__)
 #define GEN_ELF_ARCH    EM_AARCH64
-#define GEN_ELF_ENDIAN  ELFDATA2LSB
 #define GEN_ELF_CLASS   ELFCLASS64
 #elif defined(__x86_64__)
 #define GEN_ELF_ARCH    EM_X86_64
-#define GEN_ELF_ENDIAN  ELFDATA2LSB
 #define GEN_ELF_CLASS   ELFCLASS64
 #elif defined(__i386__)
 #define GEN_ELF_ARCH    EM_386
-#define GEN_ELF_ENDIAN  ELFDATA2LSB
 #define GEN_ELF_CLASS   ELFCLASS32
-#elif defined(__ppcle__)
-#define GEN_ELF_ARCH    EM_PPC
-#define GEN_ELF_ENDIAN  ELFDATA2LSB
-#define GEN_ELF_CLASS   ELFCLASS64
-#elif defined(__powerpc__)
-#define GEN_ELF_ARCH    EM_PPC64
-#define GEN_ELF_ENDIAN  ELFDATA2MSB
-#define GEN_ELF_CLASS   ELFCLASS64
-#elif defined(__powerpcle__)
+#elif defined(__powerpc64__)
 #define GEN_ELF_ARCH    EM_PPC64
-#define GEN_ELF_ENDIAN  ELFDATA2LSB
 #define GEN_ELF_CLASS   ELFCLASS64
+#elif defined(__powerpc__)
+#define GEN_ELF_ARCH    EM_PPC
+#define GEN_ELF_CLASS   ELFCLASS32
 #else
 #error "unsupported architecture"
 #endif
 
+#if __BYTE_ORDER == __BIG_ENDIAN
+#define GEN_ELF_ENDIAN  ELFDATA2MSB
+#else
+#define GEN_ELF_ENDIAN  ELFDATA2LSB
+#endif
+
 #if GEN_ELF_CLASS == ELFCLASS64
 #define elf_newehdr     elf64_newehdr
 #define elf_getshdr     elf64_getshdr
diff --git a/tools/perf/util/intel-bts.c b/tools/perf/util/intel-bts.c
index 6bc3ecd2e7ca..abf1366e2a24 100644
--- a/tools/perf/util/intel-bts.c
+++ b/tools/perf/util/intel-bts.c
@@ -279,6 +279,7 @@ static int intel_bts_synth_branch_sample(struct intel_bts_queue *btsq,
         event.sample.header.misc = PERF_RECORD_MISC_USER;
         event.sample.header.size = sizeof(struct perf_event_header);
 
+        sample.cpumode = PERF_RECORD_MISC_USER;
         sample.ip = le64_to_cpu(branch->from);
         sample.pid = btsq->pid;
         sample.tid = btsq->tid;
diff --git a/tools/perf/util/intel-pt.c b/tools/perf/util/intel-pt.c
index 05d815851be1..407f11b97c8d 100644
--- a/tools/perf/util/intel-pt.c
+++ b/tools/perf/util/intel-pt.c
@@ -979,6 +979,7 @@ static int intel_pt_synth_branch_sample(struct intel_pt_queue *ptq)
         if (!pt->timeless_decoding)
                 sample.time = tsc_to_perf_time(ptq->timestamp, &pt->tc);
 
+        sample.cpumode = PERF_RECORD_MISC_USER;
         sample.ip = ptq->state->from_ip;
         sample.pid = ptq->pid;
         sample.tid = ptq->tid;
@@ -1035,6 +1036,7 @@ static int intel_pt_synth_instruction_sample(struct intel_pt_queue *ptq)
         if (!pt->timeless_decoding)
                 sample.time = tsc_to_perf_time(ptq->timestamp, &pt->tc);
 
+        sample.cpumode = PERF_RECORD_MISC_USER;
         sample.ip = ptq->state->from_ip;
         sample.pid = ptq->pid;
         sample.tid = ptq->tid;
@@ -1092,6 +1094,7 @@ static int intel_pt_synth_transaction_sample(struct intel_pt_queue *ptq)
         if (!pt->timeless_decoding)
                 sample.time = tsc_to_perf_time(ptq->timestamp, &pt->tc);
 
+        sample.cpumode = PERF_RECORD_MISC_USER;
         sample.ip = ptq->state->from_ip;
         sample.pid = ptq->pid;
         sample.tid = ptq->tid;
diff --git a/tools/perf/util/jitdump.c b/tools/perf/util/jitdump.c
index cd272cc21e05..ad0c0bb1fbc7 100644
--- a/tools/perf/util/jitdump.c
+++ b/tools/perf/util/jitdump.c
@@ -417,6 +417,7 @@ static int jit_repipe_code_load(struct jit_buf_desc *jd, union jr_entry *jr)
          * use first address as sample address
          */
         memset(&sample, 0, sizeof(sample));
+        sample.cpumode = PERF_RECORD_MISC_USER;
         sample.pid  = pid;
         sample.tid  = tid;
         sample.time = id->time;
@@ -505,6 +506,7 @@ static int jit_repipe_code_move(struct jit_buf_desc *jd, union jr_entry *jr)
          * use first address as sample address
          */
         memset(&sample, 0, sizeof(sample));
+        sample.cpumode = PERF_RECORD_MISC_USER;
         sample.pid  = pid;
         sample.tid  = tid;
         sample.time = id->time;
diff --git a/tools/power/x86/turbostat/turbostat.c b/tools/power/x86/turbostat/turbostat.c
index 20a257a12ea5..acbf7ff2ee6e 100644
--- a/tools/power/x86/turbostat/turbostat.c
+++ b/tools/power/x86/turbostat/turbostat.c
@@ -66,6 +66,8 @@ unsigned int do_slm_cstates;
 unsigned int use_c1_residency_msr;
 unsigned int has_aperf;
 unsigned int has_epb;
+unsigned int do_irtl_snb;
+unsigned int do_irtl_hsw;
 unsigned int units = 1000000;   /* MHz etc */
 unsigned int genuine_intel;
 unsigned int has_invariant_tsc;
@@ -187,7 +189,7 @@ struct pkg_data {
         unsigned long long pkg_any_core_c0;
         unsigned long long pkg_any_gfxe_c0;
         unsigned long long pkg_both_core_gfxe_c0;
-        unsigned long long gfx_rc6_ms;
+        long long gfx_rc6_ms;
         unsigned int gfx_mhz;
         unsigned int package_id;
         unsigned int energy_pkg;        /* MSR_PKG_ENERGY_STATUS */
@@ -621,8 +623,14 @@ int format_counters(struct thread_data *t, struct core_data *c,
                 outp += sprintf(outp, "%8d", p->pkg_temp_c);
 
         /* GFXrc6 */
-        if (do_gfx_rc6_ms)
-                outp += sprintf(outp, "%8.2f", 100.0 * p->gfx_rc6_ms / 1000.0 / interval_float);
+        if (do_gfx_rc6_ms) {
+                if (p->gfx_rc6_ms == -1) {      /* detect counter reset */
+                        outp += sprintf(outp, "  ***.**");
+                } else {
+                        outp += sprintf(outp, "%8.2f",
+                                p->gfx_rc6_ms / 10.0 / interval_float);
+                }
+        }
 
         /* GFXMHz */
         if (do_gfx_mhz)
@@ -766,7 +774,12 @@ delta_package(struct pkg_data *new, struct pkg_data *old)
         old->pc10 = new->pc10 - old->pc10;
         old->pkg_temp_c = new->pkg_temp_c;
 
-        old->gfx_rc6_ms = new->gfx_rc6_ms - old->gfx_rc6_ms;
+        /* flag an error when rc6 counter resets/wraps */
+        if (old->gfx_rc6_ms >  new->gfx_rc6_ms)
+                old->gfx_rc6_ms = -1;
+        else
+                old->gfx_rc6_ms = new->gfx_rc6_ms - old->gfx_rc6_ms;
+
         old->gfx_mhz = new->gfx_mhz;
 
         DELTA_WRAP32(new->energy_pkg, old->energy_pkg);
@@ -1296,6 +1309,7 @@ int hsw_pkg_cstate_limits[16] = {PCL__0, PCL__2, PCL__3, PCL__6, PCL__7, PCL_7S,
 int slv_pkg_cstate_limits[16] = {PCL__0, PCL__1, PCLRSV, PCLRSV, PCL__4, PCLRSV, PCL__6, PCL__7, PCLRSV, PCLRSV, PCLRSV, PCLRSV, PCLRSV, PCLRSV, PCLRSV, PCLRSV};
 int amt_pkg_cstate_limits[16] = {PCL__0, PCL__1, PCL__2, PCLRSV, PCLRSV, PCLRSV, PCL__6, PCL__7, PCLRSV, PCLRSV, PCLRSV, PCLRSV, PCLRSV, PCLRSV, PCLRSV, PCLRSV};
 int phi_pkg_cstate_limits[16] = {PCL__0, PCL__2, PCL_6N, PCL_6R, PCLRSV, PCLRSV, PCLRSV, PCLUNL, PCLRSV, PCLRSV, PCLRSV, PCLRSV, PCLRSV, PCLRSV, PCLRSV, PCLRSV};
+int bxt_pkg_cstate_limits[16] = {PCL__0, PCL__2, PCLUNL, PCLRSV, PCLRSV, PCLRSV, PCLRSV, PCLRSV, PCLRSV, PCLRSV, PCLRSV, PCLRSV, PCLRSV, PCLRSV, PCLRSV, PCLRSV};
 
 
 static void
@@ -1579,6 +1593,47 @@ dump_config_tdp(void)
         fprintf(outf, " lock=%d", (unsigned int)(msr >> 31) & 1);
         fprintf(outf, ")\n");
 }
+
+unsigned int irtl_time_units[] = {1, 32, 1024, 32768, 1048576, 33554432, 0, 0 };
+
+void print_irtl(void)
+{
+        unsigned long long msr;
+
+        get_msr(base_cpu, MSR_PKGC3_IRTL, &msr);
+        fprintf(outf, "cpu%d: MSR_PKGC3_IRTL: 0x%08llx (", base_cpu, msr);
+        fprintf(outf, "%svalid, %lld ns)\n", msr & (1 << 15) ? "" : "NOT",
+                (msr & 0x3FF) * irtl_time_units[(msr >> 10) & 0x3]);
+
+        get_msr(base_cpu, MSR_PKGC6_IRTL, &msr);
+        fprintf(outf, "cpu%d: MSR_PKGC6_IRTL: 0x%08llx (", base_cpu, msr);
+        fprintf(outf, "%svalid, %lld ns)\n", msr & (1 << 15) ? "" : "NOT",
+                (msr & 0x3FF) * irtl_time_units[(msr >> 10) & 0x3]);
+
+        get_msr(base_cpu, MSR_PKGC7_IRTL, &msr);
+        fprintf(outf, "cpu%d: MSR_PKGC7_IRTL: 0x%08llx (", base_cpu, msr);
+        fprintf(outf, "%svalid, %lld ns)\n", msr & (1 << 15) ? "" : "NOT",
+                (msr & 0x3FF) * irtl_time_units[(msr >> 10) & 0x3]);
+
+        if (!do_irtl_hsw)
+                return;
+
+        get_msr(base_cpu, MSR_PKGC8_IRTL, &msr);
+        fprintf(outf, "cpu%d: MSR_PKGC8_IRTL: 0x%08llx (", base_cpu, msr);
+        fprintf(outf, "%svalid, %lld ns)\n", msr & (1 << 15) ? "" : "NOT",
+                (msr & 0x3FF) * irtl_time_units[(msr >> 10) & 0x3]);
+
+        get_msr(base_cpu, MSR_PKGC9_IRTL, &msr);
+        fprintf(outf, "cpu%d: MSR_PKGC9_IRTL: 0x%08llx (", base_cpu, msr);
+        fprintf(outf, "%svalid, %lld ns)\n", msr & (1 << 15) ? "" : "NOT",
+                (msr & 0x3FF) * irtl_time_units[(msr >> 10) & 0x3]);
+
+        get_msr(base_cpu, MSR_PKGC10_IRTL, &msr);
+        fprintf(outf, "cpu%d: MSR_PKGC10_IRTL: 0x%08llx (", base_cpu, msr);
+        fprintf(outf, "%svalid, %lld ns)\n", msr & (1 << 15) ? "" : "NOT",
+                (msr & 0x3FF) * irtl_time_units[(msr >> 10) & 0x3]);
+
+}
 void free_fd_percpu(void)
 {
         int i;
@@ -2144,6 +2199,9 @@ int probe_nhm_msrs(unsigned int family, unsigned int model)
         case 0x56:      /* BDX-DE */
         case 0x4E:      /* SKL */
         case 0x5E:      /* SKL */
+        case 0x8E:      /* KBL */
+        case 0x9E:      /* KBL */
+        case 0x55:      /* SKX */
                 pkg_cstate_limits = hsw_pkg_cstate_limits;
                 break;
         case 0x37:      /* BYT */
@@ -2156,6 +2214,9 @@ int probe_nhm_msrs(unsigned int family, unsigned int model)
         case 0x57:      /* PHI */
                 pkg_cstate_limits = phi_pkg_cstate_limits;
                 break;
+        case 0x5C:      /* BXT */
+                pkg_cstate_limits = bxt_pkg_cstate_limits;
+                break;
         default:
                 return 0;
         }
@@ -2248,6 +2309,9 @@ int has_config_tdp(unsigned int family, unsigned int model)
         case 0x56:      /* BDX-DE */
         case 0x4E:      /* SKL */
         case 0x5E:      /* SKL */
+        case 0x8E:      /* KBL */
+        case 0x9E:      /* KBL */
+        case 0x55:      /* SKX */
 
         case 0x57:      /* Knights Landing */
                 return 1;
@@ -2585,13 +2649,19 @@ void rapl_probe(unsigned int family, unsigned int model)
         case 0x47:      /* BDW */
                 do_rapl = RAPL_PKG | RAPL_CORES | RAPL_CORE_POLICY | RAPL_GFX | RAPL_PKG_POWER_INFO;
                 break;
+        case 0x5C:      /* BXT */
+                do_rapl = RAPL_PKG | RAPL_PKG_POWER_INFO;
+                break;
         case 0x4E:      /* SKL */
         case 0x5E:      /* SKL */
+        case 0x8E:      /* KBL */
+        case 0x9E:      /* KBL */
                 do_rapl = RAPL_PKG | RAPL_DRAM | RAPL_DRAM_PERF_STATUS | RAPL_PKG_PERF_STATUS | RAPL_PKG_POWER_INFO;
                 break;
         case 0x3F:      /* HSX */
         case 0x4F:      /* BDX */
         case 0x56:      /* BDX-DE */
+        case 0x55:      /* SKX */
         case 0x57:      /* KNL */
                 do_rapl = RAPL_PKG | RAPL_DRAM | RAPL_DRAM_POWER_INFO | RAPL_DRAM_PERF_STATUS | RAPL_PKG_PERF_STATUS | RAPL_PKG_POWER_INFO;
                 break;
@@ -2871,6 +2941,10 @@ int has_snb_msrs(unsigned int family, unsigned int model)
         case 0x56:      /* BDX-DE */
         case 0x4E:      /* SKL */
         case 0x5E:      /* SKL */
+        case 0x8E:      /* KBL */
+        case 0x9E:      /* KBL */
+        case 0x55:      /* SKX */
+        case 0x5C:      /* BXT */
                 return 1;
         }
         return 0;
@@ -2879,9 +2953,14 @@ int has_snb_msrs(unsigned int family, unsigned int model)
 /*
  * HSW adds support for additional MSRs:
  *
- * MSR_PKG_C8_RESIDENCY            0x00000630
- * MSR_PKG_C9_RESIDENCY            0x00000631
- * MSR_PKG_C10_RESIDENCY           0x00000632
+ * MSR_PKG_C8_RESIDENCY         0x00000630
+ * MSR_PKG_C9_RESIDENCY         0x00000631
+ * MSR_PKG_C10_RESIDENCY        0x00000632
+ *
+ * MSR_PKGC8_IRTL               0x00000633
+ * MSR_PKGC9_IRTL               0x00000634
+ * MSR_PKGC10_IRTL              0x00000635
+ *
  */
 int has_hsw_msrs(unsigned int family, unsigned int model)
 {
@@ -2893,6 +2972,9 @@ int has_hsw_msrs(unsigned int family, unsigned int model)
         case 0x3D:      /* BDW */
         case 0x4E:      /* SKL */
         case 0x5E:      /* SKL */
+        case 0x8E:      /* KBL */
+        case 0x9E:      /* KBL */
+        case 0x5C:      /* BXT */
                 return 1;
         }
         return 0;
@@ -2914,6 +2996,8 @@ int has_skl_msrs(unsigned int family, unsigned int model)
         switch (model) {
         case 0x4E:      /* SKL */
         case 0x5E:      /* SKL */
+        case 0x8E:      /* KBL */
+        case 0x9E:      /* KBL */
                 return 1;
         }
         return 0;
@@ -3187,7 +3271,7 @@ void process_cpuid()
         if (debug)
                 decode_misc_enable_msr();
 
-        if (max_level >= 0x7) {
+        if (max_level >= 0x7 && debug) {
                 int has_sgx;
 
                 ecx = 0;
@@ -3221,7 +3305,15 @@ void process_cpuid()
                                 switch(model) {
                                 case 0x4E:      /* SKL */
                                 case 0x5E:      /* SKL */
-                                        crystal_hz = 24000000;  /* 24 MHz */
+                                case 0x8E:      /* KBL */
+                                case 0x9E:      /* KBL */
+                                        crystal_hz = 24000000;  /* 24.0 MHz */
+                                        break;
+                                case 0x55:      /* SKX */
+                                        crystal_hz = 25000000;  /* 25.0 MHz */
+                                        break;
+                                case 0x5C:      /* BXT */
+                                        crystal_hz = 19200000;  /* 19.2 MHz */
                                         break;
                                 default:
                                         crystal_hz = 0;
@@ -3254,11 +3346,13 @@ void process_cpuid()
 
         do_nhm_platform_info = do_nhm_cstates = do_smi = probe_nhm_msrs(family, model);
         do_snb_cstates = has_snb_msrs(family, model);
+        do_irtl_snb = has_snb_msrs(family, model);
         do_pc2 = do_snb_cstates && (pkg_cstate_limit >= PCL__2);
         do_pc3 = (pkg_cstate_limit >= PCL__3);
         do_pc6 = (pkg_cstate_limit >= PCL__6);
         do_pc7 = do_snb_cstates && (pkg_cstate_limit >= PCL__7);
         do_c8_c9_c10 = has_hsw_msrs(family, model);
+        do_irtl_hsw = has_hsw_msrs(family, model);
         do_skl_residency = has_skl_msrs(family, model);
         do_slm_cstates = is_slm(family, model);
         do_knl_cstates  = is_knl(family, model);
@@ -3564,6 +3658,9 @@ void turbostat_init()
 
         if (debug)
                 for_all_cpus(print_thermal, ODD_COUNTERS);
+
+        if (debug && do_irtl_snb)
+                print_irtl();
 }
 
 int fork_it(char **argv)
@@ -3629,7 +3726,7 @@ int get_and_dump_counters(void)
 }
 
 void print_version() {
-        fprintf(outf, "turbostat version 4.11 27 Feb 2016"
+        fprintf(outf, "turbostat version 4.12 5 Apr 2016"
                 " - Len Brown <lenb@kernel.org>\n");
 }
 
diff --git a/tools/testing/selftests/seccomp/seccomp_bpf.c b/tools/testing/selftests/seccomp/seccomp_bpf.c
index b9453b838162..150829dd7998 100644
--- a/tools/testing/selftests/seccomp/seccomp_bpf.c
+++ b/tools/testing/selftests/seccomp/seccomp_bpf.c
@@ -1497,15 +1497,15 @@ TEST_F(TRACE_syscall, syscall_dropped)
 #define SECCOMP_SET_MODE_FILTER 1
 #endif
 
-#ifndef SECCOMP_FLAG_FILTER_TSYNC
-#define SECCOMP_FLAG_FILTER_TSYNC 1
+#ifndef SECCOMP_FILTER_FLAG_TSYNC
+#define SECCOMP_FILTER_FLAG_TSYNC 1
 #endif
 
 #ifndef seccomp
-int seccomp(unsigned int op, unsigned int flags, struct sock_fprog *filter)
+int seccomp(unsigned int op, unsigned int flags, void *args)
 {
         errno = 0;
-        return syscall(__NR_seccomp, op, flags, filter);
+        return syscall(__NR_seccomp, op, flags, args);
 }
 #endif
 
@@ -1613,7 +1613,7 @@ TEST(TSYNC_first)
                 TH_LOG("Kernel does not support PR_SET_NO_NEW_PRIVS!");
         }
 
-        ret = seccomp(SECCOMP_SET_MODE_FILTER, SECCOMP_FLAG_FILTER_TSYNC,
+        ret = seccomp(SECCOMP_SET_MODE_FILTER, SECCOMP_FILTER_FLAG_TSYNC,
                       &prog);
         ASSERT_NE(ENOSYS, errno) {
                 TH_LOG("Kernel does not support seccomp syscall!");
@@ -1831,7 +1831,7 @@ TEST_F(TSYNC, two_siblings_with_ancestor)
                 self->sibling_count++;
         }
 
-        ret = seccomp(SECCOMP_SET_MODE_FILTER, SECCOMP_FLAG_FILTER_TSYNC,
+        ret = seccomp(SECCOMP_SET_MODE_FILTER, SECCOMP_FILTER_FLAG_TSYNC,
                       &self->apply_prog);
         ASSERT_EQ(0, ret) {
                 TH_LOG("Could install filter on all threads!");
@@ -1892,7 +1892,7 @@ TEST_F(TSYNC, two_siblings_with_no_filter)
                 TH_LOG("Kernel does not support PR_SET_NO_NEW_PRIVS!");
         }
 
-        ret = seccomp(SECCOMP_SET_MODE_FILTER, SECCOMP_FLAG_FILTER_TSYNC,
+        ret = seccomp(SECCOMP_SET_MODE_FILTER, SECCOMP_FILTER_FLAG_TSYNC,
                       &self->apply_prog);
         ASSERT_NE(ENOSYS, errno) {
                 TH_LOG("Kernel does not support seccomp syscall!");
@@ -1940,7 +1940,7 @@ TEST_F(TSYNC, two_siblings_with_one_divergence)
                 self->sibling_count++;
         }
 
-        ret = seccomp(SECCOMP_SET_MODE_FILTER, SECCOMP_FLAG_FILTER_TSYNC,
+        ret = seccomp(SECCOMP_SET_MODE_FILTER, SECCOMP_FILTER_FLAG_TSYNC,
                       &self->apply_prog);
         ASSERT_EQ(self->sibling[0].system_tid, ret) {
                 TH_LOG("Did not fail on diverged sibling.");
@@ -1992,7 +1992,7 @@ TEST_F(TSYNC, two_siblings_not_under_filter)
                 TH_LOG("Kernel does not support SECCOMP_SET_MODE_FILTER!");
         }
 
-        ret = seccomp(SECCOMP_SET_MODE_FILTER, SECCOMP_FLAG_FILTER_TSYNC,
+        ret = seccomp(SECCOMP_SET_MODE_FILTER, SECCOMP_FILTER_FLAG_TSYNC,
                       &self->apply_prog);
         ASSERT_EQ(ret, self->sibling[0].system_tid) {
                 TH_LOG("Did not fail on diverged sibling.");
@@ -2021,7 +2021,7 @@ TEST_F(TSYNC, two_siblings_not_under_filter)
         /* Switch to the remaining sibling */
         sib = !sib;
 
-        ret = seccomp(SECCOMP_SET_MODE_FILTER, SECCOMP_FLAG_FILTER_TSYNC,
+        ret = seccomp(SECCOMP_SET_MODE_FILTER, SECCOMP_FILTER_FLAG_TSYNC,
                       &self->apply_prog);
         ASSERT_EQ(0, ret) {
                 TH_LOG("Expected the remaining sibling to sync");
@@ -2044,7 +2044,7 @@ TEST_F(TSYNC, two_siblings_not_under_filter)
         while (!kill(self->sibling[sib].system_tid, 0))
                 sleep(0.1);
 
-        ret = seccomp(SECCOMP_SET_MODE_FILTER, SECCOMP_FLAG_FILTER_TSYNC,
+        ret = seccomp(SECCOMP_SET_MODE_FILTER, SECCOMP_FILTER_FLAG_TSYNC,
                       &self->apply_prog);
         ASSERT_EQ(0, ret);  /* just us chickens */
 }