From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Wed, 27 Nov 2019 07:59:33 +0000 (+0100)
Subject: 5.3-stable patches
X-Git-Tag: v4.4.204~54
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d3b58b1027b36624499f6d5716f63dccd3578182;p=thirdparty%2Fkernel%2Fstable-queue.git

5.3-stable patches

added patches:
	arm-8904-1-skip-nomap-memblocks-while-finding-the-lowmem-highmem-boundary.patch
---

diff --git a/queue-5.3/arm-8904-1-skip-nomap-memblocks-while-finding-the-lowmem-highmem-boundary.patch b/queue-5.3/arm-8904-1-skip-nomap-memblocks-while-finding-the-lowmem-highmem-boundary.patch
new file mode 100644
index 00000000000..714bdc4e808
--- /dev/null
+++ b/queue-5.3/arm-8904-1-skip-nomap-memblocks-while-finding-the-lowmem-highmem-boundary.patch
@@ -0,0 +1,36 @@
+From 1d31999cf04c21709f72ceb17e65b54a401330da Mon Sep 17 00:00:00 2001
+From: Chester Lin <clin@suse.com>
+Date: Fri, 30 Aug 2019 14:30:07 +0100
+Subject: ARM: 8904/1: skip nomap memblocks while finding the lowmem/highmem boundary
+
+From: Chester Lin <clin@suse.com>
+
+commit 1d31999cf04c21709f72ceb17e65b54a401330da upstream.
+
+adjust_lowmem_bounds() checks every memblocks in order to find the boundary
+between lowmem and highmem. However some memblocks could be marked as NOMAP
+so they are not used by kernel, which should be skipped while calculating
+the boundary.
+
+Signed-off-by: Chester Lin <clin@suse.com>
+Reviewed-by: Mike Rapoport <rppt@linux.ibm.com>
+Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
+Signed-off-by: Lee Jones <lee.jones@linaro.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ arch/arm/mm/mmu.c |    3 +++
+ 1 file changed, 3 insertions(+)
+
+--- a/arch/arm/mm/mmu.c
++++ b/arch/arm/mm/mmu.c
+@@ -1197,6 +1197,9 @@ void __init adjust_lowmem_bounds(void)
+ 		phys_addr_t block_start = reg->base;
+ 		phys_addr_t block_end = reg->base + reg->size;
+ 
++		if (memblock_is_nomap(reg))
++			continue;
++
+ 		if (reg->base < vmalloc_limit) {
+ 			if (block_end > lowmem_limit)
+ 				/*
diff --git a/queue-5.3/series b/queue-5.3/series
index f39c4fe5f2e..8e07b81ca87 100644
--- a/queue-5.3/series
+++ b/queue-5.3/series
@@ -42,3 +42,4 @@ revert-bluetooth-hci_ll-set-operational-frequency-earlier.patch
 revert-dm-crypt-use-wq_highpri-for-the-io-and-crypt-workqueues.patch
 md-raid10-prevent-access-of-uninitialized-resync_pages-offset.patch
 mdio_bus-fix-init-if-config_reset_controller-n.patch
+arm-8904-1-skip-nomap-memblocks-while-finding-the-lowmem-highmem-boundary.patch