forked from mirrors/linux
		
	 57c8a661d9
			
		
	
	
		57c8a661d9
		
	
	
	
	
		
			
			Move remaining definitions and declarations from include/linux/bootmem.h into include/linux/memblock.h and remove the redundant header. The includes were replaced with the semantic patch below and then semi-automated removal of duplicated '#include <linux/memblock.h> @@ @@ - #include <linux/bootmem.h> + #include <linux/memblock.h> [sfr@canb.auug.org.au: dma-direct: fix up for the removal of linux/bootmem.h] Link: http://lkml.kernel.org/r/20181002185342.133d1680@canb.auug.org.au [sfr@canb.auug.org.au: powerpc: fix up for removal of linux/bootmem.h] Link: http://lkml.kernel.org/r/20181005161406.73ef8727@canb.auug.org.au [sfr@canb.auug.org.au: x86/kaslr, ACPI/NUMA: fix for linux/bootmem.h removal] Link: http://lkml.kernel.org/r/20181008190341.5e396491@canb.auug.org.au Link: http://lkml.kernel.org/r/1536927045-23536-30-git-send-email-rppt@linux.vnet.ibm.com Signed-off-by: Mike Rapoport <rppt@linux.vnet.ibm.com> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> Acked-by: Michal Hocko <mhocko@suse.com> Cc: Catalin Marinas <catalin.marinas@arm.com> Cc: Chris Zankel <chris@zankel.net> Cc: "David S. Miller" <davem@davemloft.net> Cc: Geert Uytterhoeven <geert@linux-m68k.org> Cc: Greentime Hu <green.hu@gmail.com> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Cc: Guan Xuetao <gxt@pku.edu.cn> Cc: Ingo Molnar <mingo@redhat.com> Cc: "James E.J. Bottomley" <jejb@parisc-linux.org> Cc: Jonas Bonn <jonas@southpole.se> Cc: Jonathan Corbet <corbet@lwn.net> Cc: Ley Foon Tan <lftan@altera.com> Cc: Mark Salter <msalter@redhat.com> Cc: Martin Schwidefsky <schwidefsky@de.ibm.com> Cc: Matt Turner <mattst88@gmail.com> Cc: Michael Ellerman <mpe@ellerman.id.au> Cc: Michal Simek <monstr@monstr.eu> Cc: Palmer Dabbelt <palmer@sifive.com> Cc: Paul Burton <paul.burton@mips.com> Cc: Richard Kuo <rkuo@codeaurora.org> Cc: Richard Weinberger <richard@nod.at> Cc: Rich Felker <dalias@libc.org> Cc: Russell King <linux@armlinux.org.uk> Cc: Serge Semin <fancer.lancer@gmail.com> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Tony Luck <tony.luck@intel.com> Cc: Vineet Gupta <vgupta@synopsys.com> Cc: Yoshinori Sato <ysato@users.sourceforge.jp> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
		
			
				
	
	
		
			183 lines
		
	
	
	
		
			3.9 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			183 lines
		
	
	
	
		
			3.9 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
| // SPDX-License-Identifier: GPL-2.0
 | |
| /*
 | |
|  * AMD NUMA support.
 | |
|  * Discover the memory map and associated nodes.
 | |
|  *
 | |
|  * This version reads it directly from the AMD northbridge.
 | |
|  *
 | |
|  * Copyright 2002,2003 Andi Kleen, SuSE Labs.
 | |
|  */
 | |
| #include <linux/kernel.h>
 | |
| #include <linux/init.h>
 | |
| #include <linux/string.h>
 | |
| #include <linux/nodemask.h>
 | |
| #include <linux/memblock.h>
 | |
| 
 | |
| #include <asm/io.h>
 | |
| #include <linux/pci_ids.h>
 | |
| #include <linux/acpi.h>
 | |
| #include <asm/types.h>
 | |
| #include <asm/mmzone.h>
 | |
| #include <asm/proto.h>
 | |
| #include <asm/e820/api.h>
 | |
| #include <asm/pci-direct.h>
 | |
| #include <asm/numa.h>
 | |
| #include <asm/mpspec.h>
 | |
| #include <asm/apic.h>
 | |
| #include <asm/amd_nb.h>
 | |
| 
 | |
| static unsigned char __initdata nodeids[8];
 | |
| 
 | |
| static __init int find_northbridge(void)
 | |
| {
 | |
| 	int num;
 | |
| 
 | |
| 	for (num = 0; num < 32; num++) {
 | |
| 		u32 header;
 | |
| 
 | |
| 		header = read_pci_config(0, num, 0, 0x00);
 | |
| 		if (header != (PCI_VENDOR_ID_AMD | (0x1100<<16)) &&
 | |
| 			header != (PCI_VENDOR_ID_AMD | (0x1200<<16)) &&
 | |
| 			header != (PCI_VENDOR_ID_AMD | (0x1300<<16)))
 | |
| 			continue;
 | |
| 
 | |
| 		header = read_pci_config(0, num, 1, 0x00);
 | |
| 		if (header != (PCI_VENDOR_ID_AMD | (0x1101<<16)) &&
 | |
| 			header != (PCI_VENDOR_ID_AMD | (0x1201<<16)) &&
 | |
| 			header != (PCI_VENDOR_ID_AMD | (0x1301<<16)))
 | |
| 			continue;
 | |
| 		return num;
 | |
| 	}
 | |
| 
 | |
| 	return -ENOENT;
 | |
| }
 | |
| 
 | |
| int __init amd_numa_init(void)
 | |
| {
 | |
| 	u64 start = PFN_PHYS(0);
 | |
| 	u64 end = PFN_PHYS(max_pfn);
 | |
| 	unsigned numnodes;
 | |
| 	u64 prevbase;
 | |
| 	int i, j, nb;
 | |
| 	u32 nodeid, reg;
 | |
| 	unsigned int bits, cores, apicid_base;
 | |
| 
 | |
| 	if (!early_pci_allowed())
 | |
| 		return -EINVAL;
 | |
| 
 | |
| 	nb = find_northbridge();
 | |
| 	if (nb < 0)
 | |
| 		return nb;
 | |
| 
 | |
| 	pr_info("Scanning NUMA topology in Northbridge %d\n", nb);
 | |
| 
 | |
| 	reg = read_pci_config(0, nb, 0, 0x60);
 | |
| 	numnodes = ((reg >> 4) & 0xF) + 1;
 | |
| 	if (numnodes <= 1)
 | |
| 		return -ENOENT;
 | |
| 
 | |
| 	pr_info("Number of physical nodes %d\n", numnodes);
 | |
| 
 | |
| 	prevbase = 0;
 | |
| 	for (i = 0; i < 8; i++) {
 | |
| 		u64 base, limit;
 | |
| 
 | |
| 		base = read_pci_config(0, nb, 1, 0x40 + i*8);
 | |
| 		limit = read_pci_config(0, nb, 1, 0x44 + i*8);
 | |
| 
 | |
| 		nodeids[i] = nodeid = limit & 7;
 | |
| 		if ((base & 3) == 0) {
 | |
| 			if (i < numnodes)
 | |
| 				pr_info("Skipping disabled node %d\n", i);
 | |
| 			continue;
 | |
| 		}
 | |
| 		if (nodeid >= numnodes) {
 | |
| 			pr_info("Ignoring excess node %d (%Lx:%Lx)\n", nodeid,
 | |
| 				base, limit);
 | |
| 			continue;
 | |
| 		}
 | |
| 
 | |
| 		if (!limit) {
 | |
| 			pr_info("Skipping node entry %d (base %Lx)\n",
 | |
| 				i, base);
 | |
| 			continue;
 | |
| 		}
 | |
| 		if ((base >> 8) & 3 || (limit >> 8) & 3) {
 | |
| 			pr_err("Node %d using interleaving mode %Lx/%Lx\n",
 | |
| 			       nodeid, (base >> 8) & 3, (limit >> 8) & 3);
 | |
| 			return -EINVAL;
 | |
| 		}
 | |
| 		if (node_isset(nodeid, numa_nodes_parsed)) {
 | |
| 			pr_info("Node %d already present, skipping\n",
 | |
| 				nodeid);
 | |
| 			continue;
 | |
| 		}
 | |
| 
 | |
| 		limit >>= 16;
 | |
| 		limit++;
 | |
| 		limit <<= 24;
 | |
| 
 | |
| 		if (limit > end)
 | |
| 			limit = end;
 | |
| 		if (limit <= base)
 | |
| 			continue;
 | |
| 
 | |
| 		base >>= 16;
 | |
| 		base <<= 24;
 | |
| 
 | |
| 		if (base < start)
 | |
| 			base = start;
 | |
| 		if (limit > end)
 | |
| 			limit = end;
 | |
| 		if (limit == base) {
 | |
| 			pr_err("Empty node %d\n", nodeid);
 | |
| 			continue;
 | |
| 		}
 | |
| 		if (limit < base) {
 | |
| 			pr_err("Node %d bogus settings %Lx-%Lx.\n",
 | |
| 			       nodeid, base, limit);
 | |
| 			continue;
 | |
| 		}
 | |
| 
 | |
| 		/* Could sort here, but pun for now. Should not happen anyroads. */
 | |
| 		if (prevbase > base) {
 | |
| 			pr_err("Node map not sorted %Lx,%Lx\n",
 | |
| 			       prevbase, base);
 | |
| 			return -EINVAL;
 | |
| 		}
 | |
| 
 | |
| 		pr_info("Node %d MemBase %016Lx Limit %016Lx\n",
 | |
| 			nodeid, base, limit);
 | |
| 
 | |
| 		prevbase = base;
 | |
| 		numa_add_memblk(nodeid, base, limit);
 | |
| 		node_set(nodeid, numa_nodes_parsed);
 | |
| 	}
 | |
| 
 | |
| 	if (!nodes_weight(numa_nodes_parsed))
 | |
| 		return -ENOENT;
 | |
| 
 | |
| 	/*
 | |
| 	 * We seem to have valid NUMA configuration.  Map apicids to nodes
 | |
| 	 * using the coreid bits from early_identify_cpu.
 | |
| 	 */
 | |
| 	bits = boot_cpu_data.x86_coreid_bits;
 | |
| 	cores = 1 << bits;
 | |
| 	apicid_base = 0;
 | |
| 
 | |
| 	/*
 | |
| 	 * get boot-time SMP configuration:
 | |
| 	 */
 | |
| 	early_get_smp_config();
 | |
| 
 | |
| 	if (boot_cpu_physical_apicid > 0) {
 | |
| 		pr_info("BSP APIC ID: %02x\n", boot_cpu_physical_apicid);
 | |
| 		apicid_base = boot_cpu_physical_apicid;
 | |
| 	}
 | |
| 
 | |
| 	for_each_node_mask(i, numa_nodes_parsed)
 | |
| 		for (j = apicid_base; j < cores + apicid_base; j++)
 | |
| 			set_apicid_to_node((i << bits) + j, i);
 | |
| 
 | |
| 	return 0;
 | |
| }
 |