drop queue-4.14/mips-make-sure-dt-memory-regions-are-valid.patch

diff --git a/queue-4.14/mips-make-sure-dt-memory-regions-are-valid.patch b/queue-4.14/mips-make-sure-dt-memory-regions-are-valid.patch
deleted file mode 100644 (file)
index f1fc127..0000000
--- a/queue-4.14/mips-make-sure-dt-memory-regions-are-valid.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From 50ba11f352fb9cdb18e22b27448b636a691f0607 Mon Sep 17 00:00:00 2001
-From: Serge Semin <fancer.lancer@gmail.com>
-Date: Fri, 3 May 2019 20:50:40 +0300
-Subject: mips: Make sure dt memory regions are valid
-
-[ Upstream commit 93fa5b280761a4dbb14c5330f260380385ab2b49 ]
-
-There are situations when memory regions coming from dts may be
-too big for the platform physical address space. This especially
-concerns XPA-capable systems. Bootloader may determine more than 4GB
-memory available and pass it to the kernel over dts memory node, while
-kernel is built without XPA/64BIT support. In this case the region
-may either simply be truncated by add_memory_region() method
-or by u64->phys_addr_t type casting. But in worst case the method
-can even drop the memory region if it exceeds PHYS_ADDR_MAX size.
-So lets make sure the retrieved from dts memory regions are valid,
-and if some of them aren't, just manually truncate them with a warning
-printed out.
-
-Signed-off-by: Serge Semin <fancer.lancer@gmail.com>
-Signed-off-by: Paul Burton <paul.burton@mips.com>
-Cc: Ralf Baechle <ralf@linux-mips.org>
-Cc: James Hogan <jhogan@kernel.org>
-Cc: Mike Rapoport <rppt@linux.ibm.com>
-Cc: Andrew Morton <akpm@linux-foundation.org>
-Cc: Michal Hocko <mhocko@suse.com>
-Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-Cc: Thomas Bogendoerfer <tbogendoerfer@suse.de>
-Cc: Huacai Chen <chenhc@lemote.com>
-Cc: Stefan Agner <stefan@agner.ch>
-Cc: Stephen Rothwell <sfr@canb.auug.org.au>
-Cc: Alexandre Belloni <alexandre.belloni@bootlin.com>
-Cc: Juergen Gross <jgross@suse.com>
-Cc: Serge Semin <Sergey.Semin@t-platforms.ru>
-Cc: linux-mips@vger.kernel.org
-Cc: linux-kernel@vger.kernel.org
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- arch/mips/kernel/prom.c | 14 +++++++++++++-
- 1 file changed, 13 insertions(+), 1 deletion(-)
-
-diff --git a/arch/mips/kernel/prom.c b/arch/mips/kernel/prom.c
-index 0dbcd152a1a9..90f332f0625f 100644
---- a/arch/mips/kernel/prom.c
-+++ b/arch/mips/kernel/prom.c
-@@ -41,7 +41,19 @@ char *mips_get_machine_name(void)
- #ifdef CONFIG_USE_OF
- void __init early_init_dt_add_memory_arch(u64 base, u64 size)
- {
--      return add_memory_region(base, size, BOOT_MEM_RAM);
-+      if (base >= PHYS_ADDR_MAX) {
-+              pr_warn("Trying to add an invalid memory region, skipped\n");
-+              return;
-+      }
-+
-+      /* Truncate the passed memory region instead of type casting */
-+      if (base + size - 1 >= PHYS_ADDR_MAX || base + size < base) {
-+              pr_warn("Truncate memory region %llx @ %llx to size %llx\n",
-+                      size, base, PHYS_ADDR_MAX - base);
-+              size = PHYS_ADDR_MAX - base;
-+      }
-+
-+      add_memory_region(base, size, BOOT_MEM_RAM);
- }
- 
- void * __init early_init_dt_alloc_memory_arch(u64 size, u64 align)
--- 
-2.20.1
-

diff --git a/queue-4.14/series b/queue-4.14/series
index d5fe6696b18d49676b7b1af605123a4007979c77..5d71d3d73830cde2d8b59cb5e4bef18e637236f5 100644 (file)
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -31,7 +31,6 @@ percpu-remove-spurious-lock-dependency-between-percp.patch
 configfs-fix-possible-use-after-free-in-configfs_reg.patch
 uml-fix-a-boot-splat-wrt-use-of-cpu_all_mask.patch
 mmc-mmci-prevent-polling-for-busy-detection-in-irq-c.patch
-mips-make-sure-dt-memory-regions-are-valid.patch
 watchdog-imx2_wdt-fix-set_timeout-for-big-timeout-va.patch
 watchdog-fix-compile-time-error-of-pretimeout-govern.patch
 blk-mq-move-cancel-of-requeue_work-into-blk_mq_relea.patch