Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8ee2debc authored by David Rientjes's avatar David Rientjes Committed by Ingo Molnar
Browse files

x86: Export k8 physical topology 



To eventually interleave emulated nodes over physical nodes, we
need to know the physical topology of the machine without actually
registering it.  This does the k8 node setup in two parts:
detection and registration.  NUMA emulation can then used the
physical topology detected to setup the address ranges of emulated
nodes accordingly.  If emulation isn't used, the k8 nodes are
registered as normal.

Two formals are added to the x86 NUMA setup functions: `acpi' and
`k8'. These represent whether ACPI or K8 NUMA has been detected;
both cannot be true at the same time.  This specifies to the NUMA
emulation code whether an underlying physical NUMA topology exists
and which interface to use.

This patch deals solely with separating the k8 setup path into
Northbridge detection and registration steps and leaves the ACPI
changes for a subsequent patch.  The `acpi' formal is added here,
however, to avoid touching all the header files again in the next
patch.

This approach also ensures emulated nodes will not span physical
nodes so the true memory latency is not misrepresented.

k8_get_nodes() may now be used to export the k8 physical topology
of the machine for NUMA emulation.

Signed-off-by: default avatarDavid Rientjes <rientjes@google.com>
Cc: Andreas Herrmann <andreas.herrmann3@amd.com>
Cc: Yinghai Lu <yinghai@kernel.org>
Cc: Balbir Singh <balbir@linux.vnet.ibm.com>
Cc: Ankita Garg <ankita@in.ibm.com>
Cc: Len Brown <len.brown@intel.com>
LKML-Reference: <alpine.DEB.1.00.0909251518400.14754@chino.kir.corp.google.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 1af5ba51

arch/x86/include/asm/k8.h

+3 −1
Original line number Diff line number Diff line
@@ -10,7 +10,9 @@ extern struct pci_dev **k8_northbridges; 
extern int num_k8_northbridges;

extern int cache_k8_northbridges(void);

extern void k8_flush_garts(void);

extern int k8_scan_nodes(unsigned long start, unsigned long end);

extern int k8_get_nodes(struct bootnode *nodes);

extern int k8_numa_init(unsigned long start_pfn, unsigned long end_pfn);

extern int k8_scan_nodes(void);



#ifdef CONFIG_K8_NB

static inline struct pci_dev *node_to_k8_nb_misc(int node)

arch/x86/include/asm/page_types.h

+2 −1
Original line number Diff line number Diff line
@@ -49,7 +49,8 @@ extern unsigned long max_pfn_mapped; 
extern unsigned long init_memory_mapping(unsigned long start,

					 unsigned long end);



extern void initmem_init(unsigned long start_pfn, unsigned long end_pfn);

extern void initmem_init(unsigned long start_pfn, unsigned long end_pfn,

				int acpi, int k8);

extern void free_initmem(void);



#endif	/* !__ASSEMBLY__ */

arch/x86/kernel/setup.c

+9 −1
Original line number Diff line number Diff line
@@ -106,6 +106,7 @@ 
#include <asm/percpu.h>

#include <asm/topology.h>

#include <asm/apicdef.h>

#include <asm/k8.h>

#ifdef CONFIG_X86_64

#include <asm/numa_64.h>

#endif
@@ -691,6 +692,9 @@ static struct dmi_system_id __initdata bad_bios_dmi_table[] = { 


void __init setup_arch(char **cmdline_p)

{

	int acpi = 0;

	int k8 = 0;



#ifdef CONFIG_X86_32

	memcpy(&boot_cpu_data, &new_cpu_data, sizeof(new_cpu_data));

	visws_early_detect();
@@ -937,7 +941,11 @@ void __init setup_arch(char **cmdline_p) 
	acpi_numa_init();

#endif



	initmem_init(0, max_pfn);

#ifdef CONFIG_K8_NUMA

	k8 = !k8_numa_init(0, max_pfn);

#endif



	initmem_init(0, max_pfn, acpi, k8);



#ifdef CONFIG_ACPI_SLEEP

	/*

arch/x86/mm/init_32.c

+2 −2
Original line number Diff line number Diff line
@@ -703,8 +703,8 @@ void __init find_low_pfn_range(void) 
}



#ifndef CONFIG_NEED_MULTIPLE_NODES

void __init initmem_init(unsigned long start_pfn,

				  unsigned long end_pfn)

void __init initmem_init(unsigned long start_pfn, unsigned long end_pfn,

				int acpi, int k8)

{

#ifdef CONFIG_HIGHMEM

	highstart_pfn = highend_pfn = max_pfn;

arch/x86/mm/init_64.c

+2 −1
Original line number Diff line number Diff line
@@ -568,7 +568,8 @@ kernel_physical_mapping_init(unsigned long start, 
}



#ifndef CONFIG_NUMA

void __init initmem_init(unsigned long start_pfn, unsigned long end_pfn)

void __init initmem_init(unsigned long start_pfn, unsigned long end_pfn,

				int acpi, int k8)

{

	unsigned long bootmap_size, bootmap;