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

Commit 940fed2e authored by Tejun Heo's avatar Tejun Heo
Browse files

x86-64, NUMA: Unify {acpi|amd}_{numa_init|scan_nodes}() arguments and return values 



The functions used during NUMA initialization - *_numa_init() and
*_scan_nodes() - have different arguments and return values.  Unify
them such that they all take no argument and return 0 on success and
-errno on failure.  This is in preparation for further NUMA init
cleanups.

Signed-off-by: default avatarTejun Heo <tj@kernel.org>
Cc: Yinghai Lu <yinghai@kernel.org>
Cc: Brian Gerst <brgerst@gmail.com>
Cc: Cyrill Gorcunov <gorcunov@gmail.com>
Cc: Shaohui Zheng <shaohui.zheng@intel.com>
Cc: David Rientjes <rientjes@google.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: H. Peter Anvin <hpa@linux.intel.com>
parent 86ef4dbf

arch/x86/include/asm/acpi.h

+1 −1
Original line number Diff line number Diff line
@@ -187,7 +187,7 @@ struct bootnode; 
extern int acpi_numa;

extern void acpi_get_nodes(struct bootnode *physnodes, unsigned long start,

				unsigned long end);

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

extern int acpi_scan_nodes(void);

#define NR_NODE_MEMBLKS (MAX_NUMNODES*2)



#ifdef CONFIG_NUMA_EMU

arch/x86/include/asm/amd_nb.h

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ struct bootnode; 
extern int early_is_amd_nb(u32 value);

extern int amd_cache_northbridges(void);

extern void amd_flush_garts(void);

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

extern int amd_numa_init(void);

extern int amd_scan_nodes(void);

extern int amd_get_subcaches(int);

extern int amd_set_subcaches(int, int);

arch/x86/kernel/setup.c

+2 −2
Original line number Diff line number Diff line
@@ -995,12 +995,12 @@ void __init setup_arch(char **cmdline_p) 
	/*

	 * Parse SRAT to discover nodes.

	 */

	acpi = acpi_numa_init();

	acpi = !acpi_numa_init();

#endif



#ifdef CONFIG_AMD_NUMA

	if (!acpi)

		amd = !amd_numa_init(0, max_pfn);

		amd = !amd_numa_init();

#endif



	initmem_init(acpi, amd);

arch/x86/mm/amdtopology_64.c

+9 −9
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ static __init int find_northbridge(void) 
		return num;

	}



	return -1;

	return -ENOENT;

}



static __init void early_get_boot_cpu_id(void)
@@ -69,17 +69,17 @@ static __init void early_get_boot_cpu_id(void) 
#endif

}



int __init amd_numa_init(unsigned long start_pfn, unsigned long end_pfn)

int __init amd_numa_init(void)

{

	unsigned long start = PFN_PHYS(start_pfn);

	unsigned long end = PFN_PHYS(end_pfn);

	unsigned long start = PFN_PHYS(0);

	unsigned long end = PFN_PHYS(max_pfn);

	unsigned numnodes;

	unsigned long prevbase;

	int i, nb, found = 0;

	u32 nodeid, reg;



	if (!early_pci_allowed())

		return -1;

		return -EINVAL;



	nb = find_northbridge();

	if (nb < 0)
@@ -90,7 +90,7 @@ int __init amd_numa_init(unsigned long start_pfn, unsigned long end_pfn) 
	reg = read_pci_config(0, nb, 0, 0x60);

	numnodes = ((reg >> 4) & 0xF) + 1;

	if (numnodes <= 1)

		return -1;

		return -ENOENT;



	pr_info("Number of physical nodes %d\n", numnodes);
@@ -121,7 +121,7 @@ int __init amd_numa_init(unsigned long start_pfn, unsigned long end_pfn) 
		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 -1;

			return -EINVAL;

		}

		if (node_isset(nodeid, nodes_parsed)) {

			pr_info("Node %d already present, skipping\n",
@@ -160,7 +160,7 @@ int __init amd_numa_init(unsigned long start_pfn, unsigned long end_pfn) 
		if (prevbase > base) {

			pr_err("Node map not sorted %lx,%lx\n",

			       prevbase, base);

			return -1;

			return -EINVAL;

		}



		pr_info("Node %d MemBase %016lx Limit %016lx\n",
@@ -177,7 +177,7 @@ int __init amd_numa_init(unsigned long start_pfn, unsigned long end_pfn) 
	}



	if (!found)

		return -1;

		return -ENOENT;

	return 0;

}

arch/x86/mm/numa_64.c

+1 −1
Original line number Diff line number Diff line
@@ -596,7 +596,7 @@ void __init initmem_init(int acpi, int amd) 
#endif



#ifdef CONFIG_ACPI_NUMA

	if (!numa_off && acpi && !acpi_scan_nodes(0, max_pfn << PAGE_SHIFT))

	if (!numa_off && acpi && !acpi_scan_nodes())

		return;

	nodes_clear(node_possible_map);

	nodes_clear(node_online_map);