[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <20251231105701.519711-1-rppt@kernel.org>
Date: Wed, 31 Dec 2025 12:57:01 +0200
From: Mike Rapoport <rppt@...nel.org>
To: Thomas Bogendoerfer <tsbogend@...ha.franken.de>
Cc: Andrew Morton <akpm@...ux-foundation.org>,
Chris Packham <Chris.Packham@...iedtelesis.co.nz>,
Mike Rapoport <rppt@...nel.org>,
Thomas Gleixner <tglx@...utronix.de>,
hauke@...ke-m.de,
jelonek.jonas@...il.com,
markus.stockhausen@....de,
linux-mips@...r.kernel.org,
linux-kernel@...r.kernel.org,
linux-mm@...ck.org
Subject: [PATCH] mips: fix HIGHMEM initialization
From: "Mike Rapoport (Microsoft)" <rppt@...nel.org>
Commit 6faea3422e3b ("arch, mm: streamline HIGHMEM freeing") overzealously
removed mem_init_free_highmem() function that beside freeing high memory
pages checked for CPU support for high memory as a prerequisite.
Partially restore mem_init_free_highmem() with a new highmem_init() name
and make it discard high memory in case there is no CPU support for it.
Reported-by: markus.stockhausen@....de
Fixes: 6faea3422e3b ("arch, mm: streamline HIGHMEM freeing")
Signed-off-by: Mike Rapoport (Microsoft) <rppt@...nel.org>
---
arch/mips/mm/init.c | 23 +++++++++++++++++++++++
1 file changed, 23 insertions(+)
diff --git a/arch/mips/mm/init.c b/arch/mips/mm/init.c
index a673d3d68254..8986048f9b11 100644
--- a/arch/mips/mm/init.c
+++ b/arch/mips/mm/init.c
@@ -425,6 +425,28 @@ void __init paging_init(void)
static struct kcore_list kcore_kseg0;
#endif
+static inline void __init highmem_init(void)
+{
+#ifdef CONFIG_HIGHMEM
+ unsigned long tmp;
+
+ /*
+ * If CPU cannot support HIGHMEM discard the memory above highstart_pfn
+ */
+ if (cpu_has_dc_aliases) {
+ memblock_remove(PFN_PHYS(highstart_pfn), -1);
+ return;
+ }
+
+ for (tmp = highstart_pfn; tmp < highend_pfn; tmp++) {
+ struct page *page = pfn_to_page(tmp);
+
+ if (!memblock_is_memory(PFN_PHYS(tmp)))
+ SetPageReserved(page);
+ }
+#endif
+}
+
void __init arch_mm_preinit(void)
{
/*
@@ -435,6 +457,7 @@ void __init arch_mm_preinit(void)
maar_init();
setup_zero_pages(); /* Setup zeroed pages. */
+ highmem_init();
#ifdef CONFIG_64BIT
if ((unsigned long) &_text > (unsigned long) CKSEG0)
--
2.51.0
Powered by blists - more mailing lists