Skip to contentSkip to conversation

x86/amd-nb changes for v4.21

GIT PULL Merged Ingo Molnar 3 participants 3 messages Dec 24, 2018 – Dec 27, 2018

lore
Share & tools
lore
#0 lore raw

Linus,

Please pull the latest x86-amd-nb-for-linus git tree from:

git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86-amd-nb-for-linus

# HEAD: 210ba1201ff950b3d05bfd8fa5d47540cea393c0 hwmon/k10temp: Add support for AMD family 17h, model 30h CPUs

Update DF/SMN access and k10temp for AMD F17h M30h, by Brian Woods:

"Updates the data fabric/system management network code needed to get
k10temp working for M30h. Since there are now processors which have multiple roots per DF/SMN interface, there needs to some logic which skips N-1 root complexes per DF/SMN interface. This is because the root complexes per interface are redundant (as far as DF/SMN goes). These changes shouldn't effect past processors and, for F17h M0Xh, the mappings stay the same."

The hwmon changes were seen and acked by hwmon maintainer Guenter Roeck.

out-of-topic modifications in x86-amd-nb-for-linus:
-----------------------------------------------------
drivers/hwmon/k10temp.c # 210ba1201ff9: hwmon/k10temp: Add support f

                                   # dedf7dce4cec: hwmon/k10temp, x86/amd_nb: C
  include/linux/pci_ids.h            # be3518a16ef2: x86/amd_nb: Add PCI device I
                                   # dedf7dce4cec: hwmon/k10temp, x86/amd_nb: C

Thanks,

Ingo

------------------>
Woods, Brian (4):
hwmon/k10temp, x86/amd_nb: Consolidate shared device IDs x86/amd_nb: Add support for newer PCI topologies x86/amd_nb: Add PCI device IDs for family 17h, model 30h hwmon/k10temp: Add support for AMD family 17h, model 30h CPUs

 arch/x86/kernel/amd_nb.c | 53 ++++++++++++++++++++++++++++++++++++++++--------
 drivers/hwmon/k10temp.c  | 10 ++-------
 include/linux/pci_ids.h  |  3 +++
 3 files changed, 50 insertions(+), 16 deletions(-)
#1 lore raw
Quoted 18 lines · Ingo Molnar

Linus,

Please pull the latest x86-amd-nb-for-linus git tree from:

    git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86-amd-nb-for-linus

    # HEAD: 210ba1201ff950b3d05bfd8fa5d47540cea393c0 hwmon/k10temp: Add support for AMD family 17h, model 30h CPUs

Update DF/SMN access and k10temp for AMD F17h M30h, by Brian Woods:

"Updates the data fabric/system management network code needed to get
k10temp working for M30h. Since there are now processors which have multiple roots per DF/SMN interface, there needs to some logic which skips N-1 root complexes per DF/SMN interface. This is because the root complexes per interface are redundant (as far as DF/SMN goes). These changes shouldn't effect past processors and, for F17h M0Xh, the mappings stay the same."

Quoted 6 lines

The hwmon changes were seen and acked by hwmon maintainer Guenter Roeck.

out-of-topic modifications in x86-amd-nb-for-linus:

   -----------------------------------------------------
   drivers/hwmon/k10temp.c            # 210ba1201ff9: hwmon/k10temp: Add support f
                                    # dedf7dce4cec: hwmon/k10temp, x86/amd_nb: C

This will likely result in a minor conflict against the changes coming in from the hwmon tree (overlapping PCI IDs). Resolution is to accept both changes.

Guenter

Quoted 20 lines

include/linux/pci_ids.h # be3518a16ef2: x86/amd_nb: Add PCI device I

                                    # dedf7dce4cec: hwmon/k10temp, x86/amd_nb: C

Thanks,

Ingo

------------------>
Woods, Brian (4):
hwmon/k10temp, x86/amd_nb: Consolidate shared device IDs x86/amd_nb: Add support for newer PCI topologies x86/amd_nb: Add PCI device IDs for family 17h, model 30h hwmon/k10temp: Add support for AMD family 17h, model 30h CPUs

  arch/x86/kernel/amd_nb.c | 53 ++++++++++++++++++++++++++++++++++++++++--------
  drivers/hwmon/k10temp.c  | 10 ++-------
  include/linux/pci_ids.h  |  3 +++
  3 files changed, 50 insertions(+), 16 deletions(-)
merge bot Merged
#2 lore raw
In reply to Ingo Molnar
The pull request you sent on Mon, 24 Dec 2018 23:50:04 +0100:

The pull request you sent on Mon, 24 Dec 2018 23:50:04 +0100:

Quoted 1 line

git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86-amd-nb-for-linus

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

Thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.wiki.kernel.org/userdoc/prtracker