]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commit
x86/cpu: Sanitize FAM6_ATOM naming
authorPeter Zijlstra <peterz@infradead.org>
Tue, 7 Aug 2018 17:17:27 +0000 (10:17 -0700)
committerStefan Bader <stefan.bader@canonical.com>
Mon, 6 May 2019 16:58:11 +0000 (18:58 +0200)
commit2811e5d507fb544dd6829aadc818fa830a6dbb0b
tree007f15c6bf15916f4fdd7876cca7a9fb6ede99cf
parent48565d03374c792c8bf8c3870a54a096e796a484
x86/cpu: Sanitize FAM6_ATOM naming

Going primarily by:

  https://en.wikipedia.org/wiki/List_of_Intel_Atom_microprocessors

with additional information gleaned from other related pages; notably:

 - Bonnell shrink was called Saltwell
 - Moorefield is the Merriefield refresh which makes it Airmont

The general naming scheme is: FAM6_ATOM_UARCH_SOCTYPE

  for i in `git grep -l FAM6_ATOM` ; do
sed -i  -e 's/ATOM_PINEVIEW/ATOM_BONNELL/g' \
-e 's/ATOM_LINCROFT/ATOM_BONNELL_MID/' \
-e 's/ATOM_PENWELL/ATOM_SALTWELL_MID/g' \
-e 's/ATOM_CLOVERVIEW/ATOM_SALTWELL_TABLET/g' \
-e 's/ATOM_CEDARVIEW/ATOM_SALTWELL/g' \
-e 's/ATOM_SILVERMONT1/ATOM_SILVERMONT/g' \
-e 's/ATOM_SILVERMONT2/ATOM_SILVERMONT_X/g' \
-e 's/ATOM_MERRIFIELD/ATOM_SILVERMONT_MID/g' \
-e 's/ATOM_MOOREFIELD/ATOM_AIRMONT_MID/g' \
-e 's/ATOM_DENVERTON/ATOM_GOLDMONT_X/g' \
-e 's/ATOM_GEMINI_LAKE/ATOM_GOLDMONT_PLUS/g' ${i}
  done

Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Vince Weaver <vincent.weaver@maine.edu>
Cc: dave.hansen@linux.intel.com
Cc: len.brown@intel.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
CVE-2018-12126
CVE-2018-12127
CVE-2018-12130

(backported from commit f2c4db1bd80720cd8cb2a5aa220d9bc9f374f04e)
[tyhicks: Backport to 4.15:
 - arch/x86/kernel/cpu/intel_rdt_pseudo_lock.c doesn't yet exist
 - arch/x86/kernel/tsc_msr.c doesn't use any FAM6_ATOM macros because it
   is missing commit 397d3ad18dc4
 - sound/soc/intel/boards/bytcr_rt5651.c doesn't use any FAM6_ATOM
   macros because it is missing commit fbea16dbc0a3
 - The FAM6_ATOM items in the intel_pstate_cpu_ids[] array use bxt_funcs
   due to missing commit dbd49b85eec7
 - Context change in process_cpuid() because SKYLAKE_X and ATOM_DENVERTON
   share a case block due to missing commit 733ef0f8e76e
 - Manually ran the for loop documented in the commit message to ensure
   that there were no additional uses of the old macros]
Signed-off-by: Tyler Hicks <tyhicks@canonical.com>
Acked-by: Stefan Bader <stefan.bader@canonical.com>
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
23 files changed:
arch/x86/events/intel/core.c
arch/x86/events/intel/cstate.c
arch/x86/events/intel/rapl.c
arch/x86/events/msr.c
arch/x86/include/asm/intel-family.h
arch/x86/kernel/cpu/common.c
arch/x86/kernel/tsc.c
arch/x86/platform/atom/punit_atom_debug.c
arch/x86/platform/intel-mid/device_libs/platform_bt.c
drivers/acpi/acpi_lpss.c
drivers/acpi/x86/utils.c
drivers/cpufreq/intel_pstate.c
drivers/edac/pnd2_edac.c
drivers/idle/intel_idle.c
drivers/mmc/host/sdhci-acpi.c
drivers/pci/pci-mid.c
drivers/platform/x86/intel_int0002_vgpio.c
drivers/platform/x86/intel_mid_powerbtn.c
drivers/platform/x86/intel_telemetry_debugfs.c
drivers/platform/x86/intel_telemetry_pltdrv.c
drivers/powercap/intel_rapl.c
drivers/thermal/intel_soc_dts_thermal.c
tools/power/x86/turbostat/turbostat.c