[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <0308c977-2105-5d33-adb9-9e1f00b2a1e0@roeck-us.net>
Date: Mon, 24 Dec 2018 15:01:03 -0800
From: Guenter Roeck <linux@...ck-us.net>
To: Ingo Molnar <mingo@...nel.org>,
Linus Torvalds <torvalds@...ux-foundation.org>
Cc: linux-kernel@...r.kernel.org, Borislav Petkov <bp@...en8.de>,
Thomas Gleixner <tglx@...utronix.de>,
Peter Zijlstra <a.p.zijlstra@...llo.nl>,
Andrew Morton <akpm@...ux-foundation.org>
Subject: Re: [GIT PULL] x86/amd-nb changes for v4.21
On 12/24/18 2:50 PM, Ingo Molnar wrote:
> 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
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
> 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(-)
>
Powered by blists - more mailing lists