Unverified Commit eb75541f authored by Atish Patra's avatar Atish Patra Committed by Palmer Dabbelt
Browse files

arm64, numa: Change the numa init functions name to be generic 



This is a preparatory patch for unifying numa implementation between
ARM64 & RISC-V. As the numa implementation will be moved to generic
code, rename the arm64 related functions to a generic one.

Signed-off-by: default avatarAtish Patra <atish.patra@wdc.com>
Acked-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
Signed-off-by: default avatarPalmer Dabbelt <palmerdabbelt@google.com>
parent 5a2308da

arch/arm64/include/asm/numa.h

+2 −2
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ static inline const struct cpumask *cpumask_of_node(int node) 
}

#endif



void __init arm64_numa_init(void);

void __init arch_numa_init(void);

int __init numa_add_memblk(int nodeid, u64 start, u64 end);

void __init numa_set_distance(int from, int to, int distance);

void __init numa_free_distance(void);
@@ -46,7 +46,7 @@ void numa_remove_cpu(unsigned int cpu); 
static inline void numa_store_cpu_info(unsigned int cpu) { }

static inline void numa_add_cpu(unsigned int cpu) { }

static inline void numa_remove_cpu(unsigned int cpu) { }

static inline void arm64_numa_init(void) { }

static inline void arch_numa_init(void) { }

static inline void early_map_cpu_to_node(unsigned int cpu, int nid) { }



#endif	/* CONFIG_NUMA */

arch/arm64/kernel/acpi_numa.c

+0 −12
Original line number Diff line number Diff line
@@ -118,15 +118,3 @@ void __init acpi_numa_gicc_affinity_init(struct acpi_srat_gicc_affinity *pa) 
	node_set(node, numa_nodes_parsed);

}

int __init arm64_acpi_numa_init(void)

{

	int ret;



	ret = acpi_numa_init();

	if (ret) {

		pr_info("Failed to initialise from firmware\n");

		return ret;

	}



	return srat_disabled() ? -EINVAL : 0;

}

arch/arm64/mm/init.c

+2 −2
Original line number Diff line number Diff line
@@ -418,10 +418,10 @@ void __init bootmem_init(void) 
	max_pfn = max_low_pfn = max;

	min_low_pfn = min;



	arm64_numa_init();

	arch_numa_init();



	/*

	 * must be done after arm64_numa_init() which calls numa_init() to

	 * must be done after arch_numa_init() which calls numa_init() to

	 * initialize node_online_map that gets used in hugetlb_cma_reserve()

	 * while allocating required CMA size across online nodes.

	 */

arch/arm64/mm/numa.c

+23 −4
Original line number Diff line number Diff line
@@ -13,7 +13,6 @@ 
#include <linux/module.h>

#include <linux/of.h>



#include <asm/acpi.h>

#include <asm/sections.h>



struct pglist_data *node_data[MAX_NUMNODES] __read_mostly;
@@ -445,16 +444,36 @@ static int __init dummy_numa_init(void) 
	return 0;

}



#ifdef CONFIG_ACPI_NUMA

static int __init arch_acpi_numa_init(void)

{

	int ret;



	ret = acpi_numa_init();

	if (ret) {

		pr_info("Failed to initialise from firmware\n");

		return ret;

	}



	return srat_disabled() ? -EINVAL : 0;

}

#else

static int __init arch_acpi_numa_init(void)

{

	return -EOPNOTSUPP;

}

#endif



/**

 * arm64_numa_init() - Initialize NUMA

 * arch_numa_init() - Initialize NUMA

 *

 * Try each configured NUMA initialization method until one succeeds. The

 * last fallback is dummy single node config encompassing whole memory.

 */

void __init arm64_numa_init(void)

void __init arch_numa_init(void)

{

	if (!numa_off) {

		if (!acpi_disabled && !numa_init(arm64_acpi_numa_init))

		if (!acpi_disabled && !numa_init(arch_acpi_numa_init))

			return;

		if (acpi_disabled && !numa_init(of_numa_init))

			return;