korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-12-12 13:34:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

x86, NUMA: Enable CONFIG_AMD_NUMA on 32bit too

Browse Source 
Now that NUMA init path is unified, amdtopology can be enabled on
32bit.  Make amdtopology.c safe on 32bit by explicitly using u64 and
drop X86_64 dependency from Kconfig.

Inclusion of bootmem.h is added for max_pfn declaration.

Signed-off-by: Tejun Heo <tj@kernel.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Yinghai Lu <yinghai@kernel.org>
Cc: David Rientjes <rientjes@google.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: "H. Peter Anvin" <hpa@zytor.com>
This commit is contained in:
Tejun Heo 2011-05-02 17:24:48 +02:00
parent c6f5887820
commit 2706a0bf7b
2 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/x86/Kconfig
View File

@ -1174,7 +1174,7 @@ comment "NUMA (Summit) requires SMP, 64GB highmem support, ACPI"
config AMD_NUMA config AMD_NUMA
def_bool y def_bool y
prompt "Old style AMD Opteron NUMA detection" prompt "Old style AMD Opteron NUMA detection"
depends on X86_64 && NUMA && PCI depends on NUMA && PCI
---help--- ---help---
Enable AMD NUMA node topology detection. You should say Y here if Enable AMD NUMA node topology detection. You should say Y here if
you have a multi processor AMD system. This uses an old method to you have a multi processor AMD system. This uses an old method to

21
arch/x86/mm/amdtopology.c
View File

@ -12,6 +12,7 @@
#include <linux/module.h> #include <linux/module.h>
#include <linux/nodemask.h> #include <linux/nodemask.h>
#include <linux/memblock.h> #include <linux/memblock.h>
#include <linux/bootmem.h>
#include <asm/io.h> #include <asm/io.h>
#include <linux/pci_ids.h> #include <linux/pci_ids.h>
@ -69,10 +70,10 @@ static __init void early_get_boot_cpu_id(void)
int __init amd_numa_init(void) int __init amd_numa_init(void)
{ {
unsigned long start = PFN_PHYS(0); u64 start = PFN_PHYS(0);
unsigned long end = PFN_PHYS(max_pfn); u64 end = PFN_PHYS(max_pfn);
unsigned numnodes; unsigned numnodes;
unsigned long prevbase; u64 prevbase;
int i, j, nb; int i, j, nb;
u32 nodeid, reg; u32 nodeid, reg;
unsigned int bits, cores, apicid_base; unsigned int bits, cores, apicid_base;
@ -95,7 +96,7 @@ int __init amd_numa_init(void)
prevbase = 0; prevbase = 0;
for (i = 0; i < 8; i++) { for (i = 0; i < 8; i++) {
unsigned long base, limit; u64 base, limit;
base = read_pci_config(0, nb, 1, 0x40 + i*8); base = read_pci_config(0, nb, 1, 0x40 + i*8);
limit = read_pci_config(0, nb, 1, 0x44 + i*8); limit = read_pci_config(0, nb, 1, 0x44 + i*8);
@ -107,18 +108,18 @@ int __init amd_numa_init(void)
continue; continue;
} }
if (nodeid >= numnodes) { if (nodeid >= numnodes) {
pr_info("Ignoring excess node %d (%lx:%lx)\n", nodeid, pr_info("Ignoring excess node %d (%Lx:%Lx)\n", nodeid,
base, limit); base, limit);
continue; continue;
} }
if (!limit) { if (!limit) {
pr_info("Skipping node entry %d (base %lx)\n", pr_info("Skipping node entry %d (base %Lx)\n",
i, base); i, base);
continue; continue;
} }
if ((base >> 8) & 3 || (limit >> 8) & 3) { if ((base >> 8) & 3 || (limit >> 8) & 3) {
pr_err("Node %d using interleaving mode %lx/%lx\n", pr_err("Node %d using interleaving mode %Lx/%Lx\n",
nodeid, (base >> 8) & 3, (limit >> 8) & 3); nodeid, (base >> 8) & 3, (limit >> 8) & 3);
return -EINVAL; return -EINVAL;
} }
@ -150,19 +151,19 @@ int __init amd_numa_init(void)
continue; continue;
} }
if (limit < base) { if (limit < base) {
pr_err("Node %d bogus settings %lx-%lx.\n", pr_err("Node %d bogus settings %Lx-%Lx.\n",
nodeid, base, limit); nodeid, base, limit);
continue; continue;
} }
/* Could sort here, but pun for now. Should not happen anyroads. */ /* Could sort here, but pun for now. Should not happen anyroads. */
if (prevbase > base) { if (prevbase > base) {
pr_err("Node map not sorted %lx,%lx\n", pr_err("Node map not sorted %Lx,%Lx\n",
prevbase, base); prevbase, base);
return -EINVAL; return -EINVAL;
} }
pr_info("Node %d MemBase %016lx Limit %016lx\n", pr_info("Node %d MemBase %016Lx Limit %016Lx\n",
nodeid, base, limit); nodeid, base, limit);
prevbase = base; prevbase = base;