Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-11 14:42:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

ARM: Remove DISCONTIGMEM support

Browse Source 
Everything should now be using sparsemem rather than discontigmem, so
remove the code supporting discontigmem from ARM.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
This commit is contained in:
Russell King 2010-05-07 17:40:33 +01:00
parent 7961239599
commit be37030274
30 changed files with 137 additions and 426 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
arch/arm/Kconfig
View File

@ -719,7 +719,6 @@ config ARCH_SHARK
config ARCH_LH7A40X config ARCH_LH7A40X
bool "Sharp LH7A40X" bool "Sharp LH7A40X"
select CPU_ARM922T select CPU_ARM922T
select ARCH_DISCONTIGMEM_ENABLE if !LH7A40X_CONTIGMEM
select ARCH_SPARSEMEM_ENABLE if !LH7A40X_CONTIGMEM select ARCH_SPARSEMEM_ENABLE if !LH7A40X_CONTIGMEM
select ARCH_USES_GETTIMEOFFSET select ARCH_USES_GETTIMEOFFSET
help help
@ -1241,10 +1240,6 @@ config OABI_COMPAT
config ARCH_HAS_HOLES_MEMORYMODEL config ARCH_HAS_HOLES_MEMORYMODEL
bool bool
# Discontigmem is deprecated
config ARCH_DISCONTIGMEM_ENABLE
bool
config ARCH_SPARSEMEM_ENABLE config ARCH_SPARSEMEM_ENABLE
bool bool
@ -1252,13 +1247,7 @@ config ARCH_SPARSEMEM_DEFAULT
def_bool ARCH_SPARSEMEM_ENABLE def_bool ARCH_SPARSEMEM_ENABLE
config ARCH_SELECT_MEMORY_MODEL config ARCH_SELECT_MEMORY_MODEL
def_bool ARCH_DISCONTIGMEM_ENABLE && ARCH_SPARSEMEM_ENABLE def_bool ARCH_SPARSEMEM_ENABLE
config NODES_SHIFT
int
default "4" if ARCH_LH7A40X
default "2"
depends on NEED_MULTIPLE_NODES
config HIGHMEM config HIGHMEM
bool "High Memory Support (EXPERIMENTAL)" bool "High Memory Support (EXPERIMENTAL)"

65
arch/arm/include/asm/memory.h
View File

@ -234,76 +234,11 @@ static inline __deprecated void *bus_to_virt(unsigned long x)
* virt_to_page(k) convert a _valid_ virtual address to struct page * * virt_to_page(k) convert a _valid_ virtual address to struct page *
* virt_addr_valid(k) indicates whether a virtual address is valid * virt_addr_valid(k) indicates whether a virtual address is valid
*/ */
#ifndef CONFIG_DISCONTIGMEM
#define ARCH_PFN_OFFSET PHYS_PFN_OFFSET #define ARCH_PFN_OFFSET PHYS_PFN_OFFSET
#define virt_to_page(kaddr) pfn_to_page(__pa(kaddr) >> PAGE_SHIFT) #define virt_to_page(kaddr) pfn_to_page(__pa(kaddr) >> PAGE_SHIFT)
#define virt_addr_valid(kaddr) ((unsigned long)(kaddr) >= PAGE_OFFSET && (unsigned long)(kaddr) < (unsigned long)high_memory) #define virt_addr_valid(kaddr) ((unsigned long)(kaddr) >= PAGE_OFFSET && (unsigned long)(kaddr) < (unsigned long)high_memory)
#define PHYS_TO_NID(addr) (0)
#else /* CONFIG_DISCONTIGMEM */
/*
* This is more complex. We have a set of mem_map arrays spread
* around in memory.
*/
#include <linux/numa.h>
#define arch_pfn_to_nid(pfn) PFN_TO_NID(pfn)
#define arch_local_page_offset(pfn, nid) LOCAL_MAP_NR((pfn) << PAGE_SHIFT)
#define virt_to_page(kaddr) \
(ADDR_TO_MAPBASE(kaddr) + LOCAL_MAP_NR(kaddr))
#define virt_addr_valid(kaddr) (KVADDR_TO_NID(kaddr) < MAX_NUMNODES)
/*
* Common discontigmem stuff.
* PHYS_TO_NID is used by the ARM kernel/setup.c
*/
#define PHYS_TO_NID(addr) PFN_TO_NID((addr) >> PAGE_SHIFT)
/*
* Given a kaddr, ADDR_TO_MAPBASE finds the owning node of the memory
* and returns the mem_map of that node.
*/
#define ADDR_TO_MAPBASE(kaddr) NODE_MEM_MAP(KVADDR_TO_NID(kaddr))
/*
* Given a page frame number, find the owning node of the memory
* and returns the mem_map of that node.
*/
#define PFN_TO_MAPBASE(pfn) NODE_MEM_MAP(PFN_TO_NID(pfn))
#ifdef NODE_MEM_SIZE_BITS
#define NODE_MEM_SIZE_MASK ((1 << NODE_MEM_SIZE_BITS) - 1)
/*
* Given a kernel address, find the home node of the underlying memory.
*/
#define KVADDR_TO_NID(addr) \
(((unsigned long)(addr) - PAGE_OFFSET) >> NODE_MEM_SIZE_BITS)
/*
* Given a page frame number, convert it to a node id.
*/
#define PFN_TO_NID(pfn) \
(((pfn) - PHYS_PFN_OFFSET) >> (NODE_MEM_SIZE_BITS - PAGE_SHIFT))
/*
* Given a kaddr, LOCAL_MEM_MAP finds the owning node of the memory
* and returns the index corresponding to the appropriate page in the
* node's mem_map.
*/
#define LOCAL_MAP_NR(addr) \
(((unsigned long)(addr) & NODE_MEM_SIZE_MASK) >> PAGE_SHIFT)
#endif /* NODE_MEM_SIZE_BITS */
#endif /* !CONFIG_DISCONTIGMEM */
/* /*
* Optional coherency support. Currently used only by selected * Optional coherency support. Currently used only by selected
* Intel XSC3-based systems. * Intel XSC3-based systems.

30
arch/arm/include/asm/mmzone.h
View File

@ -1,30 +0,0 @@
/*
* arch/arm/include/asm/mmzone.h
*
* 1999-12-29 Nicolas Pitre Created
*
* 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.
*/
#ifndef __ASM_MMZONE_H
#define __ASM_MMZONE_H
/*
* Currently defined in arch/arm/mm/discontig.c
*/
extern pg_data_t discontig_node_data[];
/*
* Return a pointer to the node data for node n.
*/
#define NODE_DATA(nid) (&discontig_node_data[nid])
/*
* NODE_MEM_MAP gives the kaddr for the mem_map of the node.
*/
#define NODE_MEM_MAP(nid) (NODE_DATA(nid)->node_mem_map)
#include <mach/memory.h>
#endif

8
arch/arm/include/asm/setup.h
View File

@ -201,8 +201,7 @@ static struct tagtable __tagtable_##fn __tag = { tag, fn }
struct membank { struct membank {
unsigned long start; unsigned long start;
unsigned long size; unsigned long size;
unsigned short node; unsigned int highmem;
unsigned short highmem;
}; };
struct meminfo { struct meminfo {
@ -212,9 +211,8 @@ struct meminfo {
extern struct meminfo meminfo; extern struct meminfo meminfo;
#define for_each_nodebank(iter,mi,no) \ #define for_each_bank(iter,mi) \
for (iter = 0; iter < (mi)->nr_banks; iter++) \ for (iter = 0; iter < (mi)->nr_banks; iter++)
if ((mi)->bank[iter].node == no)
#define bank_pfn_start(bank) __phys_to_pfn((bank)->start) #define bank_pfn_start(bank) __phys_to_pfn((bank)->start)
#define bank_pfn_end(bank) __phys_to_pfn((bank)->start + (bank)->size) #define bank_pfn_end(bank) __phys_to_pfn((bank)->start + (bank)->size)

3
arch/arm/kernel/setup.c
View File

@ -402,13 +402,12 @@ static int __init arm_add_memory(unsigned long start, unsigned long size)
size -= start & ~PAGE_MASK; size -= start & ~PAGE_MASK;
bank->start = PAGE_ALIGN(start); bank->start = PAGE_ALIGN(start);
bank->size = size & PAGE_MASK; bank->size = size & PAGE_MASK;
bank->node = PHYS_TO_NID(start);
/* /*
* Check whether this memory region has non-zero size or * Check whether this memory region has non-zero size or
* invalid node number. * invalid node number.
*/ */
if (bank->size == 0 || bank->node >= MAX_NUMNODES) if (bank->size == 0)
return -EINVAL; return -EINVAL;
meminfo.nr_banks++; meminfo.nr_banks++;

10
arch/arm/mach-aaec2000/include/mach/memory.h
View File

@ -14,14 +14,4 @@
#define PHYS_OFFSET UL(0xf0000000) #define PHYS_OFFSET UL(0xf0000000)
/*
* The nodes are the followings:
*
* node 0: 0xf000.0000 - 0xf3ff.ffff
* node 1: 0xf400.0000 - 0xf7ff.ffff
* node 2: 0xf800.0000 - 0xfbff.ffff
* node 3: 0xfc00.0000 - 0xffff.ffff
*/
#define NODE_MEM_SIZE_BITS 26
#endif /* __ASM_ARCH_MEMORY_H */ #endif /* __ASM_ARCH_MEMORY_H */

1
arch/arm/mach-clps711x/Kconfig
View File

@ -30,7 +30,6 @@ config ARCH_CLEP7312
config ARCH_EDB7211 config ARCH_EDB7211
bool "EDB7211" bool "EDB7211"
select ISA select ISA
select ARCH_DISCONTIGMEM_ENABLE
select ARCH_SPARSEMEM_ENABLE select ARCH_SPARSEMEM_ENABLE
select ARCH_SELECT_MEMORY_MODEL select ARCH_SELECT_MEMORY_MODEL
help help

1
arch/arm/mach-clps711x/clep7312.c
View File

@ -32,7 +32,6 @@ fixup_clep7312(struct machine_desc *desc, struct tag *tags,
mi->nr_banks=1; mi->nr_banks=1;
mi->bank[0].start = 0xc0000000; mi->bank[0].start = 0xc0000000;
mi->bank[0].size = 0x01000000; mi->bank[0].size = 0x01000000;
mi->bank[0].node = 0;
} }

2
arch/arm/mach-clps711x/edb7211-arch.c
View File

@ -43,10 +43,8 @@ fixup_edb7211(struct machine_desc *desc, struct tag *tags,
*/ */
mi->bank[0].start = 0xc0000000; mi->bank[0].start = 0xc0000000;
mi->bank[0].size = 8*1024*1024; mi->bank[0].size = 8*1024*1024;
mi->bank[0].node = 0;
mi->bank[1].start = 0xc1000000; mi->bank[1].start = 0xc1000000;
mi->bank[1].size = 8*1024*1024; mi->bank[1].size = 8*1024*1024;
mi->bank[1].node = 1;
mi->nr_banks = 2; mi->nr_banks = 2;
} }

1
arch/arm/mach-clps711x/fortunet.c
View File

@ -39,7 +39,6 @@ struct meminfo memmap = {
{ {
.start = 0xC0000000, .start = 0xC0000000,
.size = 0x01000000, .size = 0x01000000,
.node = 0
}, },
}, },
}; };

2
arch/arm/mach-clps711x/include/mach/memory.h
View File

@ -20,7 +20,6 @@
#ifndef __ASM_ARCH_MEMORY_H #ifndef __ASM_ARCH_MEMORY_H
#define __ASM_ARCH_MEMORY_H #define __ASM_ARCH_MEMORY_H
/* /*
* Physical DRAM offset. * Physical DRAM offset.
*/ */
@ -72,7 +71,6 @@
* node 2: 0xd0000000 - 0xd7ffffff * node 2: 0xd0000000 - 0xd7ffffff
* node 3: 0xd8000000 - 0xdfffffff * node 3: 0xd8000000 - 0xdfffffff
*/ */
#define NODE_MEM_SIZE_BITS 24
#define SECTION_SIZE_BITS 24 #define SECTION_SIZE_BITS 24
#define MAX_PHYSMEM_BITS 32 #define MAX_PHYSMEM_BITS 32

2
arch/arm/mach-iop13xx/include/mach/memory.h
View File

@ -69,6 +69,4 @@ static inline unsigned long __lbus_to_virt(dma_addr_t x)
#endif /* CONFIG_ARCH_IOP13XX */ #endif /* CONFIG_ARCH_IOP13XX */
#endif /* !ASSEMBLY */ #endif /* !ASSEMBLY */
#define PFN_TO_NID(addr) (0)
#endif #endif

44
arch/arm/mach-lh7a40x/include/mach/memory.h
View File

@ -19,50 +19,6 @@
*/ */
#define PHYS_OFFSET UL(0xc0000000) #define PHYS_OFFSET UL(0xc0000000)
#ifdef CONFIG_DISCONTIGMEM
/*
* Given a kernel address, find the home node of the underlying memory.
*/
# ifdef CONFIG_LH7A40X_ONE_BANK_PER_NODE
# define KVADDR_TO_NID(addr) \
( ((((unsigned long) (addr) - PAGE_OFFSET) >> 24) & 1)\
| ((((unsigned long) (addr) - PAGE_OFFSET) >> 25) & ~1))
# else /* 2 banks per node */
# define KVADDR_TO_NID(addr) \
(((unsigned long) (addr) - PAGE_OFFSET) >> 26)
# endif
/*
* Given a page frame number, convert it to a node id.
*/
# ifdef CONFIG_LH7A40X_ONE_BANK_PER_NODE
# define PFN_TO_NID(pfn) \
(((((pfn) - PHYS_PFN_OFFSET) >> (24 - PAGE_SHIFT)) & 1)\
| ((((pfn) - PHYS_PFN_OFFSET) >> (25 - PAGE_SHIFT)) & ~1))
# else /* 2 banks per node */
# define PFN_TO_NID(pfn) \
(((pfn) - PHYS_PFN_OFFSET) >> (26 - PAGE_SHIFT))
#endif
/*
* Given a kaddr, LOCAL_MEM_MAP finds the owning node of the memory
* and returns the index corresponding to the appropriate page in the
* node's mem_map.
*/
# ifdef CONFIG_LH7A40X_ONE_BANK_PER_NODE
# define LOCAL_MAP_NR(addr) \
(((unsigned long)(addr) & 0x003fffff) >> PAGE_SHIFT)
# else /* 2 banks per node */
# define LOCAL_MAP_NR(addr) \
(((unsigned long)(addr) & 0x01ffffff) >> PAGE_SHIFT)
# endif
#endif
/* /*
* Sparsemem version of the above * Sparsemem version of the above
*/ */

1
arch/arm/mach-msm/board-trout.c
View File

@ -50,7 +50,6 @@ static void __init trout_fixup(struct machine_desc *desc, struct tag *tags,
{ {
mi->nr_banks = 1; mi->nr_banks = 1;
mi->bank[0].start = PHYS_OFFSET; mi->bank[0].start = PHYS_OFFSET;
mi->bank[0].node = PHYS_TO_NID(PHYS_OFFSET);
mi->bank[0].size = (101*1024*1024); mi->bank[0].size = (101*1024*1024);
} }

1
arch/arm/mach-pxa/corgi.c
View File

@ -715,7 +715,6 @@ static void __init fixup_corgi(struct machine_desc *desc,
sharpsl_save_param(); sharpsl_save_param();
mi->nr_banks=1; mi->nr_banks=1;
mi->bank[0].start = 0xa0000000; mi->bank[0].start = 0xa0000000;
mi->bank[0].node = 0;
if (machine_is_corgi()) if (machine_is_corgi())
mi->bank[0].size = (32*1024*1024); mi->bank[0].size = (32*1024*1024);
else else

1
arch/arm/mach-pxa/eseries.c
View File

@ -34,7 +34,6 @@ void __init eseries_fixup(struct machine_desc *desc,
{ {
mi->nr_banks=1; mi->nr_banks=1;
mi->bank[0].start = 0xa0000000; mi->bank[0].start = 0xa0000000;
mi->bank[0].node = 0;
if (machine_is_e800()) if (machine_is_e800())
mi->bank[0].size = (128*1024*1024); mi->bank[0].size = (128*1024*1024);
else else

3
arch/arm/mach-pxa/generic.h
View File

@ -26,8 +26,7 @@ extern unsigned int get_clk_frequency_khz(int info);
#define SET_BANK(__nr,__start,__size) \ #define SET_BANK(__nr,__start,__size) \
mi->bank[__nr].start = (__start), \ mi->bank[__nr].start = (__start), \
mi->bank[__nr].size = (__size), \ mi->bank[__nr].size = (__size)
mi->bank[__nr].node = (((unsigned)(__start) - PHYS_OFFSET) >> 27)
#define ARRAY_AND_SIZE(x) (x), ARRAY_SIZE(x) #define ARRAY_AND_SIZE(x) (x), ARRAY_SIZE(x)

12
arch/arm/mach-pxa/include/mach/memory.h
View File

@ -17,18 +17,6 @@
*/ */
#define PHYS_OFFSET UL(0xa0000000) #define PHYS_OFFSET UL(0xa0000000)
/*
* The nodes are matched with the physical SDRAM banks as follows:
*
* node 0: 0xa0000000-0xa3ffffff --> 0xc0000000-0xc3ffffff
* node 1: 0xa4000000-0xa7ffffff --> 0xc4000000-0xc7ffffff
* node 2: 0xa8000000-0xabffffff --> 0xc8000000-0xcbffffff
* node 3: 0xac000000-0xafffffff --> 0xcc000000-0xcfffffff
*
* This needs a node mem size of 26 bits.
*/
#define NODE_MEM_SIZE_BITS 26
#if !defined(__ASSEMBLY__) && defined(CONFIG_MACH_ARMCORE) && defined(CONFIG_PCI) #if !defined(__ASSEMBLY__) && defined(CONFIG_MACH_ARMCORE) && defined(CONFIG_PCI)
void cmx2xx_pci_adjust_zones(int node, unsigned long *size, void cmx2xx_pci_adjust_zones(int node, unsigned long *size,
unsigned long *holes); unsigned long *holes);

1
arch/arm/mach-pxa/poodle.c
View File

@ -463,7 +463,6 @@ static void __init fixup_poodle(struct machine_desc *desc,
sharpsl_save_param(); sharpsl_save_param();
mi->nr_banks=1; mi->nr_banks=1;
mi->bank[0].start = 0xa0000000; mi->bank[0].start = 0xa0000000;
mi->bank[0].node = 0;
mi->bank[0].size = (32*1024*1024); mi->bank[0].size = (32*1024*1024);
} }

1
arch/arm/mach-pxa/spitz.c
View File

@ -847,7 +847,6 @@ static void __init fixup_spitz(struct machine_desc *desc,
sharpsl_save_param(); sharpsl_save_param();
mi->nr_banks = 1; mi->nr_banks = 1;
mi->bank[0].start = 0xa0000000; mi->bank[0].start = 0xa0000000;
mi->bank[0].node = 0;
mi->bank[0].size = (64*1024*1024); mi->bank[0].size = (64*1024*1024);
} }

1
arch/arm/mach-pxa/tosa.c
View File

@ -948,7 +948,6 @@ static void __init fixup_tosa(struct machine_desc *desc,
sharpsl_save_param(); sharpsl_save_param();
mi->nr_banks=1; mi->nr_banks=1;
mi->bank[0].start = 0xa0000000; mi->bank[0].start = 0xa0000000;
mi->bank[0].node = 0;
mi->bank[0].size = (64*1024*1024); mi->bank[0].size = (64*1024*1024);
} }

1
arch/arm/mach-s3c2412/mach-smdk2413.c
View File

@ -119,7 +119,6 @@ static void __init smdk2413_fixup(struct machine_desc *desc,
mi->nr_banks=1; mi->nr_banks=1;
mi->bank[0].start = 0x30000000; mi->bank[0].start = 0x30000000;
mi->bank[0].size = SZ_64M; mi->bank[0].size = SZ_64M;
mi->bank[0].node = 0;
} }
} }

1
arch/arm/mach-s3c2412/mach-vstms.c
View File

@ -137,7 +137,6 @@ static void __init vstms_fixup(struct machine_desc *desc,
mi->nr_banks=1; mi->nr_banks=1;
mi->bank[0].start = 0x30000000; mi->bank[0].start = 0x30000000;
mi->bank[0].size = SZ_64M; mi->bank[0].size = SZ_64M;
mi->bank[0].node = 0;
} }
} }

3
arch/arm/mach-sa1100/generic.h
View File

@ -13,8 +13,7 @@ extern void __init sa1100_init_gpio(void);
#define SET_BANK(__nr,__start,__size) \ #define SET_BANK(__nr,__start,__size) \
mi->bank[__nr].start = (__start), \ mi->bank[__nr].start = (__start), \
mi->bank[__nr].size = (__size), \ mi->bank[__nr].size = (__size)
mi->bank[__nr].node = (((unsigned)(__start) - PHYS_OFFSET) >> 27)
extern void (*sa1100fb_backlight_power)(int on); extern void (*sa1100fb_backlight_power)(int on);
extern void (*sa1100fb_lcd_power)(int on); extern void (*sa1100fb_lcd_power)(int on);

1
arch/arm/mm/Makefile
View File

@ -15,7 +15,6 @@ endif
obj-$(CONFIG_MODULES) += proc-syms.o obj-$(CONFIG_MODULES) += proc-syms.o
obj-$(CONFIG_ALIGNMENT_TRAP) += alignment.o obj-$(CONFIG_ALIGNMENT_TRAP) += alignment.o
obj-$(CONFIG_DISCONTIGMEM) += discontig.o
obj-$(CONFIG_HIGHMEM) += highmem.o obj-$(CONFIG_HIGHMEM) += highmem.o
obj-$(CONFIG_CPU_ABRT_NOMMU) += abort-nommu.o obj-$(CONFIG_CPU_ABRT_NOMMU) += abort-nommu.o

45
arch/arm/mm/discontig.c
View File

@ -1,45 +0,0 @@
/*
* linux/arch/arm/mm/discontig.c
*
* Discontiguous memory support.
*
* Initial code: Copyright (C) 1999-2000 Nicolas Pitre
*
* 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.
*/
#include <linux/module.h>
#include <linux/mmzone.h>
#include <linux/bootmem.h>
#if MAX_NUMNODES != 4 && MAX_NUMNODES != 16
# error Fix Me Please
#endif
/*
* Our node_data structure for discontiguous memory.
*/
pg_data_t discontig_node_data[MAX_NUMNODES] = {
{ .bdata = &bootmem_node_data[0] },
{ .bdata = &bootmem_node_data[1] },
{ .bdata = &bootmem_node_data[2] },
{ .bdata = &bootmem_node_data[3] },
#if MAX_NUMNODES == 16
{ .bdata = &bootmem_node_data[4] },
{ .bdata = &bootmem_node_data[5] },
{ .bdata = &bootmem_node_data[6] },
{ .bdata = &bootmem_node_data[7] },
{ .bdata = &bootmem_node_data[8] },
{ .bdata = &bootmem_node_data[9] },
{ .bdata = &bootmem_node_data[10] },
{ .bdata = &bootmem_node_data[11] },
{ .bdata = &bootmem_node_data[12] },
{ .bdata = &bootmem_node_data[13] },
{ .bdata = &bootmem_node_data[14] },
{ .bdata = &bootmem_node_data[15] },
#endif
};
EXPORT_SYMBOL(discontig_node_data);

156
arch/arm/mm/init.c
View File

@ -79,13 +79,13 @@ struct meminfo meminfo;
void show_mem(void) void show_mem(void)
{ {
int free = 0, total = 0, reserved = 0; int free = 0, total = 0, reserved = 0;
int shared = 0, cached = 0, slab = 0, node, i; int shared = 0, cached = 0, slab = 0, i;
struct meminfo * mi = &meminfo; struct meminfo * mi = &meminfo;
printk("Mem-info:\n"); printk("Mem-info:\n");
show_free_areas(); show_free_areas();
for_each_online_node(node) {
for_each_nodebank (i,mi,node) { for_each_bank (i, mi) {
struct membank *bank = &mi->bank[i]; struct membank *bank = &mi->bank[i];
unsigned int pfn1, pfn2; unsigned int pfn1, pfn2;
struct page *page, *end; struct page *page, *end;
@ -111,7 +111,6 @@ void show_mem(void)
page++; page++;
} while (page < end); } while (page < end);
} }
}
printk("%d pages of RAM\n", total); printk("%d pages of RAM\n", total);
printk("%d free pages\n", free); printk("%d free pages\n", free);
@ -121,7 +120,7 @@ void show_mem(void)
printk("%d pages swap cached\n", cached); printk("%d pages swap cached\n", cached);
} }
static void __init find_node_limits(int node, struct meminfo *mi, static void __init find_limits(struct meminfo *mi,
unsigned long *min, unsigned long *max_low, unsigned long *max_high) unsigned long *min, unsigned long *max_low, unsigned long *max_high)
{ {
int i; int i;
@ -129,7 +128,7 @@ static void __init find_node_limits(int node, struct meminfo *mi,
*min = -1UL; *min = -1UL;
*max_low = *max_high = 0; *max_low = *max_high = 0;
for_each_nodebank(i, mi, node) { for_each_bank (i, mi) {
struct membank *bank = &mi->bank[i]; struct membank *bank = &mi->bank[i];
unsigned long start, end; unsigned long start, end;
@ -154,14 +153,14 @@ static void __init find_node_limits(int node, struct meminfo *mi,
* the end, we won't clash. * the end, we won't clash.
*/ */
static unsigned int __init static unsigned int __init
find_bootmap_pfn(int node, struct meminfo *mi, unsigned int bootmap_pages) find_bootmap_pfn(struct meminfo *mi, unsigned int bootmap_pages)
{ {
unsigned int start_pfn, i, bootmap_pfn; unsigned int start_pfn, i, bootmap_pfn;
start_pfn = PAGE_ALIGN(__pa(_end)) >> PAGE_SHIFT; start_pfn = PAGE_ALIGN(__pa(_end)) >> PAGE_SHIFT;
bootmap_pfn = 0; bootmap_pfn = 0;
for_each_nodebank(i, mi, node) { for_each_bank(i, mi) {
struct membank *bank = &mi->bank[i]; struct membank *bank = &mi->bank[i];
unsigned int start, end; unsigned int start, end;
@ -191,7 +190,7 @@ find_bootmap_pfn(int node, struct meminfo *mi, unsigned int bootmap_pages)
static int __init check_initrd(struct meminfo *mi) static int __init check_initrd(struct meminfo *mi)
{ {
int initrd_node = -2; int initrd = -2;
#ifdef CONFIG_BLK_DEV_INITRD #ifdef CONFIG_BLK_DEV_INITRD
unsigned long end = phys_initrd_start + phys_initrd_size; unsigned long end = phys_initrd_start + phys_initrd_size;
@ -202,17 +201,17 @@ static int __init check_initrd(struct meminfo *mi)
if (phys_initrd_size) { if (phys_initrd_size) {
unsigned int i; unsigned int i;
initrd_node = -1; initrd = -1;
for (i = 0; i < mi->nr_banks; i++) { for (i = 0; i < mi->nr_banks; i++) {
struct membank *bank = &mi->bank[i]; struct membank *bank = &mi->bank[i];
if (bank_phys_start(bank) <= phys_initrd_start && if (bank_phys_start(bank) <= phys_initrd_start &&
end <= bank_phys_end(bank)) end <= bank_phys_end(bank))
initrd_node = bank->node; initrd = 0;
} }
} }
if (initrd_node == -1) { if (initrd == -1) {
printk(KERN_ERR "INITRD: 0x%08lx+0x%08lx extends beyond " printk(KERN_ERR "INITRD: 0x%08lx+0x%08lx extends beyond "
"physical memory - disabling initrd\n", "physical memory - disabling initrd\n",
phys_initrd_start, phys_initrd_size); phys_initrd_start, phys_initrd_size);
@ -220,10 +219,10 @@ static int __init check_initrd(struct meminfo *mi)
} }
#endif #endif
return initrd_node; return initrd;
} }
static void __init bootmem_init_node(int node, struct meminfo *mi, static void __init arm_bootmem_init(struct meminfo *mi,
unsigned long start_pfn, unsigned long end_pfn) unsigned long start_pfn, unsigned long end_pfn)
{ {
unsigned long boot_pfn; unsigned long boot_pfn;
@ -235,36 +234,35 @@ static void __init bootmem_init_node(int node, struct meminfo *mi,
* Allocate the bootmem bitmap page. * Allocate the bootmem bitmap page.
*/ */
boot_pages = bootmem_bootmap_pages(end_pfn - start_pfn); boot_pages = bootmem_bootmap_pages(end_pfn - start_pfn);
boot_pfn = find_bootmap_pfn(node, mi, boot_pages); boot_pfn = find_bootmap_pfn(mi, boot_pages);
/* /*
* Initialise the bootmem allocator for this node, handing the * Initialise the bootmem allocator, handing the
* memory banks over to bootmem. * memory banks over to bootmem.
*/ */
node_set_online(node); node_set_online(0);
pgdat = NODE_DATA(node); pgdat = NODE_DATA(0);
init_bootmem_node(pgdat, boot_pfn, start_pfn, end_pfn); init_bootmem_node(pgdat, boot_pfn, start_pfn, end_pfn);
for_each_nodebank(i, mi, node) { for_each_bank(i, mi) {
struct membank *bank = &mi->bank[i]; struct membank *bank = &mi->bank[i];
if (!bank->highmem) if (!bank->highmem)
free_bootmem_node(pgdat, bank_phys_start(bank), bank_phys_size(bank)); free_bootmem(bank_phys_start(bank), bank_phys_size(bank));
} }
/* /*
* Reserve the bootmem bitmap for this node. * Reserve the bootmem bitmap.
*/ */
reserve_bootmem_node(pgdat, boot_pfn << PAGE_SHIFT, reserve_bootmem(boot_pfn << PAGE_SHIFT,
boot_pages << PAGE_SHIFT, BOOTMEM_DEFAULT); boot_pages << PAGE_SHIFT, BOOTMEM_DEFAULT);
} }
static void __init bootmem_reserve_initrd(int node) static void __init bootmem_reserve_initrd(void)
{ {
#ifdef CONFIG_BLK_DEV_INITRD #ifdef CONFIG_BLK_DEV_INITRD
pg_data_t *pgdat = NODE_DATA(node);
int res; int res;
res = reserve_bootmem_node(pgdat, phys_initrd_start, res = reserve_bootmem(phys_initrd_start,
phys_initrd_size, BOOTMEM_EXCLUSIVE); phys_initrd_size, BOOTMEM_EXCLUSIVE);
if (res == 0) { if (res == 0) {
@ -279,23 +277,23 @@ static void __init bootmem_reserve_initrd(int node)
#endif #endif
} }
static void __init bootmem_free_node(int node, struct meminfo *mi) static void __init arm_bootmem_free(struct meminfo *mi)
{ {
unsigned long zone_size[MAX_NR_ZONES], zhole_size[MAX_NR_ZONES]; unsigned long zone_size[MAX_NR_ZONES], zhole_size[MAX_NR_ZONES];
unsigned long min, max_low, max_high; unsigned long min, max_low, max_high;
int i; int i;
find_node_limits(node, mi, &min, &max_low, &max_high); find_limits(mi, &min, &max_low, &max_high);
/* /*
* initialise the zones within this node. * initialise the zones.
*/ */
memset(zone_size, 0, sizeof(zone_size)); memset(zone_size, 0, sizeof(zone_size));
/* /*
* The size of this node has already been determined. If we need * The memory size has already been determined. If we need
* to do anything fancy with the allocation of this memory to the * to do anything fancy with the allocation of this memory
* zones, now is the time to do it. * to the zones, now is the time to do it.
*/ */
zone_size[0] = max_low - min; zone_size[0] = max_low - min;
#ifdef CONFIG_HIGHMEM #ifdef CONFIG_HIGHMEM
@ -303,11 +301,11 @@ static void __init bootmem_free_node(int node, struct meminfo *mi)
#endif #endif
/* /*
* For each bank in this node, calculate the size of the holes. * Calculate the size of the holes.
* holes = node_size - sum(bank_sizes_in_node) * holes = node_size - sum(bank_sizes)
*/ */
memcpy(zhole_size, zone_size, sizeof(zhole_size)); memcpy(zhole_size, zone_size, sizeof(zhole_size));
for_each_nodebank(i, mi, node) { for_each_bank(i, mi) {
int idx = 0; int idx = 0;
#ifdef CONFIG_HIGHMEM #ifdef CONFIG_HIGHMEM
if (mi->bank[i].highmem) if (mi->bank[i].highmem)
@ -320,9 +318,9 @@ static void __init bootmem_free_node(int node, struct meminfo *mi)
* Adjust the sizes according to any special requirements for * Adjust the sizes according to any special requirements for
* this machine type. * this machine type.
*/ */
arch_adjust_zones(node, zone_size, zhole_size); arch_adjust_zones(0, zone_size, zhole_size);
free_area_init_node(node, zone_size, min, zhole_size); free_area_init_node(0, zone_size, min, zhole_size);
} }
#ifndef CONFIG_SPARSEMEM #ifndef CONFIG_SPARSEMEM
@ -346,16 +344,16 @@ int pfn_valid(unsigned long pfn)
} }
EXPORT_SYMBOL(pfn_valid); EXPORT_SYMBOL(pfn_valid);
static void arm_memory_present(struct meminfo *mi, int node) static void arm_memory_present(struct meminfo *mi)
{ {
} }
#else #else
static void arm_memory_present(struct meminfo *mi, int node) static void arm_memory_present(struct meminfo *mi)
{ {
int i; int i;
for_each_nodebank(i, mi, node) { for_each_bank(i, mi) {
struct membank *bank = &mi->bank[i]; struct membank *bank = &mi->bank[i];
memory_present(node, bank_pfn_start(bank), bank_pfn_end(bank)); memory_present(0, bank_pfn_start(bank), bank_pfn_end(bank));
} }
} }
#endif #endif
@ -364,55 +362,35 @@ void __init bootmem_init(void)
{ {
struct meminfo *mi = &meminfo; struct meminfo *mi = &meminfo;
unsigned long min, max_low, max_high; unsigned long min, max_low, max_high;
int node, initrd_node; int initrd;
/* /*
* Locate which node contains the ramdisk image, if any. * Locate the ramdisk image, if any.
*/ */
initrd_node = check_initrd(mi); initrd = check_initrd(mi);
max_low = max_high = 0; max_low = max_high = 0;
/* find_limits(mi, &min, &max_low, &max_high);
* Run through each node initialising the bootmem allocator.
*/
for_each_node(node) {
unsigned long node_low, node_high;
find_node_limits(node, mi, &min, &node_low, &node_high); arm_bootmem_init(mi, min, max_low);
if (node_low > max_low)
max_low = node_low;
if (node_high > max_high)
max_high = node_high;
/* /*
* If there is no memory in this node, ignore it. * Reserve any special regions.
* (We can't have nodes which have no lowmem)
*/ */
if (node_low == 0) reserve_special_regions();
continue;
bootmem_init_node(node, mi, min, node_low);
/* /*
* Reserve any special node zero regions. * If the initrd is present, reserve its memory.
*/ */
if (node == 0) if (initrd == 0)
reserve_node_zero(NODE_DATA(node)); bootmem_reserve_initrd();
/*
* If the initrd is in this node, reserve its memory.
*/
if (node == initrd_node)
bootmem_reserve_initrd(node);
/* /*
* Sparsemem tries to allocate bootmem in memory_present(), * Sparsemem tries to allocate bootmem in memory_present(),
* so must be done after the fixed reservations * so must be done after the fixed reservations
*/ */
arm_memory_present(mi, node); arm_memory_present(mi);
}
/* /*
* sparse_init() needs the bootmem allocator up and running. * sparse_init() needs the bootmem allocator up and running.
@ -420,12 +398,11 @@ void __init bootmem_init(void)
sparse_init(); sparse_init();
/* /*
* Now free memory in each node - free_area_init_node needs * Now free the memory - free_area_init_node needs
* the sparse mem_map arrays initialized by sparse_init() * the sparse mem_map arrays initialized by sparse_init()
* for memmap_init_zone(), otherwise all PFNs are invalid. * for memmap_init_zone(), otherwise all PFNs are invalid.
*/ */
for_each_node(node) arm_bootmem_free(mi);
bootmem_free_node(node, mi);
high_memory = __va((max_low << PAGE_SHIFT) - 1) + 1; high_memory = __va((max_low << PAGE_SHIFT) - 1) + 1;
@ -460,7 +437,7 @@ static inline int free_area(unsigned long pfn, unsigned long end, char *s)
} }
static inline void static inline void
free_memmap(int node, unsigned long start_pfn, unsigned long end_pfn) free_memmap(unsigned long start_pfn, unsigned long end_pfn)
{ {
struct page *start_pg, *end_pg; struct page *start_pg, *end_pg;
unsigned long pg, pgend; unsigned long pg, pgend;
@ -483,13 +460,13 @@ free_memmap(int node, unsigned long start_pfn, unsigned long end_pfn)
* free the section of the memmap array. * free the section of the memmap array.
*/ */
if (pg < pgend) if (pg < pgend)
free_bootmem_node(NODE_DATA(node), pg, pgend - pg); free_bootmem(pg, pgend - pg);
} }
/* /*
* The mem_map array can get very big. Free the unused area of the memory map. * The mem_map array can get very big. Free the unused area of the memory map.
*/ */
static void __init free_unused_memmap_node(int node, struct meminfo *mi) static void __init free_unused_memmap(struct meminfo *mi)
{ {
unsigned long bank_start, prev_bank_end = 0; unsigned long bank_start, prev_bank_end = 0;
unsigned int i; unsigned int i;
@ -499,7 +476,7 @@ static void __init free_unused_memmap_node(int node, struct meminfo *mi)
* may not be the case, especially if the user has provided the * may not be the case, especially if the user has provided the
* information on the command line. * information on the command line.
*/ */
for_each_nodebank(i, mi, node) { for_each_bank(i, mi) {
struct membank *bank = &mi->bank[i]; struct membank *bank = &mi->bank[i];
bank_start = bank_pfn_start(bank); bank_start = bank_pfn_start(bank);
@ -514,7 +491,7 @@ static void __init free_unused_memmap_node(int node, struct meminfo *mi)
* between the current bank and the previous, free it. * between the current bank and the previous, free it.
*/ */
if (prev_bank_end && prev_bank_end != bank_start) if (prev_bank_end && prev_bank_end != bank_start)
free_memmap(node, prev_bank_end, bank_start); free_memmap(prev_bank_end, bank_start);
prev_bank_end = bank_pfn_end(bank); prev_bank_end = bank_pfn_end(bank);
} }
@ -528,21 +505,14 @@ static void __init free_unused_memmap_node(int node, struct meminfo *mi)
void __init mem_init(void) void __init mem_init(void)
{ {
unsigned long reserved_pages, free_pages; unsigned long reserved_pages, free_pages;
int i, node; int i;
#ifndef CONFIG_DISCONTIGMEM
max_mapnr = pfn_to_page(max_pfn + PHYS_PFN_OFFSET) - mem_map; max_mapnr = pfn_to_page(max_pfn + PHYS_PFN_OFFSET) - mem_map;
#endif
/* this will put all unused low memory onto the freelists */ /* this will put all unused low memory onto the freelists */
for_each_online_node(node) { free_unused_memmap(&meminfo);
pg_data_t *pgdat = NODE_DATA(node);
free_unused_memmap_node(node, &meminfo); totalram_pages += free_all_bootmem();
if (pgdat->node_spanned_pages != 0)
totalram_pages += free_all_bootmem_node(pgdat);
}
#ifdef CONFIG_SA1111 #ifdef CONFIG_SA1111
/* now that our DMA memory is actually so designated, we can free it */ /* now that our DMA memory is actually so designated, we can free it */
@ -552,21 +522,18 @@ void __init mem_init(void)
#ifdef CONFIG_HIGHMEM #ifdef CONFIG_HIGHMEM
/* set highmem page free */ /* set highmem page free */
for_each_online_node(node) { for_each_bank (i, &meminfo) {
for_each_nodebank (i, &meminfo, node) {
unsigned long start = bank_pfn_start(&meminfo.bank[i]); unsigned long start = bank_pfn_start(&meminfo.bank[i]);
unsigned long end = bank_pfn_end(&meminfo.bank[i]); unsigned long end = bank_pfn_end(&meminfo.bank[i]);
if (start >= max_low_pfn + PHYS_PFN_OFFSET) if (start >= max_low_pfn + PHYS_PFN_OFFSET)
totalhigh_pages += free_area(start, end, NULL); totalhigh_pages += free_area(start, end, NULL);
} }
}
totalram_pages += totalhigh_pages; totalram_pages += totalhigh_pages;
#endif #endif
reserved_pages = free_pages = 0; reserved_pages = free_pages = 0;
for_each_online_node(node) { for_each_bank(i, &meminfo) {
for_each_nodebank(i, &meminfo, node) {
struct membank *bank = &meminfo.bank[i]; struct membank *bank = &meminfo.bank[i];
unsigned int pfn1, pfn2; unsigned int pfn1, pfn2;
struct page *page, *end; struct page *page, *end;
@ -585,7 +552,6 @@ void __init mem_init(void)
page++; page++;
} while (page < end); } while (page < end);
} }
}
/* /*
* Since our memory may not be contiguous, calculate the * Since our memory may not be contiguous, calculate the

4
arch/arm/mm/mm.h
View File

@ -28,7 +28,5 @@ extern void __flush_dcache_page(struct address_space *mapping, struct page *page
#endif #endif
struct pglist_data;
void __init bootmem_init(void); void __init bootmem_init(void);
void reserve_node_zero(struct pglist_data *pgdat); void reserve_special_regions(void);

36
arch/arm/mm/mmu.c
View File

@ -827,9 +827,9 @@ static inline void prepare_page_table(void)
} }
/* /*
* Reserve the various regions of node 0 * Reserve the various regions
*/ */
void __init reserve_node_zero(pg_data_t *pgdat) void __init reserve_special_regions(void)
{ {
unsigned long res_size = 0; unsigned long res_size = 0;
@ -838,18 +838,16 @@ void __init reserve_node_zero(pg_data_t *pgdat)
* Note that this can only be in node 0. * Note that this can only be in node 0.
*/ */
#ifdef CONFIG_XIP_KERNEL #ifdef CONFIG_XIP_KERNEL
reserve_bootmem_node(pgdat, __pa(_data), _end - _data, reserve_bootmem(__pa(_data), _end - _data, BOOTMEM_DEFAULT);
BOOTMEM_DEFAULT);
#else #else
reserve_bootmem_node(pgdat, __pa(_stext), _end - _stext, reserve_bootmem(__pa(_stext), _end - _stext, BOOTMEM_DEFAULT);
BOOTMEM_DEFAULT);
#endif #endif
/* /*
* Reserve the page tables. These are already in use, * Reserve the page tables. These are already in use,
* and can only be in node 0. * and can only be in node 0.
*/ */
reserve_bootmem_node(pgdat, __pa(swapper_pg_dir), reserve_bootmem(__pa(swapper_pg_dir),
PTRS_PER_PGD * sizeof(pgd_t), BOOTMEM_DEFAULT); PTRS_PER_PGD * sizeof(pgd_t), BOOTMEM_DEFAULT);
/* /*
@ -874,29 +872,22 @@ void __init reserve_node_zero(pg_data_t *pgdat)
if (machine_is_h1940() || machine_is_rx3715() if (machine_is_h1940() || machine_is_rx3715()
|| machine_is_rx1950()) { || machine_is_rx1950()) {
reserve_bootmem_node(pgdat, 0x30003000, 0x1000, reserve_bootmem(0x30003000, 0x1000, BOOTMEM_DEFAULT);
BOOTMEM_DEFAULT); reserve_bootmem(0x30081000, 0x1000, BOOTMEM_DEFAULT);
reserve_bootmem_node(pgdat, 0x30081000, 0x1000,
BOOTMEM_DEFAULT);
} }
if (machine_is_palmld() || machine_is_palmtx()) { if (machine_is_palmld() || machine_is_palmtx()) {
reserve_bootmem_node(pgdat, 0xa0000000, 0x1000, reserve_bootmem(0xa0000000, 0x1000, BOOTMEM_EXCLUSIVE);
BOOTMEM_EXCLUSIVE); reserve_bootmem(0xa0200000, 0x1000, BOOTMEM_EXCLUSIVE);
reserve_bootmem_node(pgdat, 0xa0200000, 0x1000,
BOOTMEM_EXCLUSIVE);
} }
if (machine_is_treo680() || machine_is_centro()) { if (machine_is_treo680() || machine_is_centro()) {
reserve_bootmem_node(pgdat, 0xa0000000, 0x1000, reserve_bootmem(0xa0000000, 0x1000, BOOTMEM_EXCLUSIVE);
BOOTMEM_EXCLUSIVE); reserve_bootmem(0xa2000000, 0x1000, BOOTMEM_EXCLUSIVE);
reserve_bootmem_node(pgdat, 0xa2000000, 0x1000,
BOOTMEM_EXCLUSIVE);
} }
if (machine_is_palmt5()) if (machine_is_palmt5())
reserve_bootmem_node(pgdat, 0xa0200000, 0x1000, reserve_bootmem(0xa0200000, 0x1000, BOOTMEM_EXCLUSIVE);
BOOTMEM_EXCLUSIVE);
/* /*
* U300 - This platform family can share physical memory * U300 - This platform family can share physical memory
@ -920,8 +911,7 @@ void __init reserve_node_zero(pg_data_t *pgdat)
res_size = __pa(swapper_pg_dir) - PHYS_OFFSET; res_size = __pa(swapper_pg_dir) - PHYS_OFFSET;
#endif #endif
if (res_size) if (res_size)
reserve_bootmem_node(pgdat, PHYS_OFFSET, res_size, reserve_bootmem(PHYS_OFFSET, res_size, BOOTMEM_DEFAULT);
BOOTMEM_DEFAULT);
} }
/* /*

13
arch/arm/mm/nommu.c
View File

@ -18,20 +18,18 @@
#include "mm.h" #include "mm.h"
/* /*
* Reserve the various regions of node 0 * Reserve the various regions
*/ */
void __init reserve_node_zero(pg_data_t *pgdat) void __init reserve_special_regions(void)
{ {
/* /*
* Register the kernel text and data with bootmem. * Register the kernel text and data with bootmem.
* Note that this can only be in node 0. * Note that this can only be in node 0.
*/ */
#ifdef CONFIG_XIP_KERNEL #ifdef CONFIG_XIP_KERNEL
reserve_bootmem_node(pgdat, __pa(_data), _end - _data, reserve_bootmem(__pa(_data), _end - _data, BOOTMEM_DEFAULT);
BOOTMEM_DEFAULT);
#else #else
reserve_bootmem_node(pgdat, __pa(_stext), _end - _stext, reserve_bootmem(__pa(_stext), _end - _stext, BOOTMEM_DEFAULT);
BOOTMEM_DEFAULT);
#endif #endif
/* /*
@ -39,8 +37,7 @@ void __init reserve_node_zero(pg_data_t *pgdat)
* some architectures which the DRAM is the exception vector to trap, * some architectures which the DRAM is the exception vector to trap,
* alloc_page breaks with error, although it is not NULL, but "0." * alloc_page breaks with error, although it is not NULL, but "0."
*/ */
reserve_bootmem_node(pgdat, CONFIG_VECTORS_BASE, PAGE_SIZE, reserve_bootmem(CONFIG_VECTORS_BASE, PAGE_SIZE, BOOTMEM_DEFAULT);
BOOTMEM_DEFAULT);
} }
/* /*