From: Mike Rapoport <rppt@kernel.org>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: Alexey Dobriyan <adobriyan@gmail.com>,
Catalin Marinas <catalin.marinas@arm.com>,
Geert Uytterhoeven <geert@linux-m68k.org>,
Greg Ungerer <gerg@linux-m68k.org>,
John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>,
Jonathan Corbet <corbet@lwn.net>,
Matt Turner <mattst88@gmail.com>, Meelis Roos <mroos@linux.ee>,
Michael Schmitz <schmitzmic@gmail.com>,
Mike Rapoport <rppt@kernel.org>,
Mike Rapoport <rppt@linux.ibm.com>,
Russell King <linux@armlinux.org.uk>,
Tony Luck <tony.luck@intel.com>,
Vineet Gupta <vgupta@synopsys.com>, Will Deacon <will@kernel.org>,
linux-alpha@vger.kernel.org,
linux-arm-kernel@lists.infradead.org, linux-doc@vger.kernel.org,
linux-fsdevel@vger.kernel.org, linux-ia64@vger.kernel.org,
linux-kernel@vger.kernel.org, linux-m68k@lists.linux-m68k.org,
linux-mm@kvack.org, linux-snps-arc@lists.infradead.org
Subject: [PATCH v2 11/13] m68k/mm: make node data and node setup depend on CONFIG_DISCONTIGMEM
Date: Sun, 1 Nov 2020 19:04:52 +0200 [thread overview]
Message-ID: <20201101170454.9567-12-rppt@kernel.org> (raw)
In-Reply-To: <20201101170454.9567-1-rppt@kernel.org>
From: Mike Rapoport <rppt@linux.ibm.com>
The pg_data_t node structures and their initialization currently depends on
!CONFIG_SINGLE_MEMORY_CHUNK. Since they are required only for DISCONTIGMEM
make this dependency explicit and replace usage of
CONFIG_SINGLE_MEMORY_CHUNK with CONFIG_DISCONTIGMEM where appropriate.
The CONFIG_SINGLE_MEMORY_CHUNK was implicitly disabled on the ColdFire MMU
variant, although it always presumed a single memory bank. As there is no
actual need for DISCONTIGMEM in this case, make sure that ColdFire MMU
systems set CONFIG_SINGLE_MEMORY_CHUNK to 'y'.
Signed-off-by: Mike Rapoport <rppt@linux.ibm.com>
---
arch/m68k/Kconfig.cpu | 4 ++--
arch/m68k/include/asm/page_mm.h | 2 +-
arch/m68k/include/asm/virtconvert.h | 2 +-
arch/m68k/mm/init.c | 4 ++--
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/arch/m68k/Kconfig.cpu b/arch/m68k/Kconfig.cpu
index 694c4fca9f5d..e8ad721e52f6 100644
--- a/arch/m68k/Kconfig.cpu
+++ b/arch/m68k/Kconfig.cpu
@@ -373,7 +373,7 @@ config RMW_INSNS
config SINGLE_MEMORY_CHUNK
bool "Use one physical chunk of memory only" if ADVANCED && !SUN3
depends on MMU
- default y if SUN3
+ default y if SUN3 || MMU_COLDFIRE
select NEED_MULTIPLE_NODES
help
Ignore all but the first contiguous chunk of physical memory for VM
@@ -406,7 +406,7 @@ config M68K_L2_CACHE
config NODES_SHIFT
int
default "3"
- depends on !SINGLE_MEMORY_CHUNK
+ depends on DISCONTIGMEM
config CPU_HAS_NO_BITFIELDS
bool
diff --git a/arch/m68k/include/asm/page_mm.h b/arch/m68k/include/asm/page_mm.h
index e6b75992192b..0e794051d3bb 100644
--- a/arch/m68k/include/asm/page_mm.h
+++ b/arch/m68k/include/asm/page_mm.h
@@ -126,7 +126,7 @@ static inline void *__va(unsigned long x)
extern int m68k_virt_to_node_shift;
-#ifdef CONFIG_SINGLE_MEMORY_CHUNK
+#ifndef CONFIG_DISCONTIGMEM
#define __virt_to_node(addr) (&pg_data_map[0])
#else
extern struct pglist_data *pg_data_table[];
diff --git a/arch/m68k/include/asm/virtconvert.h b/arch/m68k/include/asm/virtconvert.h
index dfe43083b579..eb9eb5cb23a6 100644
--- a/arch/m68k/include/asm/virtconvert.h
+++ b/arch/m68k/include/asm/virtconvert.h
@@ -29,7 +29,7 @@ static inline void *phys_to_virt(unsigned long address)
}
/* Permanent address of a page. */
-#if defined(CONFIG_MMU) && defined(CONFIG_SINGLE_MEMORY_CHUNK)
+#if defined(CONFIG_MMU) && !defined(CONFIG_DISCONTIGMEM)
#define page_to_phys(page) \
__pa(PAGE_OFFSET + (((page) - pg_data_map[0].node_mem_map) << PAGE_SHIFT))
#else
diff --git a/arch/m68k/mm/init.c b/arch/m68k/mm/init.c
index 53040857a9ed..4b46ceace3d3 100644
--- a/arch/m68k/mm/init.c
+++ b/arch/m68k/mm/init.c
@@ -47,14 +47,14 @@ EXPORT_SYMBOL(pg_data_map);
int m68k_virt_to_node_shift;
-#ifndef CONFIG_SINGLE_MEMORY_CHUNK
+#ifdef CONFIG_DISCONTIGMEM
pg_data_t *pg_data_table[65];
EXPORT_SYMBOL(pg_data_table);
#endif
void __init m68k_setup_node(int node)
{
-#ifndef CONFIG_SINGLE_MEMORY_CHUNK
+#ifdef CONFIG_DISCONTIGMEM
struct m68k_mem_info *info = m68k_memory + node;
int i, end;
--
2.28.0
next prev parent reply other threads:[~2020-11-01 17:06 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-01 17:04 [PATCH v2 00/13] arch, mm: deprecate DISCONTIGMEM Mike Rapoport
2020-11-01 17:04 ` [PATCH v2 01/13] alpha: switch from DISCONTIGMEM to SPARSEMEM Mike Rapoport
2020-11-01 17:04 ` [PATCH v2 02/13] ia64: remove custom __early_pfn_to_nid() Mike Rapoport
2020-11-01 17:04 ` [PATCH v2 03/13] ia64: remove 'ifdef CONFIG_ZONE_DMA32' statements Mike Rapoport
2020-11-01 17:04 ` [PATCH v2 04/13] ia64: discontig: paging_init(): remove local max_pfn calculation Mike Rapoport
2020-11-01 17:04 ` [PATCH v2 05/13] ia64: split virtual map initialization out of paging_init() Mike Rapoport
2020-11-01 17:04 ` [PATCH v2 06/13] ia64: forbid using VIRTUAL_MEM_MAP with FLATMEM Mike Rapoport
2020-11-01 17:04 ` [PATCH v2 07/13] ia64: make SPARSEMEM default and disable DISCONTIGMEM Mike Rapoport
2020-11-01 17:04 ` [PATCH v2 08/13] arm: remove CONFIG_ARCH_HAS_HOLES_MEMORYMODEL Mike Rapoport
2020-11-02 9:43 ` David Hildenbrand
2020-11-01 17:04 ` [PATCH v2 09/13] arm, arm64: move free_unused_memmap() to generic mm Mike Rapoport
2020-11-14 12:15 ` Catalin Marinas
2020-11-01 17:04 ` [PATCH v2 10/13] arc: use FLATMEM with freeing of unused memory map instead of DISCONTIGMEM Mike Rapoport
2020-11-17 6:40 ` Vineet Gupta
2020-11-17 6:57 ` Mike Rapoport
2020-11-24 0:26 ` Vineet Gupta
2020-11-01 17:04 ` Mike Rapoport [this message]
2020-11-01 17:04 ` [PATCH v2 12/13] m68k/mm: enable use of generic memory_model.h for !DISCONTIGMEM Mike Rapoport
2020-11-01 17:04 ` [PATCH v2 13/13] m68k: deprecate DISCONTIGMEM Mike Rapoport
2020-11-17 5:24 ` [PATCH v2 00/13] arch, mm: " John Paul Adrian Glaubitz
2020-11-17 6:23 ` Mike Rapoport
2020-11-17 8:07 ` John Paul Adrian Glaubitz
2020-11-17 8:14 ` Mike Rapoport
2020-12-01 9:10 ` John Paul Adrian Glaubitz
2020-12-01 10:29 ` Mike Rapoport
2020-12-01 11:35 ` John Paul Adrian Glaubitz
2020-12-01 12:10 ` Mike Rapoport
2020-12-01 12:16 ` John Paul Adrian Glaubitz
2020-12-01 13:56 ` Mike Rapoport
2020-12-01 15:03 ` Jens Axboe
2020-12-01 15:33 ` Geert Uytterhoeven
2020-12-02 8:43 ` Christoph Hellwig
2020-12-02 8:45 ` John Paul Adrian Glaubitz
2020-12-02 8:46 ` Christoph Hellwig
2020-12-02 8:46 ` Mike Rapoport
2020-12-02 8:47 ` Christoph Hellwig
2020-12-01 15:07 ` John Paul Adrian Glaubitz
2020-12-01 19:55 ` John Paul Adrian Glaubitz
2020-12-02 7:14 ` Mike Rapoport
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201101170454.9567-12-rppt@kernel.org \
--to=rppt@kernel.org \
--cc=adobriyan@gmail.com \
--cc=akpm@linux-foundation.org \
--cc=catalin.marinas@arm.com \
--cc=corbet@lwn.net \
--cc=geert@linux-m68k.org \
--cc=gerg@linux-m68k.org \
--cc=glaubitz@physik.fu-berlin.de \
--cc=linux-alpha@vger.kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-doc@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-ia64@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-m68k@lists.linux-m68k.org \
--cc=linux-mm@kvack.org \
--cc=linux-snps-arc@lists.infradead.org \
--cc=linux@armlinux.org.uk \
--cc=mattst88@gmail.com \
--cc=mroos@linux.ee \
--cc=rppt@linux.ibm.com \
--cc=schmitzmic@gmail.com \
--cc=tony.luck@intel.com \
--cc=vgupta@synopsys.com \
--cc=will@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).