[GIT PULL] x86/misc for v6.14-rc1

[GIT PULL] x86/misc for v6.14-rc1

[Borislav Petkov]

Hi Linus,

please pull the x86/misc lineup for v6.14-rc1.

Thx.

You might encounter a trivial merge conflict in arch/x86/include/asm/amd_nb.h.

The final result should be this:

------------------------ arch/x86/include/asm/amd_nb.h ------------------------
index d0caac26533f..b48dc6975da2 100644
@@ -4,7 +4,7 @@
 
 #include <linux/ioport.h>
 #include <linux/pci.h>
-#include <linux/refcount.h>
+#include <asm/amd_node.h>
 
 struct amd_nb_bus_dev_range {
 	u8 bus;

---

---

The following changes since commit 40384c840ea1944d7c5a392e8975ed088ecf0b37:

  Linux 6.13-rc1 (2024-12-01 14:28:56 -0800)

are available in the Git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip tags/x86_misc_for_v6.14_rc1

for you to fetch changes up to 79821b907f8d7fbc991554fc940075dc1b29a0f4:

  x86/amd_node: Use defines for SMN register offsets (2025-01-08 11:02:28 +0100)

----------------------------------------------------------------
- The first part of a restructuring of AMD's representation of a northbridge
  which is legacy now, and the creation of the new AMD node concept which
  represents the Zen architecture of having a collection of I/O devices within
  an SoC. Those nodes comprise the so-called data fabric on Zen. This has
  at least one practical advantage of not having to add a PCI ID each time
  a new data fabric PCI device releases. Eventually, the lot more uniform
  provider of data fabric functionality amd_node.c will be used by all the
  drivers which need it

- Smaller cleanups

----------------------------------------------------------------
Kirill A. Shutemov (1):
      x86/mtrr: Rename mtrr_overwrite_state() to guest_force_mtrr_state()

Mario Limonciello (2):
      x86/amd_nb, hwmon: (k10temp): Simplify amd_pci_dev_to_node_id()
      x86/amd_nb: Move SMN access code to a new amd_node driver

Yazen Ghannam (10):
      x86/amd_nb: Restrict init function to AMD-based systems
      x86/amd_nb: Clean up early_is_amd_nb()
      x86: Start moving AMD node functionality out of AMD_NB
      x86/amd_nb: Simplify function 4 search
      x86/amd_nb: Simplify root device search
      x86/amd_nb: Use topology info to get AMD node count
      x86/amd_nb: Simplify function 3 search
      x86/amd_node: Update __amd_smn_rw() error paths
      x86/amd_node: Remove dependency on AMD_NB
      x86/amd_node: Use defines for SMN register offsets

 MAINTAINERS                          |   8 +
 arch/x86/Kconfig                     |   4 +
 arch/x86/hyperv/ivm.c                |   2 +-
 arch/x86/include/asm/amd_nb.h        |  22 +--
 arch/x86/include/asm/amd_node.h      |  36 +++++
 arch/x86/include/asm/mtrr.h          |  10 +-
 arch/x86/kernel/Makefile             |   1 +
 arch/x86/kernel/amd_nb.c             | 300 +++--------------------------------
 arch/x86/kernel/amd_node.c           | 215 +++++++++++++++++++++++++
 arch/x86/kernel/cpu/mtrr/generic.c   |   6 +-
 arch/x86/kernel/cpu/mtrr/mtrr.c      |   2 +-
 arch/x86/kernel/kvm.c                |   2 +-
 arch/x86/pci/fixup.c                 |   4 +-
 arch/x86/xen/enlighten_pv.c          |   4 +-
 drivers/edac/Kconfig                 |   1 +
 drivers/edac/amd64_edac.c            |   1 +
 drivers/hwmon/Kconfig                |   2 +-
 drivers/hwmon/k10temp.c              |   7 +-
 drivers/platform/x86/amd/pmc/Kconfig |   2 +-
 drivers/platform/x86/amd/pmc/pmc.c   |   3 +-
 drivers/platform/x86/amd/pmf/Kconfig |   2 +-
 drivers/platform/x86/amd/pmf/core.c  |   2 +-
 drivers/ras/amd/atl/Kconfig          |   1 +
 drivers/ras/amd/atl/internal.h       |   1 +
 24 files changed, 317 insertions(+), 321 deletions(-)
 create mode 100644 arch/x86/include/asm/amd_node.h
 create mode 100644 arch/x86/kernel/amd_node.c

-- 
Regards/Gruss,
    Boris.

https://people.kernel.org/tglx/notes-about-netiquette

Re: [GIT PULL] x86/misc for v6.14-rc1

[pr-tracker-bot]

The pull request you sent on Tue, 21 Jan 2025 18:36:14 +0100:

> git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip tags/x86_misc_for_v6.14_rc1

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/b9d8a295ed6bc3cee846f8e3f27c9c6e9ebe43f2

Thank you!

-- 
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/prtracker.html