linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Tony Luck <tony.luck@intel.com>
To: Borislav Petkov <bp@alien8.de>
Cc: x86@kernel.org, linux-kernel@vger.kernel.org,
	patches@lists.linux.dev, Tony Luck <tony.luck@intel.com>
Subject: [PATCH v5 00/47] New Intel CPUID families
Date: Tue, 30 Apr 2024 09:49:13 -0700	[thread overview]
Message-ID: <20240430164913.73473-1-tony.luck@intel.com> (raw)

See notes below on which patches can be applied to current cycle x86/cpu
branch, and which would have conflicts with other tip branches or linux-next.

See notes below on which patches can be applied to current cycle x86/cpu
branch, and which would have conflicts with other tip branches or linux-next.

Full cover letter here:
Link: https://lore.kernel.org/all/20240416211941.9369-1-tony.luck@intel.com/

But the tl;dr version is that some surgery is required to make adding
CPUs with new CPUID "family" values elegant.

This series also available with:
 $ git fetch git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux.git new_families_v5

Signed-off-by: Tony Luck <tony.luck@intel.com>

Changes since v4:
Link: https://lore.kernel.org/all/20240424181245.41141-1-tony.luck@intel.com/

* More patches from this series have been applied to TIP x86/cpu so I
  have dropped them from this posting. Down to 47 from 74. Yay!

* Base commit for this series is now:
        2eda374e883a ("x86/mm: Switch to new Intel CPU model defines")

* PECI patches have been merged into one refactored patch that properly
  converts to using vendor-family-model instead of extracting the model
  from the Intel #define.

* A bunch more Acked-by and Reviewed-by tags applied. Note that Hans
  de Goede explicitly said it was OK to take the patches he has ACked
  through TIP tree. That's 0002..0003, 0005, 0015..0023.

* Re-ordered remaining patches like this:
  0001..0023: Have Acked/Reviewed tags and do not conflict with any
              patches currently in the linux-next tree.
  0024..0037: Awaiting Acks (though there are a few x86 patches in this
              set, and I'm the maintainer for the four EDAC patches,
              I'm fine with those going through TIP).
  0038..0045: Conflict with linux-next. I will fix post v6.10-rc1
  0046..0047: Delete unused INTEL_FAM6 stuff. Must wait until all
              other patches have been applied.

Tony Luck (47):
  tpm: Switch to new Intel CPU model defines
  platform/x86/intel/ifs: Switch to new Intel CPU model defines
  media: atomisp: Switch to new Intel CPU model defines
  ASoC: Intel: avs: es8336: Switch to new Intel CPU model defines
  platform/x86: intel_scu_wdt: Switch to new Intel CPU model defines
  KVM: x86/pmu: Switch to new Intel CPU model defines
  KVM: VMX: Switch to new Intel CPU model defines
  cpufreq: Switch to new Intel CPU model defines
  intel_idle: Switch to new Intel CPU model defines
  PCI: PM: Switch to new Intel CPU model defines
  powercap: intel_rapl: Switch to new Intel CPU model defines
  ASoC: Intel: Switch to new Intel CPU model defines
  thermal: intel: intel_tcc_cooling: Switch to new Intel CPU model
    defines
  x86/platform/intel-mid: Switch to new Intel CPU model defines
  platform/x86: intel_speed_select_if: Switch to new Intel CPU model
    defines
  platform/x86: intel-uncore-freq: Switch to new Intel CPU model defines
  platform/x86: intel_ips: Switch to new Intel CPU model defines
  platform/x86: intel_telemetry: Switch to new Intel CPU model defines
  platform/x86: intel: telemetry: Switch to new Intel CPU model defines
  platform/x86: intel_turbo_max_3: Switch to new Intel CPU model defines
  platform/x86: p2sb: Switch to new Intel CPU model defines
  platform/x86/intel: pmc: Switch to new Intel CPU model defines
  platform/x86/intel/pmc: Switch to new Intel CPU model defines
  crypto: x86/poly1305 - Switch to new Intel CPU model defines
  crypto: x86/twofish - Switch to new Intel CPU model defines
  x86/cpu/intel: Switch to new Intel CPU model defines
  x86/PCI: Switch to new Intel CPU model defines
  x86/virt/tdx: Switch to new Intel CPU model defines
  perf/x86/intel: Switch to new Intel CPU model defines
  x86/platform/atom: Switch to new Intel CPU model defines
  x86/cpu: Switch to new Intel CPU model defines
  x86/boot: Switch to new Intel CPU model defines
  EDAC/i10nm: Switch to new Intel CPU model defines
  EDAC, pnd2: Switch to new Intel CPU model defines
  EDAC/sb_edac: Switch to new Intel CPU model defines
  EDAC/skx: Switch to new Intel CPU model defines
  extcon: axp288: Switch to new Intel CPU model defines
  ACPI: LPSS: Switch to new Intel CPU model defines
  cpufreq: intel_pstate: Switch to new Intel CPU model defines
  powercap: intel_rapl: Switch to new Intel CPU model defines
  tools/power/turbostat: Switch to new Intel CPU model defines
  platform/x86: ISST: Switch to new Intel CPU model defines
  perf/x86/rapl: Switch to new Intel CPU model defines
  peci, hwmon: Switch to new Intel CPU model defines
  ACPI: x86: Switch to new Intel CPU model defines
  x86/cpu/vfm: Delete X86_MATCH_INTEL_FAM6_MODEL[_STEPPING]() macros
  x86/cpu/vfm: Delete all the *_FAM6_ CPU #defines

 .../atomisp/include/linux/atomisp_platform.h  |  27 +--
 include/linux/peci-cpu.h                      |  24 ++
 include/linux/peci.h                          |   6 +-
 include/linux/platform_data/x86/soc.h         |  12 +-
 arch/x86/include/asm/cpu_device_id.h          |  28 +--
 arch/x86/include/asm/intel-family.h           |  85 +------
 drivers/char/tpm/tpm.h                        |   2 +-
 drivers/char/tpm/tpm_tis_core.h               |   2 +-
 drivers/peci/internal.h                       |   6 +-
 arch/x86/boot/cpucheck.c                      |   2 +-
 arch/x86/crypto/poly1305_glue.c               |   4 +-
 arch/x86/crypto/twofish_glue_3way.c           |  10 +-
 arch/x86/events/intel/core.c                  | 212 +++++++++---------
 arch/x86/events/rapl.c                        |  84 +++----
 arch/x86/kernel/cpu/intel.c                   | 108 +++++----
 arch/x86/kvm/pmu.c                            |   8 +-
 arch/x86/kvm/vmx/vmx.c                        |  20 +-
 arch/x86/pci/intel_mid_pci.c                  |   4 +-
 arch/x86/platform/atom/punit_atom_debug.c     |  11 +-
 arch/x86/platform/intel-mid/intel-mid.c       |   7 +-
 arch/x86/virt/vmx/tdx/tdx.c                   |   8 +-
 drivers/acpi/acpi_lpss.c                      |   4 +-
 drivers/acpi/x86/utils.c                      |  42 ++--
 drivers/cpufreq/intel_pstate.c                |  90 ++++----
 drivers/cpufreq/speedstep-centrino.c          |   8 +-
 drivers/edac/i10nm_base.c                     |  20 +-
 drivers/edac/pnd2_edac.c                      |   4 +-
 drivers/edac/sb_edac.c                        |  14 +-
 drivers/edac/skx_base.c                       |   2 +-
 drivers/extcon/extcon-axp288.c                |   2 +-
 drivers/hwmon/peci/cputemp.c                  |   8 +-
 drivers/idle/intel_idle.c                     | 116 +++++-----
 drivers/pci/pci-mid.c                         |   4 +-
 drivers/peci/core.c                           |   5 +-
 drivers/peci/cpu.c                            |  21 +-
 drivers/peci/device.c                         |   3 +-
 drivers/platform/x86/intel/ifs/core.c         |  15 +-
 drivers/platform/x86/intel/pmc/core.c         |  46 ++--
 drivers/platform/x86/intel/pmc/pltdrv.c       |  16 +-
 .../intel/speed_select_if/isst_if_common.c    |   4 +-
 .../intel/speed_select_if/isst_if_mbox_msr.c  |   2 +-
 .../platform/x86/intel/telemetry/debugfs.c    |   4 +-
 drivers/platform/x86/intel/telemetry/pltdrv.c |   4 +-
 drivers/platform/x86/intel/turbo_max_3.c      |   4 +-
 .../intel/uncore-frequency/uncore-frequency.c |  56 ++---
 drivers/platform/x86/intel_ips.c              |   3 +-
 drivers/platform/x86/intel_scu_wdt.c          |   2 +-
 drivers/platform/x86/p2sb.c                   |   2 +-
 drivers/powercap/intel_rapl_common.c          | 118 +++++-----
 drivers/powercap/intel_rapl_msr.c             |  16 +-
 drivers/thermal/intel/intel_soc_dts_thermal.c |   2 +-
 drivers/thermal/intel/intel_tcc_cooling.c     |  30 +--
 sound/soc/intel/avs/boards/es8336.c           |   8 +-
 tools/power/x86/turbostat/turbostat.c         | 161 +++++++------
 54 files changed, 716 insertions(+), 790 deletions(-)


base-commit: 2eda374e883ad297bd9fe575a16c1dc850346075
-- 
2.44.0


             reply	other threads:[~2024-04-30 16:49 UTC|newest]

Thread overview: 48+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-04-30 16:49 Tony Luck [this message]
2024-04-30 16:50 ` [PATCH v5 01/47] tpm: Switch to new Intel CPU model defines Tony Luck
2024-04-30 16:50   ` [PATCH v5 02/47] platform/x86/intel/ifs: " Tony Luck
2024-04-30 16:50   ` [PATCH v5 03/47] media: atomisp: " Tony Luck
2024-04-30 16:50   ` [PATCH v5 04/47] ASoC: Intel: avs: es8336: " Tony Luck
2024-04-30 16:50   ` [PATCH v5 05/47] platform/x86: intel_scu_wdt: " Tony Luck
2024-04-30 16:50   ` [PATCH v5 06/47] KVM: x86/pmu: " Tony Luck
2024-04-30 16:50   ` [PATCH v5 07/47] KVM: VMX: " Tony Luck
2024-04-30 16:50   ` [PATCH v5 08/47] cpufreq: " Tony Luck
2024-04-30 16:50   ` [PATCH v5 09/47] intel_idle: " Tony Luck
2024-04-30 16:50   ` [PATCH v5 10/47] PCI: PM: " Tony Luck
2024-04-30 16:50   ` [PATCH v5 11/47] powercap: intel_rapl: " Tony Luck
2024-04-30 16:50   ` [PATCH v5 12/47] ASoC: Intel: " Tony Luck
2024-04-30 16:50   ` [PATCH v5 13/47] thermal: intel: intel_tcc_cooling: " Tony Luck
2024-04-30 16:50   ` [PATCH v5 14/47] x86/platform/intel-mid: " Tony Luck
2024-04-30 16:50   ` [PATCH v5 15/47] platform/x86: intel_speed_select_if: " Tony Luck
2024-04-30 16:50   ` [PATCH v5 16/47] platform/x86: intel-uncore-freq: " Tony Luck
2024-04-30 16:50   ` [PATCH v5 17/47] platform/x86: intel_ips: " Tony Luck
2024-04-30 16:50   ` [PATCH v5 18/47] platform/x86: intel_telemetry: " Tony Luck
2024-04-30 16:50   ` [PATCH v5 19/47] platform/x86: intel: telemetry: " Tony Luck
2024-04-30 16:50   ` [PATCH v5 20/47] platform/x86: intel_turbo_max_3: " Tony Luck
2024-04-30 16:50   ` [PATCH v5 21/47] platform/x86: p2sb: " Tony Luck
2024-04-30 16:50   ` [PATCH v5 22/47] platform/x86/intel: pmc: " Tony Luck
2024-04-30 16:50   ` [PATCH v5 23/47] platform/x86/intel/pmc: " Tony Luck
2024-04-30 16:50   ` [PATCH v5 24/47] crypto: x86/poly1305 - " Tony Luck
2024-04-30 16:50   ` [PATCH v5 25/47] crypto: x86/twofish " Tony Luck
2024-04-30 16:50   ` [PATCH v5 26/47] x86/cpu/intel: " Tony Luck
2024-04-30 16:50   ` [PATCH v5 27/47] x86/PCI: " Tony Luck
2024-04-30 16:50   ` [PATCH v5 28/47] x86/virt/tdx: " Tony Luck
2024-04-30 16:50   ` [PATCH v5 29/47] perf/x86/intel: " Tony Luck
2024-04-30 16:50   ` [PATCH v5 30/47] x86/platform/atom: " Tony Luck
2024-04-30 16:50   ` [PATCH v5 31/47] x86/cpu: " Tony Luck
2024-04-30 16:50   ` [PATCH v5 32/47] x86/boot: " Tony Luck
2024-04-30 16:50   ` [PATCH v5 33/47] EDAC/i10nm: " Tony Luck
2024-04-30 16:50   ` [PATCH v5 34/47] EDAC, pnd2: " Tony Luck
2024-04-30 16:50   ` [PATCH v5 35/47] EDAC/sb_edac: " Tony Luck
2024-04-30 16:50   ` [PATCH v5 36/47] EDAC/skx: " Tony Luck
2024-04-30 16:50   ` [PATCH v5 37/47] extcon: axp288: " Tony Luck
2024-04-30 16:50   ` [PATCH v5 38/47] ACPI: LPSS: " Tony Luck
2024-04-30 16:50   ` [PATCH v5 39/47] cpufreq: intel_pstate: " Tony Luck
2024-04-30 16:50   ` [PATCH v5 40/47] powercap: intel_rapl: " Tony Luck
2024-04-30 16:50   ` [PATCH v5 41/47] tools/power/turbostat: " Tony Luck
2024-04-30 16:50   ` [PATCH v5 42/47] platform/x86: ISST: " Tony Luck
2024-04-30 16:50   ` [PATCH v5 43/47] perf/x86/rapl: " Tony Luck
2024-04-30 16:50   ` [PATCH v5 44/47] peci, hwmon: " Tony Luck
2024-04-30 16:50   ` [PATCH v5 45/47] ACPI: x86: " Tony Luck
2024-04-30 16:50   ` [PATCH v5 46/47] x86/cpu/vfm: Delete X86_MATCH_INTEL_FAM6_MODEL[_STEPPING]() macros Tony Luck
2024-04-30 16:51   ` [PATCH v5 47/47] x86/cpu/vfm: Delete all the *_FAM6_ CPU #defines Tony Luck

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20240430164913.73473-1-tony.luck@intel.com \
    --to=tony.luck@intel.com \
    --cc=bp@alien8.de \
    --cc=linux-kernel@vger.kernel.org \
    --cc=patches@lists.linux.dev \
    --cc=x86@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).