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

Commit 1a2db300 authored by Ganapatrao Kulkarni's avatar Ganapatrao Kulkarni Committed by Will Deacon
Browse files

arm64, numa: Add NUMA support for arm64 platforms. 



Attempt to get the memory and CPU NUMA node via of_numa.  If that
fails, default the dummy NUMA node and map all memory and CPUs to node
0.

Tested-by: default avatarShannon Zhao <shannon.zhao@linaro.org>
Reviewed-by: default avatarRobert Richter <rrichter@cavium.com>
Signed-off-by: default avatarGanapatrao Kulkarni <gkulkarni@caviumnetworks.com>
Signed-off-by: default avatarDavid Daney <david.daney@cavium.com>
Signed-off-by: default avatarWill Deacon <will.deacon@arm.com>
parent 3194ac6e

arch/arm64/Kconfig

+26 −0
Original line number Diff line number Diff line
@@ -76,6 +76,7 @@ config ARM64 
	select HAVE_HW_BREAKPOINT if PERF_EVENTS

	select HAVE_IRQ_TIME_ACCOUNTING

	select HAVE_MEMBLOCK

	select HAVE_MEMBLOCK_NODE_MAP if NUMA

	select HAVE_PATA_PLATFORM

	select HAVE_PERF_EVENTS

	select HAVE_PERF_REGS
@@ -98,6 +99,7 @@ config ARM64 
	select SYSCTL_EXCEPTION_TRACE

	select HAVE_CONTEXT_TRACKING

	select HAVE_ARM_SMCCC

	select OF_NUMA if NUMA && OF

	help

	  ARM 64-bit (AArch64) Linux support.
@@ -546,6 +548,30 @@ config HOTPLUG_CPU 
	  Say Y here to experiment with turning CPUs off and on.  CPUs

	  can be controlled through /sys/devices/system/cpu.



# Common NUMA Features

config NUMA

	bool "Numa Memory Allocation and Scheduler Support"

	depends on SMP

	help

	  Enable NUMA (Non Uniform Memory Access) support.



	  The kernel will try to allocate memory used by a CPU on the

	  local memory of the CPU and add some more

	  NUMA awareness to the kernel.



config NODES_SHIFT

	int "Maximum NUMA Nodes (as a power of 2)"

	range 1 10

	default "2"

	depends on NEED_MULTIPLE_NODES

	help

	  Specify the maximum number of NUMA Nodes available on the target

	  system.  Increases memory reserved to accommodate various tables.



config USE_PERCPU_NUMA_NODE_ID

	def_bool y

	depends on NUMA



source kernel/Kconfig.preempt

source kernel/Kconfig.hz

arch/arm64/include/asm/mmzone.h

0 → 100644
+12 −0
Original line number Diff line number Diff line 
#ifndef __ASM_MMZONE_H

#define __ASM_MMZONE_H



#ifdef CONFIG_NUMA



#include <asm/numa.h>



extern struct pglist_data *node_data[];

#define NODE_DATA(nid)		(node_data[(nid)])



#endif /* CONFIG_NUMA */

#endif /* __ASM_MMZONE_H */

arch/arm64/include/asm/numa.h

0 → 100644
+45 −0
Original line number Diff line number Diff line 
#ifndef __ASM_NUMA_H

#define __ASM_NUMA_H



#include <asm/topology.h>



#ifdef CONFIG_NUMA



/* currently, arm64 implements flat NUMA topology */

#define parent_node(node)	(node)



int __node_distance(int from, int to);

#define node_distance(a, b) __node_distance(a, b)



extern nodemask_t numa_nodes_parsed __initdata;



/* Mappings between node number and cpus on that node. */

extern cpumask_var_t node_to_cpumask_map[MAX_NUMNODES];

void numa_clear_node(unsigned int cpu);



#ifdef CONFIG_DEBUG_PER_CPU_MAPS

const struct cpumask *cpumask_of_node(int node);

#else

/* Returns a pointer to the cpumask of CPUs on Node 'node'. */

static inline const struct cpumask *cpumask_of_node(int node)

{

	return node_to_cpumask_map[node];

}

#endif



void __init arm64_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);

void __init early_map_cpu_to_node(unsigned int cpu, int nid);

void numa_store_cpu_info(unsigned int cpu);



#else	/* CONFIG_NUMA */



static inline void numa_store_cpu_info(unsigned int cpu) { }

static inline void arm64_numa_init(void) { }

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



#endif	/* CONFIG_NUMA */



#endif	/* __ASM_NUMA_H */

arch/arm64/include/asm/topology.h

+10 −0
Original line number Diff line number Diff line
@@ -22,6 +22,16 @@ void init_cpu_topology(void); 
void store_cpu_topology(unsigned int cpuid);

const struct cpumask *cpu_coregroup_mask(int cpu);



#ifdef CONFIG_NUMA



struct pci_bus;

int pcibus_to_node(struct pci_bus *bus);

#define cpumask_of_pcibus(bus)	(pcibus_to_node(bus) == -1 ?		\

				 cpu_all_mask :				\

				 cpumask_of_node(pcibus_to_node(bus)))



#endif /* CONFIG_NUMA */



#include <asm-generic/topology.h>



#endif /* _ASM_ARM_TOPOLOGY_H */

arch/arm64/kernel/pci.c

+10 −0
Original line number Diff line number Diff line
@@ -74,6 +74,16 @@ int raw_pci_write(unsigned int domain, unsigned int bus, 
	return -ENXIO;

}



#ifdef CONFIG_NUMA



int pcibus_to_node(struct pci_bus *bus)

{

	return dev_to_node(&bus->dev);

}

EXPORT_SYMBOL(pcibus_to_node);



#endif



#ifdef CONFIG_ACPI

/* Root bridge scanning */

struct pci_bus *pci_acpi_scan_root(struct acpi_pci_root *root)