UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

[ARM] mm: allow LH7A40x to use sparsemem 

Enable Sparsemem support for LH7A40x SoCs, while still allowing the
existing discontig support for the time being.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
This commit is contained in:
Russell King 2008-10-01 21:38:23 +01:00 committed by Russell King
parent 07a2f737ba
commit 4ba3f7c559
3 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
arch/arm/Kconfig
View File

@ -510,6 +510,8 @@ config ARCH_SHARK
config ARCH_LH7A40X config ARCH_LH7A40X
bool "Sharp LH7A40X" bool "Sharp LH7A40X"
select ARCH_DISCONTIGMEM_ENABLE if !LH7A40X_CONTIGMEM
select ARCH_SPARSEMEM_ENABLE if !LH7A40X_CONTIGMEM
help help
Say Y here for systems based on one of the Sharp LH7A40X Say Y here for systems based on one of the Sharp LH7A40X
System on a Chip processors. These CPUs include an ARM922T System on a Chip processors. These CPUs include an ARM922T
@ -842,12 +844,6 @@ config OABI_COMPAT
# Discontigmem is deprecated # Discontigmem is deprecated
config ARCH_DISCONTIGMEM_ENABLE config ARCH_DISCONTIGMEM_ENABLE
bool bool
default (ARCH_LH7A40X && !LH7A40X_CONTIGMEM)
help
Say Y to support efficient handling of discontiguous physical memory,
for architectures which are either NUMA (Non-Uniform Memory Access)
or have huge holes in the physical address space for other reasons.
See <file:Documentation/vm/numa> for more.
config ARCH_SPARSEMEM_ENABLE config ARCH_SPARSEMEM_ENABLE
bool bool

13
arch/arm/mach-lh7a40x/Kconfig
View File

@ -40,23 +40,22 @@ config LPD7A40X_CPLD_SSP
bool bool
config LH7A40X_CONTIGMEM config LH7A40X_CONTIGMEM
bool "Disable NUMA Support" bool "Disable NUMA/SparseMEM Support"
depends on ARCH_LH7A40X
help help
Say Y here if your bootloader sets the SROMLL bit(s) in Say Y here if your bootloader sets the SROMLL bit(s) in
the SDRAM controller, organizing memory as a contiguous the SDRAM controller, organizing memory as a contiguous
array. This option will disable CONFIG_DISCONTIGMEM and array. This option will disable sparse memory support
force the kernel to manage all memory in one node. and force the kernel to manage all memory in one node.
Setting this option incorrectly may prevent the kernel from Setting this option incorrectly may prevent the kernel
booting. It is OK to leave it N. from booting. It is OK to leave it N.
For more information, consult For more information, consult
<file:Documentation/arm/Sharp-LH/SDRAM>. <file:Documentation/arm/Sharp-LH/SDRAM>.
config LH7A40X_ONE_BANK_PER_NODE config LH7A40X_ONE_BANK_PER_NODE
bool "Optimize NUMA Node Tables for Size" bool "Optimize NUMA Node Tables for Size"
depends on ARCH_LH7A40X && !LH7A40X_CONTIGMEM depends on !LH7A40X_CONTIGMEM
help help
Say Y here to produce compact memory node tables. By Say Y here to produce compact memory node tables. By
default pairs of adjacent physical RAM banks are managed default pairs of adjacent physical RAM banks are managed

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

@ -73,4 +73,10 @@
#endif #endif
/*
* Sparsemem version of the above
*/
#define MAX_PHYSMEM_BITS 32
#define SECTION_SIZE_BITS 24
#endif #endif