Skip to content

Commit 8d1a240

Browse files
committed
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
Pull sparc fixes from David Miller: 1) With modern networking cards we can run out of 32-bit DMA space, so support 64-bit DMA addressing when possible on sparc64. From Dave Tushar. 2) Some signal frame validation checks are inverted on sparc32, fix from Andreas Larsson. 3) Lockdep tables can get too large in some circumstances on sparc64, add a way to adjust the size a bit. From Babu Moger. 4) Fix NUMA node probing on some sun4v systems, from Thomas Tai. * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc: sparc: drop duplicate header scatterlist.h lockdep: Limit static allocations if PROVE_LOCKING_SMALL is defined config: Adding the new config parameter CONFIG_PROVE_LOCKING_SMALL for sparc sunbmac: Fix compiler warning sunqe: Fix compiler warnings sparc64: Enable 64-bit DMA sparc64: Enable sun4v dma ops to use IOMMU v2 APIs sparc64: Bind PCIe devices to use IOMMU v2 service sparc64: Initialize iommu_map_table and iommu_pool sparc64: Add ATU (new IOMMU) support sparc64: Add FORCE_MAX_ZONEORDER and default to 13 sparc64: fix compile warning section mismatch in find_node() sparc32: Fix inverted invalid_frame_pointer checks on sigreturns sparc64: Fix find_node warning if numa node cannot be found
2 parents 27e7ab9 + 9dd35d6 commit 8d1a240

17 files changed

Lines changed: 948 additions & 83 deletions

File tree

arch/sparc/Kconfig

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ config SPARC
4343
select ARCH_HAS_SG_CHAIN
4444
select CPU_NO_EFFICIENT_FFS
4545
select HAVE_ARCH_HARDENED_USERCOPY
46+
select PROVE_LOCKING_SMALL if PROVE_LOCKING
4647

4748
config SPARC32
4849
def_bool !64BIT
@@ -89,6 +90,14 @@ config ARCH_DEFCONFIG
8990
config ARCH_PROC_KCORE_TEXT
9091
def_bool y
9192

93+
config ARCH_ATU
94+
bool
95+
default y if SPARC64
96+
97+
config ARCH_DMA_ADDR_T_64BIT
98+
bool
99+
default y if ARCH_ATU
100+
92101
config IOMMU_HELPER
93102
bool
94103
default y if SPARC64
@@ -304,6 +313,20 @@ config ARCH_SPARSEMEM_ENABLE
304313
config ARCH_SPARSEMEM_DEFAULT
305314
def_bool y if SPARC64
306315

316+
config FORCE_MAX_ZONEORDER
317+
int "Maximum zone order"
318+
default "13"
319+
help
320+
The kernel memory allocator divides physically contiguous memory
321+
blocks into "zones", where each zone is a power of two number of
322+
pages. This option selects the largest power of two that the kernel
323+
keeps in the memory allocator. If you need to allocate very large
324+
blocks of physically contiguous memory, then you may need to
325+
increase this value.
326+
327+
This config option is actually maximum order plus one. For example,
328+
a value of 13 means that the largest free memory block is 2^12 pages.
329+
307330
source "mm/Kconfig"
308331

309332
if SPARC64

0 commit comments

Comments
 (0)