From: Lin Wang <wanglin@open-hieco.net>
To: Borislav Petkov <bp@alien8.de>,
Yazen Ghannam <yazen.ghannam@amd.com>,
Mario Limonciello <mario.limonciello@amd.com>
Cc: Pu Wen <puwen@hygon.cn>, Thomas Gleixner <tglx@kernel.org>,
Ingo Molnar <mingo@redhat.com>,
Dave Hansen <dave.hansen@linux.intel.com>,
"H. Peter Anvin" <hpa@zytor.com>, Tony Luck <tony.luck@intel.com>,
x86@kernel.org, linux-edac@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: [PATCH v9 6/7] x86/amd_node: Restrict SMN setup to AMD CPUs
Date: Thu, 29 Oct 2026 13:33:12 +0800 [thread overview]
Message-ID: <20261029053313.46323-7-wanglin@open-hieco.net> (raw)
In-Reply-To: <20261029053313.46323-1-wanglin@open-hieco.net>
amd_smn_init() also runs on Hygon because Hygon sets X86_FEATURE_ZEN.
It reserves config space on the matching host-bridge roots and groups
them by the CPU-derived node count. Hygon DF nodes are enumerated by
PCI ID, CPU NodeIds are sparse, and the nodes in a socket share one SMN
ingress, so the resulting root map is wrong on Hygon. These reservations
also prevent the Hygon node layer from claiming roots for its own
node-to-root mapping.
Hygon vendor matching has been removed from amd64_edac, amd_atl, and
k10temp modules. The remaining users match AMD PCI IDs or check for an
AMD CPU. With these changes in place, no in-tree Hygon driver uses the
AMD SMN accessors.
Restrict SMN setup and root discovery to AMD CPUs.
Signed-off-by: Lin Wang <wanglin@open-hieco.net>
Reviewed-by: Yazen Ghannam <yazen.ghannam@amd.com>
---
arch/x86/kernel/amd_node.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/arch/x86/kernel/amd_node.c b/arch/x86/kernel/amd_node.c
index b7926ba3610a..c36b410d04a4 100644
--- a/arch/x86/kernel/amd_node.c
+++ b/arch/x86/kernel/amd_node.c
@@ -229,8 +229,7 @@ static struct pci_dev *get_next_root(struct pci_dev *root)
if (root->devfn)
continue;
- if (root->vendor != PCI_VENDOR_ID_AMD &&
- root->vendor != PCI_VENDOR_ID_HYGON)
+ if (root->vendor != PCI_VENDOR_ID_AMD)
continue;
break;
@@ -253,6 +252,9 @@ static int __init amd_smn_init(void)
u16 count, num_roots, roots_per_node, node, num_nodes;
struct pci_dev *root __free(pci_dev_put) = NULL;
+ if (boot_cpu_data.x86_vendor != X86_VENDOR_AMD)
+ return 0;
+
if (!cpu_feature_enabled(X86_FEATURE_ZEN))
return 0;
--
2.43.0
next prev parent reply other threads:[~2026-10-29 5:33 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-10-29 5:33 [PATCH v9 0/7] x86/hygon: Add Family 0x18 DF node enumeration and SMN access Lin Wang
2026-10-29 5:33 ` [PATCH v9 1/7] x86/hygon: Add Family 0x18 DF node enumeration Lin Wang
2026-10-29 5:33 ` [PATCH v9 2/7] x86/hygon: Map CPU NodeIds to DF nodes Lin Wang
2026-10-29 5:33 ` [PATCH v9 3/7] EDAC/amd64: Stop matching Hygon CPUs Lin Wang
2026-10-29 5:33 ` [PATCH v9 4/7] RAS/AMD/ATL: Match AMD CPUs only Lin Wang
2026-10-29 5:33 ` [PATCH v9 5/7] x86/amd_nb: Restrict the northbridge framework to AMD CPUs Lin Wang
2026-10-29 5:33 ` Lin Wang [this message]
2026-10-29 5:33 ` [PATCH v9 7/7] x86/hygon: Add Family 0x18 SMN access Lin Wang
2026-11-04 17:16 ` Yazen Ghannam
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=20261029053313.46323-7-wanglin@open-hieco.net \
--to=wanglin@open-hieco.net \
--cc=bp@alien8.de \
--cc=dave.hansen@linux.intel.com \
--cc=hpa@zytor.com \
--cc=linux-edac@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mario.limonciello@amd.com \
--cc=mingo@redhat.com \
--cc=puwen@hygon.cn \
--cc=tglx@kernel.org \
--cc=tony.luck@intel.com \
--cc=x86@kernel.org \
--cc=yazen.ghannam@amd.com \
/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
all inboxes | Powered by JetHome®