mm-memblock-do-not-enforce-current-limit-for-memblock_phys-family.patch removed from -mm tree
The patch titled
Subject: mm: memblock: do not enforce current limit for memblock_phys* family
has been removed from the -mm tree. Its filename was
mm-memblock-do-not-enforce-current-limit-for-memblock_phys-family.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Mike Rapoport <[email protected]>
Subject: mm: memblock: do not enforce current limit for memblock_phys* family
Until commit 92d12f9544b7 ("memblock: refactor internal allocation functions") the maximal address for memblock allocations was forced to memblock.current_limit only for the allocation functions returning virtual address. The changes introduced by that commit moved the limit enforcement into the allocation core and as a result the allocation functions returning physical address also started to limit allocations to memblock.current_limit.
This caused breakage of etnaviv GPU driver:
[ 3.682347] etnaviv etnaviv: bound 130000.gpu (ops gpu_ops) [ 3.688669] etnaviv etnaviv: bound 134000.gpu (ops gpu_ops) [ 3.695099] etnaviv etnaviv: bound 2204000.gpu (ops gpu_ops) [ 3.700800] etnaviv-gpu 130000.gpu: model: GC2000, revision: 5108 [ 3.723013] etnaviv-gpu 130000.gpu: command buffer outside valid memory window [ 3.731308] etnaviv-gpu 134000.gpu: model: GC320, revision: 5007 [ 3.752437] etnaviv-gpu 134000.gpu: command buffer outside valid memory window [ 3.760583] etnaviv-gpu 2204000.gpu: model: GC355, revision: 1215 [ 3.766766] etnaviv-gpu 2204000.gpu: Ignoring GPU with VG and FE2.0
Restore the behaviour of memblock_phys* family so that these functions will not enforce memblock.current_limit.
---
mm/memblock.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
mm/memblock.c renamed from mm/memblock.c~mm-memblock-do-not-enforce-current-limit-for-memblock_phys-family +3 -3
@@ -1356,9 +1356,6 @@ static phys_addr_t __init memblock_alloc align =SMP_CACHE_BYTES ; } -if (end > memblock.current_limit) - end = memblock.current_limit; - again: found =memblock_find_in_range_node (size, align, start, end, nid, flags);
@@ -1469,6 +1466,9 @@ static void * __init memblock_alloc_inteif (WARN_ON_ONCE (slab_is_available ()))return kzalloc_node (size,GFP_NOWAIT , nid); +if (max_addr > memblock.current_limit) + max_addr = memblock.current_limit; + alloc =memblock_alloc_range_nid (size, align, min_addr, max_addr, nid);/* retry allocation without lower limit */
_
Patches currently in -mm which might be from [email protected] are