From: Steve Capper Date: Tue, 27 Nov 2012 11:49:22 +0000 (+0000) Subject: ARM: mm: Add discontiguous memory support. X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=30487a2d9c878b8eddde48a5ee67c5db1b36a124;p=people%2Faperard%2Flinux-arndale.git ARM: mm: Add discontiguous memory support. This patch adds support for discontiguous memory, with a view to each discontiguous block being assigned to a NUMA node (in a future patch). Discontiguous memory should only be used to back NUMA on systems where sparse memory is not available. Signed-off-by: Steve Capper --- diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 9ca0b958bc3e5..86cac0e0773f1 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -1175,8 +1175,23 @@ config ARM_TIMER_SP804 select CLKSRC_MMIO select HAVE_SCHED_CLOCK +config ARCH_FLATMEM_ENABLE + bool + depends on MMU + default y + +config ARCH_DISCONTIGMEM_ENABLE + bool + depends on MMU + default y + source arch/arm/mm/Kconfig +config NUMA_ALLOC_NODES + bool + depends on DISCONTIGMEM + default y + config ARM_NR_BANKS int default 16 if ARCH_EP93XX diff --git a/arch/arm/include/asm/mmzone.h b/arch/arm/include/asm/mmzone.h new file mode 100644 index 0000000000000..f6d733796dd00 --- /dev/null +++ b/arch/arm/include/asm/mmzone.h @@ -0,0 +1,37 @@ +/* + * Discontiguous memory and NUMA support, based on the PowerPC implementation. + * + * Copyright (C) 2012 ARM Limited + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + * + */ + +#ifndef __ASM_ARM_MMZONE_H_ +#define __ASM_ARM_MMZONE_H_ +#ifdef __KERNEL__ + +#include + +#ifdef CONFIG_NUMA_ALLOC_NODES +#define NODE_DATA(nid) (node_data[nid]) +extern void __init arm_numa_alloc_nodes(unsigned long max_low); +extern struct pglist_data *node_data[]; +#else +#define arm_numa_alloc_nodes(_mlow) do {} while (0) +#endif + +#define pfn_to_nid(pfn) (0) + +#endif /* __KERNEL__ */ +#endif /* __ASM_ARM_MMZONE_H_ */ diff --git a/arch/arm/mm/Makefile b/arch/arm/mm/Makefile index adf0b19a77fbc..6bc37cf85964a 100644 --- a/arch/arm/mm/Makefile +++ b/arch/arm/mm/Makefile @@ -102,3 +102,5 @@ obj-$(CONFIG_CACHE_FEROCEON_L2) += cache-feroceon-l2.o obj-$(CONFIG_CACHE_L2X0) += cache-l2x0.o obj-$(CONFIG_CACHE_XSC3L2) += cache-xsc3l2.o obj-$(CONFIG_CACHE_TAUROS2) += cache-tauros2.o + +obj-$(CONFIG_NUMA_ALLOC_NODES) += numa.o diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c index 08284cfa219c2..67c6c31bcb8ac 100644 --- a/arch/arm/mm/init.c +++ b/arch/arm/mm/init.c @@ -33,6 +33,7 @@ #include #include +#include #include "mm.h" @@ -178,6 +179,12 @@ static void __init arm_bootmem_init(unsigned long start_pfn, phys_addr_t bitmap; pg_data_t *pgdat; + /* + * If we have NUMA or discontiguous memory, allocate the required + * nodes by reserving memblocks. + */ + arm_numa_alloc_nodes(end_pfn); + /* * Allocate the bootmem bitmap page. This must be in a region * of memory which has already been mapped. @@ -621,7 +628,9 @@ void __init mem_init(void) extern u32 itcm_end; #endif +#ifdef CONFIG_FLATMEM max_mapnr = pfn_to_page(max_pfn + PHYS_PFN_OFFSET) - mem_map; +#endif /* this will put all unused low memory onto the freelists */ free_unused_memmap(&meminfo); diff --git a/arch/arm/mm/numa.c b/arch/arm/mm/numa.c new file mode 100644 index 0000000000000..51411349ea286 --- /dev/null +++ b/arch/arm/mm/numa.c @@ -0,0 +1,50 @@ +/* + * Discontiguous memory and NUMA support, based on the PowerPC implementation. + * + * Copyright (C) 2012 ARM Limited + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + * + */ + +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include + +struct pglist_data *node_data[MAX_NUMNODES]; +EXPORT_SYMBOL(node_data); + +static unsigned int numa_node_count = 1; + +void __init arm_numa_alloc_nodes(unsigned long max_low) +{ + int node; + + for (node = 0; node < numa_node_count; node++) { + phys_addr_t pa = memblock_alloc_base(sizeof(pg_data_t), + L1_CACHE_BYTES, __pfn_to_phys(max_low)); + + NODE_DATA(node) = __va(pa); + memset(NODE_DATA(node), 0, sizeof(pg_data_t)); + NODE_DATA(node)->bdata = &bootmem_node_data[node]; + } +}