Merge branch 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull perf updates from Ingo Molnar:
 "The main updates in this cycle were:

   - Lots of perf tooling changes too voluminous to list (big perf trace
     and perf stat improvements, lots of libtraceevent reorganization,
     etc.), so I'll list the authors and refer to the changelog for
     details:

       Benjamin Peterson, Jérémie Galarneau, Kim Phillips, Peter
       Zijlstra, Ravi Bangoria, Sangwon Hong, Sean V Kelley, Steven
       Rostedt, Thomas Gleixner, Ding Xiang, Eduardo Habkost, Thomas
       Richter, Andi Kleen, Sanskriti Sharma, Adrian Hunter, Tzvetomir
       Stoyanov, Arnaldo Carvalho de Melo, Jiri Olsa.

     ... with the bulk of the changes written by Jiri Olsa, Tzvetomir
     Stoyanov and Arnaldo Carvalho de Melo.

   - Continued intel_rdt work with a focus on playing well with perf
     events. This also imported some non-perf RDT work due to
     dependencies. (Reinette Chatre)

   - Implement counter freezing for Arch Perfmon v4 (Skylake and newer).
     This allows to speed up the PMI handler by avoiding unnecessary MSR
     writes and make it more accurate. (Andi Kleen)

   - kprobes cleanups and simplification (Masami Hiramatsu)

   - Intel Goldmont PMU updates (Kan Liang)

   - ... plus misc other fixes and updates"

* 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (155 commits)
  kprobes/x86: Use preempt_enable() in optimized_callback()
  x86/intel_rdt: Prevent pseudo-locking from using stale pointers
  kprobes, x86/ptrace.h: Make regs_get_kernel_stack_nth() not fault on bad stack
  perf/x86/intel: Export mem events only if there's PEBS support
  x86/cpu: Drop pointless static qualifier in punit_dev_state_show()
  x86/intel_rdt: Fix initial allocation to consider CDP
  x86/intel_rdt: CBM overlap should also check for overlap with CDP peer
  x86/intel_rdt: Introduce utility to obtain CDP peer
  tools lib traceevent, perf tools: Move struct tep_handler definition in a local header file
  tools lib traceevent: Separate out tep_strerror() for strerror_r() issues
  perf python: More portable way to make CFLAGS work with clang
  perf python: Make clang_has_option() work on Python 3
  perf tools: Free temporary 'sys' string in read_event_files()
  perf tools: Avoid double free in read_event_file()
  perf tools: Free 'printk' string in parse_ftrace_printk()
  perf tools: Cleanup trace-event-info 'tdata' leak
  perf strbuf: Match va_{add,copy} with va_end
  perf test: S390 does not support watchpoints in test 22
  perf auxtrace: Include missing asm/bitsperlong.h to get BITS_PER_LONG
  tools include: Adopt linux/bits.h
  ...

13 files changed, 28 insertions, 28 deletions

diff --git a/drivers/acpi/acpi_lpss.c b/drivers/acpi/acpi_lpss.c
index 10adb8cb3a3f..b9bda06d344d 100644
--- a/drivers/acpi/acpi_lpss.c
+++ b/drivers/acpi/acpi_lpss.c
@@ -314,7 +314,7 @@ static const struct lpss_device_desc bsw_spi_dev_desc = {
 #define ICPU(model)     { X86_VENDOR_INTEL, 6, model, X86_FEATURE_ANY, }
 
 static const struct x86_cpu_id lpss_cpu_ids[] = {
-        ICPU(INTEL_FAM6_ATOM_SILVERMONT1),      /* Valleyview, Bay Trail */
+        ICPU(INTEL_FAM6_ATOM_SILVERMONT),       /* Valleyview, Bay Trail */
         ICPU(INTEL_FAM6_ATOM_AIRMONT),  /* Braswell, Cherry Trail */
         {}
 };
diff --git a/drivers/acpi/x86/utils.c b/drivers/acpi/x86/utils.c
index 06c31ec3cc70..9a8e286dd86f 100644
--- a/drivers/acpi/x86/utils.c
+++ b/drivers/acpi/x86/utils.c
@@ -54,7 +54,7 @@ static const struct always_present_id always_present_ids[] = {
          * Bay / Cherry Trail PWM directly poked by GPU driver in win10,
          * but Linux uses a separate PWM driver, harmless if not used.
          */
-        ENTRY("80860F09", "1", ICPU(INTEL_FAM6_ATOM_SILVERMONT1), {}),
+        ENTRY("80860F09", "1", ICPU(INTEL_FAM6_ATOM_SILVERMONT), {}),
         ENTRY("80862288", "1", ICPU(INTEL_FAM6_ATOM_AIRMONT), {}),
         /*
          * The INT0002 device is necessary to clear wakeup interrupt sources
diff --git a/drivers/cpufreq/intel_pstate.c b/drivers/cpufreq/intel_pstate.c
index 2a99e2fd9412..49c0abf2d48f 100644
--- a/drivers/cpufreq/intel_pstate.c
+++ b/drivers/cpufreq/intel_pstate.c
@@ -1816,7 +1816,7 @@ static const struct pstate_funcs knl_funcs = {
 static const struct x86_cpu_id intel_pstate_cpu_ids[] = {
         ICPU(INTEL_FAM6_SANDYBRIDGE,            core_funcs),
         ICPU(INTEL_FAM6_SANDYBRIDGE_X,          core_funcs),
-        ICPU(INTEL_FAM6_ATOM_SILVERMONT1,       silvermont_funcs),
+        ICPU(INTEL_FAM6_ATOM_SILVERMONT,        silvermont_funcs),
         ICPU(INTEL_FAM6_IVYBRIDGE,              core_funcs),
         ICPU(INTEL_FAM6_HASWELL_CORE,           core_funcs),
         ICPU(INTEL_FAM6_BROADWELL_CORE,         core_funcs),
@@ -1833,7 +1833,7 @@ static const struct x86_cpu_id intel_pstate_cpu_ids[] = {
         ICPU(INTEL_FAM6_XEON_PHI_KNL,           knl_funcs),
         ICPU(INTEL_FAM6_XEON_PHI_KNM,           knl_funcs),
         ICPU(INTEL_FAM6_ATOM_GOLDMONT,          core_funcs),
-        ICPU(INTEL_FAM6_ATOM_GEMINI_LAKE,       core_funcs),
+        ICPU(INTEL_FAM6_ATOM_GOLDMONT_PLUS,     core_funcs),
         ICPU(INTEL_FAM6_SKYLAKE_X,              core_funcs),
         {}
 };
diff --git a/drivers/edac/pnd2_edac.c b/drivers/edac/pnd2_edac.c
index df28b65358d2..903a4f1fadcc 100644
--- a/drivers/edac/pnd2_edac.c
+++ b/drivers/edac/pnd2_edac.c
@@ -1541,7 +1541,7 @@ static struct dunit_ops dnv_ops = {
 
 static const struct x86_cpu_id pnd2_cpuids[] = {
         { X86_VENDOR_INTEL, 6, INTEL_FAM6_ATOM_GOLDMONT, 0, (kernel_ulong_t)&apl_ops },
-        { X86_VENDOR_INTEL, 6, INTEL_FAM6_ATOM_DENVERTON, 0, (kernel_ulong_t)&dnv_ops },
+        { X86_VENDOR_INTEL, 6, INTEL_FAM6_ATOM_GOLDMONT_X, 0, (kernel_ulong_t)&dnv_ops },
         { }
 };
 MODULE_DEVICE_TABLE(x86cpu, pnd2_cpuids);
diff --git a/drivers/idle/intel_idle.c b/drivers/idle/intel_idle.c
index 791b8a366e6e..8b5d85c91e9d 100644
--- a/drivers/idle/intel_idle.c
+++ b/drivers/idle/intel_idle.c
@@ -1073,14 +1073,14 @@ static const struct x86_cpu_id intel_idle_ids[] __initconst = {
         INTEL_CPU_FAM6(WESTMERE,                idle_cpu_nehalem),
         INTEL_CPU_FAM6(WESTMERE_EP,             idle_cpu_nehalem),
         INTEL_CPU_FAM6(NEHALEM_EX,              idle_cpu_nehalem),
-        INTEL_CPU_FAM6(ATOM_PINEVIEW,           idle_cpu_atom),
-        INTEL_CPU_FAM6(ATOM_LINCROFT,           idle_cpu_lincroft),
+        INTEL_CPU_FAM6(ATOM_BONNELL,            idle_cpu_atom),
+        INTEL_CPU_FAM6(ATOM_BONNELL_MID,        idle_cpu_lincroft),
         INTEL_CPU_FAM6(WESTMERE_EX,             idle_cpu_nehalem),
         INTEL_CPU_FAM6(SANDYBRIDGE,             idle_cpu_snb),
         INTEL_CPU_FAM6(SANDYBRIDGE_X,           idle_cpu_snb),
-        INTEL_CPU_FAM6(ATOM_CEDARVIEW,          idle_cpu_atom),
-        INTEL_CPU_FAM6(ATOM_SILVERMONT1,        idle_cpu_byt),
-        INTEL_CPU_FAM6(ATOM_MERRIFIELD,         idle_cpu_tangier),
+        INTEL_CPU_FAM6(ATOM_SALTWELL,           idle_cpu_atom),
+        INTEL_CPU_FAM6(ATOM_SILVERMONT,         idle_cpu_byt),
+        INTEL_CPU_FAM6(ATOM_SILVERMONT_MID,     idle_cpu_tangier),
         INTEL_CPU_FAM6(ATOM_AIRMONT,            idle_cpu_cht),
         INTEL_CPU_FAM6(IVYBRIDGE,               idle_cpu_ivb),
         INTEL_CPU_FAM6(IVYBRIDGE_X,             idle_cpu_ivt),
@@ -1088,7 +1088,7 @@ static const struct x86_cpu_id intel_idle_ids[] __initconst = {
         INTEL_CPU_FAM6(HASWELL_X,               idle_cpu_hsw),
         INTEL_CPU_FAM6(HASWELL_ULT,             idle_cpu_hsw),
         INTEL_CPU_FAM6(HASWELL_GT3E,            idle_cpu_hsw),
-        INTEL_CPU_FAM6(ATOM_SILVERMONT2,        idle_cpu_avn),
+        INTEL_CPU_FAM6(ATOM_SILVERMONT_X,       idle_cpu_avn),
         INTEL_CPU_FAM6(BROADWELL_CORE,          idle_cpu_bdw),
         INTEL_CPU_FAM6(BROADWELL_GT3E,          idle_cpu_bdw),
         INTEL_CPU_FAM6(BROADWELL_X,             idle_cpu_bdw),
@@ -1101,8 +1101,8 @@ static const struct x86_cpu_id intel_idle_ids[] __initconst = {
         INTEL_CPU_FAM6(XEON_PHI_KNL,            idle_cpu_knl),
         INTEL_CPU_FAM6(XEON_PHI_KNM,            idle_cpu_knl),
         INTEL_CPU_FAM6(ATOM_GOLDMONT,           idle_cpu_bxt),
-        INTEL_CPU_FAM6(ATOM_GEMINI_LAKE,        idle_cpu_bxt),
-        INTEL_CPU_FAM6(ATOM_DENVERTON,          idle_cpu_dnv),
+        INTEL_CPU_FAM6(ATOM_GOLDMONT_PLUS,      idle_cpu_bxt),
+        INTEL_CPU_FAM6(ATOM_GOLDMONT_X,         idle_cpu_dnv),
         {}
 };
 
@@ -1319,7 +1319,7 @@ static void intel_idle_state_table_update(void)
                 ivt_idle_state_table_update();
                 break;
         case INTEL_FAM6_ATOM_GOLDMONT:
-        case INTEL_FAM6_ATOM_GEMINI_LAKE:
+        case INTEL_FAM6_ATOM_GOLDMONT_PLUS:
                 bxt_idle_state_table_update();
                 break;
         case INTEL_FAM6_SKYLAKE_DESKTOP:
diff --git a/drivers/mmc/host/sdhci-acpi.c b/drivers/mmc/host/sdhci-acpi.c
index 82c9b9326e9e..057e24f4a620 100644
--- a/drivers/mmc/host/sdhci-acpi.c
+++ b/drivers/mmc/host/sdhci-acpi.c
@@ -247,7 +247,7 @@ static const struct sdhci_acpi_chip sdhci_acpi_chip_int = {
 static bool sdhci_acpi_byt(void)
 {
         static const struct x86_cpu_id byt[] = {
-                { X86_VENDOR_INTEL, 6, INTEL_FAM6_ATOM_SILVERMONT1 },
+                { X86_VENDOR_INTEL, 6, INTEL_FAM6_ATOM_SILVERMONT },
                 {}
         };
 
diff --git a/drivers/pci/pci-mid.c b/drivers/pci/pci-mid.c
index 314e135014dc..30fbe2ea6eab 100644
--- a/drivers/pci/pci-mid.c
+++ b/drivers/pci/pci-mid.c
@@ -62,8 +62,8 @@ static const struct pci_platform_pm_ops mid_pci_platform_pm = {
  * arch/x86/platform/intel-mid/pwr.c.
  */
 static const struct x86_cpu_id lpss_cpu_ids[] = {
-        ICPU(INTEL_FAM6_ATOM_PENWELL),
-        ICPU(INTEL_FAM6_ATOM_MERRIFIELD),
+        ICPU(INTEL_FAM6_ATOM_SALTWELL_MID),
+        ICPU(INTEL_FAM6_ATOM_SILVERMONT_MID),
         {}
 };
 
diff --git a/drivers/platform/x86/intel_int0002_vgpio.c b/drivers/platform/x86/intel_int0002_vgpio.c
index a473dc51b18d..e89ad4964dc1 100644
--- a/drivers/platform/x86/intel_int0002_vgpio.c
+++ b/drivers/platform/x86/intel_int0002_vgpio.c
@@ -60,7 +60,7 @@ static const struct x86_cpu_id int0002_cpu_ids[] = {
 /*
  * Limit ourselves to Cherry Trail for now, until testing shows we
  * need to handle the INT0002 device on Baytrail too.
- *      ICPU(INTEL_FAM6_ATOM_SILVERMONT1),       * Valleyview, Bay Trail *
+ *      ICPU(INTEL_FAM6_ATOM_SILVERMONT),        * Valleyview, Bay Trail *
  */
         ICPU(INTEL_FAM6_ATOM_AIRMONT),          /* Braswell, Cherry Trail */
         {}
diff --git a/drivers/platform/x86/intel_mid_powerbtn.c b/drivers/platform/x86/intel_mid_powerbtn.c
index d79fbf924b13..5ad44204a9c3 100644
--- a/drivers/platform/x86/intel_mid_powerbtn.c
+++ b/drivers/platform/x86/intel_mid_powerbtn.c
@@ -125,8 +125,8 @@ static const struct mid_pb_ddata mrfld_ddata = {
         { X86_VENDOR_INTEL, 6, model, X86_FEATURE_ANY, (kernel_ulong_t)&ddata }
 
 static const struct x86_cpu_id mid_pb_cpu_ids[] = {
-        ICPU(INTEL_FAM6_ATOM_PENWELL,           mfld_ddata),
-        ICPU(INTEL_FAM6_ATOM_MERRIFIELD,        mrfld_ddata),
+        ICPU(INTEL_FAM6_ATOM_SALTWELL_MID,              mfld_ddata),
+        ICPU(INTEL_FAM6_ATOM_SILVERMONT_MID,    mrfld_ddata),
         {}
 };
 
diff --git a/drivers/platform/x86/intel_telemetry_debugfs.c b/drivers/platform/x86/intel_telemetry_debugfs.c
index ffd0474b0531..cee08f236292 100644
--- a/drivers/platform/x86/intel_telemetry_debugfs.c
+++ b/drivers/platform/x86/intel_telemetry_debugfs.c
@@ -320,7 +320,7 @@ static struct telemetry_debugfs_conf telem_apl_debugfs_conf = {
 
 static const struct x86_cpu_id telemetry_debugfs_cpu_ids[] = {
         TELEM_DEBUGFS_CPU(INTEL_FAM6_ATOM_GOLDMONT, telem_apl_debugfs_conf),
-        TELEM_DEBUGFS_CPU(INTEL_FAM6_ATOM_GEMINI_LAKE, telem_apl_debugfs_conf),
+        TELEM_DEBUGFS_CPU(INTEL_FAM6_ATOM_GOLDMONT_PLUS, telem_apl_debugfs_conf),
         {}
 };
 
diff --git a/drivers/platform/x86/intel_telemetry_pltdrv.c b/drivers/platform/x86/intel_telemetry_pltdrv.c
index 2f889d6c270e..fcc6bee51a42 100644
--- a/drivers/platform/x86/intel_telemetry_pltdrv.c
+++ b/drivers/platform/x86/intel_telemetry_pltdrv.c
@@ -192,7 +192,7 @@ static struct telemetry_plt_config telem_glk_config = {
 
 static const struct x86_cpu_id telemetry_cpu_ids[] = {
         TELEM_CPU(INTEL_FAM6_ATOM_GOLDMONT, telem_apl_config),
-        TELEM_CPU(INTEL_FAM6_ATOM_GEMINI_LAKE, telem_glk_config),
+        TELEM_CPU(INTEL_FAM6_ATOM_GOLDMONT_PLUS, telem_glk_config),
         {}
 };
 
diff --git a/drivers/powercap/intel_rapl.c b/drivers/powercap/intel_rapl.c
index bb92874b1175..6cdb2c14eee4 100644
--- a/drivers/powercap/intel_rapl.c
+++ b/drivers/powercap/intel_rapl.c
@@ -1157,13 +1157,13 @@ static const struct x86_cpu_id rapl_ids[] __initconst = {
         INTEL_CPU_FAM6(KABYLAKE_DESKTOP,        rapl_defaults_core),
         INTEL_CPU_FAM6(CANNONLAKE_MOBILE,       rapl_defaults_core),
 
-        INTEL_CPU_FAM6(ATOM_SILVERMONT1,        rapl_defaults_byt),
+        INTEL_CPU_FAM6(ATOM_SILVERMONT,         rapl_defaults_byt),
         INTEL_CPU_FAM6(ATOM_AIRMONT,            rapl_defaults_cht),
-        INTEL_CPU_FAM6(ATOM_MERRIFIELD,         rapl_defaults_tng),
-        INTEL_CPU_FAM6(ATOM_MOOREFIELD,         rapl_defaults_ann),
+        INTEL_CPU_FAM6(ATOM_SILVERMONT_MID,     rapl_defaults_tng),
+        INTEL_CPU_FAM6(ATOM_AIRMONT_MID,        rapl_defaults_ann),
         INTEL_CPU_FAM6(ATOM_GOLDMONT,           rapl_defaults_core),
-        INTEL_CPU_FAM6(ATOM_GEMINI_LAKE,        rapl_defaults_core),
-        INTEL_CPU_FAM6(ATOM_DENVERTON,          rapl_defaults_core),
+        INTEL_CPU_FAM6(ATOM_GOLDMONT_PLUS,      rapl_defaults_core),
+        INTEL_CPU_FAM6(ATOM_GOLDMONT_X,         rapl_defaults_core),
 
         INTEL_CPU_FAM6(XEON_PHI_KNL,            rapl_defaults_hsw_server),
         INTEL_CPU_FAM6(XEON_PHI_KNM,            rapl_defaults_hsw_server),
diff --git a/drivers/thermal/intel_soc_dts_thermal.c b/drivers/thermal/intel_soc_dts_thermal.c
index 1e47511a6bd5..d748527d7a38 100644
--- a/drivers/thermal/intel_soc_dts_thermal.c
+++ b/drivers/thermal/intel_soc_dts_thermal.c
@@ -45,7 +45,7 @@ static irqreturn_t soc_irq_thread_fn(int irq, void *dev_data)
 }
 
 static const struct x86_cpu_id soc_thermal_ids[] = {
-        { X86_VENDOR_INTEL, 6, INTEL_FAM6_ATOM_SILVERMONT1, 0,
+        { X86_VENDOR_INTEL, 6, INTEL_FAM6_ATOM_SILVERMONT, 0,
                 BYT_SOC_DTS_APIC_IRQ},
         {}
 };