* [GIT PULL] x86/amd-nb changes for v4.21
@ 2018-12-24 22:50 Ingo Molnar
2018-12-24 23:01 ` Guenter Roeck
2018-12-27 2:45 ` pr-tracker-bot
0 siblings, 2 replies; 3+ messages in thread
From: Ingo Molnar @ 2018-12-24 22:50 UTC (permalink / raw)
To: Linus Torvalds
Cc: linux-kernel, Borislav Petkov, Thomas Gleixner, Peter Zijlstra,
Andrew Morton, Guenter Roeck
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(-)
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [GIT PULL] x86/amd-nb changes for v4.21
2018-12-24 22:50 [GIT PULL] x86/amd-nb changes for v4.21 Ingo Molnar
@ 2018-12-24 23:01 ` Guenter Roeck
2018-12-27 2:45 ` pr-tracker-bot
1 sibling, 0 replies; 3+ messages in thread
From: Guenter Roeck @ 2018-12-24 23:01 UTC (permalink / raw)
To: Ingo Molnar, Linus Torvalds
Cc: linux-kernel, Borislav Petkov, Thomas Gleixner, Peter Zijlstra,
Andrew Morton
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(-)
>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [GIT PULL] x86/amd-nb changes for v4.21
2018-12-24 22:50 [GIT PULL] x86/amd-nb changes for v4.21 Ingo Molnar
2018-12-24 23:01 ` Guenter Roeck
@ 2018-12-27 2:45 ` pr-tracker-bot
1 sibling, 0 replies; 3+ messages in thread
From: pr-tracker-bot @ 2018-12-27 2:45 UTC (permalink / raw)
To: Ingo Molnar
Cc: Linus Torvalds, linux-kernel, Borislav Petkov, Thomas Gleixner,
Peter Zijlstra, Andrew Morton, Guenter Roeck
The pull request you sent on Mon, 24 Dec 2018 23:50:04 +0100:
> 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!
--
Deet-doot-dot, I am a bot.
https://korg.wiki.kernel.org/userdoc/prtracker
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2018-12-27 2:45 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-12-24 22:50 [GIT PULL] x86/amd-nb changes for v4.21 Ingo Molnar
2018-12-24 23:01 ` Guenter Roeck
2018-12-27 2:45 ` pr-tracker-bot
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).